From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 16:20:40 +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 1b3d580..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
@@ -33,7 +33,7 @@
ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
- public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId);
+ public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
@PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
@@ -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