From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +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 | 15 ++++++---------
1 files changed, 6 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 49a3396..10e801c 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
@@ -1,11 +1,10 @@
package com.dsh.account.feignclient.activity;
+import com.dsh.account.dto.Location;
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;
@@ -16,7 +15,7 @@
public interface MerChandiseClient {
@PostMapping("/base/pointMerchars/convertGoods")
- public List<IntegralCommodity> getConvertibleGoods();
+ public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location);
@PostMapping("/base/pointMerchars/getCommoditys")
@@ -65,8 +64,6 @@
void deletePaymentRecord(@RequestBody String code);
-
-
-
-
+ @PostMapping("/base/pointMerchars/getConsumeDetails")
+ List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1