From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:46:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 b868a95..c8b23de 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
@@ -60,6 +60,8 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+ @Autowired
+ private TAppUserService appUserService;
@ResponseBody
@@ -82,6 +84,17 @@
commodities = commodities.subList(0, 5);
}
indexOfUserBenefirVo.setCommodities(commodities);
+ TAppUser byId = appUserService.getById(appUserId);
+ if (byId.getIsVip()!=null && byId.getIsVip()==1){
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ if (byId.getVipEndTime().getTime() > System.currentTimeMillis()) {
+ indexOfUserBenefirVo.setVipEndTime(simpleDateFormat.format(byId.getVipEndTime()));
+ } else {
+ indexOfUserBenefirVo.setVipEndTime("");
+ }
+ }else{
+ indexOfUserBenefirVo.setVipEndTime("");
+ }
return ResultUtil.success(indexOfUserBenefirVo);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.7.1