复制价格包装数据复制

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/mysql/warehouse/WarehouseMapper.java

@@ -159,7 +159,15 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
             "</if>",
             "GROUP BY w.title_zh",
             "</when>",
+            "<when test = 'type == 4'>",
+            "GROUP BY w.shi",
+            "</when>",
+            "<when test = 'type == 5'>",
+            "GROUP BY w.title_zh",
+            "</when>",
             "</script>"
             })
-    List<WarehouseTreeRegionVO> getRegionList(@Param("type") Integer type, @Param("regionId") String regionId);
+    List<WarehouseTreeRegionVO> getRegionList(@Param("type") Integer type,@Param("regionId") String regionId,
+                                              @Param("destCountryId") String destCountryId,@Param("objectiveId") String objectiveId,
+                                              @Param("destWarehouseId") String  destWarehouseId);
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/WarehouseService.java

@@ -171,5 +171,5 @@ public interface WarehouseService {
 
     List<WarehouseTreeRegionVO> getWarehouseTreeRegionList(Integer tradeType);
 
-    List<WarehouseTreeRegionVO> getRegionList(Integer type, String regionId);
+    List<WarehouseTreeRegionVO> getRegionList(Integer type, String regionId, String destCountryId, String objectiveId, String destWarehouseId);
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseServiceImpl.java

@@ -514,11 +514,11 @@ public class WarehouseServiceImpl implements WarehouseService {
     }
 
     @Override
-    public List<WarehouseTreeRegionVO> getRegionList(Integer type, String regionId) {
+    public List<WarehouseTreeRegionVO> getRegionList(Integer type, String regionId, String destCountryId, String objectiveId, String destWarehouseId) {
         if(regionId.equals("")){
             return new ArrayList();
         }
-        List<WarehouseTreeRegionVO> list = warehouseMapper.getRegionList(type,regionId);
+        List<WarehouseTreeRegionVO> list = warehouseMapper.getRegionList(type,regionId,destCountryId,objectiveId,destWarehouseId);
         return list;
     }
 }

yudao-module-depository/yudao-module-depository-rest/src/main/java/cn/iocoder/yudao/module/depository/controller/admin/warehouse/WarehouseController.java

@@ -101,8 +101,9 @@ public class WarehouseController {
     }
 
     @GetMapping("/getRegionList")
-    public  CommonResult<List<WarehouseTreeRegionVO>> getRegionList(@RequestParam(value = "type", required = false) Integer type,String regionId){
-        List<WarehouseTreeRegionVO> list = warehouseService.getRegionList(type,regionId);
+    public  CommonResult<List<WarehouseTreeRegionVO>> getRegionList(@RequestParam(value = "type", required = false) Integer type,
+                                                                    String regionId,String destCountryId, String objectiveId ,String destWarehouseId){
+        List<WarehouseTreeRegionVO> list = warehouseService.getRegionList(type,regionId,destCountryId,objectiveId,destWarehouseId);
         return success(list);
     }
 

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/product/ProductPriceSpecialDO.java

@@ -7,6 +7,9 @@ import lombok.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+/**
+ * 线路价格特需
+ */
 @TableName("ecw_product_price_special")
 @Data
 @EqualsAndHashCode(callSuper = true)