From 2875be234bb2631071c09ab0852f5fb28af0e9ee Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 04 七月 2023 12:15:47 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 03821bd..0d4f469 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
@@ -2,11 +2,9 @@
import com.hx.resultTool.Result;
-import com.hz.his.dto.coupon.CouponDetailDto;
-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.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;
@@ -102,4 +100,28 @@
*/
@PostMapping(value = "/marketing/data")
Result marketingData(@RequestBody(required = false) MarketingCouponDto marketingCouponDto);
+
+
+ /**
+ * 浼樻儬鍒哥粺涓�鏍￠獙鎺ュ彛
+ */
+ @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);
+
+ /**
+ * 鏍规嵁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);
}
--
Gitblit v1.8.0