From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 19f7b0e..e05a568 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,6 +1,7 @@
package com.dsh.account.feignclient.activity;
+import com.dsh.account.dto.Location;
import com.dsh.account.feignclient.activity.model.*;
import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.model.vo.userBenefitDetail.*;
@@ -14,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")
@@ -35,14 +36,14 @@
ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
- PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
+ PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
@PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
@PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
- public Long saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
+ public Long saveDetailsUserPointMercase(UserPointsMerchandise merchandise);
@PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
@@ -55,6 +56,7 @@
@PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp);
+
@PostMapping("/base/pointMerchars/queryUserHasGoodsNums1")
int queryUserHasGoodsNums1(@RequestBody AppUserGoodResp goodResp);
--
Gitblit v1.7.1