From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 a7eac39..cb942aa 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")
@@ -142,4 +149,6 @@
      */
     @PostMapping(value = "/couponType/list")
     Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
+
+
 }

--
Gitblit v1.8.0