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 | 360 ++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 288 insertions(+), 72 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 fca9ac4..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 @@ -51,18 +51,30 @@ 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; /** @@ -84,9 +96,8 @@ private TAppUserService appUserService; @Resource private TAppUserTagService appUserTagService; - @Autowired + @Resource private OrderClient orderClient; - @Resource private TAppUserVipDetailService tAppUserVipDetailService; @Resource @@ -121,6 +132,9 @@ private TAppUserCarService carService; @Resource private IntegralRuleClient integralRuleClient; + + @Resource + private RedisTemplate redisTemplate; @Resource @@ -130,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 @@ -145,7 +261,8 @@ appUserService.updateById(byId); return R.ok(); } - + + @ApiOperation(value = "查询当前用户是否为会员 0否1是", tags = {"小程序--查询当前用户是否为会员"}) @PostMapping(value = "/getUserInfo") public AjaxResult<Integer> getUserInfo() { @@ -505,7 +622,7 @@ } @RequiresPermissions(value = {"/appUser/select", "/vipList/select"}, logical = Logical.OR) - @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表","小程序-个人中心"}) + @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表"}) @PostMapping(value = "/user/points/page") public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) { if (pointsQueryDto.getUserId()==null){ @@ -554,7 +671,58 @@ 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) { @@ -616,7 +784,8 @@ } @Resource private TAppUserVipDetailService appUserVipDetailService; - + + @ApiOperation(value = "个人中心信息", tags = {"小程序-个人中心"}) @GetMapping(value = "/user/info") public R<AppUserInfoDto> info() { @@ -657,18 +826,25 @@ 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) { @@ -722,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) { @@ -745,35 +921,32 @@ 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()==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; - } + 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()); @@ -785,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) { @@ -798,7 +994,7 @@ } return R.ok(page); } - + @ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"}) @GetMapping(value = "/user/invite/info") public R<InviteInfoDto> inviteInfo() { @@ -815,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) { @@ -839,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) { @@ -876,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)); + } /** @@ -911,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; @@ -981,7 +1180,6 @@ } - //已签到日期 @ApiOperation(value = "本月已签到日期", tags = {"小程序-个人中心-签到"}) @GetMapping(value = "/user/has/sign") public R<List<TAppUserSign>> hasSign() { @@ -1001,11 +1199,9 @@ return R.ok(signRecords); } - - - - //已连续签到多少天 - + + + @ApiOperation(value = "本月已连续签到天数", tags = {"小程序-个人中心-签到"}) @GetMapping(value = "/user/continue/sign") public R continueSign() { @@ -1034,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) { @@ -1067,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){ @@ -1119,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) { @@ -1130,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) { @@ -1140,7 +1340,7 @@ } return R.ok(byId); } - + @ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"}) @GetMapping(value = "/user/car/getBrands") public R getBrands(String name) throws Exception { @@ -1161,7 +1361,8 @@ return R.ok(data); } - + + @ApiOperation(value = "根据品牌获取车系", tags = {"小程序-个人中心-车辆"}) @GetMapping(value = "/user/car/getModel") public R getModel(String id) throws Exception { @@ -1180,6 +1381,8 @@ } return R.ok(backList); } + + @ApiOperation(value = "根据车系获取车型", tags = {"小程序-个人中心-车辆"}) @GetMapping(value = "/user/car/getSeries") public R getSeries(String id) throws Exception { @@ -1197,7 +1400,8 @@ return R.ok(data); } - + + @ApiOperation(value = "根据车型获取详情", tags = {"小程序-个人中心-车辆"}) @GetMapping(value = "/user/car/getDetail") public R getDetail(String id) throws Exception { @@ -1210,6 +1414,7 @@ + @Log(title = "【我的】修改个人信息", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE) @PostMapping(value = "/user/editAppUserInfo") @ApiOperation(value = "修改个人信息", tags = {"小程序-个人中心"}) public AjaxResult editAppUserInfo(@RequestBody TAppUser appUser){ @@ -1236,8 +1441,19 @@ 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(){ -- Gitblit v1.7.1