Merge branch 'master' into master-test

wangrenhuang

2023-11-15 9329e4df9d50bb47176de86d5b7a443cbd412641

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

@@ -60,16 +60,18 @@
    Result checkCoupon(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-检查优惠券是否可用 - 开单结账同时执行使用
     */
    @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
    Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-订单发放优惠券
     */
    @PostMapping(value = "/coupon/order/send/coupon")
    Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);

    /**
     * 开放平台-检查优惠券是否可用 - 开单结账同时执行使用
     */
    @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
    Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);


    /**
     * 开放平台-校验优惠券是否存在 创建或者更新
@@ -78,15 +80,9 @@
    Result couponCheckCreate(@RequestBody CouponAddDto couponAddDto);

    /**
     * 开放平台-获取优惠券限额配置 总的
     * 开放平台- 校验优惠券剩余数量
     */
    @PostMapping(value = "/coupon/use/quato/info/by/total")
    Result couponUseQuotaInfoByTotal(@RequestBody CouponAddDto couponAddDto);

    /**
     * 开放平台-获取优惠券限额配置 当前月
     */
    @PostMapping(value = "/coupon/use/quato/info/by/month")
    Result couponUseQuotaInfoByMonth(@RequestBody CouponAddDto couponAddDto);
    @PostMapping(value = "/coupon/check/surplus/num")
    Result checkCouponSurplusNum(@RequestBody CouponDto couponDto);

}