From 9f53055abd60eb0fb5d8060587124012d77d8ab6 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 23 三月 2023 17:08:44 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 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..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;
@@ -38,16 +40,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 +70,36 @@
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);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棰嗗彇钀ラ攢浼樻儬鍒告暟鎹�
+ */
+ @PostMapping(value = "/marketing/data")
+ Result marketingData(@RequestBody(required = false) MarketingCouponDto marketingCouponDto);
}
--
Gitblit v1.8.0