Merge remote-tracking branch 'origin/master'

xuhy

2024-08-22 5e1cf8e0e94b42a94c3a3d3ccda5147fe6ce94f0

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

@@ -1,12 +1,12 @@
package com.ruoyi.account.api.feignClient;

import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.account.api.factory.AppUserFallbackFactory;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
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;

@@ -20,4 +20,33 @@
    @PostMapping(value = "/t-app-user/user/getUserIdsByPhone")
    public R<List<Long>> getUserIdsByPhone(@RequestParam("phone") String phone);

    /**
     * 根据用户id查询用户信息
     * @param appUserIds 用户id集合
     * @return
     */
    @PostMapping(value = "/t-app-user/user/getUserByIds")
    public R<List<TAppUser>> getUserByIds(@RequestBody List<Long> appUserIds);
    
    
    /**
     * 根据id获取用户
     * @param id
     * @return
     */
    @PostMapping(value = "/t-app-user/user/getUserById/{id}")
    R<TAppUser> getUserById(@PathVariable("id") Long id);
    
    
    
    @PostMapping("/t-app-user/user/updateAppUser")
    R updateAppUser(@RequestBody TAppUser appUser);

    /**
     * 通过手机号查询用户
     * @param phone
     * @return
     */
    @GetMapping("/t-app-user/user/selectByPhone")
    R<TAppUser> selectByPhone(@RequestParam("phone") String phone);
}