需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/DispatchController.java

@@ -146,7 +146,7 @@ public class DispatchController {
 
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.pList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                 websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
@@ -158,7 +158,7 @@ public class DispatchController {
 
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.cList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                 websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
@@ -170,7 +170,7 @@ public class DispatchController {
 
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.aList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                 websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
@@ -181,7 +181,7 @@ public class DispatchController {
             @RequestBody WebsitDispatchRe websitDispatchRe
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.sList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                 websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
@@ -193,7 +193,7 @@ public class DispatchController {
             @RequestBody WebsitDispatchRe websitDispatchRe
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.channel(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                 websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
 
         return ResponseHelper.success(dispatchCherVOS);
@@ -206,7 +206,7 @@ public class DispatchController {
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic
                 .smallList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                        websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                        websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                         websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
 
         return ResponseHelper.success(dispatchCherVOS);
@@ -219,7 +219,7 @@ public class DispatchController {
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic
                 .categoryList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                        websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                        websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                         websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
@@ -231,7 +231,7 @@ public class DispatchController {
     ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic
                 .sourceList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
-                        websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                        websitDispatchRe.getAreaCode(), websitDispatchRe.getStreetCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
                         websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }

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

@@ -1316,9 +1316,7 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setIsThreeOrder(true);
         }
 
-        for (PgOrderOperatorLog pgOrderOperatorLog : syncOrderDto.getPgOrderOperatorLogs()) {
-            pgOrderOperatorLog.setIsThreeOrder(true);
-        }
+
 
 
         pgOrderBaseService.saveBatch(syncOrderDto.getPgOrderBases());
@@ -1327,7 +1325,14 @@ public class OrderBaseExcelLogic {
 
         pgOrderProductService.saveBatch(syncOrderDto.getOrderProducts());
 
-        pgOrderOperatorLogService.saveBatch(syncOrderDto.getPgOrderOperatorLogs());
+
+        if (!CollectionUtils.isEmpty(syncOrderDto.getPgOrderOperatorLogs())) {
+            for (PgOrderOperatorLog pgOrderOperatorLog : syncOrderDto.getPgOrderOperatorLogs()) {
+                pgOrderOperatorLog.setIsThreeOrder(true);
+            }
+
+            pgOrderOperatorLogService.saveBatch(syncOrderDto.getPgOrderOperatorLogs());
+        }
 
     }
 

mall-server-api/src/main/resources/mapper/workorder/IncreMapper.xml

@@ -130,16 +130,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN
@@ -208,16 +208,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN
@@ -286,16 +286,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN
@@ -364,16 +364,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN
@@ -442,16 +442,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN
@@ -520,16 +520,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN
@@ -598,16 +598,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN
@@ -676,16 +676,16 @@
         AND a.`level` = 4
 
         <if test="pId != null and pId !=''">
-            AND a.pid == #{pId}
+            AND a.province_code = #{pId}
         </if>
         <if test="cityCode != null and cityCode !=''">
-            AND a.city_code == #{cityCode}
+            AND a.city_code = #{cityCode}
         </if>
         <if test="areaCode != null and areaCode !=''">
-            AND a.area_code == #{areaCode}
+            AND a.area_code = #{areaCode}
         </if>
         <if test="streetCode != null and streetCode !=''">
-            AND a.id ==  #{streetCode}
+            AND a.id =  #{streetCode}
         </if>
         <if test="dictCode != null and dictCode.size > 0">
             AND b.dict_code IN