From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
index 2ffb151..3fb2b93 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
@@ -17,18 +17,12 @@
     @PostMapping("/base/pointMerchars/convertGoods")
     public List<IntegralCommodity> getConvertibleGoods();
 
-    @PostMapping("/base/pointMerchars/getCommoditys")
-    public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request);
-
     @PostMapping("/base/pointMerchars/getRedeemedNums")
     public int getRedeemedQuantity(@RequestBody Integer goodId);
 
 
     @PostMapping("/base/pointMerchars/getGoodDetails")
     ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest);
-
-    @PostMapping("/base/pointMerchars/getDetailsOfExchange")
-    List<ExchangeDetailsResponse> getIntegralExchangeDetails(@RequestBody Integer appUserId);
 
 
     @PostMapping("/base/pointMerchars/getSpecificsOfGoods")
@@ -37,10 +31,6 @@
 
     @PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
     public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
-
-
-    @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
-    public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
 
     @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
     public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);

--
Gitblit v1.7.1