Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score

yudao-module-member/yudao-module-member-impl/pom.xml

@@ -44,5 +44,10 @@
             <version>${revision}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-depository-core</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 </project>

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/scoreRule/ScoreRuleController.java

@@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.module.depository.service.warehouse.WarehouseService;
+import cn.iocoder.yudao.module.depository.vo.warehouse.WarehouseTreeRegionVO;
 import cn.iocoder.yudao.module.member.convert.scoreRule.ScoreRuleConvert;
 import cn.iocoder.yudao.module.member.dal.dataobject.scoreRule.ScoreRuleDO;
 import cn.iocoder.yudao.module.member.service.scoreRule.ScoreRuleService;
@@ -12,6 +14,7 @@ import cn.iocoder.yudao.module.member.vo.scoreRule.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +39,8 @@ public class ScoreRuleController {
 
     @Resource
     private ScoreRuleService scoreRuleService;
+    @Resource
+    private WarehouseService warehouseService;
 
     @PostMapping("/create")
     @ApiOperation("创建积分规则")
@@ -105,6 +110,17 @@ public class ScoreRuleController {
         return success(true);
     }
 
+    @GetMapping("/getWarehouseTreeRegionList")
+    @ApiOperation("获得目的国、目的城市、目的仓列表")
+    public CommonResult<List<WarehouseTreeRegionVO>> WarehouseTreeRegionList() {
+        List<WarehouseTreeRegionVO> listIn = warehouseService.getWarehouseTreeRegionList(1);
+        List<WarehouseTreeRegionVO> listOut = warehouseService.getWarehouseTreeRegionList(2);
+        List<WarehouseTreeRegionVO> list = ListUtils.sum(listIn, listOut);
+        return success(list);
+    }
+
+
+
     @GetMapping("/export-excel")
     @ApiOperation("导出积分规则Excel")
     @PreAuthorize("@ss.hasPermission('member:score-rule:export')")