fix 后台获取GPT验证码

netflix-service/src/main/java/com/cyksj/service/mange/account/CmsAccountServiceImpl.java

@@ -26,9 +26,7 @@ import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.views.CmsUserVO;
 import com.cyksj.model.views.ExpiredAccountDataView;
 import com.cyksj.redis.RedisService;
-import com.cyksj.service.mail.CuiQiuMailService;
-import com.cyksj.service.mail.MailLuService;
-import com.cyksj.service.mail.YhMailService;
+import com.cyksj.service.mail.CommonMailService;
 import com.cyksj.service.mange.AccountCommonService;
 import com.cyksj.service.mange.CmsAccountService;
 import com.cyksj.service.mange.CmsGroupService;
@@ -80,11 +78,7 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 
 	private final AccountBlockedReplaceRecordMapper accountBlockedReplaceRecordMapper;
 
-	private final CuiQiuMailService cuiQiuMailService;
-
-	private final YhMailService yhMailService;
-
-	private final MailLuService mailLuService;
+	private final CommonMailService commonMailService;
 
 	@Override
 	public IPage<ExpiredAccountDataView> getExpiredAccountView(Boolean isCorpWx, String customerService, Long goodsId, Long skuId, String account, Boolean renewStatus, Boolean handleStatus, String cnAccount, String usAccount, Integer userId, String startTime, String endTime, String now, Long offset, Long limit) {
@@ -472,25 +466,7 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 		if (StrUtil.hasEmpty(account, password)) {
 			throw BusinessRuntimeException.getInstance("账户异常");
 		}
-		if (StrUtil.isNotEmpty(at.getRelateEmail())) {
-			account = at.getRelateEmail();
-		}
-		if (cuiQiuMailService.isCuiQiuEmail(account)) {
-			return cuiQiuMailService.getVerifyCode(at.getAccount(), at.getRelateEmail(), at.getGoodsId(), null, 1, false);
-		}
-		//是否是 mail lu邮箱
-		if (mailLuService.isMailLuEmail(account)) {
-			return mailLuService.getVerifyCode(account, at.getGoodsId(), null, 1, false);
-		}
-		String code = null;
-		try {
-			code = yhMailService.getVerifyCode(account, at.getGoodsId(), null, 1, false);
-		} catch (Exception e) {
-			if (e.getMessage() != null && e.getMessage().contains("认证链接")) {
-				throw BusinessRuntimeException.getInstance("请联系用户确认是否发送邮件");
-			}
-			throw BusinessRuntimeException.getInstance(e.getMessage());
-		}
+		String code = commonMailService.getTicketMailCode(at.getGoodsId(), at.getAccount(), at.getRelateEmail(), at.getGptEmailPwd(), at.getCreatedTime(), null, 1, false);
 		return code;
 	}
 
@@ -505,17 +481,7 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 		if (StrUtil.hasEmpty(account, password)) {
 			throw BusinessRuntimeException.getInstance("账户异常");
 		}
-		if (StrUtil.isNotEmpty(at.getRelateEmail())) {
-			account = at.getRelateEmail();
-		}
-		if (cuiQiuMailService.isCuiQiuEmail(account)) {
-			return cuiQiuMailService.getVerifyCode(at.getAccount(), at.getRelateEmail(), at.getGoodsId(), null, null, false);
-		}
-		//是否是 mail lu邮箱
-		if (mailLuService.isMailLuEmail(account)) {
-			return mailLuService.getVerifyCode(account, at.getGoodsId(), null, null, false);
-		}
-		String code = yhMailService.getVerifyCode(account, at.getGoodsId(), null, null, false);
+		String code = commonMailService.getTicketMailCode(at.getGoodsId(), at.getAccount(), at.getRelateEmail(), at.getGptEmailPwd(), at.getCreatedTime(), null, null, false);
 		return code;
 	}
 }