From efc09045da6ca5fc06ff9221723ed9ddf81e568e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 09 八月 2023 09:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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..1b3d580 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,11 +1,9 @@
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.ExchangeDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.ProductDetailsVo;
import org.springframework.cloud.openfeign.FeignClient;
@@ -22,7 +20,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);
@@ -32,8 +30,23 @@
@PostMapping("/base/pointMerchars/getDetailsOfExchange")
- List<ExchangeDetailsResponse> getIntegralExchangeDetails(@RequestBody Integer appUserId);
+ ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);
@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( 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