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 | 101 ++++++++++++++++++++++----------------------------
1 files changed, 45 insertions(+), 56 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 fefc4da..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
@@ -49,7 +49,6 @@
import com.ruoyi.other.api.feignClient.VipClient;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.model.LoginUserApplet;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeUtility;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.IOUtils;
@@ -63,10 +62,7 @@
import javax.activation.FileDataSource;
import javax.annotation.Resource;
import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import javax.mail.internet.*;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileOutputStream;
@@ -162,7 +158,7 @@
// 指定发送邮件的主机为
String host = "smtp.163.com";
Properties properties = new Properties();
- properties.put("mail.smtp.host", "smtp.163.com");
+ 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");
@@ -174,7 +170,7 @@
public javax.mail.PasswordAuthentication getPasswordAuthentication()
{
//发件人邮件用户名、授权码，换成自己的发件箱及授权码
- return new PasswordAuthentication("13281306557@163.com", "NUSdxDQqadYvVek2");
+ return new PasswordAuthentication(from, "NUSdxDQqadYvVek2");
}
});
@@ -184,7 +180,7 @@
// Set From，设置发件人
InternetAddress fromMail = new InternetAddress(from);
//设置发件人名称，TODO 换成自己的发件箱
- fromMail.setPersonal(MimeUtility.encodeText("明星新能源科技有限公司<13281306557@163.com>"));
+ fromMail.setPersonal(MimeUtility.encodeText("明星新能源科技有限公司<" + from + ">"));
message.setFrom(fromMail);
// Set To: 设置收件人
InternetAddress toMail = new InternetAddress(to);
@@ -265,7 +261,8 @@
appUserService.updateById(byId);
return R.ok();
}
-
+
+
@ApiOperation(value = "查询当前用户是否为会员 0否1是", tags = {"小程序--查询当前用户是否为会员"})
@PostMapping(value = "/getUserInfo")
public AjaxResult<Integer> getUserInfo() {
@@ -676,7 +673,6 @@
}
-
@ApiOperation(value = "用户详情积分明细", tags = {"小程序-个人中心"})
@PostMapping(value = "/user/points/page1")
public R<Page<TAppUserIntegralChange>> pointsDetail1(@RequestBody PointsQueryDto pointsQueryDto) {
@@ -727,7 +723,6 @@
}
-
@ApiOperation(value = "积分详情", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/points/detail")
public R<TAppUserIntegralChange> pointsDetail(String id) {
@@ -789,7 +784,8 @@
}
@Resource
private TAppUserVipDetailService appUserVipDetailService;
-
+
+
@ApiOperation(value = "个人中心信息", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/info")
public R<AppUserInfoDto> info() {
@@ -830,8 +826,9 @@
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) {
@@ -847,7 +844,7 @@
appUserService.updateById(byId);
return R.ok();
}
-
+
@ApiOperation(value = "优惠卷列表不分页（1可使用2不可用）", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/coupon")
public R<ListInfoCouponDto> userCoupon(@RequestParam("type") Integer type) {
@@ -901,8 +898,8 @@
return R.ok(listInfoCouponDto);
}
-
-
+
+
@ApiOperation(value = "优惠卷详情（1可使用2不可用）", tags = {"小程序-个人中心"})
@PostMapping(value = "/user/coupon/getById")
public R<TAppCoupon> couponGetById(@RequestParam("id")Long id) {
@@ -977,36 +974,14 @@
} 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()==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);
- // 新增后台赠送记录
- TGrantVip tGrantVip = new TGrantVip();
- tGrantVip.setCode(OrderCodeUtil.getOrderCode("ZS"));
- tGrantVip.setAppUserId(nowUser.getId());
- tGrantVip.setVipId(giveVipDto.getVipId());
- tGrantVip.setOrderAmount(bigDecimal);
- tGrantVip.setCreateTime(LocalDateTime.now());
- tGrantVip.setAppUserId(nowUser.getId());
- orderClient.managementGiveVip(tGrantVip);
}
return R.ok();
}
-
+
@ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"})
@PostMapping(value = "/user/invite/page")
public R<Page<TInviteUser>> invitePage(@RequestBody BasePage basePage) {
@@ -1019,7 +994,7 @@
}
return R.ok(page);
}
-
+
@ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"})
@GetMapping(value = "/user/invite/info")
public R<InviteInfoDto> inviteInfo() {
@@ -1036,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) {
@@ -1060,7 +1035,9 @@
appUserService.updateById(appUser1);
return AjaxResult.success();
}
-
+
+
+ @Log(title = "【我的】注销接口", businessType = BusinessType.DELETE,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "注销接口", tags = {"小程序-用户管理-注销账号"})
@DeleteMapping("/logoff")
public AjaxResult<?> logoff(HttpServletRequest request) {
@@ -1136,7 +1113,8 @@
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() {
@@ -1202,7 +1180,6 @@
}
- //已签到日期
@ApiOperation(value = "本月已签到日期", tags = {"小程序-个人中心-签到"})
@GetMapping(value = "/user/has/sign")
public R<List<TAppUserSign>> hasSign() {
@@ -1222,11 +1199,9 @@
return R.ok(signRecords);
}
-
-
-
- //已连续签到多少天
-
+
+
+
@ApiOperation(value = "本月已连续签到天数", tags = {"小程序-个人中心-签到"})
@GetMapping(value = "/user/continue/sign")
public R continueSign() {
@@ -1255,7 +1230,9 @@
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) {
@@ -1338,6 +1315,8 @@
return R.ok();
}
+
+ @Log(title = "【我的】添加编辑车辆", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/delete")
public R carDelete(String id) {
@@ -1349,6 +1328,8 @@
boolean b = appUserCarService.removeById(id);
return R.ok();
}
+
+
@ApiOperation(value = "车辆详情", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/detail")
public R<TAppUserCar> carDetail(String id) {
@@ -1359,7 +1340,7 @@
}
return R.ok(byId);
}
-
+
@ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getBrands")
public R getBrands(String name) throws Exception {
@@ -1380,7 +1361,8 @@
return R.ok(data);
}
-
+
+
@ApiOperation(value = "根据品牌获取车系", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getModel")
public R getModel(String id) throws Exception {
@@ -1399,6 +1381,8 @@
}
return R.ok(backList);
}
+
+
@ApiOperation(value = "根据车系获取车型", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getSeries")
public R getSeries(String id) throws Exception {
@@ -1416,7 +1400,8 @@
return R.ok(data);
}
-
+
+
@ApiOperation(value = "根据车型获取详情", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getDetail")
public R getDetail(String id) throws Exception {
@@ -1429,6 +1414,7 @@
+ @Log(title = "【我的】修改个人信息", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
@PostMapping(value = "/user/editAppUserInfo")
@ApiOperation(value = "修改个人信息", tags = {"小程序-个人中心"})
public AjaxResult editAppUserInfo(@RequestBody TAppUser appUser){
@@ -1465,6 +1451,9 @@
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(){
--
Gitblit v1.7.1