创建订单非空判断

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -3178,6 +3178,12 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 }
 
                 FsShippingTemplatesRegionScrm shippingTemplatesRegion = shippingTemplatesRegionMap.get(tempId);
+                
+                // 如果该运费模板在当前城市没有配置运费区域，跳过该商品
+                if (shippingTemplatesRegion == null) {
+                    continue;
+                }
+                
                 BigDecimal price = NumberUtil.round(NumberUtil.mul(storeCartVO.getCartNum(),
                         storeCartVO.getPrice()), 2);
                 if (!templateDTOMap.containsKey(tempId)) {
@@ -5013,7 +5019,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 return R.ok("接收成功").put("code", "ok");
             }
             String failMsg = addParam.getFailMsg();
-            if (com.hc.openapi.tool.util.StringUtils.isNotBlank(failMsg)) {
+            if (StringUtils.isNotBlank(failMsg)) {
                 if (failMsg.equals("暂未结果, 请稍后再查")) {
                     return R.ok("接收成功").put("code", "ok");
                 }
@@ -5068,7 +5074,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                             if (rlsDetails != null && !rlsDetails.isEmpty()) {
                                 RlsDetail rlsDetail = rlsDetails.get(0);
                                 String proName = rlsDetail.getProName();
-                                if (com.hc.openapi.tool.util.StringUtils.isNotBlank(proName)) {
+                                if (StringUtils.isNotBlank(proName)) {
                                     FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderNumber);
                                     if (order != null && order.getStatus() == 2) {
                                         order.setDeliveryId(mailNumber);