Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

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

@@ -116,6 +116,13 @@
    Result userCouponCheckList(@RequestBody(required = false) CouponListDto couponListDto);

    /**
     * 用户-升单订单的原使用优惠券列表
     * @return canUseCouponList可用券列表 canUseCount可用券数量
     * */
    @PostMapping(value = "/coupon/user/riseOrderOriCouponList")
    Result riseOrderOriCouponList(@RequestBody(required = false) CouponListDto couponListDto);

    /**
     * 根据skuid查询关联优惠券
     */
    @PostMapping(value = "/coupon/find/skuId")
@@ -124,4 +131,22 @@
    /*下单校验优惠券是否可用*/
    @PostMapping(value = "/coupon/order/check")
    Result orderCheck(@RequestBody(required = false) CouponListDto couponListDto);

    /**
     * 查看商品详情用户可用优惠券
     */
    @PostMapping(value = "/coupon/user/goods")
    Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);

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

    /**
     * 查询优惠券分类
     */
    @PostMapping(value = "/couponType/list")
    Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
}