From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 133 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 116 insertions(+), 17 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 9673a12..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
@@ -2,8 +2,10 @@
import com.hx.resultTool.Result;
-import com.hz.his.dto.coupon.CouponDto;
-import com.hz.his.dto.coupon.CouponGoodsDto;
+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;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,26 +18,18 @@
public interface SCouponService {
/**
- * 鑾峰彇浼樻儬鍒稿垪琛�(鍚寚瀹�)
- * @return Result
- */
- @PostMapping(value = "/coupon/list/appoint")
- Result getListAppoint(@RequestBody CouponDto couponDto);
-
- /**
* 鑾峰彇浼樻儬鍒稿垪琛�
* @return Result
*/
@PostMapping(value = "/coupon/list")
Result getList(@RequestBody CouponDto couponDto);
-
/**
- * 鍟嗗搧鍙鍙栦紭鎯犲埜
+ * 鑾峰彇浼樻儬鍒稿垪琛�(鍚寚瀹�,缁熻浜烘暟)
+ * @return Result
*/
- @PostMapping(value = "/goods/receive/coupon")
- Result goodsReceiveCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
-
+ @PostMapping(value = "/coupon/list/appoint")
+ Result getListAppoint(@RequestBody CouponDetailDto couponDetailDto);
/**
* 浼樻儬鍒歌鎯�
@@ -43,11 +37,116 @@
@PostMapping(value = "/coupon/detail")
Result couponDetail(@RequestParam("couponId") String couponId);
+ /**
+ * 鐢ㄦ埛浼樻儬鍒歌鎯�
+ */
+ @PostMapping(value = "/coupon/couponNumberDetail")
+ Result couponNumberDetail(@RequestParam("couponNumberId") String couponNumberId);
/**
- * 鍟嗗搧鍙敤浼樻儬鍒�
+ * 浼樻儬鍒哥粺璁�
*/
- @PostMapping(value = "/goods/canUsed/coupon")
- Result goodsCanUsedCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
+ @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);
+
+ /**
+ * 鐢ㄦ埛鏄惁棰嗗彇杩囧洟璐椿鍔ㄤ紭鎯犲埜
+ */
+ @PostMapping(value = "/check/group/coupon")
+ 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);
+
+
+ /**
+ * 浼樻儬鍒哥粺涓�鏍￠獙鎺ュ彛
+ */
+ @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