From 764f045c785959117db3d27d744e63d2dad6240c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 13 十一月 2023 09:04:41 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
index 23d5d10..19f7b0e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
@@ -2,10 +2,8 @@
 
 
 import com.dsh.account.feignclient.activity.model.*;
-import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
-import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsVo;
-import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
-import com.dsh.account.model.vo.userBenefitDetail.ProductDetailsVo;
+import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
+import com.dsh.account.model.vo.userBenefitDetail.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +27,10 @@
     ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest);
 
 
+    @PostMapping("/base/pointMerchars/getGoodDetailsWithIdOne")
+    ProductDetailsVo getGoodDetailsWithIdOne(@RequestBody Integer id);
+
+
     @PostMapping("/base/pointMerchars/getDetailsOfExchange")
     ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);
 
@@ -40,7 +42,7 @@
 
 
     @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
-    public void saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
+    public Long saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
 
 
     @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
@@ -53,9 +55,14 @@
 
     @PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
     int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp);
+    @PostMapping("/base/pointMerchars/queryUserHasGoodsNums1")
+    int queryUserHasGoodsNums1(@RequestBody AppUserGoodResp goodResp);
 
 
     @PostMapping("/base/pointMerchars/deletePaymentRecord")
     void deletePaymentRecord(@RequestBody String code);
 
+
+    @PostMapping("/base/pointMerchars/getConsumeDetails")
+    List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo);
 }

--
Gitblit v1.7.1