From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 534 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 418 insertions(+), 116 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 2062fdb..754743b 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
@@ -16,12 +16,11 @@
import com.ruoyi.account.util.carBrand.CarBrandUtil;
import com.ruoyi.account.wx.model.WeixinProperties;
import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.constant.MsgConstants;
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.OrderCodeUtil;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.*;
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,6 +29,8 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.annotation.Logical;
+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;
@@ -41,25 +42,39 @@
import com.ruoyi.order.api.model.TGrantVip;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.feignClient.IntegralRuleClient;
import com.ruoyi.other.api.feignClient.OtherClient;
import com.ruoyi.other.api.feignClient.VipClient;
+import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.model.LoginUserApplet;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
import javax.annotation.Resource;
+import javax.mail.*;
+import javax.mail.internet.*;
import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
+import java.net.URL;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -81,9 +96,8 @@
private TAppUserService appUserService;
@Resource
private TAppUserTagService appUserTagService;
- @Autowired
+ @Resource
private OrderClient orderClient;
-
@Resource
private TAppUserVipDetailService tAppUserVipDetailService;
@Resource
@@ -118,6 +132,9 @@
private TAppUserCarService carService;
@Resource
private IntegralRuleClient integralRuleClient;
+
+ @Resource
+ private RedisTemplate redisTemplate;
@Resource
@@ -127,7 +144,109 @@
@Resource
private GiveVipUtil giveVipUtil;
+ /**
+ * 远程调用 发送邮件
+ * @return
+ */
+ @PostMapping(value = "/uploadPdf")
+ public R uploadPdf(@RequestBody UploadPdfDTO dto) {
+ // 发送邮箱
+ // 收件人电子邮箱,TODO 换成自己的收件箱
+ String to = dto.getMailBox();
+ // 发件人电子邮箱,TODO 换成自己的发件箱
+ String from = "13281306557@163.com";
+ // 指定发送邮件的主机为
+ String host = "smtp.163.com";
+ Properties properties = new Properties();
+ properties.put("mail.smtp.host", host);
+ properties.put("mail.smtp.socketFactory.port", "465");
+ properties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ properties.put("mail.smtp.auth", "true");
+ properties.put("mail.smtp.port", "465");
+ properties.put("mail.smtp.ssl.enable", "true"); // 明确开启SSL
+ // 获取默认session对象
+ Session session = Session.getDefaultInstance(properties,new Authenticator(){
+ @Override
+ public javax.mail.PasswordAuthentication getPasswordAuthentication()
+ {
+ //发件人邮件用户名、授权码，换成自己的发件箱及授权码
+ return new PasswordAuthentication(from, "NUSdxDQqadYvVek2");
+ }
+ });
+ try{
+ // 创建默认的 MimeMessage 对象
+ MimeMessage message = new MimeMessage(session);
+ // Set From，设置发件人
+ InternetAddress fromMail = new InternetAddress(from);
+ //设置发件人名称，TODO 换成自己的发件箱
+ fromMail.setPersonal(MimeUtility.encodeText("明星新能源科技有限公司<" + from + ">"));
+ message.setFrom(fromMail);
+ // Set To: 设置收件人
+ InternetAddress toMail = new InternetAddress(to);
+ // TODO 换成自己的收件箱
+ InternetAddress toMail2 = new InternetAddress(to);
+ //发多个邮箱
+ Address[] allRecipients = {toMail, toMail2};
+ message.setRecipients(Message.RecipientType.TO, allRecipients);
+ // Set Subject: 邮件主体
+ message.setSubject("明星电力");
+ // 设置消息体
+ message.setSentDate(new Date());
+ javax.mail.internet.MimeMultipart msgMultipart = new MimeMultipart("mixed");
+
+ // 指定为混合关系
+ message.setContent(msgMultipart);
+ // 邮件信息组装
+ //组装的顺序非常重要，一定要先组装文本域，再组装文件
+ javax.mail.internet.MimeBodyPart htmlPart = new javax.mail.internet.MimeBodyPart();
+ // 组装内容
+ htmlPart.setContent("开票", "text/html;charset=UTF-8");
+ msgMultipart.addBodyPart(htmlPart);
+
+ // 组装附件
+ javax.mail.internet.MimeBodyPart filePart = new MimeBodyPart();
+ String imageUrl = dto.getInvoiceUrl();
+ try {
+ // 下载数据
+ URL url = new URL(imageUrl);
+ InputStream inputStream = url.openStream();
+ byte[] imageBytes = IOUtils.toByteArray(inputStream);
+
+ // 创建临时文件
+ // 截取imageUrl后缀名
+ String fileExtension = imageUrl.substring(imageUrl.lastIndexOf("."));
+ File tempFile = File.createTempFile("tempImage", fileExtension);
+ try (FileOutputStream fos = new FileOutputStream(tempFile)) {
+ fos.write(imageBytes);
+ }
+
+ // 创建 FileDataSource
+ FileDataSource fileDataSource = new FileDataSource(tempFile);
+ System.out.println("FileDataSource created: " + fileDataSource.getName());
+ // 如果需要，可以使用 DataHandler 进行进一步处理
+ DataHandler dh = new DataHandler(fileDataSource);
+ // 清理：删除临时文件（如果不再需要）
+ tempFile.deleteOnExit(); // 可根据需要保留或删除
+ filePart.setDataHandler(dh);
+ // 附件区别内嵌内容的一个特点是有文件名，为防止中文乱码要编码
+ filePart.setFileName(MimeUtility.encodeText(dh.getName()));
+ msgMultipart.addBodyPart(filePart);
+ message.saveChanges();
+ //发送
+ //Transport.send(message, message.getAllRecipients());
+ Transport.send(message);
+ System.out.println("发送成功");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }catch (MessagingException | UnsupportedEncodingException mex) {
+ mex.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
/**
* 远程调用 积分兑换订单 退款回退积分
* @return
@@ -142,7 +261,8 @@
appUserService.updateById(byId);
return R.ok();
}
-
+
+
@ApiOperation(value = "查询当前用户是否为会员 0否1是", tags = {"小程序--查询当前用户是否为会员"})
@PostMapping(value = "/getUserInfo")
public AjaxResult<Integer> getUserInfo() {
@@ -163,7 +283,7 @@
}
-
+ @RequiresPermissions(value = {"/company"}, logical = Logical.OR)
@ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"})
@PostMapping(value = "/unit/page")
public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
@@ -176,8 +296,10 @@
}
return R.ok(data);
}
-
-
+
+
+
+ @RequiresPermissions(value = {"/appUser/list", "/appUser/add", "/appUser/update", "/appUser/updateCompany"}, logical = Logical.OR)
@ApiOperation(value = "单位下拉框", tags = {"用户管理-单位管理"})
@GetMapping(value = "/unit/select")
public R<List<TCompany>> unitSelect() {
@@ -189,8 +311,10 @@
return R.ok(pageR.getData().getRecords());
}
-
-
+
+
+
+ @RequiresPermissions(value = {"/company/add", "/company/update"}, logical = Logical.OR)
@ApiOperation(value = "单位管理添加或编辑", tags = {"用户管理-单位管理"})
@PostMapping(value = "/unit/addOrUpdate")
@Log(title = "【单位管理】添加或编辑单位", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@@ -199,10 +323,10 @@
otherClient.unitAddorUpadate(tCompany);
return R.ok();
}
-
-
-
-
+
+
+
+ @RequiresPermissions(value = {"/company/del"}, logical = Logical.OR)
@ApiOperation(value = "单位管理删除", tags = {"用户管理-单位管理"})
@DeleteMapping(value = "/unit/delete")
@Log(title = "【单位管理】删除单位", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -218,8 +342,9 @@
return R.ok();
}
-
-
+
+
+ @RequiresPermissions(value = {"/appUser/list"}, logical = Logical.OR)
@ApiOperation(value = "用户列表", tags = {"用户管理-用户列表"})
@PostMapping(value = "/user/page")
public R<Page<TAppUser>> userPage(@RequestBody UserListQueryDto userListQueryDto) {
@@ -283,7 +408,9 @@
}
return R.ok(page);
}
-
+
+
+ @RequiresPermissions(value = {"/vipList"}, logical = Logical.OR)
@ApiOperation(value = "会员列表", tags = {"用户管理-会员列表"})
@PostMapping(value = "/user/vip/page")
public R<Page<TAppUser>> vipPage(@RequestBody UserListQueryDto userListQueryDto) {
@@ -349,7 +476,9 @@
}
return R.ok(page);
}
-
+
+
+ @RequiresPermissions(value = {"/coupon/send"}, logical = Logical.OR)
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券发放-选择人员")
@PostMapping("/choiceUser")
public R<Page<TAppUser>> choiceUser(@RequestBody ChoiceUserListQueryDto userListQueryDto) {
@@ -405,8 +534,9 @@
}
return R.ok(page);
}
-
-
+
+
+ @RequiresPermissions(value = {"/appUser/add", "/appUser/update"}, logical = Logical.OR)
@ApiOperation(value = "用户添加编辑", tags = {"用户管理-用户列表"})
@PostMapping(value = "/user/addOrUpdate")
@Log(title = "【用户列表】添加编辑用户", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@@ -453,7 +583,9 @@
appUserService.saveOrUpdate(tAppUser);
return R.ok();
}
-
+
+
+ @RequiresPermissions(value = {"/appUser/select", "/vipList/select"}, logical = Logical.OR)
@ApiOperation(value = "用户详情", tags = {"用户管理-用户列表"})
@GetMapping(value = "/user/detail/{id}")
public R<UserDetailDto> userDetail(@PathVariable Long id) {
@@ -488,8 +620,9 @@
return R.ok(userDetailDto);
}
-
- @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表","小程序-个人中心"})
+
+ @RequiresPermissions(value = {"/appUser/select", "/vipList/select"}, logical = Logical.OR)
+ @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表"})
@PostMapping(value = "/user/points/page")
public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) {
if (pointsQueryDto.getUserId()==null){
@@ -538,20 +671,79 @@
return R.ok(page);
}
-
+
+
+ @ApiOperation(value = "用户详情积分明细", tags = {"小程序-个人中心"})
+ @PostMapping(value = "/user/points/page1")
+ public R<Page<TAppUserIntegralChange>> pointsDetail1(@RequestBody PointsQueryDto pointsQueryDto) {
+ if (pointsQueryDto.getUserId()==null){
+ pointsQueryDto.setUserId(tokenService.getLoginUserApplet().getUserId());
+ }
+ List<Integer> types = new ArrayList<>();
+ 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())
+ .orderByDesc(TAppUserIntegralChange::getCreateTime)
+ .eq(pointsQueryDto.getChangeType() != null, TAppUserIntegralChange::getChangeType, pointsQueryDto.getChangeType())
+ .in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
+
+ for (TAppUserIntegralChange record : page.getRecords()) {
+ record.setDateTime(record.getCreateTime());
+ record.setUid(record.getId().toString());
+ 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());
+ }
+ }
+ if (record.getChangeType()==6){
+ R<TExchangeOrder> tExchangeOrderR = exchangeOrderClient.orderDetail(Long.valueOf(record.getExtension()));
+ if (tExchangeOrderR.getData()!=null){
+ record.setOrderNum(tExchangeOrderR.getData().getCode());
+ }
+ }
+ }
+
+ return R.ok(page);
+
+ }
+
@ApiOperation(value = "积分详情", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/points/detail")
public R<TAppUserIntegralChange> pointsDetail(String id) {
TAppUserIntegralChange byId = integralChangeService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!byId.getAppUserId().equals(userId)){
+ return R.fail("权限不足");
+ }
if (byId.getChangeType()==6) {
TExchangeOrder data = exchangeOrderClient.orderDetail(Long.valueOf(byId.getExtension())).getData();
if (data != null) {
byId.setGoodType(data.getOrderType());
}
+ }else if (byId.getChangeType()==4){
+ TAppUser byId1 = appUserService.getById(byId.getExtension());
+ byId.setExtension(byId1.getPhone());
}
return R.ok(byId);
}
-
+
+ @RequiresPermissions(value = {"/appUser/freeze"}, logical = Logical.OR)
@ApiOperation(value = "冻结解冻用户", tags = {"后台-用户管理-用户列表"})
@PostMapping(value = "/user/status/change")
@Log(title = "【用户列表】冻结解冻用户", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@@ -562,7 +754,9 @@
appUserService.updateById(appUser);
return R.ok();
}
-
+
+
+ @RequiresPermissions(value = {"/appUser/updateCompany"}, logical = Logical.OR)
@ApiOperation(value = "修改单位", tags = {"后台-用户管理-用户列表"})
@PostMapping(value = "/user/unit/change")
@Log(title = "【用户列表】修改用户单位", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@@ -574,7 +768,9 @@
}
return R.ok();
}
-
+
+
+ @RequiresPermissions(value = {"/appUser/del"}, logical = Logical.OR)
@ApiOperation(value = "删除用户", tags = {"后台-用户管理-用户列表"})
@DeleteMapping(value = "/user/delete")
@Log(title = "【用户列表】删除用户", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -588,7 +784,8 @@
}
@Resource
private TAppUserVipDetailService appUserVipDetailService;
-
+
+
@ApiOperation(value = "个人中心信息", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/info")
public R<AppUserInfoDto> info() {
@@ -612,10 +809,6 @@
appUserInfoDto.setVipCouponNum(count);
appUserInfoDto.setIsVip(1);
appUserInfoDto.setVipExpireTime(byId.getVipEndTime());
-
-
-
-
}
//判断当天是否签到
Long count = signService.lambdaQuery().eq(TAppUserSign::getAppUserId,userId).eq(TAppUserSign::getSignDay, LocalDate.now()).count();
@@ -631,29 +824,27 @@
appUserInfoDto.setUserCars(list);
appUserInfoDto.setFirstAdd(byId.getFirstAdd()!=null?byId.getFirstAdd():0);
appUserInfoDto.setPoints(byId.getPoints()==null?0:byId.getPoints());
-
-
-
-
-
return R.ok(appUserInfoDto);
-
-
}
-
-
+
+
+ @Log(title = "【我的】设置头像", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "设置头像", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/set/avatar")
public R avatar(String url) {
Long userId = tokenService.getLoginUserApplet().getUserId();
+ String fileName = redisTemplate.opsForValue().get("file:" + userId).toString();
+ String substring = url.substring(url.lastIndexOf("/") + 1);
+ if(StringUtils.isEmpty(fileName) || fileName.equals(substring)){
+ return R.fail("请重新上传头像");
+ }
+
TAppUser byId = appUserService.getById(userId);
byId.setAvatar(url);
appUserService.updateById(byId);
-
return R.ok();
-
}
-
+
@ApiOperation(value = "优惠卷列表不分页（1可使用2不可用）", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/coupon")
public R<ListInfoCouponDto> userCoupon(@RequestParam("type") Integer type) {
@@ -707,53 +898,55 @@
return R.ok(listInfoCouponDto);
}
-
-
+
+
@ApiOperation(value = "优惠卷详情（1可使用2不可用）", tags = {"小程序-个人中心"})
- @GetMapping(value = "/user/coupon/getById")
+ @PostMapping(value = "/user/coupon/getById")
public R<TAppCoupon> couponGetById(@RequestParam("id")Long id) {
TAppCoupon appCoupon = appCouponService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!appCoupon.getAppUserId().equals(userId)){
+ return R.fail("权限不足");
+ }
appCoupon.setUid(id.toString());
return R.ok(appCoupon);
}
-
-
-
+
+
+
+ @RequiresPermissions(value = {"/appUser/giftVip", "/appUser/gift_vip"}, logical = Logical.OR)
@ApiOperation(value = "赠送会员", tags = {"用户管理-用户列表"})
@PostMapping(value = "/user/give/vip")
@Log(title = "【用户列表】赠送会员", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
public R giveVip(@RequestBody GiveVipDto giveVipDto) {
String[] split = giveVipDto.getUserIds().split(",");
for (String s : split) {
-
-
- TAppUser nowUser = appUserService.getById(s);
-
- int plusDay = 0;
- if (giveVipDto.getType() == 1) {
- plusDay = 1;
- } else if (giveVipDto.getType() == 2) {
- plusDay = 3;
- } else if (giveVipDto.getType() == 3) {
- plusDay = 12;
- }
+ TAppUser nowUser = appUserService.getById(s);
+ int plusDay = 0;
+ if (giveVipDto.getType() == 1) {
+ plusDay = 1;
+ } else if (giveVipDto.getType() == 2) {
+ plusDay = 3;
+ } else if (giveVipDto.getType() == 3) {
+ plusDay = 12;
+ }
BigDecimal bigDecimal = new BigDecimal("0");
TVip info = vipClient.getInfo1(giveVipDto.getVipId()).getData();
- switch (giveVipDto.getType()){
- case 1:
- bigDecimal = bigDecimal.add(info.getMonthlyCard());
- break;
- case 2:
- bigDecimal = bigDecimal.add(info.getSeasonCard());
- break;
- case 3:
- bigDecimal = bigDecimal.add(info.getAnnualCard());
- break;
- }
+ switch (giveVipDto.getType()){
+ case 1:
+ bigDecimal = bigDecimal.add(info.getMonthlyCard()==null?new BigDecimal(0):info.getMonthlyCard());
+ break;
+ case 2:
+ bigDecimal = bigDecimal.add(info.getSeasonCard()==null?new BigDecimal(0):info.getSeasonCard());
+ break;
+ case 3:
+ bigDecimal = bigDecimal.add(info.getAnnualCard()==null?new BigDecimal(0):info.getAnnualCard());
+ break;
+ }
//增加vipDetail
- giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
- appUserService.updateById(nowUser);
- // 新增后台赠送记录
+ giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
+ appUserService.updateById(nowUser);
+ // 新增后台赠送记录
TGrantVip tGrantVip = new TGrantVip();
tGrantVip.setCode(OrderCodeUtil.getOrderCode("ZS"));
tGrantVip.setAppUserId(nowUser.getId());
@@ -765,7 +958,30 @@
}
return R.ok();
}
-
+
+
+
+ @PostMapping(value = "/user/give/vip1")
+ public R giveVip1(@RequestBody GiveVipDto giveVipDto) {
+ String[] split = giveVipDto.getUserIds().split(",");
+ for (String s : split) {
+ TAppUser nowUser = appUserService.getById(s);
+ int plusDay = 0;
+ if (giveVipDto.getType() == 1) {
+ plusDay = 1;
+ } else if (giveVipDto.getType() == 2) {
+ plusDay = 3;
+ } else if (giveVipDto.getType() == 3) {
+ plusDay = 12;
+ }
+ //增加vipDetail
+ giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
+ appUserService.updateById(nowUser);
+ }
+ return R.ok();
+ }
+
+
@ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"})
@PostMapping(value = "/user/invite/page")
public R<Page<TInviteUser>> invitePage(@RequestBody BasePage basePage) {
@@ -774,10 +990,11 @@
for (TInviteUser record : page.getRecords()) {
TAppUser byId = appUserService.getById(record.getBeInvitedAppUserId());
record.setAvatar(byId.getAvatar());
+ record.setName(byId.getName());
}
return R.ok(page);
}
-
+
@ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"})
@GetMapping(value = "/user/invite/info")
public R<InviteInfoDto> inviteInfo() {
@@ -794,9 +1011,9 @@
return R.ok(inviteInfoDto);
}
-
-
-
+
+
+ @Log(title = "【我的】更换手机号", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "更换手机号", tags = {"小程序-用户管理-更换手机号"})
@PostMapping(value = "/user/updatePhone")
public AjaxResult<String> updatePhone(@Validated @RequestBody UpdatePhoneDTO dto) {
@@ -809,12 +1026,18 @@
}
// 获取当前用户信息
Long userId = tokenService.getLoginUserApplet().getUserId();
- TAppUser appUser = appUserService.getById(userId);
- appUser.setPhone(dto.getPhone());
- appUserService.updateById(appUser);
+ TAppUser appUser = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getPhone()).eq(TAppUser::getDelFlag, 0).eq(TAppUser::getStatus, 3));
+ if (Objects.nonNull(appUser)){
+ return AjaxResult.error("手机号已使用，请更换其他手机号");
+ }
+ TAppUser appUser1 = appUserService.getById(userId);
+ appUser1.setPhone(dto.getPhone());
+ appUserService.updateById(appUser1);
return AjaxResult.success();
}
-
+
+
+ @Log(title = "【我的】注销接口", businessType = BusinessType.DELETE,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "注销接口", tags = {"小程序-用户管理-注销账号"})
@DeleteMapping("/logoff")
public AjaxResult<?> logoff(HttpServletRequest request) {
@@ -851,6 +1074,10 @@
TAppUser appUser = appUserService.getById(id);
return R.ok(appUser);
}
+ @PostMapping(value = "/user/getAllUser")
+ public R<List<TAppUser>> getAllUser(){
+ return R.ok(appUserService.list(null));
+ }
/**
@@ -886,20 +1113,17 @@
return R.ok(appUserService.list(Wrappers.lambdaQuery(TAppUser.class)
.eq(TAppUser::getPhone,phone)));
}
-
+
+ @Log(title = "【我的】签到", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "签到", tags = {"小程序-个人中心-签到"})
@GetMapping(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("今日已签到");
}
-
//判断当前生效的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;
@@ -956,7 +1180,6 @@
}
- //已签到日期
@ApiOperation(value = "本月已签到日期", tags = {"小程序-个人中心-签到"})
@GetMapping(value = "/user/has/sign")
public R<List<TAppUserSign>> hasSign() {
@@ -969,14 +1192,16 @@
.eq(TAppUserSign::getAppUserId, userId)
.orderByDesc(TAppUserSign::getSignDay)
.list();
+ for (TAppUserSign signRecord : signRecords) {
+ int i = signDayUtil.calculateContinuousSignDays1(signRecord.getAppUserId(), signRecord.getSignDay());
+ signRecord.setContinueDays(i);
+ }
return R.ok(signRecords);
}
-
-
-
- //已连续签到多少天
-
+
+
+
@ApiOperation(value = "本月已连续签到天数", tags = {"小程序-个人中心-签到"})
@GetMapping(value = "/user/continue/sign")
public R continueSign() {
@@ -1005,11 +1230,19 @@
appUserService.updateById(byId);
return R.ok();
}
-
+
+
+ @Log(title = "【我的】添加编辑车辆", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
@PostMapping(value = "/user/car/addOrUpdate")
public R carAdd(@RequestBody TAppUserCar appUserCar) {
-
+ if(null != appUserCar.getId()){
+ TAppUserCar userCar = appUserCarService.getById(appUserCar.getId());
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!userCar.getAppUserId().equals(userId)){
+ return R.fail("权限不足");
+ }
+ }
LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
Long userId = loginUserApplet.getUserId();
TAppUser byId = appUserService.getById(userId);
@@ -1032,43 +1265,41 @@
if (count==0){
R<TIntegralRule> set = integralRuleClient.getSet();
TIntegralRule data = set.getData();
- JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
-
-
- Integer point = 0;
- //增加车牌50分，必填
+ if(null != data){
+ JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+ 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(),"","");
- byId.setPoints(byId.getPoints()+point);
+
+ //增加积分记录
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"","");
+ byId.setPoints(byId.getPoints()+point);
+ }
byId.setFirstAdd(1);
-
-
}
CarNumDto carNumDto = CarUtil.carNum(appUserCar.getLicensePlate());
if (carNumDto==null){
@@ -1084,19 +1315,32 @@
return R.ok();
}
+
+ @Log(title = "【我的】添加编辑车辆", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/delete")
public R carDelete(String id) {
+ TAppUserCar appUserCar = appUserCarService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!appUserCar.getAppUserId().equals(userId)){
+ return R.fail("权限不足");
+ }
boolean b = appUserCarService.removeById(id);
return R.ok();
}
+
+
@ApiOperation(value = "车辆详情", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/detail")
public R<TAppUserCar> carDetail(String id) {
TAppUserCar byId = appUserCarService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!byId.getAppUserId().equals(userId)){
+ return R.fail("权限不足");
+ }
return R.ok(byId);
}
-
+
@ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getBrands")
public R getBrands(String name) throws Exception {
@@ -1117,7 +1361,8 @@
return R.ok(data);
}
-
+
+
@ApiOperation(value = "根据品牌获取车系", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getModel")
public R getModel(String id) throws Exception {
@@ -1136,6 +1381,8 @@
}
return R.ok(backList);
}
+
+
@ApiOperation(value = "根据车系获取车型", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getSeries")
public R getSeries(String id) throws Exception {
@@ -1153,7 +1400,8 @@
return R.ok(data);
}
-
+
+
@ApiOperation(value = "根据车型获取详情", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getDetail")
public R getDetail(String id) throws Exception {
@@ -1166,6 +1414,7 @@
+ @Log(title = "【我的】修改个人信息", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
@PostMapping(value = "/user/editAppUserInfo")
@ApiOperation(value = "修改个人信息", tags = {"小程序-个人中心"})
public AjaxResult editAppUserInfo(@RequestBody TAppUser appUser){
@@ -1174,5 +1423,58 @@
appUserService.updateById(appUser);
return AjaxResult.success();
}
+
+ @PostMapping("/sendMessage")
+ public R<String> sendMessage(@RequestBody SendMessageDTO sendMessageDTO){
+ switch (sendMessageDTO.getType()){
+ case 1:
+ String reqStr1 = MsgUtil.codeMsg(sendMessageDTO.getPhone(), sendMessageDTO.getCode());
+ String result1 = HttpUtils.post(MsgConstants.SEND_URL, reqStr1);
+ return R.ok(result1);
+ case 2:
+ String reqStr2 = MsgUtil.applyCodeMsg(sendMessageDTO.getPhone(), sendMessageDTO.getCode());
+ String result2 = HttpUtils.post(MsgConstants.SEND_URL, reqStr2);
+ return R.ok(result2);
+ default:
+ String reqStr3 = MsgUtil.faultMsg(sendMessageDTO.getPhone(), sendMessageDTO.getSite(), sendMessageDTO.getChargeGun());
+ String result3 = HttpUtils.post(MsgConstants.SEND_URL, reqStr3);
+ return R.ok(result3);
+ }
+ }
+
+
+ public static void main(String[] args) {
+// String reqStr1 = MsgUtil.codeMsg("19983174515", "123456");
+// String result1 = HttpUtils.post(MsgConstants.SEND_URL, reqStr1);
+
+ String reqStr3 = MsgUtil.faultMsg("18398968484", "长河服务区充电站（遂", "123");
+ String result3 = HttpUtils.post(MsgConstants.SEND_URL, reqStr3);
+ System.err.println(result3);
+ }
+
+
+ @Log(title = "【我的】退出登录", businessType = BusinessType.STOP,operatorType = OperatorType.MOBILE)
+ @PostMapping(value = "/user/logOut")
+ @ApiOperation(value = "退出登录", tags = {"小程序-个人中心"})
+ public AjaxResult logOut(){
+ String token = tokenService.getLoginUserApplet().getToken();
+ redisService.deleteObject("login_tokens:" + token);
+ return AjaxResult.success();
+ }
+
+
+
+ @PostMapping("/refresh")
+ @ApiOperation(value = "刷新token过期时间", tags = {"小程序-个人中心"})
+ public R<?> refresh(HttpServletRequest request) {
+ LoginUserApplet loginUser = tokenService.getLoginUserAppletToken(request);
+ if (StringUtils.isNotNull(loginUser)) {
+ // 刷新令牌有效期
+ tokenService.refreshToken1(loginUser);
+ return R.ok();
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1