fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -662,7 +662,7 @@ public interface FsStoreOrderScrmMapper
 
     @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 ,CASE WHEN o.certificates IS NULL OR o.certificates = '' THEN 0 ELSE 1 END AS is_upload  " +
-            ", CASE o.is_audit WHEN 1 THEN '是' ELSE '否' END AS isAudit " +
+            ", CASE o.is_audit WHEN 1 THEN '是' ELSE '否' END AS isAudit , mac.merchant_id as merchantId " +
             " from fs_store_order_scrm o  " +
             " left JOIN fs_store_product_package_scrm p on o.package_id=p.package_id " +
             " left join fs_user u on o.user_id=u.user_id  " +
@@ -677,6 +677,7 @@ public interface FsStoreOrderScrmMapper
             "            FROM fs_store_payment_scrm sp\n" +
             "            WHERE sp.business_code IS NOT NULL\n" +
             "            ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1\n" +
+            "            LEFT JOIN merchant_app_config mac ON (mac.id = sp_latest.mer_config_id OR (sp_latest.app_id IS NOT NULL AND FIND_IN_SET(sp_latest.app_id, mac.app_id) > 0 AND (mac.is_deleted = 0 OR mac.is_deleted IS NULL)))\n" +
             "where o.is_del = 0 " +
             "<if test=\"maps.bankTransactionId !=null and maps.bankTransactionId!=''\">" +
             " and sp_latest.bank_transaction_id = #{maps.bankTransactionId} " +
@@ -1325,7 +1326,7 @@ public interface FsStoreOrderScrmMapper
             "cu.phonenumber as company_usere_phonenumber ,p.title as package_title ," +
             "CASE WHEN o.certificates IS NULL OR o.certificates = '' THEN 0 ELSE 1 END AS is_upload " +
             ",df.login_account as erp_account," +
-            "        csc.name miniProgramName " +
+            "        csc.name miniProgramName , mac.merchant_id as merchantId " +
             " from fs_store_order_scrm o  left JOIN fs_store_product_package_scrm 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_order_df df on df.order_id=o.id " +
@@ -1336,6 +1337,7 @@ public interface FsStoreOrderScrmMapper
             "FROM fs_store_payment_scrm sp " +
             " ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1 " +
             " LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id " +
+            " LEFT JOIN merchant_app_config mac ON (mac.id = sp_latest.mer_config_id OR (sp_latest.app_id IS NOT NULL AND FIND_IN_SET(sp_latest.app_id, mac.app_id) > 0 AND (mac.is_deleted = 0 OR mac.is_deleted IS NULL))) " +
             "where 1=1 " +
             "<if test = 'maps.orderCode != null and  maps.orderCode !=\"\"    '> " +
             "and o.order_code like CONCAT('%',#{maps.orderCode},'%') " +

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

@@ -6100,6 +6100,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         map.put("圆通", "YTO");
         map.put("自提", "ZT");
         map.put("极兔", "JTSD");
+        map.put("韵达", "YD");
         return map;
     }
 

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

@@ -21,6 +21,8 @@ public class FsStoreOrderErpExportVO extends FsStoreOrderExportVO
     private String erpPhone;
     @Excel(name = "ERP账户",sort = 2)
     private String erpAccount;
+    @Excel(name = "商户号", sort = 3)
+    private String merchantId;
     @Excel(name = "商品明细")
     private String orderItem;
 }