From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 155dea3..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
@@ -2,9 +2,8 @@
import com.dsh.activity.entity.PointsMerchandise;
-import com.dsh.activity.feignclient.model.IntegralCommodity;
-import com.dsh.activity.feignclient.model.ProductDetailRequest;
-import com.dsh.activity.feignclient.model.ProductDetailsVo;
+import com.dsh.activity.entity.UserPointsMerchandise;
+import com.dsh.activity.feignclient.model.*;
import com.dsh.activity.model.request.CommodityRequest;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -18,9 +17,6 @@
@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);
@@ -28,4 +24,18 @@
@PostMapping("/base/pointMerchars/getGoodDetails")
ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest);
+
+ @PostMapping("/base/pointMerchars/getSpecificsOfGoods")
+ public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId);
+
+
+ @PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
+ public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
+
+ @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
+ public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
+
+ @PostMapping("/base/pointMerchars/queryUserPointMerchaseByCode")
+ public List<UserPointsMerchandise> queryUserPointMerchaseByCode(@RequestBody String code);
+
}
--
Gitblit v1.7.1