Merge branch 'master-prod-new' into chenjiahe-订单积分

chenjiahe

2023-11-13 99ffdf25456cd2d9bb90d275d00257cdd8cfc879

Merge branch 'master-prod-new' into chenjiahe-订单积分

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

@@ -51,6 +51,12 @@

    /** 是否是营销助手申请 0=否 1=是*/
    private Integer isMarketApply = 0;
    /**是否查询关联信息*/
    private Integer isSelectGoods = 1;
    /**查询生日券*/
    private Integer isSelectBirthday;
    /**优惠券类型*/
    private String couponType;

    /** 优惠券分类ID*/
    private String couponTypeId;

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

@@ -34,13 +34,13 @@
    Result check(@RequestBody UserDto userDto);

    @PostMapping(value = "/user/query/visitCount")
    Result queryVisitCount(UserDto userDto);
    Result queryVisitCount(@RequestBody UserDto userDto);

    @PostMapping(value = "/user/query/lastVisit")
    Result queryLastVisit(UserDto userDto);
    Result queryLastVisit(@RequestBody UserDto userDto);

    @PostMapping(value = "/user/query/appointment/list")
    Result queryAppointmentList(UserDto userDto);
    Result queryAppointmentList(@RequestBody UserDto userDto);




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

@@ -36,4 +36,10 @@
     */
    @PostMapping(value = "/employee/sent/email/notice")
    Result senEmailNotice(@RequestBody EmployeeDto employeeDto);

    /**
     * 开放平台-获取企业微信用户信息
     */
    @PostMapping(value = "/employee/corp/info")
    Result corpInfo(@RequestBody EmployeeDto employeeDto);
}