fix 添加发送邮件给客服;修改文件上传获取日期格式

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelAccountTemplateData.java

@@ -1,7 +1,6 @@
 package com.cyksj.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,6 +22,5 @@ public class ExcelAccountTemplateData {
 	private String password;
 
 	@ExcelProperty("续费时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date expiryTime;
+	private String expiryTime;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/AdminController.java

@@ -244,7 +244,7 @@ public class AdminController {
 //            log.info("发送video模板消息至客服:{}","磨牙怪");
 //            weChatService.sendTemplateMessage(weChatService.getAccessToken(), Jsons.toJson(templateMessage));
             String subject = "youtube频道有更新";
-            String msg = String.format("title=%s+channel=%s+url=%s", title, channel, YOUTUBE_URL);
+            String msg = String.format("标题:%s\n频道:%s\n下载地址:%s", title, channel, YOUTUBE_URL);
             mailService.sendEmailMsgToPeople(email, subject, msg);
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult();

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -19,7 +19,6 @@ import com.cyksj.mapper.GroupsMapper;
 import com.cyksj.mapper.HomeGroupMapper;
 import com.cyksj.mapper.UserTicketClearedRecordMapper;
 import com.cyksj.model.entity.*;
-import com.cyksj.model.excel.ExcelAccountTemplateData;
 import com.cyksj.model.excel.ExcelImportAccountData;
 import com.cyksj.model.excel.ExcelManageAccountData;
 import com.cyksj.model.manage.request.ReqAccountIncrExpiryTime;
@@ -134,45 +133,53 @@ public class CmsAccountController {
     }
 
     /**
-     * 下载导入模板
+     * 下载批量修改密码模板
      */
     @GetMapping("/get/account/template")
     @SaCheckPermission("account:batchUpdatePwd")
     public void getAccountTemplate(HttpServletResponse response) {
-        EasyExcelUtils.createTemplateExcel(response, ExcelAccountTemplateData.class, "账号导入模板", "账号导入模板", ExcelTypeEnum.XLSX, null);
+        EasyExcelUtils.createTemplateExcel(response, ExcelImportAccountData.class, "账号批量修改密码模板", "账号批量修改密码模板", ExcelTypeEnum.XLSX, null);
     }
 
 	/**
-	 * 导入账号,修改密码
+	 * 导入文件,修改密码
 	 */
 	@PostMapping("/import/account")
 	public Result<String> importAccount(Long goodsId, MultipartFile file) throws Exception {
-		EasyExcel.read(file.getInputStream(), ExcelAccountTemplateData.class, new AnalysisEventListener<ExcelAccountTemplateData>() {
+		EasyExcel.read(file.getInputStream(), ExcelImportAccountData.class, new AnalysisEventListener<ExcelImportAccountData>() {
 			@SneakyThrows
 			@Override
-			public void invoke(ExcelAccountTemplateData data, AnalysisContext analysisContext) {
+			public void invoke(ExcelImportAccountData data, AnalysisContext analysisContext) {
 				if (StrUtil.isNotBlank(data.getAccount())) {
 					Account account = accountService.getOne(Wrappers.lambdaQuery(Account.class)
 							.eq(Account::getGoodsId, goodsId)
 							.eq(Account::getAccount, data.getAccount().trim()));
 					Boolean flag = false;
+					Boolean isUpdatePwd = false;
 					if (account != null) {
-						if (data.getExpiryTime() != null) {
-							account.setExpiryTime(data.getExpiryTime());
+						if (StrUtil.isNotBlank(data.getStartTime())) {
+							account.setStartTime(DateUtil.parse(data.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+							flag = true;
+						}
+						if (StrUtil.isNotBlank(data.getExpiryTime())) {
+							account.setExpiryTime(DateUtil.parse(data.getExpiryTime(), "yyyy-MM-dd HH:mm:ss"));
 							flag = true;
 						}
 						if (StrUtil.isNotBlank(data.getPassword()) && !data.getPassword().equals(account.getPassword())) {
 							account.setPassword(data.getPassword());
 							flag = true;
+							isUpdatePwd = true;
 							//发放模板消息
 							templateCommonService.sendAccountTemplateMsg(account);
 						}
 						if (flag) {
 							accountService.updateById(account);
-							//清空过期账号 逻辑删除
-							userTicketClearedRecordMapper.update(null, Wrappers.lambdaUpdate(UserTicketClearedRecord.class)
-									.set(UserTicketClearedRecord::getDeleted, false)
-									.eq(UserTicketClearedRecord::getAccountId, account.getId()));
+							if (isUpdatePwd) {
+								//清空过期账号 逻辑删除
+								userTicketClearedRecordMapper.update(null, Wrappers.lambdaUpdate(UserTicketClearedRecord.class)
+										.set(UserTicketClearedRecord::getDeleted, false)
+										.eq(UserTicketClearedRecord::getAccountId, account.getId()));
+							}
 						}
 					}
 				}