From 22a9b4588c8eeefdb9e16fda9125af8c0b846b49 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 九月 2024 18:00:39 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 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 ac8d6b4..3fb1dff 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
@@ -228,7 +228,7 @@
return R.ok(page);
}
List<Integer> vipIds = new ArrayList<>();
- vipIds = page.getRecords().stream().map(TAppUser::getVipId).collect(Collectors.toList());
+// vipIds = page.getRecords().stream().map(TAppUser::getVipId).collect(Collectors.toList());
//获取会员map
R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds);
//循环处理
@@ -242,12 +242,20 @@
appUser.setTagName(byIdTag.getData().getName());
}
}
- //匹配vipMap的值
- appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
+ if (appUser.getVipEndTime()!=null&&appUser.getVipEndTime().isAfter(LocalDateTime.now())) {
+ //匹配vipMap的值
+ appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
+ }
//累计充电次数
R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
appUser.setOrderCount(useOrderCount.getData());
appUser.setUid(appUser.getId().toString());
+ if (appUser.getCompanyId()!=null){
+ TCompany data = otherClient.unitDetail(appUser.getCompanyId()).getData();
+ if (data!=null){
+ appUser.setCompanyName(data.getName());
+ }
+ }
TAppUserCar one1 = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, appUser.getId()).orderByDesc(BasePojo::getCreateTime).last("limit 1").one();
if (one1!=null){
@@ -438,12 +446,21 @@
pointsQueryDto.setUserId(tokenService.getLoginUserApplet().getUserId());
}
List<Integer> types = new ArrayList<>();
- if (pointsQueryDto.getType()!=null){
+ if (pointsQueryDto.getType()==null){
types.add(1);
types.add(2);
types.add(3);
types.add(4);
types.add(5);
+ types.add(6);
+ }else if (pointsQueryDto.getType()==1){
+ types.add(1);
+ types.add(2);
+ types.add(3);
+ types.add(4);
+ types.add(5);
+ }else if (pointsQueryDto.getType()==2){
+ types.add(6);
}
Page<TAppUserIntegralChange> page = integralChangeService.lambdaQuery()
.eq(TAppUserIntegralChange::getAppUserId, pointsQueryDto.getUserId())
@@ -767,6 +784,17 @@
if (signService.lambdaQuery().eq(TAppUserSign::getSignDay, LocalDate.now()).eq(TAppUserSign::getAppUserId, userId).count()>0){
return R.fail("今日已签到");
}
+
+ //判断当前生效的vipDetail
+ TAppUserVipDetail one = tAppUserVipDetailService.lambdaQuery().le(TAppUserVipDetail::getStartTime, LocalDateTime.now()).ge(TAppUserVipDetail::getEndTime, LocalDateTime.now()).eq(TAppUserVipDetail::getAppUserId, userId).last("limit 1").one();
+ boolean doubleVip = false;
+ if (one!=null){
+ TVip tVip = JSONObject.parseObject(one.getVipJson(), TVip.class);
+ if (tVip.getDoubleIntegration()==1){
+ doubleVip = true;
+ }
+ }
+
//签到业务
TAppUserSign appUserSign = new TAppUserSign();
appUserSign.setSignDay(LocalDate.now());
@@ -782,6 +810,9 @@
Integer points = 0;
Integer point = jsonObject.getInteger("num1");
points= points+point;
+ if (doubleVip){
+ points= points+point;
+ }
JSONArray num2 = jsonObject.getJSONArray("num2");
if (num2!=null) {
//获取连续签到的规则放入map
@@ -796,6 +827,9 @@
Integer i = map.get(days);
if (i!=null){
points= points+i;
+ if (doubleVip){
+ points= points+i;
+ }
appUserSign.setIsGift(1);
signService.updateById(appUserSign);
}
@@ -805,6 +839,8 @@
appUserService.updateById(byId);
return R.ok();
}
+
+
//已签到日期
@ApiOperation(value = "本月已签到日期", tags = {"小程序-个人中心-签到"})
@GetMapping(value = "/user/has/sign")
@@ -864,6 +900,16 @@
TAppUser byId = appUserService.getById(userId);
appUserCar.setAppUserId(userId);
+ //判断当前生效的vipDetail
+ TAppUserVipDetail one = tAppUserVipDetailService.lambdaQuery().le(TAppUserVipDetail::getStartTime, LocalDateTime.now()).ge(TAppUserVipDetail::getEndTime, LocalDateTime.now()).eq(TAppUserVipDetail::getAppUserId, userId).last("limit 1").one();
+ boolean doubleVip = false;
+ if (one!=null){
+ TVip tVip = JSONObject.parseObject(one.getVipJson(), TVip.class);
+ if (tVip.getDoubleIntegration()==1){
+ doubleVip = true;
+ }
+ }
+
//如果是第一次添加车辆，增加积分
Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
@@ -877,17 +923,29 @@
Integer point = 0;
//增加车牌50分，必填
point = point+jsonObject.getInteger("num1");
+ if (doubleVip){
+ point = point+jsonObject.getInteger("num1");
+ }
//增加车型分
if (StringUtils.isNotEmpty(appUserCar.getVehicleModel())){
point = point+jsonObject.getInteger("num2");
+ if (doubleVip){
+ point = point+jsonObject.getInteger("num2");
+ }
}
//增加车辆用途分
if (StringUtils.isNotEmpty(appUserCar.getVehicleUse())){
point = point+jsonObject.getInteger("num3");
+ if (doubleVip){
+ point = point+jsonObject.getInteger("num3");
+ }
}
//增加续航分
if (StringUtils.isNotEmpty(appUserCar.getEndurance())){
point = point+jsonObject.getInteger("num4");
+ if (doubleVip){
+ point = point+jsonObject.getInteger("num4");
+ }
}
//增加积分记录
@@ -967,5 +1025,17 @@
return R.ok(jsonObject.getJSONObject("data"));
}
+
+
+
+
+ @PostMapping(value = "/user/editAppUserInfo")
+ @ApiOperation(value = "修改个人信息", tags = {"小程序-个人中心"})
+ public AjaxResult editAppUserInfo(@RequestBody TAppUser appUser){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ appUser.setId(userId);
+ appUserService.updateById(appUser);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1