发货单导出和批量微信发货模板发货逻辑优化2

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

@@ -3607,10 +3607,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 }if(StringUtils.isEmpty(dto.getDeliveryId())){
                     builder.append("数据第").append(i + 2).append("行快递单号为空！").append(System.lineSeparator());
                 } else {
-//                    //处理订单ID信息
-//                    String originalOrderNumber = dto.getOrderNumber();
-//                    String processedOrderNumber = extractNumbers(originalOrderNumber);
-//                    dto.setOrderNumber(processedOrderNumber);
+                    //处理订单ID信息
+                    String originalOrderNumber = dto.getOrderNumber();
+                    String processedOrderNumber = extractNumbers(originalOrderNumber);
+                    dto.setOrderNumber(processedOrderNumber);
                     orderCodeList.add(dto.getOrderNumber());
                 }
             }
@@ -3624,7 +3624,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             Map<String, List<FsStoreOrderCodeOpenIdVo>> orderDetailsMap = new HashMap<>(orderCodeOpenIdVoList.size());
 
             for (FsStoreOrderCodeOpenIdVo vo : orderCodeOpenIdVoList) {
-                orderMap.computeIfAbsent(vo.getOrderCode(), k -> {
+                orderMap.computeIfAbsent(vo.getId(), k -> {
                     OrderOpenIdTransDTO dto = new OrderOpenIdTransDTO();
                     dto.setOpenId(vo.getOpenId());
                     dto.setTransactionId(vo.getOutTransId());
@@ -3632,7 +3632,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 });
 
                 orderDetailsMap
-                        .computeIfAbsent(vo.getOrderCode(), k -> new ArrayList<>())
+                        .computeIfAbsent(vo.getId(), k -> new ArrayList<>())
                         .add(vo);
             }
             final WxMaService wxService = WxMaConfiguration.getMaService(appId);

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderCodeOpenIdVo.java

@@ -5,10 +5,15 @@ import lombok.Data;
 import java.io.Serializable;
 @Data
 public class FsStoreOrderCodeOpenIdVo implements Serializable {
+//    /**
+//     * 订单编码
+//     * **/
+//    private String orderCode;
+
     /**
-     * 订单编码
+     * 订单id
      * **/
-    private String orderCode;
+    private String id;
 
     /**
      * 用户openId

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -885,19 +885,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <set>
             delivery_sn = CASE
             <foreach collection="list" item="item">
-                WHEN order_code = #{item.orderNumber} THEN #{item.deliverySn}
+                WHEN id = #{item.orderNumber} THEN #{item.deliverySn}
             </foreach>
             ELSE delivery_sn
             END,
             delivery_name = CASE
             <foreach collection="list" item="item">
-                WHEN order_code = #{item.orderNumber} THEN #{item.logisticsCompany}
+                WHEN id = #{item.orderNumber} THEN #{item.logisticsCompany}
             </foreach>
             ELSE delivery_name
             END,
             delivery_id = CASE
             <foreach collection="list" item="item">
-                WHEN order_code = #{item.orderNumber} THEN #{item.deliveryId}
+                WHEN id = #{item.orderNumber} THEN #{item.deliveryId}
             </foreach>
             ELSE delivery_id
             END,
@@ -907,7 +907,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             END,
             delivery_send_time = NOW()
         </set>
-        WHERE order_code IN
+        WHERE id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item.orderNumber}
         </foreach>
@@ -922,7 +922,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderCodeOpenIdInOrderCode" resultType="com.fs.hisStore.vo.FsStoreOrderCodeOpenIdVo">
         SELECT
-        os.order_code,
+        os.id,
         fu.phone,
         fu.ma_open_id openId,
         ois.json_info,
@@ -932,7 +932,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INNER JOIN fs_user fu ON os.user_id = fu.user_id
         INNER JOIN fs_store_order_item_scrm ois ON ois.order_id = os.id
         INNER JOIN fs_store_payment_scrm sps ON os.id=sps.order_id
-                                                  WHERE os.order_code IN <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+                                                  WHERE os.id IN <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
         #{item}
     </foreach>
     AND  sps.`status` = 1