From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 9bf8eac..630f55c 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
@@ -40,7 +40,7 @@
 
 
     @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
-    public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
+    public void saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
 
 
     @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
@@ -49,4 +49,13 @@
 
     @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