提交

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -57,7 +57,6 @@ import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
-import com.fjhx.wms.service.WmsService;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.fjhx.wms.service.stock.StockJournalService;
 import com.fjhx.wms.service.stock.StockService;
@@ -129,8 +128,6 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
     private CompanyInfoService companyInfoService;
     @Autowired
     private JdApiService jdApiService;
-    @Autowired
-    private WmsService wmsService;
 
     @Override
     public Page<JdOrderVo> getPage(JdOrderSelectDto dto) {
@@ -1007,9 +1004,18 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         JdOrder jdOrder = getById(id);
         Assert.notEmpty(jdOrder, "未找到相关订单信息");
 
+        long count = jdOrderDetailsService.count(q -> q.eq(JdOrderDetails::getJdOrderId, jdOrder.getId()));
+        Assert.eqTrue(count == 0, "存在订单明细，无法重新同步订单");
+
         removeById(id);
         jdOrderDetailsService.remove(q -> q.eq(JdOrderDetails::getJdOrderId, jdOrder.getId()));
 
+        StockWait stockWait = stockWaitService.getOne(q -> q.eq(StockWait::getBusinessId, id));
+        if (stockWait != null) {
+            stockWaitService.remove(q -> q.eq(StockWait::getBusinessId, id));
+            stockWaitDetailsService.remove(q -> q.eq(StockWaitDetails::getStockWaitId, stockWait.getId()));
+        }
+
         try {
             jdApiService.startJdOrder(null, null, Collections.singletonList(jdOrder.getOrderId()));
         } catch (Exception e) {