From b68aa42d243a61ab31d3bb08e5ca7e588a5188de Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 11:11:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 d6937db..2ffb151 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,6 +2,7 @@
 
 
 import com.dsh.activity.entity.PointsMerchandise;
+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;
@@ -34,4 +35,17 @@
     public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId);
 
 
+    @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);
+
+    @PostMapping("/base/pointMerchars/queryUserPointMerchaseByCode")
+    public List<UserPointsMerchandise> queryUserPointMerchaseByCode(@RequestBody String code);
+
 }

--
Gitblit v1.7.1