From bba4dceccfb4d1c38b41ca3e7f9e6bc98f34d85f Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 23 十一月 2022 19:05:06 +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 |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 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 397418c..bb6ecf6 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
@@ -50,10 +50,16 @@
     Result couponCount(@RequestParam("couponId") String couponId);
 
     /**
-     * 浼樻儬鍒镐娇鐢ㄦ儏鍐�
+     * 浼樻儬鍒镐娇鐢ㄦ儏鍐靛垪琛�
      */
     @PostMapping(value = "/coupon/used/detail")
     Result couponUsedDetail(@RequestBody CouponListDetailDto couponListDetailDto);
+
+    /**
+     * 鐢ㄦ埛浼樻儬鍒告儏鍐�
+     */
+    @PostMapping(value = "/coupon/number/detail")
+    Result couponNumberDetail(@RequestBody CouponListDetailDto couponListDetailDto);
 
     /**
      * 鐢ㄦ埛鏄惁棰嗗彇杩囧洟璐椿鍔ㄤ紭鎯犲埜
@@ -62,4 +68,23 @@
     Result checkGroupCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
 
 
+    /**
+     * 鏍规嵁浼樻儬鍒竔d鏌ヨ鍏宠仈鍟嗗搧鍒嗙被
+     */
+    @PostMapping(value = "/get/coupon/type")
+    Result getCouponGoodsTyep(@RequestBody CouponGoodsDto couponGoodsDto);
+
+
+    /**
+     * 鏍规嵁浼樻儬鍒竔d缁熻鍏宠仈鍟嗗搧
+     */
+    @PostMapping(value = "/get/coupon/goods")
+    Result getCouponGoods(@RequestBody CouponGoodsDto couponGoodsDto);
+
+    /**
+     * 鑾峰彇浼樻儬鍒稿垪琛�(涓嶅垎椤�)
+     * @return Result
+     */
+    @PostMapping(value = "/getCouponList")
+    Result getCouponList(@RequestBody CouponDto couponDto);
 }

--
Gitblit v1.8.0