igl 1 год назад
Родитель
Сommit
f832121b5e

+ 36 - 0
src/main/java/com/chelvc/cloud/maintain/controller/CommonController.java

@@ -0,0 +1,36 @@
+package com.chelvc.cloud.maintain.controller;
+
+import com.chelvc.cloud.vehicle.api.dto.RegionDTO;
+import com.chelvc.cloud.vehicle.api.service.CommonService;
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 公共口
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/common")
+public class CommonController {
+
+    @DubboReference
+    CommonService commonService;
+
+    /**
+     * 根据上级id查询省市区
+     * @param pid 不传默认查询第一级
+     * @author igl
+     * @date 2024/2/26 16:12
+     */
+    @GetMapping("/region/query")
+    public List<RegionDTO> getRegionByPid(Integer pid) {
+        return this.commonService.getRegionByPid(pid);
+    }
+}

+ 12 - 1
src/main/java/com/chelvc/cloud/maintain/controller/MerchantController.java

@@ -1,12 +1,12 @@
 package com.chelvc.cloud.maintain.controller;
 
 import com.chelvc.cloud.maintain.copier.MerchantCopier;
-import com.chelvc.cloud.maintain.vo.MerchantDetailVO;
 import com.chelvc.cloud.maintain.vo.SimpleMerchantVO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantBalanceDetailDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
 import com.chelvc.cloud.vehicle.api.param.LocationQueryParam;
 import com.chelvc.cloud.vehicle.api.param.MerchantQueryParam;
+import com.chelvc.cloud.vehicle.api.param.MerchantRankParam;
 import com.chelvc.cloud.vehicle.api.param.QueryMerchantBalanceParam;
 import com.chelvc.cloud.vehicle.api.service.FavoriteService;
 import com.chelvc.cloud.vehicle.api.service.MerchantBalanceDetailService;
@@ -55,6 +55,17 @@ public class MerchantController {
         return MerchantCopier.INSTANCE.copying(this.merchantService.listSimpleMerchants(param));
     }
 
+    /**
+     * 根据地区获取商家排名
+     *
+     * @param param 查询参数
+     * @return 商家信息列表
+     */
+    @GetMapping("/merchants")
+    public List<SimpleMerchantVO> listRankMerchants(@Valid MerchantRankParam param) {
+        return MerchantCopier.INSTANCE.copying(this.merchantService.listRankMerchants(param, SessionContextHolder.getId()));
+    }
+
     /**
      * 获取商家详情
      *

+ 17 - 4
src/main/java/com/chelvc/cloud/maintain/controller/UserInviteController.java

@@ -1,14 +1,16 @@
 package com.chelvc.cloud.maintain.controller;
 
+import com.chelvc.cloud.vehicle.api.dto.TeamDTO;
+import com.chelvc.cloud.vehicle.api.param.TeamInvitePageParam;
 import com.chelvc.cloud.vehicle.api.param.UserInviteParams;
 import com.chelvc.cloud.vehicle.api.service.UserInviteService;
+import com.chelvc.framework.base.context.SessionContextHolder;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 用户邀请接口
@@ -32,4 +34,15 @@ public class UserInviteController {
     public void bindInvite(@Validated @RequestBody UserInviteParams param) {
         this.userInviteService.bindInvite(param);
     }
+
+    /**
+     * 我的团队
+     * @param param 类型:1-用户;2-商家;不传值-查所有
+     * @author igl
+     * @date 2024/2/26 10:12
+     */
+    @GetMapping("/team/page")
+    public TeamDTO teamList(@Valid TeamInvitePageParam param) {
+        return this.userInviteService.teamList(param, SessionContextHolder.getId());
+    }
 }