物流信息

fs-service-system/src/main/java/com/fs/express/impl/FsStoreDeliversServiceImpl.java

@@ -192,7 +192,7 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
 
     @Override
     public void syncDeliverInfo(Long orderId, Integer type) {
-        logger.info("开始同步订单发货信息, 订单ID: {}", orderId);
+        logger.info("开始同步订单发货信息, 订单ID: {},类型: {}", orderId,type);
         String orderCode,userPhone;
         if(ObjectUtil.equal(type,0)){
             FsStoreOrder order = orderService.selectFsStoreOrderById(orderId);
@@ -280,7 +280,9 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
                     userPhone = fsStoreOrder.getUserPhone();
                 }
             }
-            deliveryDTO.setType(0);
+            if(deliveryDTO.getType() == null) {
+                deliveryDTO.setType(0);
+            }
 
 
             fsStoreDeliversMapper.insert(deliveryDTO);

fs-service-system/src/main/resources/mapper/live/LiveAfterSalesMapper.xml

@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="liveId != null and liveId != ''"> and las.live_id = #{liveId}</if>
             <if test="storeId != null and storeId != ''"> and las.store_id = #{storeId}</if>
-            <if test="orderCode != null and orderCode != ''"> and las.order_code = #{orderCode}</if>
+            <if test="orderCode != null and orderCode != ''"> and lo.order_code = #{orderCode}</if>
             <if test="refundAmount != null "> and las.refund_amount = #{refundAmount}</if>
             <if test="refundType != null "> and las.refund_type = #{refundType}</if>
             <if test="reasons != null  and reasons != ''"> and las.reasons = #{reasons}</if>