Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-15 257d66798aa538f8737980f13d94c547bf0b51ea

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java

@@ -6,10 +6,7 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -25,14 +22,14 @@
    * @param id
    * @return
    */
   @PostMapping("/appUser/getAppUserById")
   @PostMapping("/app-user/getAppUserById")
   AppUser getAppUserById(@RequestParam("id") Long id);

   /**
    * 根据id编辑用户
    */
   @PostMapping("/app-user/editAppUserById")
   R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser);
   R<Void> editAppUserById(@RequestBody AppUser appUser);

   @PostMapping("/app-user/getCouponCount")
   R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId );
@@ -43,14 +40,87 @@
   @GetMapping("/appUserShop/shop/{userId}")
   R<List<AppUserShop>> getAppUserShop(@PathVariable("userId") Long userId);

   @PostMapping("/appUserShop/addAppUserShop")
   R<Void> addAppUserShop(@RequestBody AppUserShop appUserShop);

   /**
    * 根据用户id获取用户的祖籍列表
    */
   @GetMapping("/appletLogin/getUserAncestorList")
   R<List<AppUser>> getUserAncestorList(@RequestParam("id") Long id);

   @PostMapping("/app-user/getSuperiorLeader")
   R<AppUser> getSuperiorLeader(@RequestParam("id") Long id);

   @PostMapping("/app-user/getTopUsers")
   R<List<AppUser>> getTopUsers();

   @PostMapping("/app-user/getVipCount")
   R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId );


   @PostMapping("/app-user/listByIds")
   List<AppUser> listByIds(@RequestParam("ids") List<Long> list);

   /**
    * 根据用户名称模糊搜索用户列表
    * @param name
    * @return
    */
   @PostMapping("/app-user/getAppUserByName")
   R<List<AppUser>> getAppUserByName(@RequestParam("name") String name);

   /**
    * 根据用户电话模糊搜索用户列表
    * @param phone
    * @return
    */
   @PostMapping("/app-user/getAppUserByPhone")
   R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);


   @PostMapping("/app-user/getAppUserByPhone1")
   R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone);

   /**
    * 获得指定用户的下级用户
    * @param userId
    * @return
    */
   @PostMapping("/app-user/setLowerUserShop")
   R<List<AppUser>>  setLowerUserShop(@RequestParam("userId") Long userId,@RequestParam("shopId") Integer shopId);
	
	
	
   /**
    * 检查会员等级变更
    * @param appUserId
    */
   @PostMapping("/app-user/vipUpgrade")
   void vipUpgrade(@RequestParam("appUserId") Long appUserId);
	
	
   /**
    * 检查会员降级
    * @param appUserId
    */
   @PostMapping("/app-user/vipDemotion")
   void vipDemotion(@RequestParam("appUserId") Long appUserId);
	
	
	
   /**
    * 用户降级检测
    */
   @PostMapping("/app-user/demotionDetection")
   void demotionDetection();


   /**
    * 清空绑定门店的用户门店数据
    * @param shopId
    * @return
    */
   @PostMapping("/app-user/clearBindShop")
   R clearBindShop(@RequestParam("shopId") Integer shopId);
}