From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 12 七月 2024 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 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 6674546..c53c4c5 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
@@ -4,6 +4,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.*;
import com.hz.his.dto.dictionaries.DictionariesDto;
+import com.hz.his.dto.user.coupon.GoodsUsedCouponDto;
import com.hz.phis.dt.marketingCoupon.MarketingCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -113,4 +114,58 @@
* */
@PostMapping(value = "/coupon/user/unify/check/list")
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")
+ Result findGoodsSkuIdCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
+
+ /*涓嬪崟鏍￠獙浼樻儬鍒告槸鍚﹀彲鐢�*/
+ @PostMapping(value = "/coupon/order/check")
+ Result orderCheck(@RequestBody(required = false) CouponListDto couponListDto);
+
+ /**
+ * 鏌ョ湅鍟嗗搧璇︽儏鐢ㄦ埛鍙敤浼樻儬鍒�
+ */
+ @PostMapping(value = "/coupon/user/goods")
+ 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);
+
+ /***
+ * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 鏄惁鏈変粖骞村彂鏀炬寚瀹氱殑鐢熸棩鍒�
+ */
+ @PostMapping(value = "/coupon/birthday/list/user")
+ Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
+
+ /**
+ * 鑾峰彇浼樻儬鍒搁鍙栬鍒欏垪琛�
+ */
+ @PostMapping(value = "/coupon/receive/rule/list")
+ Result getReceiveRuleList();
+
}
--
Gitblit v1.8.0