From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 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 d77e5e2..7f9aed5 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,17 +1,61 @@
 package com.dsh.account.feignclient.activity;
 
 
-import com.dsh.account.feignclient.activity.model.IntegralCommodity;
+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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
 @FeignClient(value = "mb-cloud-activity")
 public interface MerChandiseClient {
 
-    @PostMapping("/pointMerchars/convertGoods")
+    @PostMapping("/base/pointMerchars/convertGoods")
     public List<IntegralCommodity> getConvertibleGoods();
 
 
+    @PostMapping("/base/pointMerchars/getCommoditys")
+    PointMerchandiseVo 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")
+    ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);
+
+    @PostMapping("/base/pointMerchars/getSpecificsOfGoods")
+    public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
+
+    @PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
+    public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
+
+
+    @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
+    public void saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
+
+
+    @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
+    public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
+
+
+    @PostMapping("/base/pointMerchars/queryUserPointMerchaseByCode")
+    public List<UserPointsMerchandise> queryUserPointMerchaseByCode(@RequestBody String code);
+
+
+    @PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
+    int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp);
+
+
+    @PostMapping("/base/pointMerchars/deletePaymentRecord")
+    void deletePaymentRecord(@RequestBody String code);
+
 }

--
Gitblit v1.7.1