From 9baa55cf4292ad0fe80547f9c840e917775411f4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 1f28eb8..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;
@@ -44,7 +42,7 @@
@PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
- public void saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
+ public Long saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
@PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
@@ -65,8 +63,6 @@
void deletePaymentRecord(@RequestBody String code);
-
-
-
-
+ @PostMapping("/base/pointMerchars/getConsumeDetails")
+ List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1