fix: 直播发货任务

deploy.sh

@@ -55,7 +55,7 @@ deploy_jar() {
 # 主要部署流程
 
 # 部署 fs-admin
-#deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
+deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
 
 # 部署 fs-company
 #deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
@@ -65,7 +65,7 @@ deploy_jar() {
 #deploy_jar "$LOCAL_FS_API_APP_JAR" "fs-api"
 
 #deploy_jar "$LOCAL_FS_SYNC_APP_JAR" "fs-sync"
-deploy_jar "$LOCAL_FS_LIVE_SOCKET_JAR" "fs-live-socket"
+#deploy_jar "$LOCAL_FS_LIVE_SOCKET_JAR" "fs-live-socket"
 
 echo "Deployment completed."
 

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

@@ -109,8 +109,19 @@ public class ErpOrderServiceImpl implements IErpOrderService
     }
 
     @Override
-    public ErpOrderQueryResponse getOrderLive(ErpOrderQueryRequert param) {
-        return null;
+    public ErpOrderQueryResponse getOrderLive(ErpOrderQueryRequert requert) {
+        JSONObject param = JSONUtil.createObj();
+        param.set("appkey", sysConfig.getErpAppKey());
+        param.set("sessionkey", sysConfig.getErpSessionKey());
+        param.set("method", "gy.erp.trade.get");
+        param.set("code", requert.getCode());
+        param.set("page_no", requert.getPage_no());
+        param.set("page_size", requert.getPage_size());
+
+        param.set("sign",CommonUtils.sign(param.toString(),sysConfig.getErpSecret()));
+        String result = HttpUtil.post(sysConfig.getErpUrl(), param.toString());
+        ErpOrderQueryResponse response=JSONUtil.toBean(result, ErpOrderQueryResponse.class);
+        return response;
     }
 
     @Override

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

@@ -54,9 +54,6 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
     @Autowired
     private IFsStoreOrderService fsStoreOrderService;
 
-    @Autowired
-    private ILiveOrderService liveOrderService;
-
     @Autowired
     private LiveOrderMapper liveorderMapper;
 
@@ -359,7 +356,7 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
     private ErpOrderQuery convertToErpOrderQueryLive(OrderQueryResponseDTO.Order order) {
         ErpOrderQuery erpOrder = new ErpOrderQuery();
 
-        LiveOrder liveOrder = liveOrderService.selectLiveOrderByOrderCode(order.getSoId());
+        LiveOrder liveOrder = liveorderMapper.selectLiveOrderByOrderCode(order.getSoId());
         Asserts.notNull(liveOrder, "该订单号没有找到！");
 
         // 设置基本订单信息

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

@@ -1259,25 +1259,30 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void deliveryOrder(String orderCode, String deliveryId, String deliverCode, String deliverName) {
         LiveOrder order = baseMapper.selectFsUserVipOrderByOrderCode(orderCode);
-        if(order!=null&& Objects.equals(order.getStatus(), OrderInfoEnum.STATUS_1.getValue())){
+        if(order!=null&& Objects.equals(order.getStatus(), 2)){
             // 更新订单状态
-            order.setStatus(OrderInfoEnum.STATUS_2.getValue());
+            order.setStatus(3);
             order.setDeliverySendTime(new Date());
-            baseMapper.updateLiveOrder(order);
             FsExpress express=fsExpressCacheService.selectFsExpressByOmsCode(deliverCode);
-            if(ObjectUtil.isNotNull(express)) {
-                FsStoreDelivers fsStoreDeliver = new FsStoreDelivers();
-                fsStoreDeliver.setOrderId(order.getOrderId());
-                fsStoreDeliver.setOrderCode(orderCode);
-                fsStoreDeliver.setDeliverId(deliveryId);
-                fsStoreDeliver.setDeliverSn(express.getCode());
-                fsStoreDeliver.setDeliverName(express.getName());
-                fsStoreDeliver.setCreateTime(LocalDateTime.now());
-                fsStoreDeliver.setUpdateTime(LocalDateTime.now());
-                fsStoreDeliver.setCreateBy("admin");
-                fsStoreDeliver.setUpdateBy("admin");
-                fsStoreDeliversMapper.insert(fsStoreDeliver);
-            }
+
+            order.setDeliveryName(deliverName);
+            order.setDeliverySn(deliveryId);
+            order.setDeliveryCode(express.getCode());
+
+            baseMapper.updateLiveOrder(order);
+//            if(ObjectUtil.isNotNull(express)) {
+//                FsStoreDelivers fsStoreDeliver = new FsStoreDelivers();
+//                fsStoreDeliver.setOrderId(order.getOrderId());
+//                fsStoreDeliver.setOrderCode(orderCode);
+//                fsStoreDeliver.setDeliverId(deliveryId);
+//                fsStoreDeliver.setDeliverSn(express.getCode());
+//                fsStoreDeliver.setDeliverName(express.getName());
+//                fsStoreDeliver.setCreateTime(LocalDateTime.now());
+//                fsStoreDeliver.setUpdateTime(LocalDateTime.now());
+//                fsStoreDeliver.setCreateBy("admin");
+//                fsStoreDeliver.setUpdateBy("admin");
+//                fsStoreDeliversMapper.insert(fsStoreDeliver);
+//            }
             FsWxExpressTask fsWxExpressTask = new FsWxExpressTask();
             fsWxExpressTask.setUserId(Long.valueOf(order.getUserId()));
             fsWxExpressTask.setStatus(0);