导入

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

@@ -4118,6 +4118,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             StoreConfig config = JSONUtil.toBean(json, StoreConfig.class);
 
             List<FsOrderDeliveryNoteDTO> successList = new ArrayList<>(voList.size());
+            List<FsOrderDeliveryNoteDTO> updateList = new ArrayList<>(voList.size());
             //提前获取所有必要数据
             Map<String, String> expressDeliveryMap = buildExpressDeliveryMap();
             //提取所有有效订单号
@@ -4145,28 +4146,28 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
 
                 //批量导入物流单号 存在快递鸟时订阅下方参数，进行调整
-                if(CloudHostUtils.hasCloudHostName("内蒙古一贴")){
-                    FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(dto.getOrderNumber());
-                    //订阅物流回调
-                    String lastFourNumber = "";
-                    if (dto.getLogisticsCompany().equals(ShipperCodeEnum.SF.getDesc())  || order.getDeliverySn().equals(ShipperCodeEnum.ZTO.getValue())) {
-                        lastFourNumber = order.getUserPhone();
-                        if (lastFourNumber.length() == 11) {
-                            lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
-                        }
-                    }
-                    expressService.subscribeEspress(order.getOrderCode(), order.getDeliverySn(), order.getDeliveryId(), lastFourNumber);
-
-                    TemplateBean templateBean = TemplateBean.builder()
-                            .orderId(order.getId().toString())
-                            .orderCode(order.getOrderCode().toString())
-                            .deliveryId(order.getDeliveryId())
-                            .deliveryName(order.getDeliveryName())
-                            .userId(order.getUserId())
-                            .templateType(TemplateListenEnum.TYPE_2.getValue())
-                            .build();
-                    publisher.publishEvent(new TemplateEvent(this, templateBean));
-                }
+//                if(CloudHostUtils.hasCloudHostName("内蒙古一贴")){
+//                    FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(dto.getOrderNumber());
+//                    //订阅物流回调
+//                    String lastFourNumber = "";
+//                    if (dto.getLogisticsCompany().equals(ShipperCodeEnum.SF.getDesc())  || order.getDeliverySn().equals(ShipperCodeEnum.ZTO.getValue())) {
+//                        lastFourNumber = order.getUserPhone();
+//                        if (lastFourNumber.length() == 11) {
+//                            lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
+//                        }
+//                    }
+//                    expressService.subscribeEspress(order.getOrderCode(), order.getDeliverySn(), order.getDeliveryId(), lastFourNumber);
+//
+//                    TemplateBean templateBean = TemplateBean.builder()
+//                            .orderId(order.getId().toString())
+//                            .orderCode(order.getOrderCode().toString())
+//                            .deliveryId(order.getDeliveryId())
+//                            .deliveryName(order.getDeliveryName())
+//                            .userId(order.getUserId())
+//                            .templateType(TemplateListenEnum.TYPE_2.getValue())
+//                            .build();
+//                    publisher.publishEvent(new TemplateEvent(this, templateBean));
+//                }
             }
 
             //批量查询订单信息
@@ -4244,19 +4245,19 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     // 上传物流信息到微信
                     List<FsStoreOrderCodeOpenIdVo> orderDetails = orderDetailsMap.get(orderNumber);
                     if (uploadShippingInfoToWechat(wxService, orderInfo, orderDetails, dto, uploadTime,shipmentType)) {
-                        successList.add(dto);
+                        updateList.add(dto);
                     } else {
                         builder.append("数据第").append(rowNum).append("行订单号为")
                                 .append(orderNumber).append("上传微信失败").append(System.lineSeparator());
                     }
                 } else {
-                    successList.add(dto);
+                    updateList.add(dto);
                 }
             }
 
             //批量更新数据
-            if (!successList.isEmpty()) {
-                batchUpdateDeliveryNotes(successList);
+            if (!updateList.isEmpty()) {
+                batchUpdateDeliveryNotes(updateList);
             }
 
             return R.ok(builder.toString().equals("") ? "操作成功！" : builder.toString());