Merge branch 'master-prod-new' into master-test

fhx

2023-10-19 b651b073bc20ab3124c99f690dffc7eeff75e205

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

@@ -19,6 +19,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@@ -255,6 +257,13 @@
    @PostMapping(value = "/user/crowd/import")
    Result userCrowdImport(@RequestBody UserDto userDto);

    /**
     * 获取用户信息，导入人群包专用
     * 根据CIQ或者名称全匹配查找用户
     */
    @PostMapping(value = "/user/crowd/import/new")
    Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);


    /**
     * 获取用户子项目
@@ -262,4 +271,77 @@
    @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);

    /**
     * 获取到用户
     */
    @PostMapping(value = "/user/sync/by/idList")
    Result userSyncList(@RequestBody List<String> hisIdList);

    /**
     *  判断用户是否是会员
     * @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);

    /**
     * 查询用户累计返佣
     * */
    @PostMapping(value = "/user/query/oldNewPerformance")
    Result queryOldNewPerformance(@RequestBody UserDto userDto);


    @PostMapping(value = "/user/draw/list")
    Result drawGetUserDt(@RequestBody UserDto userDto);
}