From 337d48dbcb60bacb9bad2d4a0c3f2c34b132ef73 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 05 二月 2026 18:32:39 +0800
Subject: [PATCH] 云仓对接下单,物流同步,物流回写

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
index dc694fd..1f69bcc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -24,9 +24,9 @@
 import com.ruoyi.system.service.TErpProcurementService;
 import com.ruoyi.system.task.base.QuartzManager;
 import com.ruoyi.system.task.base.TimeJobType;
-import com.ruoyi.system.task.jobs.LivePushJob;
 import com.ruoyi.system.task.jobs.RevenueSharingJob;
 import com.ruoyi.web.core.config.LakalaConfig;
+import com.ruoyi.web.listener.event.TradeOrderEvent;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
@@ -41,6 +41,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -83,14 +84,15 @@
     private final TCrmSupplierService crmSupplierService;
 
     private final TokenService tokenService;
-
+    private final ApplicationContext applicationContext;
 
     @Autowired
-    public TOrderController(TErpProcurementService erpProcurementService, TokenService tokenService, TErpProcurementGoodsService erpProcurementGoodsService, TCrmSupplierService crmSupplierService) {
+    public TOrderController(TErpProcurementService erpProcurementService, TokenService tokenService, TErpProcurementGoodsService erpProcurementGoodsService, TCrmSupplierService crmSupplierService, ApplicationContext applicationContext) {
         this.erpProcurementService = erpProcurementService;
         this.tokenService = tokenService;
         this.erpProcurementGoodsService = erpProcurementGoodsService;
         this.crmSupplierService = crmSupplierService;
+        this.applicationContext = applicationContext;
     }
 
     private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -331,6 +333,9 @@
 //                erpProcurementService.updateById(erpProcurement);
 //            }
 
+            // 执行的推送创建云仓订单
+            applicationContext.publishEvent(new TradeOrderEvent(erpProcurement.getId()+"_1"));
+
             // 响应success
             JSONObject responseJsonObject = new JSONObject();
             responseJsonObject.put("code", "SUCCESS");
@@ -456,6 +461,8 @@
             if ( erpProcurement!=null && "SUCCESS".equals(status)) {
                 erpProcurement.setStatus(6);
                 erpProcurementService.updateById(erpProcurement);
+                // 执行的推送取消云仓订单
+                applicationContext.publishEvent(new TradeOrderEvent(erpProcurement.getId()+"_2"));
                 // 响应success
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("code", "SUCCESS");

--
Gitblit v1.7.1