|
|
@@ -19,6 +19,7 @@ import com.uas.platform.b2b.support.SendMailService;
|
|
|
import com.uas.platform.b2b.support.TokenService;
|
|
|
import com.uas.platform.core.model.Constant;
|
|
|
import com.uas.platform.core.util.HttpUtil;
|
|
|
+import com.uas.platform.core.util.encry.Md5Utils;
|
|
|
import com.uas.platform.core.util.serializer.FlexJsonUtils;
|
|
|
|
|
|
@Service
|
|
|
@@ -68,7 +69,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
newEnterprise.setEnAdminEmail(enterprise.getEnAdminEmail());
|
|
|
newEnterprise.setEnAdminTel(enterprise.getEnAdminTel());
|
|
|
newEnterprise.setEnBussinesscodeImg(newEnterprise.getEnBussinessCodeAttach().getAtId());
|
|
|
-// sendToAduit(newEnterprise);//传给管理平台进行资料审核
|
|
|
+ sendToAduit(newEnterprise);//传给管理平台进行资料审核
|
|
|
return newEnterprise;
|
|
|
}
|
|
|
return null;
|
|
|
@@ -79,7 +80,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
HashMap<String, String> params = new HashMap<String, String>();
|
|
|
params.put("data", FlexJsonUtils.toJson(enterprise));
|
|
|
HttpResponse response = HttpUtil.sendPostRequest(
|
|
|
- "manageHost/b2b/unaudited", params);
|
|
|
+ "http://192.168.253.157:8081/platform-manage/b2b/unaudited", params);
|
|
|
return response;
|
|
|
}
|
|
|
|
|
|
@@ -96,8 +97,8 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
model.put("rootpath", "http://192.168.253.157:8081/platform-b2b/");
|
|
|
model.put("uu", enterprise.getUu());
|
|
|
model.put("checkcode", encodeString);
|
|
|
- sendMailService.sendTemplateMail(admin.getUserEmail(),
|
|
|
- "欢迎注册优软管理平台账号", model, "velocity/registerActive.vm");
|
|
|
+ sendMailService.sendTemplateMail("suntugui@qq.com",//TEST用自己的邮箱
|
|
|
+ "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
|
|
|
return "ALLOW";
|
|
|
} else if(result.equals("NOTALLOW")) {//审核不通过
|
|
|
User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
@@ -107,14 +108,61 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
model.put("name", enterprise.getEnName());
|
|
|
model.put("email", admin.getUserEmail());
|
|
|
model.put("reason", reason);
|
|
|
- sendMailService.sendTemplateMail(enterprise.getEnAdminEmail(),
|
|
|
+ sendMailService.sendTemplateMail("suntugui@qq.com",//TEST用自己的邮箱
|
|
|
"很遗憾账号未能通过审核", model, "velocity/invalid.vm");
|
|
|
return "NOTALLOW";
|
|
|
} else {
|
|
|
return "审核结果参数出错";
|
|
|
}
|
|
|
}
|
|
|
- return "找不到";
|
|
|
+ return "找不到uu号对应的企业";
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public String activateCheck(Long uu, String checkcode) {
|
|
|
+ Enterprise enterprise = enterpriseDao.findEnterpriseByUu(uu);
|
|
|
+ if(enterprise != null) {
|
|
|
+ if(!enterprise.isEnabled()) {
|
|
|
+ if(tokenService.isCertified("enterprise", uu, checkcode)) {
|
|
|
+ enterprise.setEnable(Constant.YES);
|
|
|
+ User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
+ admin.setEnable(Constant.YES);
|
|
|
+ userDao.save(admin);
|
|
|
+ enterpriseDao.save(enterprise);
|
|
|
+ return "SUCCESS";
|
|
|
+ } else {
|
|
|
+ return "验证码错误,激活失败";
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ return "企业账号已激活,操作失败";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return "找不到uu号对应的企业账号";
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public String sendActivateEmail(Long enuu) {
|
|
|
+ Enterprise enterprise = enterpriseDao.findEnterpriseByUu(enuu);
|
|
|
+ String encodeString = tokenService.getEncodeToken("enterprise", enuu);
|
|
|
+ User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
+ Map<String, Object> model = new HashMap<String, Object>();
|
|
|
+ model.put("name", enterprise.getEnName());
|
|
|
+ model.put("email", admin.getUserEmail());
|
|
|
+ model.put("rootpath", "http://192.168.253.157:8081/platform-b2b/");
|
|
|
+ model.put("uu", enuu);
|
|
|
+ model.put("checkcode", encodeString);
|
|
|
+ sendMailService.sendTemplateMail("suntugui@qq.com",//TEST用自己的邮箱
|
|
|
+ "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
|
|
|
+ return "SUCCESS";
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public String setAdminPassword(Long enuu, String password) {
|
|
|
+ Enterprise enterprise = enterpriseDao.findEnterpriseByUu(enuu);
|
|
|
+ User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
+ admin.setUserPwd(Md5Utils.encode(password, admin.getUserUU()));
|
|
|
+ userDao.save(admin);
|
|
|
+ return "SUCCESS";
|
|
|
}
|
|
|
|
|
|
}
|