Merge branch 'master-prod-new' into master-test

fwq

2023-10-27 06443da28c793cf6b58c05fb6ac97eb552862437

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

@@ -4,6 +4,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.*;
import com.hz.his.dto.dictionaries.DictionariesDto;
import com.hz.his.dto.user.coupon.GoodsUsedCouponDto;
import com.hz.phis.dt.marketingCoupon.MarketingCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -106,4 +107,48 @@
     */
    @PostMapping(value = "/coupon/unify/check")
    Result unifyCheck(@RequestBody(required = false) CouponCheckDto couponCheckDto);

    /**
     * 用户-可用优惠券列表-统一校验版本
     * @return canUseCouponList可用券列表 canUseCount可用券数量
     * */
    @PostMapping(value = "/coupon/user/unify/check/list")
    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")
    Result findGoodsSkuIdCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);

    /*下单校验优惠券是否可用*/
    @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);


}