From 8d2fdc29e9bbe652bba73e4a698edcdf89acf983 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 23 八月 2024 10:13:35 +0800
Subject: [PATCH] 8.23
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 31 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 3cd2e6c..b74dc0c 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
@@ -1,61 +1,50 @@
package com.ruoyi.account.controller;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.*;
import com.ruoyi.account.api.model.*;
-import com.ruoyi.account.api.vo.CouponListVOVO;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.PointDetailUtil;
import com.ruoyi.account.util.SignDayUtil;
-import com.ruoyi.account.wx.body.resp.Code2SessionRespBody;
-import com.ruoyi.account.wx.body.resq.Code2SessionResqBody;
import com.ruoyi.account.wx.model.WeixinProperties;
-import com.ruoyi.account.wx.tools.WxAppletTools;
import com.ruoyi.account.util.GiveVipUtil;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.PointChangeDto;
+import com.ruoyi.common.core.enums.status.AppUserStatusEnum;
+import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BasePojo;
-import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.feignClient.ExchangeOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TExchangeOrder;
-import com.ruoyi.other.api.domain.TCompany;
-import com.ruoyi.other.api.domain.TCoupon;
-import com.ruoyi.other.api.domain.TIntegralRule;
-import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.feignClient.IntegralRuleClient;
import com.ruoyi.other.api.feignClient.OtherClient;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.other.api.feignClient.VipClient;
import com.ruoyi.system.api.model.LoginUserApplet;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
import lombok.extern.slf4j.Slf4j;
-import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -116,6 +105,9 @@
private TAppUserCarService carService;
@Resource
private IntegralRuleClient integralRuleClient;
+
+ @Resource
+ private VipClient vipClient;
@@ -246,12 +238,15 @@
}
//列表查询
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.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)
+ .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()))
+ .in(!userIds.isEmpty(), TAppUser::getId, userIds)
.page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
if (page.getRecords().isEmpty()){
return R.ok(page);
@@ -265,15 +260,19 @@
//拿到最新的tagId
TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();
//设置最新的tagName
- R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
- if (byIdTag.getData()!=null) {
- appUser.setTagName(byIdTag.getData().getName());
+ if (one!=null) {
+ R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
+ if (byIdTag.getData() != null) {
+ appUser.setTagName(byIdTag.getData().getName());
+ }
}
//匹配vipMap的值
appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
//累计充电次数
R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
appUser.setOrderCount(useOrderCount.getData());
+ appUser.setLastDays( Duration.between(LocalDateTime.now(), appUser.getVipEndTime()).toDays());
+ appUser.setUid(appUser.getId().toString());
}
return R.ok(page);
@@ -287,6 +286,9 @@
if (userListQueryDto.getUserTagId() != null){
String[] split = userListQueryDto.getUserTagId().split(",");
userIds = appUserTagService.lambdaQuery().in(TAppUserTag::getUserTagId, Arrays.asList(split)).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList());
+ if (userIds.isEmpty()){
+ userIds.add(-1L);
+ }
}
//列表查询
Page<TAppUser> page = appUserService.lambdaQuery()
@@ -308,9 +310,11 @@
//拿到最新的tagId
TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();
//设置最新的tagName
- R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
- if (byIdTag.getData()!=null) {
- appUser.setTagName(byIdTag.getData().getName());
+ if (one!=null){
+ R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
+ if (byIdTag.getData()!=null) {
+ appUser.setTagName(byIdTag.getData().getName());
+ }
}
//匹配vipMap的值
appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
@@ -433,6 +437,7 @@
public R pointsDetail(@RequestBody UserChangeDto userChangeDto) {
TAppUser appUser = appUserService.getById(userChangeDto.getUserId());
appUser.setStatus(userChangeDto.getStatus());
+ appUser.setRemark(userChangeDto.getRemark());
appUserService.updateById(appUser);
return R.ok();
}
@@ -460,11 +465,13 @@
}
@ApiOperation(value = "个人中心信息", tags = {"小程序-个人中心"})
- @PostMapping(value = "/user/info")
+ @GetMapping(value = "/user/info")
public R<AppUserInfoDto> info() {
- Long userId = 1L;
+ Long userId = tokenService.getLoginUserApplet().getUserId();
TAppUser byId = appUserService.getById(userId);
AppUserInfoDto appUserInfoDto = new AppUserInfoDto();
+ TVip data = vipClient.getVipInfoByType(2).getData();
+ appUserInfoDto.setMinPrice(data.getMonthlyCard());
//判断会员
if (byId.getVipEndTime()==null||byId.getVipEndTime().isBefore(LocalDateTime.now())){
@@ -498,6 +505,7 @@
TCoupon coupon = JSON.toJavaObject(JSON.parseObject(tAppCoupon.getCouponJson()), TCoupon.class);
InfoCouponDto infoCouponDto = new InfoCouponDto();
BeanUtils.copyProperties(coupon,infoCouponDto);
+ infoCouponDto.setId(tAppCoupon.getId());
couponDtos.add(infoCouponDto);
}
@@ -555,6 +563,21 @@
return AjaxResult.success();
}
+ @ApiOperation(value = "注销接口", tags = {"小程序-用户管理-注销账号"})
+ @DeleteMapping("/logoff")
+ public AjaxResult<?> logoff(HttpServletRequest request) {
+ String token = SecurityUtils.getToken(request);
+ if (StringUtils.isNotEmpty(token))
+ {
+ String userId = JwtUtils.getUserId(token);
+ // 账号注销
+ appUserService.update(Wrappers.<TAppUser>lambdaUpdate().set(TAppUser::getStatus, AppUserStatusEnum.LOGOFF.getCode()).eq(TAppUser::getId, userId));
+ // 删除用户缓存记录
+ AuthUtil.logoutByToken(token);
+ }
+ return AjaxResult.success();
+ }
+
/**
* 根据用户id查询用户信息
* @param appUserIds 用户id
@@ -603,7 +626,7 @@
}
@ApiOperation(value = "签到", tags = {"小程序-个人中心-签到"})
- @PostMapping(value = "/user/sign")
+ @GetMapping(value = "/user/sign")
public R sign() {
LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
Long userId = loginUserApplet.getUserId();
@@ -647,13 +670,23 @@
signService.updateById(appUserSign);
}
}
- pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points,1,userId,"每日签到","");
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points,1,userId,"每日签到","JF");
byId.setPoints(byId.getPoints()+points);
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();
+ }
+
@ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
@PostMapping(value = "/user/car/addOrUpdate")
public R carAdd(@RequestBody TAppUserCar appUserCar) {
--
Gitblit v1.7.1