From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 20 十一月 2023 10:24:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |   92 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 88 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 3926995..b2a1681 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,10 +2,10 @@
 
 
 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;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -80,4 +80,88 @@
      */
     @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);
+
+    /***
+     * 鏌ヨ浼樻儬鍒稿彲鐢ㄩ」鐩�
+     */
+    @PostMapping(value = "/coupon/usable/project/list")
+    Result couponUsableProjectList(@RequestBody(required = false) CouponDto dto);
+
+    /***
+     * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 鏄惁鏈変粖骞村彂鏀炬寚瀹氱殑鐢熸棩鍒�
+     */
+    @PostMapping(value = "/user/birthday/coupon/list")
+    Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
+
+
+
 }

--
Gitblit v1.8.0