From 053492c159a2cb8f12e8a7f59675ef6516d31440 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 三月 2025 13:50:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 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 88e3d14..67a4855 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;
@@ -184,7 +180,7 @@
// Set From，设置发件人
InternetAddress fromMail = new InternetAddress(from);
//设置发件人名称，TODO 换成自己的发件箱
- fromMail.setPersonal(MimeUtility.encodeText("明星电力<13281306557@163.com>"));
+ fromMail.setPersonal(MimeUtility.encodeText("明星新能源科技有限公司<13281306557@163.com>"));
message.setFrom(fromMail);
// Set To: 设置收件人
InternetAddress toMail = new InternetAddress(to);
@@ -977,31 +973,9 @@
} 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();
}
--
Gitblit v1.7.1