From 7cb90b47c42b4ee5944964ad62ae89e7e6a2f9ca Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 十一月 2023 09:03:36 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 844723b..7aaa6e0 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -2,6 +2,7 @@
import com.dsh.account.entity.TAppUser;
+import com.dsh.account.feignclient.activity.model.IntegralCommodity;
import com.dsh.account.feignclient.other.SysLogClient;
import com.dsh.account.model.vo.userBenefitDetail.*;
import com.dsh.account.service.RechargeRecordsService;
@@ -14,10 +15,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -64,7 +62,13 @@
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(tauService.queryBenefitDetails(appUserId));
+ IndexOfUserBenefirVo indexOfUserBenefirVo = tauService.queryBenefitDetails(appUserId);
+ List<IntegralCommodity> commodities = indexOfUserBenefirVo.getCommodities();
+ if (commodities.size() > 5) {
+ commodities = commodities.subList(0, 5);
+ }
+ indexOfUserBenefirVo.setCommodities(commodities);
+ return ResultUtil.success(indexOfUserBenefirVo);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -287,11 +291,12 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
public ResultUtil<List<Goods>> pointsMallList(MallRequest request){
- try {
+// try {
+ System.out.println("======request========"+request);
return ResultUtil.success(tauService.queryAppUserIntegral(request));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
@@ -468,7 +473,9 @@
})
public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId){
try {
- return ResultUtil.success(uicService.queryRedemptionDetails(detailsId));
+ PointDetailsVo pointDetailsVo = uicService.queryRedemptionDetails(detailsId);
+ pointDetailsVo.getPics().remove(0);
+ return ResultUtil.success(pointDetailsVo);
}catch (Exception e){
return ResultUtil.runErr();
}
--
Gitblit v1.7.1