From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |    7 +++++++
 1 files changed, 7 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..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")

--
Gitblit v1.8.0