Browse Source

管理平台重新发送激活邮件接口

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1140 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 10 years ago
parent
commit
9364c062d3

+ 25 - 0
src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseController.java

@@ -8,6 +8,9 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -138,5 +141,27 @@ public class EnterpriseController {
 		List<Long> ids = FlexJsonUtils.fromJsonArray(jsonStr, Long.class);
 		registerLogService.upLoadSuccessRegister(ids);
 	}
+	
+	/**
+	 * 重新发送激活邮件,可修改邮箱地址
+	 * 
+	 * @param email
+	 * @return
+	 * @throws UnsupportedEncodingException 
+	 */
+	@RequestMapping(value = "/reSendEmail", method = RequestMethod.POST)
+	@ResponseBody
+	public ResponseEntity<String> reSendActivateEmail(Long enUU, String email, HttpServletRequest request) throws UnsupportedEncodingException {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text; charset=utf-8");
+		email = URLDecoder.decode(email, "UTF-8");
+		String result = null;
+		try{
+			result = enterpriseService.reSendActivateEmail(enUU, email, request);
+		} catch(Exception e) {
+			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.EXPECTATION_FAILED);
+		}
+		return new ResponseEntity<String>(result, headers, HttpStatus.OK);
+	}
 
 }

+ 2 - 0
src/main/java/com/uas/platform/b2b/service/EnterpriseService.java

@@ -60,5 +60,7 @@ public interface EnterpriseService {
 	public void audit(List<Enterprise> enterprises, HttpServletRequest request);
 
 	public void audit(Enterprise enterprise, HttpServletRequest request);
+	
+	public String reSendActivateEmail(Long enUU, String email, HttpServletRequest request);
 
 }

+ 41 - 2
src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -26,6 +26,7 @@ import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SendMailService;
 import com.uas.platform.b2b.support.TokenService;
+import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.AgentUtils;
@@ -133,7 +134,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("adminTel", admin.getUserTel());
 		model.put("checkcode", encodeString);
 		try {
-			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
 			enterprise.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			enterpriseDao.save(enterprise);
@@ -242,7 +243,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					model.put("adminEmail", admin.getUserEmail());
 					model.put("adminTel", admin.getUserTel());
 					try {
-						sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
+						sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
 						registeRecord(enter, "发送审核通过邮件", "成功");
 					} catch (Exception e) {
 						registeRecord(enter, "发送审核通过邮件", "失败");
@@ -313,4 +314,42 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		return enterprises;
 	}
 
+	@Override
+	public String reSendActivateEmail(Long enUU, String email, HttpServletRequest request) {
+		Enterprise enterprise = enterpriseDao.findEnterpriseByUu(enUU);
+		if(enterprise == null)
+			throw new IllegalOperatorException("不存在的企业UU号");
+		String encodeString = tokenService.getEncodeToken("enterprise", enUU);
+		User admin = userDao.findOne(enterprise.getEnAdminuu());
+		if(StringUtils.hasText(email) && !"null".equals(email) && email != null) {//修改管理员Email 
+			if(userService.isEmailUseable(email)) {
+				admin.setUserEmail(email);
+			} else {
+				throw new IllegalOperatorException("邮箱地址重复,不可用");
+			}
+		}
+		Map<String, Object> model = new HashMap<String, Object>();
+		model.put("name", enterprise.getEnName());
+		model.put("email", admin.getUserEmail());
+		model.put("rootpath", AgentUtils.getHost(request));
+		model.put("uu", enUU);
+		model.put("adminUU", admin.getUserUU().toString());
+		model.put("adminEmail", admin.getUserEmail());
+		model.put("adminTel", admin.getUserTel());
+		model.put("checkcode", encodeString);
+		try {
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
+			enterprise.setEnable(Constant.NO);
+			admin.setEnable(Constant.NO);
+			enterpriseDao.save(enterprise);
+			userDao.save(admin);
+			registeRecord(enterprise, "管理平台重新发送激活邮件", "成功");
+		} catch (Exception e) {
+			registeRecord(enterprise, "管理平台重新发送激活邮件", "失败");
+			e.printStackTrace();
+			throw new IllegalOperatorException("发送邮件失败");
+		}
+		return admin.getUserEmail();
+	}
+
 }