Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

chenjiahe

2022-09-02 7e507b2c234454eab68102613c1c128d58d11bed

Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java

@@ -27,4 +27,6 @@
    public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
    /**公共标识类型,老带新*/
    public static String TYPE_COMMON_OLD_NEW = "old_new";
    /**公共标识类型,团购活动*/
    public static String TYPE_COMMON_GIFT = "gift";
}

 phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java

@@ -55,6 +55,8 @@
    private String orderNo;
    /**用户优惠券标识*/
    private String userCouponId;
    /**平台类型*/
    private String platform;


    /**领取类型-未知*/

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

@@ -246,4 +246,13 @@
    @PostMapping(value = "/user/sms-find")
    Result userSms(@RequestBody UserDto userDto);

    /**
     * 获取用户信息，导入人群包专用
     * 根据CIQ或者名称全匹配查找用户
     * @param userDto 只使用name和CIQ
     * @return 转化使用UserDt
     */
    @PostMapping(value = "/user/crowd/import")
    Result userCrowdImport(@RequestBody UserDto userDto);

}

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -67,4 +67,6 @@
    private String wechat;
    /**邮箱*/
    private String email;
    /**头像*/
    private String imgUrl;
}