|
@@ -27,6 +27,7 @@ import com.cyksj.model.views.CmsUserVO;
|
|
|
import com.cyksj.model.views.ExpiredAccountDataView;
|
|
import com.cyksj.model.views.ExpiredAccountDataView;
|
|
|
import com.cyksj.redis.RedisService;
|
|
import com.cyksj.redis.RedisService;
|
|
|
import com.cyksj.service.mail.CuiQiuMailService;
|
|
import com.cyksj.service.mail.CuiQiuMailService;
|
|
|
|
|
+import com.cyksj.service.mail.MailLuService;
|
|
|
import com.cyksj.service.mail.YhMailService;
|
|
import com.cyksj.service.mail.YhMailService;
|
|
|
import com.cyksj.service.mange.AccountCommonService;
|
|
import com.cyksj.service.mange.AccountCommonService;
|
|
|
import com.cyksj.service.mange.CmsAccountService;
|
|
import com.cyksj.service.mange.CmsAccountService;
|
|
@@ -83,6 +84,8 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
|
|
|
|
|
|
|
|
private final YhMailService yhMailService;
|
|
private final YhMailService yhMailService;
|
|
|
|
|
|
|
|
|
|
+ private final MailLuService mailLuService;
|
|
|
|
|
+
|
|
|
@Override
|
|
@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) {
|
|
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) {
|
|
|
return accountMapper.getExpiredAccountView(isCorpWx, customerService, goodsId, skuId, account, renewStatus, handleStatus, cnAccount, usAccount, userId, startTime, endTime, now, new Page<>(offset, limit));
|
|
return accountMapper.getExpiredAccountView(isCorpWx, customerService, goodsId, skuId, account, renewStatus, handleStatus, cnAccount, usAccount, userId, startTime, endTime, now, new Page<>(offset, limit));
|
|
@@ -475,6 +478,10 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
|
|
|
if (cuiQiuMailService.isCuiQiuEmail(account)) {
|
|
if (cuiQiuMailService.isCuiQiuEmail(account)) {
|
|
|
return cuiQiuMailService.getVerifyCode(account, at.getGoodsId(), null, 1, false);
|
|
return cuiQiuMailService.getVerifyCode(account, at.getGoodsId(), null, 1, false);
|
|
|
}
|
|
}
|
|
|
|
|
+ //是否是 mail lu邮箱
|
|
|
|
|
+ if (mailLuService.isMailLuEmail(account)) {
|
|
|
|
|
+ return mailLuService.getVerifyCode(account, at.getGoodsId(), null, 1, false);
|
|
|
|
|
+ }
|
|
|
String code = null;
|
|
String code = null;
|
|
|
try {
|
|
try {
|
|
|
code = yhMailService.getVerifyCode(account, at.getGoodsId(), null, 1, false);
|
|
code = yhMailService.getVerifyCode(account, at.getGoodsId(), null, 1, false);
|
|
@@ -504,6 +511,10 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
|
|
|
if (cuiQiuMailService.isCuiQiuEmail(account)) {
|
|
if (cuiQiuMailService.isCuiQiuEmail(account)) {
|
|
|
return cuiQiuMailService.getVerifyCode(account, at.getGoodsId(), null, null, false);
|
|
return cuiQiuMailService.getVerifyCode(account, 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 = yhMailService.getVerifyCode(account, at.getGoodsId(), null, null, false);
|
|
|
return code;
|
|
return code;
|
|
|
}
|
|
}
|