feat: 导出添加快递

fs-admin/src/test/java/com/fs/store/controller/FsStorePaymentControllerTest.java

@@ -115,7 +115,16 @@ public class FsStorePaymentControllerTest {
     @Test
     public void refund(){
         String[] data = new String[]{
-                "851491647274359744"
+                "1909861513640804352",
+//                "1909850673067851776",
+//                "1909850015832997888",
+//                "1909843803510931456"
+//                "1909829173233319936",
+//                "1909796083228213248",
+//                "1909793106169954304",
+//                "1909753328464560128",
+//                "1909728664442896384"
+//                "851491647274359744"
 //                "1909799684457627648"
 //                "1909589366116712448",
 //                "1909522277674778624",
@@ -130,7 +139,10 @@ public class FsStorePaymentControllerTest {
         TzConfigInfoDTO tzConfigInfoDTO = TzConfigUtils.getConfig();
 
         for (String datum : data) {
-            FsStorePayment payment = fsStorePaymentService.selectFsStorePaymentByCode(datum);
+//            FsStorePayment payment = fsStorePaymentService.selectFsStorePaymentByCode(datum);
+            FsStorePayment payment = new FsStorePayment();
+            payment.setPayCode(datum);
+            payment.setPayMoney(BigDecimal.valueOf(0.1));
 
 
             RequestDTO<TzPayRefundDTO> requestDTO = new RequestDTO<TzPayRefundDTO>();

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderItemMapper.java

@@ -72,8 +72,12 @@ public interface FsStoreOrderItemMapper
 
     @Select({"<script> " +
             "select i.*,o.user_id,o.status,p.cate_id, o.real_name,o.user_phone,o.user_address,o.create_time,o.pay_time,o.delivery_sn,o.delivery_name,o.delivery_id, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber,o.upload_time ,CASE WHEN o.certificates IS NULL OR o.certificates = '' THEN 0 ELSE 1 END AS is_upload   " +
-            " ,p.title as package_name,cts.name as scheduleName from fs_store_order_item i left join fs_store_order o on o.id=i.order_id left join fs_user u on o.user_id=u.user_id  " +
-            " left join fs_store_product_package p on o.package_id=p.package_id left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id left join company_tcm_schedule cts on cts.id = o.schedule_id " +
+            " ,p.title as package_name,deliver.deliver_id as deliver_code cts.name as scheduleName from fs_store_order_item i left join fs_store_order o on o.id=i.order_id left join fs_user u on o.user_id=u.user_id  " +
+            " left join fs_store_product_package p on o.package_id=p.package_id " +
+            " left join company c on c.company_id=o.company_id " +
+            " left join company_user cu on cu.user_id=o.company_user_id " +
+            " left join company_tcm_schedule cts on cts.id = o.schedule_id " +
+            " left join fs_store_delivers deliver on o.id=deliver.order_id " +
             "where 1=1 " +
             "<if test = 'maps.orderCode != null and  maps.orderCode !=\"\"    '> " +
             "and o.order_code like CONCAT('%',#{maps.orderCode},'%') " +

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -648,9 +648,10 @@ public interface FsStoreOrderMapper
     List<FsStoreOrder> selectFsStoreOrderListByFinish7Day();
 
     @Select({"<script> " +
-            "select o.*,cts.name as scheduleName,u.nickname,u.phone,cc.push_code,cc.create_time as customer_create_time,cc.source,cc.customer_code, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber ,p.title as package_title ,p.cate_id,CASE WHEN o.certificates IS NULL OR o.certificates = '' THEN 0 ELSE 1 END AS is_upload  " +
+            "select o.*,deliver.deliver_id as deliver_code,deliver.state_ex as delivery_type_code,deliver.status as kdn_delivery_status,cts.name as scheduleName,u.nickname,u.phone,cc.push_code,cc.create_time as customer_create_time,cc.source,cc.customer_code, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber ,p.title as package_title ,p.cate_id,CASE WHEN o.certificates IS NULL OR o.certificates = '' THEN 0 ELSE 1 END AS is_upload  " +
             " from fs_store_order o  left JOIN fs_store_product_package p on o.package_id=p.package_id left join fs_user u on o.user_id=u.user_id  " +
             " left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id left join crm_customer cc on cc.customer_id=o.customer_id left join company_tcm_schedule cts on cts.id = o.schedule_id " +
+            " left join fs_store_delivers deliver on deliver.order_id=o.id "+
             "where 1=1 " +
             "<if test = 'maps.orderCode != null and  maps.orderCode !=\"\"    '> " +
             "and o.order_code like CONCAT('%',#{maps.orderCode},'%') " +

fs-service-system/src/main/java/com/fs/store/vo/FsStoreOrderExportVO.java

@@ -168,9 +168,11 @@ public class FsStoreOrderExportVO implements Serializable
     private String deliveryName;
 
     /** 快递单号/手机号 */
-    @Excel(name = "快递单号")
     private String deliveryId;
 
+    @Excel(name = "快递单号")
+    private String deliverCode;
+
 //    /** 消费赚取积分 */
 //    private BigDecimal gainIntegral;
 //
@@ -235,11 +237,15 @@ public class FsStoreOrderExportVO implements Serializable
     @Excel(name = "物流结算费用")
     private BigDecimal deliveryPayMoney;
 
-    @Excel(name = "物流状态" , dictType = "store_order_delivery_status")
+
     private String deliveryStatus;
 
-    @Excel(name = "物流跟踪状态" , dictType = "store_order_delivery_type")
     private String deliveryType;
+    @Excel(name = "物流跟踪状态" , dictType = "store_order_delivery_type")
+    private String deliveryTypeCode;
+
+    @Excel(name = "物流状态" , dictType = "store_order_delivery_status")
+    private String kdnDeliveryStatus;
 
     @Excel(name = "客户编码")
     private String customerCode;

fs-service-system/src/main/java/com/fs/store/vo/FsStoreOrderItemExportVO.java

@@ -71,13 +71,17 @@ public class FsStoreOrderItemExportVO implements Serializable
     @Excel(name = "快递公司编号")
     private String deliverySn;
 
+
     /** 快递名称/送货人姓名 */
     @Excel(name = "快递公司")
     private String deliveryName;
 
+
+    private String deliveryId;
     /** 快递单号/手机号 */
     @Excel(name = "快递单号")
-    private String deliveryId;
+    private String deliveryCode;
+
 
     @Excel(name = "所属公司")
     private String companyName;