需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -754,8 +754,12 @@ public class ChangeOrderLogic {
                                     .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
                                     .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId())
                                     .count() > 0) {
-                                throw new RemoteServiceException("存在街道：" + websitDispatch.getStreetName() + "，产品大类：" + websitDispatch.getCategoryName() +
-                                        "，销量类型：" + websitDispatch.getSaleTypeName() + "，工单类型：" + websitDispatch.getOrderSmallTypeText());
+                                WebsitDispatch websitDispatch1 = websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode, region.getId())
+                                        .eq(WebsitDispatch::getOrderSmallId, websitDispatch.getOrderSmallId())
+                                        .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
+                                        .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId()).last("limit 1").one();
+
+                                websitDispatch.setId(websitDispatch1.getId());
                             }
 
                             websitDispatches.add(websitDispatch);
@@ -767,7 +771,7 @@ public class ChangeOrderLogic {
 
         }
 
-        websitDispatchService.saveBatch(websitDispatches);
+        websitDispatchService.saveOrUpdateBatch(websitDispatches);
 
     }