From 68426f6bb5976e4852dfdb82f55fcb0e4fd9703a Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 21 九月 2023 18:58:48 +0800
Subject: [PATCH] Merge branch 'rx-0918-完善资料' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 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 ff8c45a..dc62742 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;
@@ -106,4 +107,46 @@
      */
     @PostMapping(value = "/coupon/unify/check")
     Result unifyCheck(@RequestBody(required = false) CouponCheckDto couponCheckDto);
+
+    /**
+     * 鐢ㄦ埛-鍙敤浼樻儬鍒稿垪琛�-缁熶竴鏍¢獙鐗堟湰
+     * @return canUseCouponList鍙敤鍒稿垪琛� canUseCount鍙敤鍒告暟閲�
+     * */
+    @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);
 }

--
Gitblit v1.8.0