From 15deef40aeb83d485fa1df9b5482b0deccfbdbc1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 28 十月 2024 13:38:15 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index f06c968..01c39c3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -736,13 +736,13 @@
TVip info = vipClient.getInfo1(giveVipDto.getVipId()).getData();
switch (giveVipDto.getType()){
case 1:
- bigDecimal = bigDecimal.add(info.getMonthlyCard());
+ bigDecimal = bigDecimal.add(info.getMonthlyCard()==null?new BigDecimal(0):info.getMonthlyCard());
break;
case 2:
- bigDecimal = bigDecimal.add(info.getSeasonCard());
+ bigDecimal = bigDecimal.add(info.getSeasonCard()==null?new BigDecimal(0):info.getSeasonCard());
break;
case 3:
- bigDecimal = bigDecimal.add(info.getAnnualCard());
+ bigDecimal = bigDecimal.add(info.getAnnualCard()==null?new BigDecimal(0):info.getAnnualCard());
break;
}
//增加vipDetail
@@ -765,8 +765,11 @@
@PostMapping(value = "/user/invite/page")
public R<Page<TInviteUser>> invitePage(@RequestBody BasePage basePage) {
Long userId = tokenService.getLoginUserApplet().getUserId();
-
Page<TInviteUser> page = inviteUserService.lambdaQuery().eq(TInviteUser::getAppUserId, userId).isNotNull(TInviteUser::getAward).orderByDesc(TInviteUser::getCreateTime).page(Page.of(basePage.getPageCurr(), basePage.getPageSize()));
+ for (TInviteUser record : page.getRecords()) {
+ TAppUser byId = appUserService.getById(record.getBeInvitedAppUserId());
+ record.setAvatar(byId.getAvatar());
+ }
return R.ok(page);
}
@@ -1115,6 +1118,10 @@
public R getModel(String id) throws Exception {
String modelById = CarBrandUtil.getModelById(id);
JSONObject jsonObject = JSON.parseObject(modelById);
+ Integer code = jsonObject.getInteger("code");
+ if (code==701){
+ return R.fail("当前品牌暂无分类");
+ }
JSONArray data = jsonObject.getJSONArray("data");
JSONArray backList = new JSONArray();
for (Object datum : data) {
--
Gitblit v1.7.1