From 3c8dc107047c0b5ee407fa36ca2ce06090f75929 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 四月 2025 18:05:02 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 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..e05a568 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,13 +1,10 @@
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.model.vo.userBenefitDetail.ExchangeDetailsResponse;
-import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
-import com.dsh.account.model.vo.userBenefitDetail.ProductDetailsVo;
+import com.dsh.account.dto.Location;
+import com.dsh.account.feignclient.activity.model.*;
+import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
+import com.dsh.account.model.vo.userBenefitDetail.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -18,11 +15,11 @@
public interface MerChandiseClient {
@PostMapping("/base/pointMerchars/convertGoods")
- public List<IntegralCommodity> getConvertibleGoods();
+ public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location);
@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);
@@ -31,9 +28,43 @@
ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest);
+ @PostMapping("/base/pointMerchars/getGoodDetailsWithIdOne")
+ ProductDetailsVo getGoodDetailsWithIdOne(@RequestBody Integer id);
+
+
@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);
+ PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
+
+ @PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
+ public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
+
+
+ @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
+ public Long saveDetailsUserPointMercase(UserPointsMerchandise merchandise);
+
+
+ @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
+ public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
+
+
+ @PostMapping("/base/pointMerchars/queryUserPointMerchaseByCode")
+ public List<UserPointsMerchandise> queryUserPointMerchaseByCode(@RequestBody String code);
+
+
+ @PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
+ int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp);
+
+ @PostMapping("/base/pointMerchars/queryUserHasGoodsNums1")
+ int queryUserHasGoodsNums1(@RequestBody AppUserGoodResp goodResp);
+
+
+ @PostMapping("/base/pointMerchars/deletePaymentRecord")
+ void deletePaymentRecord(@RequestBody String code);
+
+
+ @PostMapping("/base/pointMerchars/getConsumeDetails")
+ List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1