From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 七月 2023 09:30:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 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 bdcab0b..ba61917 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,9 +1,16 @@
 package com.dsh.account.feignclient.activity;
 
 
+import com.dsh.account.feignclient.activity.model.CommodityRequest;
 import com.dsh.account.feignclient.activity.model.IntegralCommodity;
+import com.dsh.account.feignclient.activity.model.PointsMerchandise;
+import com.dsh.account.feignclient.activity.model.ProductDetailRequest;
+import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
+import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
+import com.dsh.account.model.vo.userBenefitDetail.ProductDetailsVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -14,4 +21,19 @@
     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")
+    public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId);
 }

--
Gitblit v1.7.1