From c800715e798d45e50aa6b8e6930a7a680526177d Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 10 八月 2022 14:27:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 cddc55b..f9a5f91 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,7 @@
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;
@@ -14,6 +15,7 @@
import com.hz.his.dto.user.project.UserPackageDto;
import com.hz.his.dto.user.project.UserProjectDto;
import com.hz.his.dto.user.project.UserProjectUsedDto;
+import com.hz.his.dto.user.promotion.UserPromotionUsedDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -88,10 +90,9 @@
/**
* 鑾峰彇鐢ㄦ埛淇冮攢浣跨敤璁板綍
- * @param orderItemNo 瀛愯鍗曞彿
* */
@PostMapping(value = "/user/promotion/used")
- Result userPromotionUsed(@RequestParam("orderItemNo") String orderItemNo);
+ Result userPromotionUsed(@RequestBody UserPromotionUsedDto userPromotionUsedDto);
/**
@@ -112,6 +113,12 @@
* */
@PostMapping(value = "/user/can/use/coupon")
Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
+
+ /**
+ * 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒�
+ * */
+ @PostMapping(value = "/goods/can/use/coupon")
+ Result goodsCanUseCoupon(@RequestBody GoodsCanUseCouponDto goodsCanUseCouponDto);
/**
* 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
@@ -216,7 +223,7 @@
Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId);
/**
- * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,鎷ユ湁鐨勬爣绛�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
+ * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
* */
@PostMapping(value = "/user/package/list")
Result userPackageList(@RequestBody UserPackageDto userPackageDto);
--
Gitblit v1.8.0