Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-04 2875be234bb2631071c09ab0852f5fb28af0e9ee

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java

@@ -262,4 +262,61 @@
    @PostMapping(value = "/user/project/items")
    Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto);

    /**
     * 获取到用户详情(同步使用)
     * @param userId 用户标识
     * @return 转化使用UserDt
     */
    @PostMapping(value = "/user/info/baseInfo")
    Result userInfoBaseInfo(@RequestParam("userId") String userId);

    /**
     *  判断用户是否是会员
     * @param userDto userId
     * @return
     */
    @PostMapping(value = "/user/check/member")
    Result checkMember(@RequestBody UserDto userDto);

    /**
     * 查询用户会员等级下一级
     * */
    @PostMapping(value = "/user/next/level")
    Result nextLevel(@RequestBody UserDto userDto);

    /**
     * 查询累计返佣
     * */
    @PostMapping(value = "/user/query/rebate")
    Result queryRebate(@RequestBody UserDto userDto);

    /**
     * 查询用户首天消费累计
     * */
    @PostMapping(value = "/user/first/day/consumption")
    Result firstDayConsumption(@RequestBody UserDto userDto);

    /**
     * 查询用户首天消费累计
     * */
    @PostMapping(value = "/user/accumulat/consumption")
    Result accumulateConsumption(@RequestBody UserDto userDto);

    /**
     * 判断用户是否为再升美学会员（是否有购买再升美学卡项订单）
     * */
    @PostMapping(value = "/user/check/upgraded/aesthetics")
    Result checkUpgradedAesthetics(@RequestBody UserDto userDto);

    /**
     * 判断用户是否为再升美学会员（是否有购买再升美学卡项订单）
     * */
    @PostMapping(value = "/user/check/consumption")
    Result checkConsumption(@RequestBody UserDto userDto);

    /**
     * 查询用户累计返佣
     * */
    @PostMapping(value = "/user/rebate/userId")
    Result queryRebateByUserId(@RequestBody UserDto userDto);
}