From cc35e61d33b2421344bb22eb1ba50d093eacb562 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 18 四月 2023 18:28:53 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |   22 ++++++++++++++++++++++
 1 files changed, 22 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 3926995..03821bd 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
@@ -6,6 +6,8 @@
 import com.hz.his.dto.coupon.CouponDto;
 import com.hz.his.dto.coupon.CouponGoodsDto;
 import com.hz.his.dto.coupon.CouponListDetailDto;
+import com.hz.his.dto.dictionaries.DictionariesDto;
+import com.hz.phis.dt.marketingCoupon.MarketingCouponDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -80,4 +82,24 @@
      */
     @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);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛棰嗗彇钀ラ攢浼樻儬鍒告暟鎹�
+     */
+    @PostMapping(value = "/marketing/data")
+    Result marketingData(@RequestBody(required = false) MarketingCouponDto marketingCouponDto);
 }

--
Gitblit v1.8.0