From 4cc10024a08e9dff0485327929a617e555d2959a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 19 八月 2024 17:46:59 +0800
Subject: [PATCH] 8.19.1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 203 insertions(+), 32 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 86d66b2..951a6b9 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,7 +1,10 @@
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;
@@ -11,12 +14,16 @@
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.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;
@@ -30,9 +37,12 @@
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.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.system.api.model.LoginUserApplet;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -41,6 +51,7 @@
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;
@@ -81,6 +92,8 @@
@Resource
private TAppUserIntegralChangeService integralChangeService;
+ @Resource
+ private SignDayUtil signDayUtil;
@Resource
private ExchangeOrderClient exchangeOrderClient;
@@ -92,6 +105,8 @@
private WeixinProperties wxConfig;
@Autowired
private RestTemplate wxRestTemplate;
+ @Resource
+ private PointDetailUtil pointDetailUtil;
@Resource
private TAppUserSignService signService;
@@ -99,6 +114,10 @@
private TAppCouponService appCouponService;
@Resource
private TAppUserCarService carService;
+ @Resource
+ private IntegralRuleClient integralRuleClient;
+
+
@ApiOperation(value = "查询当前用户是否为会员 0否1是", tags = {"小程序--查询当前用户是否为会员"})
@@ -112,33 +131,6 @@
}else{
return AjaxResult.ok(0);
}
- }
- @ApiOperation(value = "通过code获得openid, 1 --->对应的appid：wx4c405fa42539fc21 2---->对应的appid:wx02d9f6c92e6d3c86")
- @GetMapping("openId-by-jscode2session/{code}")
- public AjaxResult<Map<String, Object>> jscode2session(@PathVariable String code) {
- log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", code);
- WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig);
- Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(code));
- String openid = body.getOpenid();
- String sessionKey = body.getSessionKey();
- TAppUser appUser = appUserService.getOne(Wrappers.lambdaQuery(TAppUser.class).eq(TAppUser::getWxOpenid, openid).last("limit 1"));
- if (Objects.isNull(appUser)) {
- appUser = new TAppUser();
- appUser.setWxOpenid(openid);
- appUserService.save(appUser);
- }
- // 提前对sessionKey进行删除
- log.info("换取sessionKey:{}", sessionKey);
- // 将sessionKey进行存储,后续获取信息需要
- redisService.setCacheObject(openid, sessionKey);
- LoginUserApplet loginUserApplet = new LoginUserApplet();
- if(ObjectUtils.isNotNull(appUser)){
- loginUserApplet.setUserId(appUser.getId());
- }
- HashMap<String, Object> tokenInfos = new HashMap<>();
- tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
- tokenInfos.put("info",loginUserApplet);
- return AjaxResult.ok(tokenInfos);
}
@ApiOperation(value = "管理后台-根据手机号查询用户ids", tags = {"管理后台-活动费用统计"})
@@ -187,9 +179,12 @@
@ApiOperation(value = "单位管理删除", tags = {"用户管理-单位管理"})
- @PostMapping(value = "/unit/delete/{id}")
- public R add(@PathVariable Integer id) {
- otherClient.unitDelete(id);
+ @DeleteMapping(value = "/unit/delete")
+ public R add(@RequestParam String ids) {
+ String[] split = ids.split(",");
+ for (String s : split) {
+ otherClient.unitDelete(Integer.valueOf(s));
+ }
return R.ok();
}
@@ -217,6 +212,49 @@
}
List<Integer> vipIds = new ArrayList<>();
vipIds = page.getRecords().stream().map(TAppUser::getVipId).collect(Collectors.toList());
+ //获取会员map
+ R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds);
+ //循环处理
+ for (TAppUser appUser : page.getRecords()) {
+ //拿到最新的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());
+ }
+ //匹配vipMap的值
+ appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
+ //累计充电次数
+ R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
+ appUser.setOrderCount(useOrderCount.getData());
+
+ }
+ return R.ok(page);
+ }
+
+ @ApiOperation(value = "会员列表", tags = {"用户管理-会员列表"})
+ @PostMapping(value = "/user/vip/page")
+ public R<Page<TAppUser>> vipPage(@RequestBody UserListQueryDto userListQueryDto) {
+ List<Long> userIds = new ArrayList<>();
+ //如果要筛选标签。用标签获取useids
+ if (userListQueryDto.getUserTagId() != null){
+ userIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getUserTagId, userListQueryDto.getUserTagId()).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList());
+ }
+ //列表查询
+ 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.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)
+ .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());
//获取会员map
R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds);
//循环处理
@@ -345,7 +383,9 @@
List<Integer> tagIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, id).orderByDesc(TAppUserTag::getCreateTime).list().stream().map(TAppUserTag::getUserTagId).collect(Collectors.toList());
R<Map<Integer, String>> tagMap = otherClient.getTagMap(tagIds);
- userDetailDto.setTagName(tagMap.getData().values().toString());
+ userDetailDto.setTagName(tagMap.getData().values()
+ .stream()
+ .collect(Collectors.joining(",")));
return R.ok(userDetailDto);
}
@@ -468,6 +508,24 @@
return R.ok();
}
+ @ApiOperation(value = "更换手机号", tags = {"小程序-用户管理-更换手机号"})
+ @PostMapping(value = "/user/updatePhone")
+ public AjaxResult<String> updatePhone(@Validated @RequestBody UpdatePhoneDTO dto) {
+ String code = redisService.getCacheObject(dto.getPhone() + Constants.APPLET);
+ if(StringUtils.isEmpty(code)){
+ return AjaxResult.error("验证码已过期,请重新获取验证码!");
+ }
+ if(!code.equals(dto.getCode())){
+ return AjaxResult.error("验证码错误!");
+ }
+ // 获取当前用户信息
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUser appUser = appUserService.getById(userId);
+ appUser.setPhone(dto.getPhone());
+ appUserService.updateById(appUser);
+ return AjaxResult.success();
+ }
+
/**
* 根据用户id查询用户信息
* @param appUserIds 用户id
@@ -502,5 +560,118 @@
appUserService.updateById(appUser);
return R.ok();
}
+
+ /**
+ * 通过手机号查询用户
+ * @param phone
+ * @return
+ */
+ @GetMapping("/user/selectByPhone")
+ public R<TAppUser> selectByPhone(@RequestParam("phone") String phone){
+ return R.ok(appUserService.getOne(Wrappers.lambdaQuery(TAppUser.class)
+ .eq(TAppUser::getPhone,phone)
+ .last("LIMIT 1")));
+ }
+
+ @ApiOperation(value = "签到", tags = {"小程序-个人中心-签到"})
+ @PostMapping(value = "/user/sign")
+ public R sign() {
+ LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
+ Long userId = loginUserApplet.getUserId();
+
+ TAppUser byId = appUserService.getById(userId);
+
+
+ if (signService.lambdaQuery().eq(TAppUserSign::getSignDay, LocalDate.now()).eq(TAppUserSign::getAppUserId, userId).count()>0){
+ return R.fail("今日已签到");
+ }
+ //签到业务
+ TAppUserSign appUserSign = new TAppUserSign();
+ appUserSign.setSignDay(LocalDate.now());
+ appUserSign.setRewardPoints(2);
+ appUserSign.setCreateTime(LocalDateTime.now());
+ appUserSign.setAppUserId(userId);
+ signService.save(appUserSign);
+ //签到加积分记录
+ R<TIntegralRule> set = integralRuleClient.getSet();
+ TIntegralRule data = set.getData();
+ JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+ //增加每日积分
+ Integer points = 0;
+ Integer point = jsonObject.getInteger("num1");
+ points= points+point;
+ JSONArray num2 = jsonObject.getJSONArray("num2");
+ if (num2!=null) {
+ //获取连续签到的规则放入map
+ Map<Integer,Integer> map = new HashMap<>();
+ for (Object o : num2) {
+ String o1 = (String) o;
+ String[] split = o1.split(",");
+ map.put(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
+ }
+ //加上今日签到，计算连续了多少天，如果到达就增加奖励的分数
+ int days = signDayUtil.calculateContinuousSignDays(userId);
+ Integer i = map.get(days);
+ if (i!=null){
+ points= points+i;
+ appUserSign.setIsGift(1);
+ signService.updateById(appUserSign);
+ }
+ }
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points,1,userId,"每日签到","");
+ byId.setPoints(byId.getPoints()+points);
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
+ @PostMapping(value = "/user/car/addOrUpdate")
+ public R carAdd(@RequestBody TAppUserCar appUserCar) {
+
+ LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
+ Long userId = loginUserApplet.getUserId();
+ TAppUser byId = appUserService.getById(userId);
+
+
+ //如果是第一次添加车辆，增加积分
+ Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
+
+
+ if (count==0){
+ R<TIntegralRule> set = integralRuleClient.getSet();
+ TIntegralRule data = set.getData();
+ JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+
+
+ Integer point = 0;
+ //增加车牌50分，必填
+ point = point+jsonObject.getInteger("num1");
+ //增加车型分
+ if (StringUtils.isNotEmpty(appUserCar.getVehicleModel())){
+ point = point+jsonObject.getInteger("num2");
+ }
+ //增加车辆用途分
+ if (StringUtils.isNotEmpty(appUserCar.getVehicleUse())){
+ point = point+jsonObject.getInteger("num3");
+ }
+ //增加续航分
+ if (StringUtils.isNotEmpty(appUserCar.getEndurance())){
+ point = point+jsonObject.getInteger("num4");
+ }
+
+ //增加积分记录
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"");
+ byId.setPoints(byId.getPoints()+point);
+ appUserService.updateById(byId);
+
+
+ }
+
+ //
+ appUserCarService.saveOrUpdate(appUserCar);
+
+ return R.ok();
+ }
}
--
Gitblit v1.7.1