Merge remote-tracking branch 'origin/feature/yc-mobile_maimai-0525' into feature/yc-mobile_maimai-0525

src/main/java/com/uas/platform/b2c/prod/store/model/EnterpriseSimple.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 
+import javax.persistence.Column;
 import java.util.Date;
 
 /**
@@ -93,6 +94,19 @@ public class EnterpriseSimple {
 	 */
 	private Date enDate;
 
+	/**
+	 * 企业简介
+	 */
+	private String description;
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
 	public EnterpriseSimple() {
 	}
 

src/main/java/com/uas/platform/b2c/prod/store/model/StoreIn.java

@@ -2,6 +2,8 @@ package com.uas.platform.b2c.prod.store.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.core.utils.JacksonUtils;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import org.springframework.util.StringUtils;
@@ -119,6 +121,10 @@ public class StoreIn implements Serializable {
 	@Column(name = "st_enuu")
 	private Long enUU;
 
+	@OneToOne(cascade = { CascadeType.REFRESH })
+	@JoinColumn(name = "st_enuu", insertable = false, updatable = false)
+	private Enterprise enterpriseInfo;
+
 	/**
 	 * 企业信息JSON
 	 */
@@ -174,6 +180,14 @@ public class StoreIn implements Serializable {
 	@Transient
 	private List<Goods> goodses;
 
+	public Enterprise getEnterpriseInfo() {
+		return enterpriseInfo;
+	}
+
+	public void setEnterpriseInfo(Enterprise enterpriseInfo) {
+		this.enterpriseInfo = enterpriseInfo;
+	}
+
 	public StoreIn() {
 	}
 
@@ -291,7 +305,9 @@ public class StoreIn implements Serializable {
 
 	public EnterpriseSimple getEnterprise() {
 		try {
-			return StringUtils.hasText(this.enterpriseJson) ? JacksonUtils.fromJson(this.enterpriseJson, EnterpriseSimple.class) : null;
+			this.enterprise = StringUtils.hasText(this.enterpriseJson) ? JacksonUtils.fromJson(this.enterpriseJson, EnterpriseSimple.class) : null;
+			this.enterprise.setDescription(this.enterpriseInfo.getDescription());
+			return this.enterprise;
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new EnterpriseSimple();

src/main/webapp/resources/js/vendor/app.js

@@ -688,7 +688,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 				$rootScope.applyStatus = 'NONE';
 			}
 
-			if ($rootScope.applyStatus === 'NONE' && $location.$$path === '/index') {
+			if ($location.$$path === '/index') {
                 AuthenticationService.getAuthentication().success(function (data) {
                     angular.forEach(data.enterprises, function (item) {
                         if (item.current) {
@@ -696,9 +696,13 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
                         }
                     });
                     $rootScope.userInfo = data;
-                    if (!(!data.pwdEnable || !data.haveUserQuestion||!data.emailValidCode || data.emailValidCode != 2)) {
-                        $state.go('vendor_store_apply');
-                    }
+					if ($rootScope.applyStatus === 'NONE') {
+						if (!(!data.pwdEnable || !data.haveUserQuestion||!data.emailValidCode || data.emailValidCode != 2)) {
+							$state.go('vendor_store_apply');
+						}
+					} else if ($rootScope.applyStatus === 'PASS') {
+						$state.go('vendor_store_maintain');
+					}
                 }).error(function (error) {
                     toaster.pop('error', '获取登录信息失败');
                 })