|
@@ -295,8 +295,13 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
|
model.put("adminUU", admin.getUserUU().toString());
|
|
model.put("adminUU", admin.getUserUU().toString());
|
|
|
model.put("adminEmail", admin.getUserEmail());
|
|
model.put("adminEmail", admin.getUserEmail());
|
|
|
model.put("adminTel", admin.getUserTel());
|
|
model.put("adminTel", admin.getUserTel());
|
|
|
|
|
+ model.put("saasUrl", enter.getEnSaasUrl());
|
|
|
try {
|
|
try {
|
|
|
- sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
|
|
|
|
|
|
|
+ if(enter.getEnSaasStatus() != null && enter.getEnSaasStatus() == Status.UNACT.value()) {
|
|
|
|
|
+ sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号和SAAS服务", model, "velocity/registerActivateSaas.vm");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
|
|
|
|
|
+ }
|
|
|
registeRecord(enter, "发送审核通过邮件", "成功");
|
|
registeRecord(enter, "发送审核通过邮件", "成功");
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
registeRecord(enter, "发送审核通过邮件", "失败");
|
|
registeRecord(enter, "发送审核通过邮件", "失败");
|
suntg