git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@678 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/EnterpriseController.java

@@ -1,75 +1,16 @@
 package com.uas.platform.b2b.controller;
 
-import javax.servlet.http.HttpSession;
-
 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.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.EnterpriseService;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
-/**
- * 企业请求
- * @author suntg
- * @date 2015年3月10日17:37:37
- */
 @Controller
-@RequestMapping(value = "/enterprise")
+@RequestMapping(value = "/account/enterprise")
 public class EnterpriseController {
-	
+
 	@Autowired
 	private EnterpriseService enterpriseService;
-	@Autowired
-	private AttachService attachService;
-	
-	/**
-	 * 执照号是否可用
-	 * @param code
-	 * @return
-	 */
-	@RequestMapping(value = "/codeEnable", method = RequestMethod.GET)
-	public ResponseEntity<String> bussinessCodeEnable(String code) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text; charset=utf-8");
-		return new ResponseEntity<String>(enterpriseService.bussinessCodeEnable(code), 
-				headers, HttpStatus.OK);
-	}
-	
-	/**
-	 * 注册新企业用户
-	 */
-	@RequestMapping("/register")
-	public @ResponseBody
-	ResponseEntity<ModelMap> register(HttpSession session, String enterprise, FileUpload uploadItem) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json; charset=utf-8");
-		ModelMap map = new ModelMap();
-		Enterprise newEnterprise = FlexJsonUtils.fromJson(enterprise, Enterprise.class);//需要把字符串转成Object
-		Attach attach = attachService.upload(uploadItem, "bussinessCodeImg", "客户营业执照复印件或照片");//先保存上传到文件
-		if(attach == null){//文件过大
-			map.put("error", "文件过大");
-			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.FORBIDDEN);
-		} else {//上传成功
-			newEnterprise.setEnBussinessCodeAttach(attach);
-			Enterprise regEnterprise = enterpriseService.registerEnterprise(newEnterprise);
-			if(regEnterprise == null) {//营业执照码验证
-				map.put("error", "操作失败");
-				return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
-			}
-			map.put("uu", regEnterprise.getUu());
-			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-		}
-	}
 
 }

src/main/java/com/uas/platform/b2b/controller/RegisterController.java

@@ -20,13 +20,14 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
  * 企业请求
+ * 
  * @author suntg
  * @date 2015年3月10日17:37:37
  */
 @Controller
-@RequestMapping(value = "/signin")
+@RequestMapping(value = "/signup")
 public class RegisterController {
-	
+
 	@Autowired
 	private EnterpriseService enterpriseService;
 	@Autowired
@@ -34,8 +35,14 @@ public class RegisterController {
 	@Autowired
 	private UserService userService;
 	
+	@RequestMapping(method = RequestMethod.GET)
+	public String getSignupPage() {
+		return "register";
+	}
+
 	/**
 	 * 执照号是否可用
+	 * 
 	 * @param code
 	 * @return
 	 */
@@ -43,28 +50,26 @@ public class RegisterController {
 	public ResponseEntity<String> bussinessCodeEnable(String code) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text; charset=utf-8");
-		return new ResponseEntity<String>(enterpriseService.bussinessCodeEnable(code), 
-				headers, HttpStatus.OK);
+		return new ResponseEntity<String>(enterpriseService.bussinessCodeEnable(code), headers, HttpStatus.OK);
 	}
-	
+
 	/**
 	 * 注册新企业用户
 	 */
-	@RequestMapping("/register.action")
-	public @ResponseBody
-	ResponseEntity<ModelMap> register(String enterprise, FileUpload uploadItem) {
+	@RequestMapping(method = RequestMethod.POST)
+	public @ResponseBody ResponseEntity<ModelMap> register(String enterprise, FileUpload uploadItem) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
-		Enterprise newEnterprise = FlexJsonUtils.fromJson(enterprise, Enterprise.class);//需要把字符串转成Object
-		Attach attach = attachService.upload(uploadItem, "bussinessCodeImg", "客户营业执照复印件或照片");//先保存上传到文件
-		if(attach == null){//文件过大
+		Enterprise newEnterprise = FlexJsonUtils.fromJson(enterprise, Enterprise.class);// 需要把字符串转成Object
+		Attach attach = attachService.upload(uploadItem, "bussinessCodeImg", "客户营业执照复印件或照片");// 先保存上传到文件
+		if (attach == null) {// 文件过大
 			map.put("error", "文件过大");
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.FORBIDDEN);
-		} else {//上传成功
+		} else {// 上传成功
 			newEnterprise.setEnBussinessCodeAttach(attach);
 			Enterprise regEnterprise = enterpriseService.registerEnterprise(newEnterprise);
-			if(regEnterprise == null) {//营业执照码验证
+			if (regEnterprise == null) {// 营业执照码验证
 				map.put("error", "操作失败");
 				return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
 			}
@@ -72,84 +77,78 @@ public class RegisterController {
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
 		}
 	}
-	
+
 	/**
 	 * 处理审核结果
 	 */
 	@RequestMapping(value = "/audit", method = RequestMethod.POST)
-	public @ResponseBody
-	ResponseEntity<ModelMap> aduit(Long uu, String result, String reason) {
+	public @ResponseBody ResponseEntity<ModelMap> aduit(Long uu, String result, String reason) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
-		System.out.println(uu);
-		System.out.println(result);
-		System.out.println(reason);
 		String aduitReslt = enterpriseService.audit(uu, result, reason);
 		map.put("aduit", aduitReslt);
-		if(aduitReslt.equals("ALLOW") || aduitReslt.equals("NOTALLOW")) {
+		if (aduitReslt.equals("ALLOW") || aduitReslt.equals("NOTALLOW")) {
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
 		}
 	}
-	
+
 	/**
 	 * 激活码验证激活
 	 */
 	@RequestMapping(value = "/activate", method = RequestMethod.POST)
-	public @ResponseBody
-	ResponseEntity<ModelMap> activateCheck(Long uu, String checkcode) {
+	public @ResponseBody ResponseEntity<ModelMap> activateCheck(Long uu, String checkcode) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
 		String checkReslt = enterpriseService.activateCheck(uu, checkcode);
 		map.put("result", checkReslt);
-		if(checkReslt.equals("SUCCESS")) {//验证通过
+		if (checkReslt.equals("SUCCESS")) {// 验证通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-		} else {//验证不通过
+		} else {// 验证不通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
 		}
 	}
-	
+
 	/**
 	 * 设置管理员账号密码
 	 */
 	@RequestMapping(value = "/setAdminPassword", method = RequestMethod.POST)
-	public @ResponseBody
-	ResponseEntity<ModelMap> setAdminPassword(Long enuu, String password) {
+	public @ResponseBody ResponseEntity<ModelMap> setAdminPassword(Long enuu, String password) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
 		String result = enterpriseService.setAdminPassword(enuu, password);
 		map.put("result", result);
-		if(result.equals("SUCCESS")) {//验证通过
+		if (result.equals("SUCCESS")) {// 验证通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-		} else {//验证不通过
+		} else {// 验证不通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
 		}
 	}
-	
+
 	/**
 	 * 重新发送激活邮件
 	 */
 	@RequestMapping(value = "/setEmailAgain", method = RequestMethod.GET)
-	public @ResponseBody
-	ResponseEntity<ModelMap> setActivateEmailAgain(Long enuu) {
+	public @ResponseBody ResponseEntity<ModelMap> setActivateEmailAgain(Long enuu) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
 		String result = enterpriseService.sendActivateEmail(enuu);
 		map.put("result", result);
-		if(result.equals("SUCCESS")) {//验证通过
+		if (result.equals("SUCCESS")) {// 验证通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-		} else {//验证不通过
+		} else {// 验证不通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
 		}
 	}
-	
+
 	/**
 	 * 手机号是否可用
+	 * 
 	 * @param tel
 	 * @return
 	 */
@@ -157,12 +156,12 @@ public class RegisterController {
 	public ResponseEntity<Boolean> telEnable(String tel) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text; charset=utf-8");
-		return new ResponseEntity<Boolean>(userService.isTelUseable(tel), 
-				headers, HttpStatus.OK);
+		return new ResponseEntity<Boolean>(userService.isTelUseable(tel), headers, HttpStatus.OK);
 	}
-	
+
 	/**
 	 * 邮箱地址是否可用
+	 * 
 	 * @param email
 	 * @return
 	 */
@@ -170,8 +169,7 @@ public class RegisterController {
 	public ResponseEntity<Boolean> emailEnable(String email) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text; charset=utf-8");
-		return new ResponseEntity<Boolean>(userService.isEmailUseable(email), 
-				headers, HttpStatus.OK);
+		return new ResponseEntity<Boolean>(userService.isEmailUseable(email), headers, HttpStatus.OK);
 	}
 
 }

src/main/java/com/uas/platform/b2b/model/PurchaseOrderReply.java

@@ -185,5 +185,9 @@ public class PurchaseOrderReply implements Serializable {
 	public String replyDescription() {
 		return "数量：" + this.qty + "，交期：" + DateFormatUtils.ISO_DATE_FORMAT.format(delivery);
 	}
+	
+	public static void main(String[] args) {
+		System.out.println(DateFormatUtils.ISO_DATE_FORMAT.format(new Date()));
+	}
 
 }

src/main/webapp/WEB-INF/spring/webmvc.xml

@@ -30,5 +30,4 @@
 	<mvc:view-controller path="/" view-name="index" />
 	<mvc:view-controller path="/signin" view-name="signin" />
 	<mvc:view-controller path="/storage" view-name="storage" />
-	<mvc:view-controller path="/signin/register" view-name="register" />
 </beans>

src/main/webapp/WEB-INF/views/normal/register.html

@@ -5,7 +5,7 @@
 <meta name="baidu-site-verification" content="S0kf5fz0uA" />
 <meta charset="utf-8">
 <title>优软商务平台</title>
-<base href="../" target="_blank" />
+<base target="_blank" />
 <meta name="keywords" content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,UBTOB.COM,USOFTCHINA.COM,优软">
 <meta name="description" content="优软商务平台，企业供销信息交流平台。">
 <link href="static/img/icon/u.png" rel="icon" type="image/x-icon" />

src/main/webapp/WEB-INF/views/normal/signin.html

@@ -23,7 +23,7 @@
 			</div>
 			<div class="navbar-right">
 				<p class="navbar-text">
-					第一次使用商务平台？ <a href="signin/register">立即注册</a>
+					第一次使用商务平台？ <a href="signup">立即注册</a>
 				</p>
 			</div>
 		</div>

src/main/webapp/resources/css/index.css

@@ -1153,4 +1153,108 @@ a {
 
 .base-info .content {
 	float: left;
+}
+
+.events {
+	position: relative;
+	margin: 5px 0 60px 148px;
+	padding-top: 40px;
+	width: 550px;
+}
+
+.events dd {
+  	position: relative;
+  	border-left: 1px solid #e1e3e6;
+  	padding-bottom: 45px;
+}
+
+.events dd:first-child {
+  	margin-top: -40px;
+  	padding-top: 40px;
+}
+
+.events dd:last-child {
+  padding-bottom: 0;
+  border-color: transparent;
+}
+
+.events dd .year,.events dd .date {
+  	position: absolute;
+  	left: -148px;
+  	top: 0;
+  	width: 120px;
+  	height: 25px;
+  	line-height: 25px;
+  	font-size: 16px;
+  	color: #333;
+  	text-align: right;
+}
+
+.events dd .year {
+	font-size: 24px;
+	color: #56a022;
+}
+
+.events dd .year .character {
+  	font-size: 16px;
+  	margin-left: 2px;
+}
+
+.events dd:first-child .year {
+  	margin-top: 40px;
+}
+
+.events dd .icon {
+  	position: absolute;
+  	left: -18px;
+  	top: -5px;
+  	border: 5px solid #fff;
+  	width: 35px;
+  	height: 35px;
+  	border-radius: 8px;
+  	text-align: center;
+  	background: #e5e5e5;
+}
+
+.events dd .icon.year-icon {
+	border-radius: 50%;
+}
+
+.events dd:first-child .icon {
+  	margin-top: 40px;
+}
+
+.events dd .icon i{
+	line-height: 25px;
+  	font-size: 16px;
+  	color: #c2c2c2;
+}
+
+.events dd .event {
+  	padding-top: 12px;
+}
+
+.events dd .event .event_tit-wrapper {
+  	height: 25px;
+  	line-height: 25px;
+  	font-size: 16px;
+  	border-top: 1px solid #e1e3e6;
+}
+
+.events dd .event .event_tit-wrapper .event_tit {
+  	position: relative;
+  	top: -13px;
+  	margin-left: 35px;
+  	padding-left: 5px;
+  	background: #fff;
+}
+
+.events dd .event .event_cnt {
+  	margin: -6px 0 0 40px;
+  	font-size: 14px;
+  	color: #999;
+}
+
+.events dd .event {
+  	padding-top: 12px;
 }

src/main/webapp/resources/js/register/registerApp.js

@@ -30,9 +30,8 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		$scope.register = function(){
 			$scope.loadingShow = true;
 			var file = $scope.myFiles[0];
-			console.log($scope.enterprise);
 			$upload.upload({
-				url: 'signin/register.action',
+				url: 'signup',
 				file: file,
 				method: 'POST',
 				data: {
@@ -49,7 +48,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		
 		$scope.$watch('enterprise.enBussinessCode', function(){
 			if($scope.enterprise.enBussinessCode && $scope.enterprise.enBussinessCode.length==15) {
-				$http.get('signin/codeEnable', {
+				$http.get('signup/codeEnable', {
 					params: {
 						code: $scope.enterprise.enBussinessCode
 					}
@@ -76,7 +75,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		
 		$scope.$watch('enterprise.enAdminTel', function(){
 			if($scope.enterprise.enAdminTel) {
-				$http.get('signin/telEnable', {
+				$http.get('signup/telEnable', {
 					params: {
 						tel: $scope.enterprise.enAdminTel
 					}
@@ -98,7 +97,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		});
 		$scope.$watch('enterprise.enAdminEmail', function(){
 			if($scope.enterprise.enAdminEmail) {
-				$http.get('signin/emailEnable', {
+				$http.get('signup/emailEnable', {
 					params: {
 						email: $scope.enterprise.enAdminEmail
 					}
@@ -169,7 +168,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		$scope.activateSendAgain = false;
 		
 		setTimeout(function() {//延迟5秒执行
-			$http.post('signin/activate?uu=' + $scope.uu + '&checkcode=' + $scope.checkcode)
+			$http.post('signup/activate?uu=' + $scope.uu + '&checkcode=' + $scope.checkcode)
 			.success(function(data){
 				$scope.checkResult = '成功';
 				$scope.activateResult = true;
@@ -185,7 +184,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		
 		$scope.setAdminPassword = function(enuu, psd) {
 			$scope.loadingShow = true;
-			$http.post('signin/setAdminPassword?enuu=' + enuu + '&password=' + psd).success(function(data){
+			$http.post('signup/setAdminPassword?enuu=' + enuu + '&password=' + psd).success(function(data){
 				$scope.loadingShow = false;
 				$scope.setSuccess = true;
 			}).error(function(data) {
@@ -196,7 +195,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		
 		$scope.sendEmailAgain = function(enuu){
 			$scope.loadingShow = true;
-			$http.get('signin/setEmailAgain?enuu=' + enuu).success(function(data){//发送失败
+			$http.get('signup/setEmailAgain?enuu=' + enuu).success(function(data){//发送失败
 				$scope.loadingShow = false;
 				$scope.emailDisabled = true;
 				$scope.sendSuccess = true;

src/main/webapp/resources/tpl/index/account/enterprise.html

@@ -88,4 +88,85 @@
 			</div>
 		</div>
 	</div>
+</div>
+<div class="pane base-info">
+	<div class="pane-header">成长历程</div>
+	<div class="pane-body">
+		<dl class="events">
+			<dd>
+				<div class="year">
+					2014<span class="character">年</span>
+				</div>
+				<div class="icon year-icon"></div>
+			</dd>
+			<dd>
+				<div class="date">
+					8月11日
+				</div>
+				<div class="icon">
+					<i class="fa fa-user"></i>
+				</div>
+				<div class="event">
+					<div class="event_tit-wrapper">
+						<div class="event_tit">
+							注册加入到优软商务平台
+						</div>
+					</div>
+				</div>
+			</dd>
+			<dd>
+				<div class="date">
+					8月15日
+				</div>
+				<div class="icon">
+					<i class="fa fa-phone"></i>
+				</div>
+				<div class="event">
+					<div class="event_tit-wrapper">
+						<div class="event_tit">
+							北宋皇帝宋太宗<a href="http://baike.baidu.com/view/8092.htm"
+								target="_blank">赵光义</a>逝世
+						</div>
+					</div>
+					<div class="event_cnt">
+						宋太宗赵光义（公元939年－公元997年），字廷宜，<a target="_blank"
+							href="/view/23604.htm">宋朝</a>的第二位皇帝。本名赵匡义，后因避其兄<a target="_blank"
+							href="/view/23700.htm">宋太祖</a>名讳改名赵光义，即位后又改...<a
+							href="http://baike.baidu.com/view/8092.htm" target="_blank">更多&gt;&gt;</a>
+					</div>
+				</div>
+			</dd>
+			<dd>
+				<div class="year">
+					2015<span class="character">年</span>
+				</div>
+				<div class="icon year-icon"></div>
+			</dd>
+			<dd>
+				<div class="date">
+					8月11日
+				</div>
+				<div class="icon">
+					<i class="fa fa-phone"></i>
+				</div>
+				<div class="event">
+					<div class="event_tit-wrapper">
+						<div class="event_tit">
+							北京奥运会奥林匹克圣火登上<a
+								href="http://baike.baidu.com/subview/2322/5098092.htm"
+								target="_blank">珠穆朗玛峰</a>
+						</div>
+					</div>
+					<div class="event_cnt">
+						<b>珠穆朗玛峰</b>（Qomolangma）简称珠峰，又意译作圣母峰，<a target="_blank"
+							href="/view/2173.htm">尼泊尔</a>称为萨加马塔峰，<a target="_blank"
+							href="/view/20007.htm">藏语</a>的“珠穆朗玛”意为“第三女神”。该峰位于<a
+							target="_blank" href="/view/61891.htm">中...</a><a
+							href="http://baike.baidu.com/subview/2322/5098092.htm"
+							target="_blank">更多&gt;&gt;</a>
+					</div>
+				</div>
+			</dd>
+		</dl>
+	</div>
 </div>