账户管理与店铺管理的企业信息同步

pom.xml

@@ -656,7 +656,7 @@
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.2</version>
 				<configuration>
-					<port>9090</port>
+					<port>8080</port>
 					<path>/platform-b2c</path>
 					<uriEncoding>utf-8</uriEncoding>
 				</configuration>

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -8,7 +8,9 @@ import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.fa.payment.utils.StringUtils;
+import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
+import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.sso.entity.ApplyUserSpaceView;
 import com.uas.sso.entity.UserSpaceDetail;
@@ -81,7 +83,11 @@ public class EnterpriseController {
 	 * @return
 	 */
 	@RequestMapping(value = "/{enuu}/info", method = RequestMethod.POST)
-	public Enterprise updateEnterprise(@PathVariable Long enuu , @RequestBody Enterprise enterprise) {
+	public Enterprise updateEnterprise(@PathVariable Long enuu, @RequestBody Enterprise enterprise) {
+		Enterprise enterpriseInfo = enterpriseService.getEnterpriseInfo(enuu);
+		if (enterpriseInfo.getEnAdminuu() == null) {
+			throw new IllegalArgumentException("企业数据异常,管理员缺失!");
+		}
 		enterprise = enterpriseService.save(enterprise);
 		SystemSession.getUser().setCurrentEnterprise(enterprise.getUu());
 		return enterprise;

src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -156,6 +156,12 @@ public class Enterprise implements Serializable {
 	@Column(name = "en_accesssecret")
 	private String accessSecret;
 
+	/**
+	 * 企业认证
+	 */
+	@Column(name = "en_validcode")
+	private Short enValidCode;
+
 	@Transient
 	private Integer receiptStatus;
 
@@ -345,6 +351,14 @@ public class Enterprise implements Serializable {
 		this.receiptStatus = receiptStatus;
 	}
 
+	public Short getEnValidCode() {
+		return enValidCode;
+	}
+
+	public void setEnValidCode(Short enValidCode) {
+		this.enValidCode = enValidCode;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;

src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java

@@ -33,6 +33,9 @@ public interface EnterpriseService {
 	 * @return
 	 */
 	public Enterprise save(Enterprise enterprise);
+
+
+
 	/**
 	 * 根据注册地址确定币别
 	 * @return

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -12,6 +12,9 @@ import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.logistics.dao.ReceiptDao;
 import com.uas.platform.b2c.logistics.model.Receipt;
+import com.uas.platform.b2c.prod.store.dao.StoreInDao;
+import com.uas.platform.b2c.prod.store.model.EnterpriseSimple;
+import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.b2c.trade.aftersale.model.ReturnFB2c;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
@@ -23,6 +26,7 @@ import com.uas.sso.entity.UserView;
 import com.uas.sso.util.AccountUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.hibernate.loader.custom.Return;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
@@ -43,11 +47,13 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 
 	@Autowired
 	private UserBaseInfoDao userBaseInfoDao;
+	@Autowired
+	private StoreInDao storeInDao;
+
 
-	
 	@Override
 	public Enterprise getEnterpriseInfo(Long uu) {
-		
+
 		return enterpriseDao.findByUu(uu);
 	}
 
@@ -116,6 +122,13 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	@Override
 	public Enterprise save(Enterprise enterprise) {
 		Enterprise existEnterprise = enterpriseDao.findOne(enterprise.getUu());
+		//更新店铺中的企业信息
+		List<StoreIn> storeIns = storeInDao.findByEnUU(enterprise.getUu());
+		for (StoreIn storeIn : storeIns) {
+            EnterpriseSimple enterpriseSimple = EnterpriseSimple.translateSimple(enterprise);
+			storeIn.setEnterprise(enterpriseSimple);
+			storeInDao.save(storeIn);
+		}
 		if (existEnterprise == null)
 			throw new IllegalArgumentException();
 		try {
@@ -127,6 +140,8 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		return enterpriseDao.save(enterprise);
 	}
 
+
+
 	private void postToAccountCenter(Enterprise enterprise) throws Exception {
 	/*	UserSpaceDetail detail = new UserSpaceDetail();
 		detail.setAddress(enterprise.getEnAddress());

src/main/webapp/resources/view/vendor/forstore/vendor_store.html

@@ -36,7 +36,7 @@
 			</div>
 			<div class="fr" style="width: 65%;">
 				<div style="text-align: left; font-size: 18px;margin-bottom: 15px;"><span>店铺名称：{{application.storeName}}</span></div>
-				<div style="text-align: left; font-size: 18px;margin-bottom: 15px;"><span>店铺简称：{{application.storeShortName}}</span></div>
+			<!--	<div style="text-align: left; font-size: 18px;margin-bottom: 15px;"><span>店铺简称：{{application.storeShortName}}</span></div>-->
 				<div style="text-align: left; font-size: 18px;margin-bottom: 15px;"><span>简介：</span></div>
 				<div style="text-align: left; font-size: 18px;margin-bottom: 15px;"><span>{{application.description}}</span></div>
 			</div>
@@ -52,10 +52,10 @@
 				<span class="fl">店铺名称<em>*</em></span>
 				<div class="fr"><input type="text" class="input01" ng-model="store.storeName" placeholder="店铺的名称"></div>
 			</li>
-			<li>
+			<!--<li>
 				<span class="fl">店铺简称</span>
 				<div class="fr"><input type="text" class="input01" ng-model="store.storeShortName" placeholder="店铺的名称"></div>
-			</li>
+			</li>-->
 			<li>
 				<span class="fl">店铺简介</span>
 				<div class="fr"><input type="text" ng-model="store.description" class="input01" placeholder="店铺的简介"></div>

src/main/webapp/resources/view/vendor/forstore/vendor_store_info.html

@@ -627,7 +627,7 @@
 					<span>店铺名称</span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" ng-change="changeInfo('STORESHORTNAME', storeShortName)" class="form-control" style="border-radius: inherit;" title="storeShortName" ng-model="storeShortName" maxlength="100"/>
+					<input type="text" ng-change="changeInfo('STORENAME', storeName)" class="form-control" style="border-radius: inherit;" title="storeName" ng-model="storeName" maxlength="100"/>
 				</div>
 			</div>
 			<div class="row com_row">

src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -683,10 +683,10 @@
 			</div>
 			<div class="row com_row" >
 				<div class="col-md-2 custom_col">
-					<span>店铺简称</span>
+					<span>店铺名称</span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" class="form-control" style="border-radius: inherit;" title="storeShortName" ng-model="sampleStore.storeShortName" maxlength="100"/>
+					<input type="text" class="form-control" style="border-radius: inherit;" title="storeName" ng-model="sampleStore.storeName" maxlength="100"/>
 				</div>
 			</div>
 			<!--<div class="row com_row" >