From 68426f6bb5976e4852dfdb82f55fcb0e4fd9703a Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 21 九月 2023 18:58:48 +0800
Subject: [PATCH] Merge branch 'rx-0918-完善资料' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 656629c..dc62742 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/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")
@@ -132,9 +139,14 @@
     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);
 }

--
Gitblit v1.8.0