From 3c99ce947f25a2dcbae14e78276df77978d412ca Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 26 九月 2024 16:03:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 07193af..d10c050 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
@@ -223,6 +223,7 @@
Page<TAppUser> page = appUserService.lambdaQuery()
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
.eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId())
+ .like(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode())
.eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
.eq(userListQueryDto.getStatus() != null, TAppUser::getStatus, userListQueryDto.getStatus())
.eq(userListQueryDto.getVipTypeId() != null, TAppUser::getVipId, userListQueryDto.getVipTypeId())
@@ -672,7 +673,7 @@
plusDay = 12;
}
//增加vipDetail
- giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay);
+ giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
appUserService.updateById(nowUser);
}
return R.ok();
@@ -976,10 +977,17 @@
pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"","");
byId.setPoints(byId.getPoints()+point);
byId.setFirstAdd(1);
- appUserService.updateById(byId);
}
+ CarNumDto carNumDto = CarUtil.carNum(appUserCar.getLicensePlate());
+ if (carNumDto==null){
+ return R.fail("请输入正确的车牌");
+ }
+
+ byId.setCityCode(carNumDto.getAreaCode());
+ byId.setProvinceCode(carNumDto.getAreaCode().substring(0,2)+"0000");
+ appUserService.updateById(byId);
//
appUserCarService.saveOrUpdate(appUserCar);
--
Gitblit v1.7.1