订单同步功能

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

@@ -76,7 +76,7 @@ public interface FsStoreOrderItemScrmMapper
     List<FsStoreOrderItemVO> selectFsStoreOrderItemListAndProductByOrderId(Long id);
 
     @Select({"<script> " +
-            "select i.*,o.user_id,u.nickname,psps.cost,o.pay_postage,o.total_num,o.status,fspcs.cate_name, 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,sp_latest.pay_money, sp_latest.bank_transaction_id as bankTransactionId, o.delivery_send_time," +
+            "select i.*,o.user_id,u.nick_name,psps.cost,o.pay_postage,o.total_num,o.status,fspcs.cate_name, 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,sp_latest.pay_money, sp_latest.bank_transaction_id as bankTransactionId, o.delivery_send_time," +
             " o.order_code, o.pay_price, o.pay_money, o.deduction_price,o.pay_delivery, o.order_type,psps.price " +
             ", CASE o.is_audit WHEN 1 THEN '是' ELSE '否' END AS isAudit " +
             ", sas.audit_remark as auditRemark, sas.reason_level1_text as reasonValue1, sas.reason_level2_text as reasonValue2 " +
@@ -125,7 +125,7 @@ public interface FsStoreOrderItemScrmMapper
             " and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +
             "<if test = 'maps.nickname != null and  maps.nickname !=\"\"     '> " +
-            "and u.nickname like CONCAT('%',#{maps.nickname},'%') " +
+            "and u.nick_name like CONCAT('%',#{maps.nickname},'%') " +
             "</if>" +
             "<if test=\"maps.realName != null and  maps.realName !=''\">" +
             " and o.real_name like CONCAT('%',#{maps.realName},'%') " +
@@ -280,7 +280,7 @@ public interface FsStoreOrderItemScrmMapper
             " and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +
             "<if test = 'maps.nickname != null and  maps.nickname !=\"\"     '> " +
-            "and u.nickname like CONCAT('%',#{maps.nickname},'%') " +
+            "and u.nick_name like CONCAT('%',#{maps.nickname},'%') " +
             "</if>" +
             "<if test=\"maps.realName != null and  maps.realName !=''\">" +
             " and o.real_name like CONCAT('%',#{maps.realName},'%') " +

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

@@ -154,6 +154,7 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.google.common.base.Joiner;
 import com.google.gson.Gson;
+import jodd.util.StringUtil;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -644,6 +645,13 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     oldStatus = existing.getStatus();
                 }
             }
+            if (StringUtil.isNotBlank(fsStoreOrder.getDeliveryId())) {
+                StringBuilder stringBuilder = new StringBuilder();
+                FsExpressScrm fsExpressScrm = tryResolveExpressByLogisticCode(fsStoreOrder.getDeliveryId(), fsStoreOrder.getOrderCode(), stringBuilder);
+                fsStoreOrder.setDeliveryName(fsExpressScrm == null ? " ": fsExpressScrm.getName());
+                fsStoreOrder.setDeliverySn(fsExpressScrm == null ? " ": fsExpressScrm.getCode());
+            }
+
             int rows = fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrder);
             if (rows > 0 && orderId != null && newStatus != null && (newStatus == 2 || newStatus == 3)
                     && (oldStatus == null || !oldStatus.equals(newStatus))) {