Merge branch 'rx-优惠券查询补充条件' into master-test

rx

2023-08-08 ec1881f3554866aeeaebf12922bf37a1580040f2

Merge branch 'rx-优惠券查询补充条件' into master-test

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

@@ -51,4 +51,9 @@

    /** 是否是营销助手申请 0=否 1=是*/
    private Integer isMarketApply = 0;

    /** 优惠券分类ID*/
    private String couponTypeId;
    /** 基础分类-优惠券*/
    private String type;
}

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java

@@ -99,4 +99,6 @@
    public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
    /**操作方式-活动参与*/
    public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
    /**操作方式-营销助手积分兑换优惠券*/
    public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral";
}

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

@@ -130,4 +130,11 @@
     */
    @PostMapping(value = "/coupon/user/goods")
    Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);

    /**
     * 查询优惠券分类
     */
    @PostMapping(value = "/coupon/type/list")
    Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);

}