更换发货模板

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

@@ -4398,6 +4398,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 }
 
                 String orderNumber = vo.getOrderNumber();
+                if (orderNumber.startsWith("E")) {
+                    orderNumber = orderNumber.substring(1);
+                }
                 dto.setOrderNumber(orderNumber);
                 dto.setDeliveryName(vo.getLogisticsCompany());
                 dto.setDeliveryId(vo.getDeliveryId());
@@ -5506,7 +5509,12 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 } else {
                     //处理订单ID信息
                     String originalOrderNumber = dto.getOrderNumber();
-                    String processedOrderNumber = extractNumbers(originalOrderNumber);
+                    String processedOrderNumber = originalOrderNumber;
+                    if (originalOrderNumber.startsWith("E")) {
+                        processedOrderNumber = originalOrderNumber.substring(1);
+                    } else {
+                        processedOrderNumber = extractNumbers(originalOrderNumber);
+                    }
                     dto.setOrderNumber(processedOrderNumber);
                     orderCodeList.add(dto.getOrderNumber());
                 }

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

@@ -12,20 +12,20 @@ import java.math.BigDecimal;
 @Data
 public class FsStoreOrderDeliveryNoteExportVO implements Serializable {
     //系统订单号
-    @Excel(name = "原始单号",width = 20,sort = 1)
+    @Excel(name = "订单号",width = 20,sort = 1)
     private String orderNumber;
 
-    @Excel(name = "收件人",width = 10,sort = 2)
+    @Excel(name = "收件人/提货人",width = 10,sort = 4)
     private String recipient;
 
-    @Excel(name = "收件人手机",width = 20,sort = 3)
+    @Excel(name = "收件人手机号",width = 20,sort = 5)
     private String recipientPhone;
 
-    @Excel(name = "收件人电话",width = 20,sort = 4)
+//    @Excel(name = "收件人电话",width = 20,sort = 4)
     private String recipientTelephone;
 
     //具体到某个街道和小区
-    @Excel(name = "收件人详细地址",width = 30,sort = 5)
+    @Excel(name = "收件人详细地址/提货地址",width = 30,sort =6 )
     private String recipientAddress;
 
 //    //省市区
@@ -33,58 +33,64 @@ public class FsStoreOrderDeliveryNoteExportVO implements Serializable {
 //    private String receivingAddress;
 
     //编号和数量:662551*2
-    @Excel(name = "组合编号及数量",width = 20,sort = 7)
+    @Excel(name = "订单商品总件数",width = 20,sort = 3)
     private String number;
 
     //名称和数量:商品名称*2
-    @Excel(name = "组合名称及数量",width = 20,sort = 8)
+    @Excel(name = "商品名称*数量",width = 20,sort = 2)
     private String nameAndNumber;
 
-    @Excel(name = "代收金额",width = 10,sort = 9)
+//    @Excel(name = "代收金额",width = 10,sort = 9)
     private BigDecimal collectionAmount;
 
-    @Excel(name = "物流公司",width = 10,sort = 10)
+    @Excel(name = "物流公司(必填)",width = 10,sort = 10)
     private String logisticsCompany;
 
-    @Excel(name = "物流产品",width = 10,sort = 11)
+//    @Excel(name = "物流产品",width = 10,sort = 11)
     private String logisticsProduct;
 
-    @Excel(name = "物流付款方式",width = 15,sort = 12)
+//    @Excel(name = "物流付款方式",width = 15,sort = 12)
     private String logisticsPayMethod;
 
-    @Excel(name = "包裹数",width = 10,sort = 13)
+//    @Excel(name = "包裹数",width = 10,sort = 13)
     private Long packageNum;
 
-    @Excel(name = "寄件人",width = 10,sort = 14)
+//    @Excel(name = "寄件人",width = 10,sort = 14)
     private String sender;
 
-    @Excel(name = "寄件人手机",width = 20,sort = 15)
+//    @Excel(name = "寄件人手机",width = 20,sort = 15)
     private String senderPhone;
 
-    @Excel(name = "寄件人电话",width = 20,sort = 16)
+//    @Excel(name = "寄件人电话",width = 20,sort = 16)
     private String senderTelephone;
 
-    @Excel(name = "寄件公司",width = 10,sort = 17)
+//    @Excel(name = "寄件公司",width = 10,sort = 17)
     private String senderCompany;
 
     //具体到某个街道和小区
-    @Excel(name = "寄件人详细地址",width = 30,sort = 18)
+//    @Excel(name = "寄件人详细地址",width = 30,sort = 18)
     private String senderAddress;
 
-    @Excel(name = "出库仓库",width = 10,sort = 19)
+//    @Excel(name = "出库仓库",width = 10,sort = 19)
     private String outboundWarehouse;
 
-    @Excel(name = "订单付款方式",width = 10,sort = 20)
+//    @Excel(name = "订单付款方式",width = 10,sort = 20)
     private String payMethod;
 
-    @Excel(name = "订单备注",width = 20,sort = 21)
+    @Excel(name = "商家订单备注",width = 20,sort = 9)
     private String orderNotes;
 
-    @Excel(name = "快递单号(必填)",width = 20,sort = 22)
+    @Excel(name = "快递单号(必填)",width = 20,sort = 11)
     private String deliveryId;
 
-    @Excel(name = "小程序名称",width = 20,sort = 23)
+//    @Excel(name = "小程序名称",width = 20,sort = 23)
     private String miniAppName;
 
     private String keyword;
+
+    @Excel(name = "订单状态",width = 10,sort = 7, readConverterExp = "-1=申请退款,-2=退款成功,-3=已取消,0=待支付,1=待发货,2=待收货,3=已完成,4=待评价")
+    private  Integer status;
+
+    @Excel(name = "归属店铺",width = 10,sort = 8)
+    private  String storeName;
 }

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

@@ -2121,7 +2121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getDeliveryNote" resultType="com.fs.hisStore.vo.FsStoreOrderDeliveryNoteExportVO">
         SELECT
-        o.order_code AS orderNumber,
+        CONCAT('E', o.order_code) AS orderNumber,
         o.real_name AS recipient,
         o.user_phone AS recipientPhone,
         o.user_address AS recipientAddress,
@@ -2133,8 +2133,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
         SEPARATOR '+'
         ) AS nameAndNumber,
+        SUM(sois.num) AS number,
         sps.keyword,
-        fcpsc.name AS miniAppName
+        fcpsc.name AS miniAppName,
+        o.status AS status,
+        fs.store_name AS storeName
         FROM
         fs_store_order_scrm o
         LEFT JOIN fs_store_order_item_scrm sois
@@ -2162,6 +2165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ON o.id = fsp.order_id
         LEFT JOIN fs_course_play_source_config fcpsc
         ON fsp.app_id = fcpsc.appid AND fcpsc.is_del = 0
+        LEFT JOIN fs_store_scrm fs
+        ON sps.store_id = fs.store_id
         WHERE
         o.is_del = 0 and
         1 = 1