From 4b5eb2ee5cfcffe55a72e29a388c75715eb45d28 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 20:52:07 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 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 9293ee1..a483474 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
@@ -112,6 +112,7 @@
@Resource
private IntegralRuleClient integralRuleClient;
+
@Resource
private VipClient vipClient;
@Resource
@@ -331,6 +332,13 @@
appUser.setLastDays( Duration.between(LocalDateTime.now(), appUser.getVipEndTime()).toDays());
appUser.setUid(appUser.getId().toString());
+
+ TAppUserCar one1 = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, appUser.getId()).orderByDesc(BasePojo::getCreateTime).last("limit 1").one();
+ if (one1!=null){
+ CarNumDto carNumDto = CarUtil.carNum(one1.getLicensePlate());
+ appUser.setPlace(carNumDto.getProvince()+carNumDto.getCity());
+
+ }
}
return R.ok(page);
}
@@ -363,6 +371,14 @@
R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds);
//循环处理
for (TAppUser appUser : page.getRecords()) {
+ if (appUser.getProvinceCode()!=null){
+ Region data = otherClient.getRegionBuyCode(appUser.getProvinceCode()).getData();
+ appUser.setProvince(data.getName());
+ }
+ if(appUser.getCityCode()!=null){
+ Region data = otherClient.getRegionBuyCode(appUser.getCityCode()).getData();
+ appUser.setCity(data.getName());
+ }
//拿到最新的tagId
TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();
//设置最新的tagName
@@ -520,9 +536,11 @@
@GetMapping(value = "/user/points/detail")
public R<TAppUserIntegralChange> pointsDetail(String id) {
TAppUserIntegralChange byId = integralChangeService.getById(id);
- TExchangeOrder data = exchangeOrderClient.orderDetail(Long.valueOf(byId.getExtension())).getData();
- if (data!=null) {
- byId.setGoodType(data.getOrderType());
+ if (byId.getChangeType()==6) {
+ TExchangeOrder data = exchangeOrderClient.orderDetail(Long.valueOf(byId.getExtension())).getData();
+ if (data != null) {
+ byId.setGoodType(data.getOrderType());
+ }
}
return R.ok(byId);
}
@@ -639,6 +657,7 @@
InfoCouponDto infoCouponDto = new InfoCouponDto();
BeanUtils.copyProperties(coupon, infoCouponDto);
infoCouponDto.setId(tAppCoupon.getId().toString());
+ infoCouponDto.setCouponId(coupon.getId());
infoCouponDto.setEndTime(tAppCoupon.getEndTime());
couponDtos1.add(infoCouponDto);
@@ -683,6 +702,7 @@
@GetMapping(value = "/user/coupon/getById")
public R<TAppCoupon> couponGetById(@RequestParam("id")Long id) {
TAppCoupon appCoupon = appCouponService.getById(id);
+ appCoupon.setUid(id.toString());
return R.ok(appCoupon);
}
@@ -849,7 +869,7 @@
boolean doubleVip = false;
if (one!=null){
TVip tVip = JSONObject.parseObject(one.getVipJson(), TVip.class);
- if (tVip.getDoubleIntegration()==1){
+ if (tVip.getDoubleIntegration()!=null&&tVip.getDoubleIntegration()==1){
doubleVip = true;
}
}
@@ -964,7 +984,7 @@
boolean doubleVip = false;
if (one!=null){
TVip tVip = JSONObject.parseObject(one.getVipJson(), TVip.class);
- if (tVip.getDoubleIntegration()==1){
+ if (tVip.getDoubleIntegration()!=null&&tVip.getDoubleIntegration()==1){
doubleVip = true;
}
}
--
Gitblit v1.7.1