Browse Source

fix(order): 修复订单数据推送逻辑问题

- 移除客户信息保存时的ERP数据推送调用
- 在新增订单时仅当不需要确认订单时才推送ERP数据
- 防止重复或不必要的订单数据推送到ERP系统
hurx 14 giờ trước cách đây
mục cha
commit
7bd96382f0

+ 0 - 1
ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/CustomerInfoServiceImpl.java

@@ -1140,7 +1140,6 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
 
         // 3. 插入新的关联数据
         saveAssociatedData(customerId, bo);
-        remoteErpPushService.pushCustomerData(customerInfoJson(customerId),false);
         return true;
     }
 

+ 6 - 3
ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -725,8 +725,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
             // 5. 批量插入订单商品
             orderProductMapper.insertBatch(orderProducts);
-
-            remoteErpPushService.pushOrderData(orderMainInfoToJson(orderId), false);
+            if (!needAffirmOrder) {
+                remoteErpPushService.pushOrderData(orderMainInfoToJson(orderId), false);
+            }
             log.info("成功新增订单,ID: {}", orderId);
             return orderId;
         } catch (RuntimeException e) {
@@ -833,7 +834,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             if (bo.getPlaceOrderType() == 1) {
                 remoteProductShoppingCartService.deleteWithValidByIds(bo.getProductShoppingCartId());
             }
-            remoteErpPushService.pushOrderData(orderMainInfoToJson(orderId), false);
+            if (!affirmFlag) {
+                remoteErpPushService.pushOrderData(orderMainInfoToJson(orderId), false);
+            }
             return orderId;
         } else {
             // 插入失败,抛出异常触发事务回滚