From 0be3fb121faead65246a567574ac062a601411b0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 18:01:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 ba61917..ebc2f3f 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,10 +1,7 @@
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 com.dsh.account.feignclient.activity.model.ProductDetailRequest;
+import com.dsh.account.feignclient.activity.model.*;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.ProductDetailsVo;
@@ -22,7 +19,7 @@
@PostMapping("/base/pointMerchars/getCommoditys")
- public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request);
+ PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request);
@PostMapping("/base/pointMerchars/getRedeemedNums")
public int getRedeemedQuantity(@RequestBody Integer goodId);
@@ -36,4 +33,19 @@
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
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