Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-19 60f70f7409ec1ece8905e088fb43e0cb0258a70b

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

@@ -2,10 +2,13 @@

import com.ruoyi.account.api.factory.AppUserClientFallbackFactory;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.AppUserShop;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * @author zhibing.pu
@@ -13,13 +16,69 @@
 */
@FeignClient(contextId = "AppUserClient", value = ServiceNameConstants.ACCOUNT_SERVICE, fallbackFactory = AppUserClientFallbackFactory.class)
public interface AppUserClient {
	

   /**
    * 根据id获取用户
    * @param id
    * @return
    */
   @PostMapping("/appUser/getAppUserById")
   @PostMapping("/app-user/getAppUserById")
   AppUser getAppUserById(@RequestParam("id") Long id);
	

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

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

   /**
    *  根据用户id查询用户门店信息
    */
   @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);

   @GetMapping("/appletLogin/getSuperiorLeader")
   R<AppUser> getSuperiorLeader(@RequestParam("id") Long id);

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

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


   @GetMapping("/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(String phone);
}