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

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

 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);


    /**
     * 获取用户子项目
@@ -269,6 +278,12 @@
     */
    @PostMapping(value = "/user/info/baseInfo")
    Result userInfoBaseInfo(@RequestParam("userId") String userId);

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

    /**
     *  判断用户是否是会员
@@ -295,4 +310,86 @@
     * */
    @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);

    /**
     * 查询用户科室关系
     * */
    @PostMapping(value = "/user/room/list")
    Result userRoomList(@RequestBody UserDto userDto);


    /**
     * 查询用户优惠券 已经过期和未过期的且过滤生日券
     * */
    @PostMapping(value = "/user/coupon/by/valid/state")
    Result userCouponByValidState(@RequestBody UserCouponDto userCouponDto);


    /**
     * 用户优惠券列表 获取订单全额退款-退回已过期优惠券
     * */
    @PostMapping(value = "/user/refund/order/overdue/coupon")
    Result userRefundOrderOverdueCoupon(@RequestBody UserCouponDto userCouponDto);

    /**
     * 用户点诊医生记录
     * */
    @PostMapping(value = "/user/doctor/data/list")
    Result userDoctorDataList(@RequestBody UserDto userDto);

    /**
     * 查询用户年度账单
     * */
    @PostMapping(value = "/user/statement/details")
    Result statementDetails(@RequestBody UserDto userDto);


    /**
     * 查询用户最新的合并账号记录
     * */
    @PostMapping(value = "/user/merge/log")
    Result userMergeLog(@RequestBody UserDto userDto);


    /**
     * 查询用户VIP记录以及要领取的优惠券,传userId字段
     * 返回实体转换 UserCouponDataVo
     * */
    @PostMapping(value = "/user/vip/log/coupon")
    Result userVipLogCoupon(@RequestBody UserDto userDto);

}