From 134d13688e4b6677133ba2d362d2978d8bda2b87 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 12 七月 2023 11:46:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 bdcab0b..7d045a8 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,9 +1,12 @@
package com.dsh.account.feignclient.activity;
+import com.dsh.account.feignclient.activity.model.CommodityRequest;
import com.dsh.account.feignclient.activity.model.IntegralCommodity;
+import com.dsh.account.feignclient.activity.model.PointsMerchandise;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -14,4 +17,10 @@
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);
+
}
--
Gitblit v1.7.1