From a00dbefc3837ab7781f9d50cd8ddb1261a416b79 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 23 十月 2024 09:54:20 +0800
Subject: [PATCH] marge
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 213 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 186 insertions(+), 27 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..dbd4de1 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
@@ -36,6 +36,7 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.feignClient.IntegralRuleClient;
import com.ruoyi.other.api.feignClient.OtherClient;
@@ -110,6 +111,7 @@
private TAppUserCarService carService;
@Resource
private IntegralRuleClient integralRuleClient;
+
@Resource
private VipClient vipClient;
@@ -198,6 +200,10 @@
@DeleteMapping(value = "/unit/delete")
@Log(title = "【单位管理】删除单位", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
public R add(@RequestParam String ids) {
+ List<TAppUser> list = appUserService.lambdaQuery().in(TAppUser::getCompanyId, Arrays.asList(ids.split(","))).list();
+ if (!list.isEmpty()){
+ return R.fail("当前单位已存在用户，无法删除！");
+ }
String[] split = ids.split(",");
for (String s : split) {
otherClient.unitDelete(Integer.valueOf(s));
@@ -219,16 +225,18 @@
Page<TAppUser> page = appUserService.lambdaQuery()
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
.eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId())
+ .eq(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())
.in(!userIds.isEmpty(),TAppUser::getId,userIds)
+ .orderByDesc(BasePojo::getCreateTime)
.page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
if (page.getRecords().isEmpty()){
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 +250,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){
@@ -269,16 +285,25 @@
if (userListQueryDto.getUserTagId() != null){
userIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getUserTagId, userListQueryDto.getUserTagId()).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList());
}
+ LocalDateTime end1 = null;
+ LocalDateTime end2 = null ;
+ if (userListQueryDto.getVipEndTime1()!=null) {
+ end1 = LocalDateTime.now().plusDays(userListQueryDto.getVipEndTime1());
+ }
+ if (userListQueryDto.getVipEndTime2()!=null){
+ end2 = LocalDateTime.now().plusDays(userListQueryDto.getVipEndTime2());
+ }
//列表查询
Page<TAppUser> page = appUserService.lambdaQuery()
.ge(TAppUser::getVipEndTime, LocalDateTime.now())
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
.eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId())
+ .eq(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())
- .ge(userListQueryDto.getVipEndTime1() != null, TAppUser::getVipEndTime, userListQueryDto.getVipEndTime1() == null ? null : LocalDateTime.now().plusDays(userListQueryDto.getVipEndTime1()))
- .le(userListQueryDto.getVipEndTime2() != null, TAppUser::getVipEndTime, userListQueryDto.getVipEndTime2() == null ? null : LocalDateTime.now().plusDays(userListQueryDto.getVipEndTime2()))
+ .ge(userListQueryDto.getVipEndTime1() != null, TAppUser::getVipEndTime, end1 )
+ .le(userListQueryDto.getVipEndTime2() != null, TAppUser::getVipEndTime, end2)
.in(!userIds.isEmpty(), TAppUser::getId, userIds)
.page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
if (page.getRecords().isEmpty()){
@@ -327,7 +352,6 @@
Page<TAppUser> page = appUserService.lambdaQuery()
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
.eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
- .eq(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode())
.in(!userIds.isEmpty(),TAppUser::getId,userIds)
.eq(TAppUser::getStatus,1)
.page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
@@ -340,6 +364,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
@@ -398,6 +430,11 @@
}
}
+ }else {
+ List<TAppUser> list = appUserService.lambdaQuery().eq(TAppUser::getPhone, tAppUser.getPhone()).list();
+ if (!list.isEmpty()){
+ return R.fail("该手机号已注册");
+ }
}
appUserService.saveOrUpdate(tAppUser);
return R.ok();
@@ -407,12 +444,16 @@
@GetMapping(value = "/user/detail/{id}")
public R<UserDetailDto> userDetail(@PathVariable Long id) {
TAppUser user = appUserService.getById(id);
- UserDetailDto userDetailDto = new UserDetailDto();
- BeanUtils.copyProperties(user,userDetailDto);
- if (user.getVipId()!=null) {
- R<Map<Integer, String>> vipMap = otherClient.getVipMap(Arrays.asList(user.getVipId()));
+ R<Map<Integer, String>> vipMap = otherClient.getVipMap(Collections.singletonList(user.getVipId()));
+ if (user.getVipEndTime()!=null&&user.getVipEndTime().isAfter(LocalDateTime.now())) {
+ //匹配vipMap的值
user.setVipName(vipMap.getData().get(user.getVipId()));
}
+
+
+ UserDetailDto userDetailDto = new UserDetailDto();
+ BeanUtils.copyProperties(user,userDetailDto);
+
//获取累计充电数量
R<Long> useOrderCount = chargingOrderClient.useOrderCount(user.getId());
userDetailDto.setOrderCount(useOrderCount.getData());
@@ -428,6 +469,9 @@
userDetailDto.setTagName(tagMap.getData().values()
.stream()
.collect(Collectors.joining(",")));
+
+
+
return R.ok(userDetailDto);
}
@@ -438,12 +482,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())
@@ -454,7 +507,7 @@
for (TAppUserIntegralChange record : page.getRecords()) {
record.setDateTime(record.getCreateTime());
record.setUid(record.getId().toString());
- if (record.getChangeType()==2){
+ if (record.getChangeType()==2||record.getChangeType()==3){
R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
if (tChargingOrderR.getData()!=null) {
record.setOrderNum(tChargingOrderR.getData().getCode());
@@ -476,6 +529,12 @@
@GetMapping(value = "/user/points/detail")
public R<TAppUserIntegralChange> pointsDetail(String id) {
TAppUserIntegralChange byId = integralChangeService.getById(id);
+ if (byId.getChangeType()==6) {
+ TExchangeOrder data = exchangeOrderClient.orderDetail(Long.valueOf(byId.getExtension())).getData();
+ if (data != null) {
+ byId.setGoodType(data.getOrderType());
+ }
+ }
return R.ok(byId);
}
@@ -521,7 +580,9 @@
TAppUser byId = appUserService.getById(userId);
AppUserInfoDto appUserInfoDto = new AppUserInfoDto();
TVip data = vipClient.getVipInfoByType(2).getData();
- appUserInfoDto.setMinPrice(data.getMonthlyCard());
+ if(null != data){
+ appUserInfoDto.setMinPrice(data.getMonthlyCard());
+ }
//判断会员
if (byId.getVipEndTime()==null||byId.getVipEndTime().isBefore(LocalDateTime.now())){
@@ -529,12 +590,20 @@
}else {
appUserInfoDto.setIsVip(1);
appUserInfoDto.setVipExpireTime(byId.getVipEndTime());
+
+
+
+
+
+
+
+
}
//判断当天是否签到
Long count = signService.lambdaQuery().eq(TAppUserSign::getAppUserId,userId).eq(TAppUserSign::getSignDay, LocalDate.now()).count();
appUserInfoDto.setIsSign(count>0?1:0);
//获取当前拥有的优惠卷数量
- Long coupons = appCouponService.lambdaQuery().eq(TAppCoupon::getAppUserId, userId).eq(TAppCoupon::getStatus, 1).count();
+ Long coupons = appCouponService.lambdaQuery().eq(TAppCoupon::getAppUserId, userId).ge(TAppCoupon::getEndTime, LocalDateTime.now()).eq(TAppCoupon::getStatus, 1).count();
appUserInfoDto.setCouponNum(Math.toIntExact(coupons));
//当前绑定的车辆
List<TAppUserCar> list = carService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).list();
@@ -544,8 +613,26 @@
appUserInfoDto.setUserCars(list);
appUserInfoDto.setFirstAdd(byId.getFirstAdd()!=null?byId.getFirstAdd():0);
appUserInfoDto.setPoints(byId.getPoints()==null?0:byId.getPoints());
+
+
+
+
+
return R.ok(appUserInfoDto);
+
+ }
+
+
+ @ApiOperation(value = "设置头像", tags = {"小程序-个人中心"})
+ @GetMapping(value = "/user/set/avatar")
+ public R avatar(String url) {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUser byId = appUserService.getById(userId);
+ byId.setAvatar(url);
+ appUserService.updateById(byId);
+
+ return R.ok();
}
@@ -563,6 +650,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);
@@ -631,7 +719,7 @@
plusDay = 12;
}
//增加vipDetail
- giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay);
+ giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
appUserService.updateById(nowUser);
}
return R.ok();
@@ -767,6 +855,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()!=null&&tVip.getDoubleIntegration()==1){
+ doubleVip = true;
+ }
+ }
+
//签到业务
TAppUserSign appUserSign = new TAppUserSign();
appUserSign.setSignDay(LocalDate.now());
@@ -782,6 +881,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,15 +898,20 @@
Integer i = map.get(days);
if (i!=null){
points= points+i;
+ if (doubleVip){
+ points= points+i;
+ }
appUserSign.setIsGift(1);
signService.updateById(appUserSign);
}
}
- pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points,1,userId,"每日签到","JF");
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points,1,userId,"每日签到","JF","");
byId.setPoints(byId.getPoints()+points);
appUserService.updateById(byId);
return R.ok();
}
+
+
//已签到日期
@ApiOperation(value = "本月已签到日期", tags = {"小程序-个人中心-签到"})
@GetMapping(value = "/user/has/sign")
@@ -837,19 +944,19 @@
//积分变化记录用
- @PostMapping(value = "/user/points/change")
- public R change(@RequestBody PointChangeDto points) {
- TAppUser byId = appUserService.getById(points.getUserId());
- pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points.getPoints(),points.getType(),points.getUserId(),points.getRemark(),"JF");
- byId.setPoints(byId.getPoints()+points.getPoints());
- appUserService.updateById(byId);
- return R.ok();
- }
+// @PostMapping(value = "/user/points/change")
+// public R change(@RequestBody PointChangeDto points) {
+// TAppUser byId = appUserService.getById(points.getUserId());
+// pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points.getPoints(),points.getType(),points.getUserId(),points.getRemark(),"JF");
+// byId.setPoints(byId.getPoints()+points.getPoints());
+// appUserService.updateById(byId);
+// return R.ok();
+// }
@PostMapping(value = "/user/points/change/down")
public R changeDown(@RequestBody PointChangeDto points) {
TAppUser byId = appUserService.getById(points.getUserId());
- pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()-points.getPoints(),points.getType(),points.getUserId(),points.getRemark(),"JF");
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()-points.getPoints(),points.getType(),points.getUserId(),points.getRemark(),"JF",points.getCode());
byId.setPoints(byId.getPoints()-points.getPoints());
appUserService.updateById(byId);
return R.ok();
@@ -864,6 +971,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()!=null&&tVip.getDoubleIntegration()==1){
+ doubleVip = true;
+ }
+ }
+
//如果是第一次添加车辆，增加积分
Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
@@ -877,27 +994,46 @@
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");
+ }
}
//增加积分记录
- pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"");
+ 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);
@@ -923,6 +1059,17 @@
String brand = CarBrandUtil.getBrand();
JSONObject jsonObject = JSON.parseObject(brand);
JSONArray data = jsonObject.getJSONArray("data");
+ JSONArray data1 = new JSONArray();
+ if (name!=null) {
+ for (int i = 0; i < data.size(); i++) {
+ JSONObject brand1 = data.getJSONObject(i);
+ String o = (String) brand1.get("name");
+ if (o.contains(name)) {
+ data1.add(brand1);
+ }
+ }
+ return R.ok(data1);
+ }
return R.ok(data);
}
@@ -967,5 +1114,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