From 1918bee03c0924732c60c8db14a37a70cf2e0acc Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期四, 27 四月 2023 10:28:56 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 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 ec180ee..03821bd 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 @@ -6,6 +6,8 @@ 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.dictionaries.DictionariesDto; +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; @@ -68,4 +70,36 @@ 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); } -- Gitblit v1.8.0