From 17a2faf677cbaa5d2ec1a35cd8111c68eb0b9e75 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 15 十一月 2023 17:41:11 +0800
Subject: [PATCH] Merge branch 'rx-1109-营销优惠券优化' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 21 ++++++++++++++++++++-
1 files changed, 20 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 656629c..0fc8854 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")
@@ -132,9 +139,21 @@
Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
/**
- * 鏌ヨ浼樻儬鍒稿垎绫�
+ * 鏌ヨ鍩虹鍒嗙被
*/
@PostMapping(value = "/coupon/type/list")
Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);
+ /**
+ * 鏌ヨ浼樻儬鍒稿垎绫�
+ */
+ @PostMapping(value = "/couponType/list")
+ Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
+
+ /***
+ * 鏌ヨ浼樻儬鍒稿彲鐢ㄩ」鐩�
+ */
+ @PostMapping(value = "/coupon/usable/project/list")
+ Result couponUsableProjectList(@RequestBody(required = false) CouponDto dto);
+
}
--
Gitblit v1.8.0