From e1107554c61919ab96c48e3280ce831498f96feb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:21:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 53be1bb..2c4166f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -243,7 +243,8 @@
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
getAppUserVipDetail.setAppUserId(userId);
getAppUserVipDetail.setVipId(data.getVipId());
- TAppUserVipDetail data1 = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ TAppUserVipDetail data1 = appUserVipDetail.getData();
String vipJson = data1.getVipJson();
TVip tVip = JSON.parseObject(vipJson, TVip.class);
vips.add(tVip);
@@ -301,8 +302,10 @@
vipInfoDto.setTotalDiscount(total);
vipInfoDto.setTimeAmount(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
- vipInfoDtos.add(vipInfoDto);
}
+ vipInfoDto.setType(vip.getType());
+ vipInfoDtos.add(vipInfoDto);
+
}
return R.ok(vipInfoDtos);
--
Gitblit v1.7.1