兔灵发货回调业务

fs-service/src/main/java/com/fs/erp/service/impl/TlErpOrderServiceImpl.java

@@ -7,8 +7,11 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fs.erp.dto.tl.JstLogisticsPushRequest;
 import com.fs.erp.dto.tl.TlCreateOrderRequest;
 import com.fs.erp.service.TlErpOrderService;
+import com.fs.his.domain.FsStoreOrder;
+import com.fs.his.service.IFsStoreOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +22,10 @@ import java.util.*;
 @Service
 public class TlErpOrderServiceImpl implements TlErpOrderService {
 
+
+    @Autowired
+    private IFsStoreOrderService storeOrderService;
+
     //测试兔灵ERP
     //@Value("${jst.api.url:https://api.xiangyue.life/api}")
 
@@ -107,6 +114,18 @@ public class TlErpOrderServiceImpl implements TlErpOrderService {
         //     order.setShipTime(LocalDateTime.parse(sendDate, ...));
         //     orderRepository.save(order);
         // }
+        FsStoreOrder fsStoreOrder = storeOrderService.selectFsStoreOrderByOrderCode(request.getSoId());
+        if (fsStoreOrder != null) {
+            FsStoreOrder map = new FsStoreOrder();
+            map.setOrderId(fsStoreOrder.getOrderId());
+            map.setExtendOrderId(request.getOId().toString());
+            //更新ERP订单号
+            storeOrderService.updateFsStoreOrder(map);
+
+            //物流同步
+            storeOrderService.deliveryOrder(fsStoreOrder.getOrderCode(),request.getLId()
+                    ,request.getLcId(),request.getLogisticsCompany(),request.getSendDate());
+        }
 
         //遍历处理items
         if (request.getItems() != null) {
@@ -114,6 +133,7 @@ public class TlErpOrderServiceImpl implements TlErpOrderService {
                 log.debug("商品项: skuId={}, qty={}", item.getSkuId(), item.getQty());
             });
         }
+
     }
 
 

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -2580,7 +2580,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         if (Boolean.TRUE.equals(response.getSuccess())) {
             //写入外部订单号
             if (fsPackage.getErpType() == 2) {
-                order.setExtendOrderId(order.getOrderCode());
+                order.setExtendOrderId(response.getCode());
             } else {
                 //支付成功后 将订单号写入待发货的REDIS中
                 redisCache.setCacheObject("delivery" + ":" + response.getCode(), order.getOrderCode());