From 20075860ecd50806f7eb594e1d959dd72c871f8a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:19:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..6a9293c 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
@@ -40,6 +40,7 @@
import com.ruoyi.order.api.model.TGrantVip;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.feignClient.IntegralRuleClient;
import com.ruoyi.other.api.feignClient.OtherClient;
@@ -705,7 +706,7 @@
@ApiOperation(value = "优惠卷详情（1可使用2不可用）", tags = {"小程序-个人中心"})
- @GetMapping(value = "/user/coupon/getById")
+ @PostMapping(value = "/user/coupon/getById")
public R<TAppCoupon> couponGetById(@RequestParam("id")Long id) {
TAppCoupon appCoupon = appCouponService.getById(id);
appCoupon.setUid(id.toString());
@@ -736,13 +737,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 +766,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);
}
@@ -961,6 +965,10 @@
.eq(TAppUserSign::getAppUserId, userId)
.orderByDesc(TAppUserSign::getSignDay)
.list();
+ for (TAppUserSign signRecord : signRecords) {
+ int i = signDayUtil.calculateContinuousSignDays1(signRecord.getAppUserId(), signRecord.getSignDay());
+ signRecord.setContinueDays(i);
+ }
return R.ok(signRecords);
}
@@ -1115,6 +1123,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