集团sku关联包材

sd-wln/src/main/java/com/sd/wln/context/OrderContext.java

@@ -140,8 +140,8 @@ public class OrderContext {
      */
     public Map<String, OrderInfo> getExistOrderMap() {
         if (existOrderMap == null) {
-            LogicHolder.setLogicHolder(true);
             List<String> uidList = wlnOrderList.stream().map(item -> item.getString("uid")).collect(Collectors.toList());
+            LogicHolder.setLogicHolder(true);
             existOrderMap = orderService.mapKEntity(OrderInfo::getWlnUid, q -> q.in(OrderInfo::getWlnUid, uidList));
             LogicHolder.clear();
         }

sd-wln/src/main/java/com/sd/wln/service/impl/OrderHandleServiceImpl.java

@@ -2,9 +2,9 @@ package com.sd.wln.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.ruoyi.common.annotation.LogicIgnore;
 import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.framework.mybatis.holder.LogicHolder;
 import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.service.order.OrderService;
 import com.sd.wln.context.OrderContext;
@@ -30,7 +30,6 @@ public class OrderHandleServiceImpl implements OrderHandleService {
     private WlnOrderService wlnOrderService;
 
     @DSTransactional
-    @LogicIgnore
     @Override
     public synchronized void resynchronization(ResynchronizationDto dto) {
         JSONObject wlnOrder;
@@ -43,6 +42,7 @@ public class OrderHandleServiceImpl implements OrderHandleService {
             throw new ServiceException("订单同步失败");
         }
 
+        LogicHolder.setLogicHolder(true);
         String uid = wlnOrder.getString("uid");
         OrderInfo orderInfo = orderService.getOne(q -> q.eq(OrderInfo::getWlnUid, uid));
         if (orderInfo != null) {
@@ -51,6 +51,7 @@ public class OrderHandleServiceImpl implements OrderHandleService {
             }
             orderService.delete(orderInfo.getId(), false);
         }
+        LogicHolder.clear();
 
         String storageCode = wlnOrder.getString("storage_code");
         OrderContext context = new OrderContext(storageCode, Collections.singletonList(wlnOrder));