From 9baa55cf4292ad0fe80547f9c840e917775411f4 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期日, 05 十一月 2023 09:45:48 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 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 cac69c8..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; @@ -61,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(); } -- Gitblit v1.7.1