FIX: 物流跟踪状态 物流状态 和订单状态没根据物流信息自动更新

fs-company/src/main/java/com/fs/company/controller/live/LiveOrderController.java

@@ -81,10 +81,6 @@ public class LiveOrderController extends BaseController
 //    @Autowired
 //    private ConfigUtil configUtil;
 
-    @Autowired
-    @Qualifier("erpOrderServiceImpl")
-    private IErpOrderService gyOrderService;
-
 //    @Autowired
 //    @Qualifier("wdtErpOrderServiceImpl")
 //    private IErpOrderService wdtOrderService;

fs-service-system/src/main/java/com/fs/erp/service/impl/ErpOrderServiceImpl.java

@@ -11,11 +11,12 @@ import com.fs.erp.dto.*;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.erp.service.IErpShopService;
 import com.fs.erp.utils.CommonUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
+@Slf4j
 @Service("erpOrderServiceImpl")
 public class ErpOrderServiceImpl implements IErpOrderService
 {
@@ -141,6 +142,9 @@ public class ErpOrderServiceImpl implements IErpOrderService
 
     @Override
     public BaseResponse refundUpdateLive(ErpRefundUpdateRequest request) {
+        log.info("开始调用ERP退款更新接口，订单号：{}，子订单号：{}，退款状态：{}",
+                request.getTid(), request.getOid(), request.getRefund_state());
+
         JSONObject param = JSONUtil.createObj();
         param.set("appkey", sysConfig.getErpAppKey());
         param.set("sessionkey", sysConfig.getErpSessionKey());
@@ -149,8 +153,17 @@ public class ErpOrderServiceImpl implements IErpOrderService
         param.set("oid", request.getOid());
         param.set("refund_state", request.getRefund_state());
         param.set("sign",CommonUtils.sign(param.toString(),sysConfig.getErpSecret()));
+
+        log.info("调用ERP退款更新接口，URL：{}，请求参数：{}", sysConfig.getErpUrl(), param.toString());
+
         String result = HttpUtil.post(sysConfig.getErpUrl(), param.toString());
+
+        log.info("ERP退款更新接口响应，订单号：{}，响应结果：{}", request.getTid(), result);
+
         ErpOrderResponse response=JSONUtil.toBean(result, ErpOrderResponse.class);
+
+        log.info("ERP退款更新接口调用完成，订单号：{}，处理结果：{}", request.getTid(),
+                response != null ? "成功" : "失败");
         return response;
     }
 

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -676,8 +676,11 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             liveOrder.setDeliveryCode(delivers.getDeliverSn());
             liveOrder.setDeliveryName(delivers.getDeliverName());
             liveOrder.setDeliverySn(delivers.getDeliverId());
+
+            liveOrder.setDeliveryStatus(delivers.getStatus());
+            liveOrder.setDeliveryType(String.valueOf(delivers.getStateEx()));
         }
-        return baseMapper.selectLiveOrderByOrderId(orderId);
+        return liveOrder;
     }
 
     /**