From 02e460a52667915cda6c4ebb58488646795c37ec Mon Sep 17 00:00:00 2001
From: 童刚 <pBP8jclM@8yTJ@4h>
Date: 星期三, 03 八月 2022 18:59:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 39b0dd2..c87eb6f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -6,6 +6,8 @@
 import com.hz.his.dto.user.UserLevelDto;
 import com.hz.his.dto.user.card.UserCardDto;
 import com.hz.his.dto.user.card.UserCardUsedDto;
+import com.hz.his.dto.user.coupon.GoodsCanUseCouponDto;
+import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
 import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
 import com.hz.his.dto.user.coupon.UserCouponDto;
 import com.hz.his.dto.user.money.*;
@@ -112,6 +114,18 @@
     @PostMapping(value = "/user/can/use/coupon")
     Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
 
+    /**
+     * 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒�
+     * */
+    @PostMapping(value = "/goods/can/use/coupon")
+    Result goodsCanUseCoupon(@RequestBody GoodsCanUseCouponDto goodsCanUseCouponDto);
+
+    /**
+     * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
+     */
+    @PostMapping(value = "/order/can/use/coupon")
+    Result orderCanUseCoupon(@RequestBody OrderCanUseCouponDto orderCanUseCouponDto);
+
 
     /**
      * 鑾峰彇鐢ㄦ埛澧炲�奸噾鍒楄〃

--
Gitblit v1.8.0