同步企业密钥2

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreApplyFacadeImpl.java

@@ -116,9 +116,9 @@ public class StoreApplyFacadeImpl implements StoreApplyFacade {
 
 		storeApplyService.handlerApply(storeApply);
 		//自动确认开通店铺;
-	/*	if (StoreApply.ApplyStatus.PASS == status) {
+		if (StoreApply.ApplyStatus.PASS == status) {
 			this.autoConfirmOpenStore(uuid, storeApply);
-		}*/
+		}
 		return ResultMap.success(null);
 	}
 

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreInFacadeImpl.java

@@ -61,15 +61,12 @@ public class StoreInFacadeImpl implements StoreInFacade {
 		if (store == null) {
 			return new ResultMap(CodeType.ERROR_STATE, String.format("编号%s对应的店铺不存在", uuid));
 		}
-		store.setEnterpriseJson(newStoreInfo.getEnterpriseJson());
-		store.setEnterprise(newStoreInfo.getEnterprise());
+
 		ResultMap resultMap = setStoreInfoByKind(store, newStoreInfo, kind);
 		if (resultMap != null) {
 			return resultMap;
 		}
-
 		Set<Qualification> qualifications = store.getQualifications();
-
 		if (!CollectionUtils.isEmpty(qualifications)) {
 			Iterator<Qualification> iterator = qualifications.iterator();
 			while (iterator.hasNext()) {
@@ -81,22 +78,6 @@ public class StoreInFacadeImpl implements StoreInFacade {
 			}
 		}
 		store.setQualifications(qualifications);
-        Enterprise enterprise = enterpriseDao.findByUu(newStoreInfo.getEnterprise().getUu());
-        enterprise.setEnName(newStoreInfo.getEnterprise().getEnName());
-        enterprise.setEnShortname(newStoreInfo.getEnterprise().getEnShortname());
-        enterprise.setEnType(newStoreInfo.getEnterprise().getEnType());
-        enterprise.setEnAddress(newStoreInfo.getEnterprise().getEnAddress());
-        enterprise.setEnTel(newStoreInfo.getEnterprise().getEnTel());
-        enterprise.setEnFax(newStoreInfo.getEnterprise().getEnFax());
-        enterprise.setEnEmail(newStoreInfo.getEnterprise().getEnEmail());
-        enterprise.setEnBussinessCode(newStoreInfo.getEnterprise().getEnBusinessCode());
-        enterprise.setEnUrl(newStoreInfo.getEnterprise().getEnUrl());
-        enterprise.setEnPhone(newStoreInfo.getEnterprise().getEnPhone());
-        enterprise.setEnWeixin(newStoreInfo.getEnterprise().getEnWeixin());
-        enterprise.setEnQQ(newStoreInfo.getEnterprise().getEnQQ());
-        enterprise.setEnLogoUrl(newStoreInfo.getEnterprise().getEnLogoUrl());
-        enterprise.setEnDate(newStoreInfo.getEnterprise().getEnDate());
-        enterpriseDao.save(enterprise);
         store = storeInDao.save(store);
 		return ResultMap.success(store);
 	}
@@ -121,6 +102,9 @@ public class StoreInFacadeImpl implements StoreInFacade {
 			enterprise.setAddress(newStoreInfo.getEnterprise().getAddress());
 			enterprise.setEnTel(newStoreInfo.getEnterprise().getEnTel());
 			enterprise.setEnFax(newStoreInfo.getEnterprise().getEnFax());
+			enterprise.setEnQQ(newStoreInfo.getEnterprise().getEnQQ());
+			enterprise.setEnPhone(newStoreInfo.getEnterprise().getEnPhone());
+			enterprise.setEnWeixin(newStoreInfo.getEnterprise().getEnWeixin());
 			store.setEnterprise(enterprise);
 			return null;
 		}