前端企业编辑和店铺资质保存排序

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

@@ -10,6 +10,9 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.fa.payment.utils.StringUtils;
+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.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserSpaceView;
 import org.apache.commons.collections.CollectionUtils;
@@ -30,6 +33,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 	@Autowired
     private UserDao userDao;
+    @Autowired
+	private StoreInDao storeInDao;
 
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
@@ -81,14 +86,22 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 adminUser = users.get(0);
             }
         }
-
         // 保存新注册企业与用户的关联关系
         if (adminUser != null) {
             adminUser.addEnterprise(newEn);
             userDao.save(adminUser);
         }
-
         if(oldenterprise != null && oldenterprise.getUu() != null) {
+            try {
+                List<StoreIn> storeIns = storeInDao.findByEnUU(enterprise.getUu());
+                if (storeIns != null && storeIns.size() > 0) {
+                    storeIns.get(0).setEnterprise(EnterpriseSimple.translateSimple(enterprise));
+                    storeIns.get(0).setStoreName(enterprise.getEnName());
+                    storeInDao.save(storeIns.get(0));
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         } else {
             logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);

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

@@ -89,6 +89,10 @@ public class StoreInFacadeImpl implements StoreInFacade {
 		}
 		store.setQualifications(qualifications);
         store = storeInDao.save(store);
+		Set<Qualification> qualificationsSort = storeInService.getQualificationsSort();
+		Set<Qualification> qualificationsPo= store.getQualifications();
+		qualificationsSort.addAll(qualificationsPo);
+		store.setQualifications(qualificationsSort);
 		return ResultMap.success(store);
 	}
 

src/main/java/com/uas/platform/b2c/prod/store/service/StoreInService.java

@@ -2,10 +2,7 @@ package com.uas.platform.b2c.prod.store.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.advertise.ad.model.StoreAdsType;
-import com.uas.platform.b2c.prod.store.model.StoreApply;
-import com.uas.platform.b2c.prod.store.model.StoreIn;
-import com.uas.platform.b2c.prod.store.model.StoreStatus;
-import com.uas.platform.b2c.prod.store.model.StoreType;
+import com.uas.platform.b2c.prod.store.model.*;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import org.springframework.data.domain.Page;
@@ -13,6 +10,7 @@ import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface StoreInService {
 
@@ -190,4 +188,13 @@ public interface StoreInService {
 	 * @return
 	 */
 	Map<String, JSONObject> getContactInfo(List<String> storeids);
+
+	/**
+	 * 给企业资质排序;
+	 * @param
+	 * @return
+	 */
+	Set<Qualification> getQualificationsSort();
+
+
 }

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreInServiceImpl.java

@@ -189,7 +189,7 @@ public class StoreInServiceImpl implements StoreInService {
 		}
 	}
 
-	private Set<Qualification> getQualificationsSort() {
+	public Set<Qualification> getQualificationsSort() {
 		return new TreeSet<Qualification>(new Comparator()
             {
                 public int compare(Object o1, Object o2) {

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

@@ -471,12 +471,7 @@
             <ul>
               <li>
                 <div class="fl">企业名称</div>
-                <div class="col-sm-10" ng-if="updateState"><input type="text" class="form-control"
-                                                                  title="企业全称"
-                                                                  ng-disabled=" !updateState"
-                                                                  ng-model="enterpriseInfo.enName"/>
-                </div>
-                <div class="fr" ng-if="!updateState"><span
+                <div class="fr"><span
                     ng-bind="enterpriseInfo.enName || '暂无信息'"></span>
                 </div>
               </li>
@@ -496,18 +491,14 @@
               </li>-->
               <li>
                 <div class="fl">营业执照号</div>
-                <div class="col-sm-10" ng-if="updateState"><input type="text" class="form-control"
-                                                                  title="营业执照号" disabled="disable"
-                                                                  ng-model="enterpriseInfo.enBussinessCode"/>
-                </div>
-                <div class="fr" ng-if="!updateState"><span
+                <div class="fr"><span
                     ng-bind="enterpriseInfo.enBussinessCode || '暂无信息'"></span></div>
               </li>
               <li>
                 <div class="fl">注册地址</div>
                 <div class="col-sm-10" ng-if="updateState"><input type="text" class="form-control"
                                                                   title="企业地址"
-                                                                  ng-disabled=" !updateState"
+                                                                  ng-disabled="enterpriseInfo.enValidCode == 2"
                                                                   ng-model="enterpriseInfo.enAddress"/>
                 </div>
                 <div class="fr" ng-if="!updateState"><span