From 99f5cda938c41638dc963d364204716aa62e8ba1 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 09 二月 2023 15:37:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 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 9bc0f5d..40cde67 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
@@ -38,16 +38,28 @@
     Result couponDetail(@RequestParam("couponId") String couponId);
 
     /**
+     * 鐢ㄦ埛浼樻儬鍒歌鎯�
+     */
+    @PostMapping(value = "/coupon/couponNumberDetail")
+    Result couponNumberDetail(@RequestParam("couponNumberId") String couponNumberId);
+
+    /**
      * 浼樻儬鍒哥粺璁�
      */
     @PostMapping(value = "/coupon/count")
     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);
 
     /**
      * 鐢ㄦ埛鏄惁棰嗗彇杩囧洟璐椿鍔ㄤ紭鎯犲埜
@@ -56,4 +68,30 @@
     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);
+
+    /**
+     * 鏌ヨ浼樻儬鍒哥爜璇︽儏(涓嶅垎椤�)
+     * @return Result
+     */
+    @PostMapping(value = "/getCouponNumber")
+    Result getCouponNumber(@RequestBody CouponDto couponDto);
 }

--
Gitblit v1.8.0