Merge branch 'dev-mysql' of ssh://10.10.100.21/source/platform-b2c into dev-mysql

pom.xml

@@ -73,11 +73,6 @@
 			<artifactId>b2c-erp-api</artifactId>
 			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.uas.api</groupId>
-			<artifactId>b2c-manage-api</artifactId>
-			<version>0.0.1</version>
-		</dependency>
 		<dependency>
 			<groupId>com.caucho</groupId>
 			<artifactId>hessian</artifactId>
@@ -408,12 +403,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.pinyin4j</groupId>
-            <artifactId>pinyin4j</artifactId>
-			<version>1.1.0</version>
-        </dependency>
         <!-- security -->
 		<dependency>
 			<groupId>org.springframework.security</groupId>
@@ -474,6 +463,12 @@
 			<artifactId>ps-entity</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.pinyin4j</groupId>
+			<artifactId>pinyin4j</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+
 		<!--Hutool POI工具类（对MS Office操作）-->
 		<!--<dependency>
 			<groupId>org.apache.poi</groupId>

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/core/utils/PinyinUtils.java

@@ -5,6 +5,7 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
 import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 
+
 /**
  * 拼音处理工具
  * Created by wangyc on 2017/3/22.

src/main/java/com/uas/platform/b2c/external/erp/product/util/ModelConverter.java

@@ -4,13 +4,14 @@ import com.uas.api.b2c_erp.baisc.model.*;
 import com.uas.api.b2c_erp.operation.model.OperationInfoUas;
 import com.uas.api.b2c_erp.seller.model.GoodsSimpleUas;
 import com.uas.api.b2c_erp.seller.model.Prod;
+import com.uas.api.b2c_erp.seller.model.ProductReplaceErp;
 import com.uas.api.domain.IPage;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.external.erp.product.model.OperationInfo;
 import com.uas.platform.b2c.prod.commodity.model.Product;
-import com.uas.platform.b2c.prod.commodity.model.ProductPrivate;
+import com.uas.platform.b2c.prod.commodity.model.ProductReplace;
 import com.uas.platform.b2c.prod.product.brand.modal.Brand;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandSubmit;
@@ -30,511 +31,556 @@ import java.util.*;
 
 /**
  * erp<==>商城对象转换类
+ *
  * @author suntg
  * @version 2017年8月2日19:48:50 wangyc 完善注释
  */
 public class ModelConverter {
 
-	/**
-	 * 将UAS品牌申请转换成brandSubmit
-	 * 
-	 * @param uas UAS品牌申请
-	 * @return 商城品牌申请
-	 */
-	public static BrandSubmit getBrandSubmit(BrandSubmitUas uas) {
-		BrandSubmit brandSubmit = new BrandSubmit();
-		brandSubmit.setId(uas.getId());
-		brandSubmit.setApplication(uas.getApplication());
-		brandSubmit.setAchievement(uas.getAchievement());
-		brandSubmit.setArea(uas.getArea());
-		brandSubmit.setBrief(uas.getBrief());
-		brandSubmit.setUrl(uas.getUrl());
-		brandSubmit.setLogoUrl(uas.getLogoUrl());
-		brandSubmit.setNameCn(uas.getNameCn());
-		brandSubmit.setNameEn(uas.getNameEn());
-		brandSubmit.setSeries(uas.getSeries());
-		brandSubmit.setVendor(uas.getVendor());
-		brandSubmit.setSource("来自接口");
-		brandSubmit.setImid(uas.getImid());
-		brandSubmit.setUuid(uas.getUuid());
-		brandSubmit.setVersion(uas.getVersion());
-		brandSubmit.setModifyenuu(uas.getModifyenuu());
-		brandSubmit.setModifyuu(uas.getModifyuu());
-		return brandSubmit;
-	}
+    /**
+     * 将UAS品牌申请转换成brandSubmit
+     *
+     * @param uas UAS品牌申请
+     * @return 商城品牌申请
+     */
+    public static BrandSubmit getBrandSubmit(BrandSubmitUas uas) {
+        BrandSubmit brandSubmit = new BrandSubmit();
+        brandSubmit.setId(uas.getId());
+        brandSubmit.setApplication(uas.getApplication());
+        brandSubmit.setAchievement(uas.getAchievement());
+        brandSubmit.setArea(uas.getArea());
+        brandSubmit.setBrief(uas.getBrief());
+        brandSubmit.setUrl(uas.getUrl());
+        brandSubmit.setLogoUrl(uas.getLogoUrl());
+        brandSubmit.setNameCn(uas.getNameCn());
+        brandSubmit.setNameEn(uas.getNameEn());
+        brandSubmit.setSeries(uas.getSeries());
+        brandSubmit.setVendor(uas.getVendor());
+        brandSubmit.setSource("来自接口");
+        brandSubmit.setImid(uas.getImid());
+        brandSubmit.setUuid(uas.getUuid());
+        brandSubmit.setVersion(uas.getVersion());
+        brandSubmit.setModifyenuu(uas.getModifyenuu());
+        brandSubmit.setModifyuu(uas.getModifyuu());
+        return brandSubmit;
+    }
 
-	/**
-	 * 属性值转换为uas属性申请
-	 * @param property 属性值
-	 * @return uas属性申请
-	 */
-	public static PropertySubmitUas convertUas(PropertyValue property) {
-		PropertySubmitUas uas = new PropertySubmitUas();
-		uas.setPropertyId(property.getPropertyid());
-		uas.setStringValue(property.getValue());
-		uas.setMax(property.getMax());
-		uas.setMin(property.getMin());
-		uas.setNumberic(property.getNumberic());
-		uas.setDetno(property.getDetno());
-		return uas;
-	}
+    /**
+     * 属性值转换为uas属性申请
+     *
+     * @param property 属性值
+     * @return uas属性申请
+     */
+    public static PropertySubmitUas convertUas(PropertyValue property) {
+        PropertySubmitUas uas = new PropertySubmitUas();
+        uas.setPropertyId(property.getPropertyid());
+        uas.setStringValue(property.getValue());
+        uas.setMax(property.getMax());
+        uas.setMin(property.getMin());
+        uas.setNumberic(property.getNumberic());
+        uas.setDetno(property.getDetno());
+        return uas;
+    }
 
-	/**
-	 * 品牌转换为uas品牌申请
-	 * @param brand 品牌
-	 * @return uas品牌申请
-	 */
-	public static BrandSubmitUas convertUas(Brand brand) {
-		BrandSubmitUas uas = new BrandSubmitUas();
-		uas.setId(brand.getId());
-		uas.setApplication(brand.getApplication());
-		uas.setAchievement(brand.getAchievement());
-		uas.setArea(brand.getArea());
-		uas.setBrief(brand.getBrief());
-		uas.setUrl(brand.getUrl());
-		uas.setLogoUrl(brand.getLogoUrl());
-		uas.setNameCn(brand.getNameCn());
-		uas.setNameEn(brand.getNameEn());
-		uas.setSeries(brand.getSeries());
-		uas.setUuid(brand.getUuid());
-		uas.setVendor(brand.getVendor());
-		uas.setVersion(brand.getVersion());
-		return uas;
-	}
+    /**
+     * 品牌转换为uas品牌申请
+     *
+     * @param brand 品牌
+     * @return uas品牌申请
+     */
+    public static BrandSubmitUas convertUas(Brand brand) {
+        BrandSubmitUas uas = new BrandSubmitUas();
+        uas.setId(brand.getId());
+        uas.setApplication(brand.getApplication());
+        uas.setAchievement(brand.getAchievement());
+        uas.setArea(brand.getArea());
+        uas.setBrief(brand.getBrief());
+        uas.setUrl(brand.getUrl());
+        uas.setLogoUrl(brand.getLogoUrl());
+        uas.setNameCn(brand.getNameCn());
+        uas.setNameEn(brand.getNameEn());
+        uas.setSeries(brand.getSeries());
+        uas.setUuid(brand.getUuid());
+        uas.setVendor(brand.getVendor());
+        uas.setVersion(brand.getVersion());
+        return uas;
+    }
 
-	/**
-	 * 器件信息转换为uas器件申请
-	 * @param component 器件信息
-	 * @return uas器件申请
-	 */
-	public static ComponentSubmitUas convertUas(Component component) {
-		ComponentSubmitUas uas = new ComponentSubmitUas();
-		uas.setUuid(component.getUuid());
-		uas.setAttach(component.getAttach());
-		uas.setUnit(component.getUnit());
-		uas.setWeight(component.getWeight());
-		uas.setCode(component.getCode());
-		uas.setBrandid(component.getBrandid());
-		uas.setKindid(component.getKindid());
-		uas.setDescription(component.getDescription());
-		uas.setImg(component.getImg());
-		uas.setPackaging(component.getEncapsulation());
-		uas.setVersion(component.getVersion());
-		uas.setBrandName(component.getBrand().getNameCn());
-		uas.setKindNameCn(component.getKind().getNameCn());
-		Set<PropertySubmitUas> uasProperties = new HashSet<PropertySubmitUas>();
-		for (PropertyValue property : component.getProperties()) {
-			PropertySubmitUas uasProperty = ModelConverter.convertUas(property);
-			uasProperties.add(uasProperty);
-		}
-		uas.setProperties(uasProperties);
-		return uas;
-	}
+    /**
+     * 器件信息转换为uas器件申请
+     *
+     * @param component 器件信息
+     * @return uas器件申请
+     */
+    public static ComponentSubmitUas convertUas(Component component) {
+        ComponentSubmitUas uas = new ComponentSubmitUas();
+        uas.setUuid(component.getUuid());
+        uas.setAttach(component.getAttach());
+        uas.setUnit(component.getUnit());
+        uas.setWeight(component.getWeight());
+        uas.setCode(component.getCode());
+        uas.setBrandid(component.getBrandid());
+        uas.setKindid(component.getKindid());
+        uas.setDescription(component.getDescription());
+        uas.setImg(component.getImg());
+        uas.setPackaging(component.getEncapsulation());
+        uas.setVersion(component.getVersion());
+        uas.setBrandName(component.getBrand().getNameCn());
+        uas.setKindNameCn(component.getKind().getNameCn());
+        Set<PropertySubmitUas> uasProperties = new HashSet<PropertySubmitUas>();
+        for (PropertyValue property : component.getProperties()) {
+            PropertySubmitUas uasProperty = ModelConverter.convertUas(property);
+            uasProperties.add(uasProperty);
+        }
+        uas.setProperties(uasProperties);
+        return uas;
+    }
 
-	/**
-	 * uas器件申请转换为商城器件申请
-	 * @param uas uas器件申请
-	 * @return 商城器件申请
-	 */
-	public static ComponentSubmit getComponentSubmit(ComponentSubmitUas uas) {
-		ComponentSubmit componentSubmit = new ComponentSubmit();
-		componentSubmit.setId(uas.getId());
-		componentSubmit.setCode(uas.getCode());
-		componentSubmit.setEncapsulation(uas.getPackaging());
-		componentSubmit.setKindid(uas.getKindid());
-		componentSubmit.setKindName(uas.getKindNameCn());
-		componentSubmit.setBrandid(uas.getBrandid());
-		componentSubmit.setBrandName(uas.getBrandName());
-		componentSubmit.setUuid(uas.getUuid());
-		componentSubmit.setVersion(uas.getVersion());
-		componentSubmit.setImg(uas.getImg());
-		componentSubmit.setDescription(uas.getDescription());
-		componentSubmit.setImid(uas.getImid());
-		componentSubmit.setWeight(uas.getWeight());
-		componentSubmit.setUnit(uas.getUnit());
-		componentSubmit.setAttach(uas.getAttach());
-		componentSubmit.setSource("来自接口");
-		componentSubmit.setModifyenuu(uas.getModifyenuu());
-		componentSubmit.setModifyuu(uas.getModifyuu());
-		Set<PropertySubmitUas> propertiesUas = uas.getProperties();
-		Set<PropertyValueSubmit> properties = new HashSet<PropertyValueSubmit>();
-		for (PropertySubmitUas propertyUas : propertiesUas) {
-			PropertyValueSubmit property = new PropertyValueSubmit();
-			property.setPropertyid(propertyUas.getPropertyId());
-			property.setDetno(propertyUas.getDetno());
-			property.setStringValue(propertyUas.getStringValue());
-			property.setNumberic(propertyUas.getNumberic());
-			property.setUnit(propertyUas.getUnit());
-			property.setMin(propertyUas.getMin());
-			property.setMax(propertyUas.getMax());
-			properties.add(property);
-		}
-		componentSubmit.setProperties(properties);
-		return componentSubmit;
-	}
+    /**
+     * uas器件申请转换为商城器件申请
+     *
+     * @param uas uas器件申请
+     * @return 商城器件申请
+     */
+    public static ComponentSubmit getComponentSubmit(ComponentSubmitUas uas) {
+        ComponentSubmit componentSubmit = new ComponentSubmit();
+        componentSubmit.setId(uas.getId());
+        componentSubmit.setCode(uas.getCode());
+        componentSubmit.setEncapsulation(uas.getPackaging());
+        componentSubmit.setKindid(uas.getKindid());
+        componentSubmit.setKindName(uas.getKindNameCn());
+        componentSubmit.setBrandid(uas.getBrandid());
+        componentSubmit.setBrandName(uas.getBrandName());
+        componentSubmit.setUuid(uas.getUuid());
+        componentSubmit.setVersion(uas.getVersion());
+        componentSubmit.setImg(uas.getImg());
+        componentSubmit.setDescription(uas.getDescription());
+        componentSubmit.setImid(uas.getImid());
+        componentSubmit.setWeight(uas.getWeight());
+        componentSubmit.setUnit(uas.getUnit());
+        componentSubmit.setAttach(uas.getAttach());
+        componentSubmit.setSource("来自接口");
+        componentSubmit.setModifyenuu(uas.getModifyenuu());
+        componentSubmit.setModifyuu(uas.getModifyuu());
+        Set<PropertySubmitUas> propertiesUas = uas.getProperties();
+        Set<PropertyValueSubmit> properties = new HashSet<PropertyValueSubmit>();
+        for (PropertySubmitUas propertyUas : propertiesUas) {
+            PropertyValueSubmit property = new PropertyValueSubmit();
+            property.setPropertyid(propertyUas.getPropertyId());
+            property.setDetno(propertyUas.getDetno());
+            property.setStringValue(propertyUas.getStringValue());
+            property.setNumberic(propertyUas.getNumberic());
+            property.setUnit(propertyUas.getUnit());
+            property.setMin(propertyUas.getMin());
+            property.setMax(propertyUas.getMax());
+            properties.add(property);
+        }
+        componentSubmit.setProperties(properties);
+        return componentSubmit;
+    }
 
-	/**
-	 * 商城器件申请转换为uas器件申请
-	 * @param componentSubmit 商城器件申请
-	 * @return uas器件申请
-	 */
-	public static ComponentSubmitUasInfo convertUasInfo(ComponentSubmit componentSubmit) {
-		ComponentSubmitUasInfo uas = new ComponentSubmitUasInfo();
-		uas.setId(componentSubmit.getId());
-		uas.setUuid(componentSubmit.getUuid());
-		uas.setCode(componentSubmit.getCode());
-		uas.setKindid(componentSubmit.getKindid());
-		uas.setBrandid(componentSubmit.getBrandid());
-		uas.setImg(componentSubmit.getImg());
-		uas.setStatus(componentSubmit.getStatus());
-		uas.setAuditOpinion(componentSubmit.getAuditOpinion());
-		return uas;
-	}
+    /**
+     * 商城器件申请转换为uas器件申请
+     *
+     * @param componentSubmit 商城器件申请
+     * @return uas器件申请
+     */
+    public static ComponentSubmitUasInfo convertUasInfo(ComponentSubmit componentSubmit) {
+        ComponentSubmitUasInfo uas = new ComponentSubmitUasInfo();
+        uas.setId(componentSubmit.getId());
+        uas.setUuid(componentSubmit.getUuid());
+        uas.setCode(componentSubmit.getCode());
+        uas.setKindid(componentSubmit.getKindid());
+        uas.setBrandid(componentSubmit.getBrandid());
+        uas.setImg(componentSubmit.getImg());
+        uas.setStatus(componentSubmit.getStatus());
+        uas.setAuditOpinion(componentSubmit.getAuditOpinion());
+        return uas;
+    }
 
-	/**
-	 * 商城器件申请转换为uas器件申请
-	 * @param componentSubmit 商城器件申请
-	 * @return uas器件申请
-	 */
-	public static ComponentSubmitUas convertUas(ComponentSubmit componentSubmit) {
-		ComponentSubmitUas uas = new ComponentSubmitUas();
-		uas.setId(componentSubmit.getId());
-		uas.setUuid(componentSubmit.getUuid());
-		uas.setStatus(componentSubmit.getStatus());
-		uas.setCode(componentSubmit.getCode());
-		uas.setVersion(componentSubmit.getVersion());
-		uas.setPackaging(componentSubmit.getEncapsulation());
-		uas.setBrandid(componentSubmit.getBrandid());
-		uas.setKindid(componentSubmit.getKindid());
-		uas.setImid(componentSubmit.getImid());
-		uas.setImg(componentSubmit.getImg());
-		uas.setWeight(componentSubmit.getWeight());
-		uas.setUnit(componentSubmit.getUnit());
-		uas.setAttach(componentSubmit.getAttach());
-		uas.setDescription(componentSubmit.getDescription());
-		uas.setModifyenuu(componentSubmit.getModifyenuu());
-		uas.setModifyuu(componentSubmit.getModifyuu());
-		Set<PropertySubmitUas> propertiesUas = new HashSet<PropertySubmitUas>();
-		for (PropertyValueSubmit property : componentSubmit.getProperties()) {
-			PropertySubmitUas propertyUas = new PropertySubmitUas();
-			propertyUas.setPropertyId(property.getPropertyid());
-			propertyUas.setDetno(property.getDetno());
-			propertyUas.setStringValue(property.getStringValue());
-			propertyUas.setPropertyName(property.getProperty().getLabelCn());
-			propertyUas.setNumberic(property.getNumberic());
-			propertyUas.setMin(property.getMin());
-			propertyUas.setMax(property.getMax());
-			propertyUas.setUnit(property.getUnit());
-			propertiesUas.add(propertyUas);
-		}
-		uas.setProperties(propertiesUas);
-		return uas;
-	}
+    /**
+     * 商城器件申请转换为uas器件申请
+     *
+     * @param componentSubmit 商城器件申请
+     * @return uas器件申请
+     */
+    public static ComponentSubmitUas convertUas(ComponentSubmit componentSubmit) {
+        ComponentSubmitUas uas = new ComponentSubmitUas();
+        uas.setId(componentSubmit.getId());
+        uas.setUuid(componentSubmit.getUuid());
+        uas.setStatus(componentSubmit.getStatus());
+        uas.setCode(componentSubmit.getCode());
+        uas.setVersion(componentSubmit.getVersion());
+        uas.setPackaging(componentSubmit.getEncapsulation());
+        uas.setBrandid(componentSubmit.getBrandid());
+        uas.setKindid(componentSubmit.getKindid());
+        uas.setImid(componentSubmit.getImid());
+        uas.setImg(componentSubmit.getImg());
+        uas.setWeight(componentSubmit.getWeight());
+        uas.setUnit(componentSubmit.getUnit());
+        uas.setAttach(componentSubmit.getAttach());
+        uas.setDescription(componentSubmit.getDescription());
+        uas.setModifyenuu(componentSubmit.getModifyenuu());
+        uas.setModifyuu(componentSubmit.getModifyuu());
+        Set<PropertySubmitUas> propertiesUas = new HashSet<PropertySubmitUas>();
+        for (PropertyValueSubmit property : componentSubmit.getProperties()) {
+            PropertySubmitUas propertyUas = new PropertySubmitUas();
+            propertyUas.setPropertyId(property.getPropertyid());
+            propertyUas.setDetno(property.getDetno());
+            propertyUas.setStringValue(property.getStringValue());
+            propertyUas.setPropertyName(property.getProperty().getLabelCn());
+            propertyUas.setNumberic(property.getNumberic());
+            propertyUas.setMin(property.getMin());
+            propertyUas.setMax(property.getMax());
+            propertyUas.setUnit(property.getUnit());
+            propertiesUas.add(propertyUas);
+        }
+        uas.setProperties(propertiesUas);
+        return uas;
+    }
 
-	/**
-	 * 将brandSubmit转换此UAS品牌申请
-	 * 
-	 * @param brandSubmit 商城品牌申请
-	 * @return uas品牌申请
-	 */
-	public static BrandSubmitUas convertUas(BrandSubmit brandSubmit) {
-		BrandSubmitUas uas = new BrandSubmitUas();
-		uas.setId(brandSubmit.getId());
-		uas.setUuid(brandSubmit.getUuid());
-		uas.setApplication(brandSubmit.getApplication());
-		uas.setAchievement(brandSubmit.getAchievement());
-		uas.setArea(brandSubmit.getArea());
-		uas.setBrief(brandSubmit.getBrief());
-		uas.setUrl(brandSubmit.getUrl());
-		uas.setLogoUrl(brandSubmit.getLogoUrl());
-		uas.setNameCn(brandSubmit.getNameCn());
-		uas.setNameEn(brandSubmit.getNameEn());
-		uas.setSeries(brandSubmit.getSeries());
-		uas.setVendor(brandSubmit.getVendor());
-		uas.setStatus(brandSubmit.getStatus());
-		uas.setAuditOpinion(brandSubmit.getAuditOpinion());
-		uas.setImid(brandSubmit.getImid());
-		uas.setUuid(brandSubmit.getUuid());
-		uas.setVersion(brandSubmit.getVersion());
-		uas.setModifyenuu(brandSubmit.getModifyenuu());
-		uas.setModifyuu(brandSubmit.getModifyuu());
-		return uas;
-	}
+    /**
+     * 将brandSubmit转换此UAS品牌申请
+     *
+     * @param brandSubmit 商城品牌申请
+     * @return uas品牌申请
+     */
+    public static BrandSubmitUas convertUas(BrandSubmit brandSubmit) {
+        BrandSubmitUas uas = new BrandSubmitUas();
+        uas.setId(brandSubmit.getId());
+        uas.setUuid(brandSubmit.getUuid());
+        uas.setApplication(brandSubmit.getApplication());
+        uas.setAchievement(brandSubmit.getAchievement());
+        uas.setArea(brandSubmit.getArea());
+        uas.setBrief(brandSubmit.getBrief());
+        uas.setUrl(brandSubmit.getUrl());
+        uas.setLogoUrl(brandSubmit.getLogoUrl());
+        uas.setNameCn(brandSubmit.getNameCn());
+        uas.setNameEn(brandSubmit.getNameEn());
+        uas.setSeries(brandSubmit.getSeries());
+        uas.setVendor(brandSubmit.getVendor());
+        uas.setStatus(brandSubmit.getStatus());
+        uas.setAuditOpinion(brandSubmit.getAuditOpinion());
+        uas.setImid(brandSubmit.getImid());
+        uas.setUuid(brandSubmit.getUuid());
+        uas.setVersion(brandSubmit.getVersion());
+        uas.setModifyenuu(brandSubmit.getModifyenuu());
+        uas.setModifyuu(brandSubmit.getModifyuu());
+        return uas;
+    }
 
-	/**
-	 * 商城品牌申请转换为uas简易品牌申请
-	 * @param brandSubmit 商城品牌
-	 * @return uas简易品牌申请
-	 */
-	public static BrandSubmitUasInfo covertUas(BrandSubmit brandSubmit) {
-		BrandSubmitUasInfo info = new BrandSubmitUasInfo();
-		info.setId(brandSubmit.getId());
-		info.setArea(brandSubmit.getArea());
-		info.setAuditOpinion(brandSubmit.getAuditOpinion());
-		info.setImid(brandSubmit.getImid());
-		info.setLogoUrl(brandSubmit.getLogoUrl());
-		info.setNameCn(brandSubmit.getNameCn());
-		info.setNameEn(brandSubmit.getNameEn());
-		info.setStatus(brandSubmit.getStatus());
-		info.setUuid(brandSubmit.getUuid());
-		info.setVendor(brandSubmit.getVendor());
-		return info;
-	}
+    /**
+     * 商城品牌申请转换为uas简易品牌申请
+     *
+     * @param brandSubmit 商城品牌
+     * @return uas简易品牌申请
+     */
+    public static BrandSubmitUasInfo covertUas(BrandSubmit brandSubmit) {
+        BrandSubmitUasInfo info = new BrandSubmitUasInfo();
+        info.setId(brandSubmit.getId());
+        info.setArea(brandSubmit.getArea());
+        info.setAuditOpinion(brandSubmit.getAuditOpinion());
+        info.setImid(brandSubmit.getImid());
+        info.setLogoUrl(brandSubmit.getLogoUrl());
+        info.setNameCn(brandSubmit.getNameCn());
+        info.setNameEn(brandSubmit.getNameEn());
+        info.setStatus(brandSubmit.getStatus());
+        info.setUuid(brandSubmit.getUuid());
+        info.setVendor(brandSubmit.getVendor());
+        return info;
+    }
 
-	/**
-	 * 商城产品批次信息转换为uas批次简易信息
-	 * @param simle  商城产品批次信息
-	 * @return uas批次简易信息
-	 */
-	public static GoodsSimpleUas convertUas(ComponentGoods simle) {
-		GoodsSimpleUas uas = new GoodsSimpleUas();
-		uas.setCode(simle.getCode());
-		uas.setUnit(simle.getUnit());
-		uas.setBatchCode(simle.getBatchCode());
-		uas.setMinBuyQty(simle.getMinBuyQty());
-		uas.setMinPackQty(simle.getMinPackQty());
-		uas.setOriginal(simle.getOriginal());
-		uas.setCurrencyName(simle.getCurrencyName());
-		uas.setQtyPrice(simle.getQtyPrice());
-		uas.setPackaging(simle.getPackaging());
-		uas.setProduceDate(simle.getProduceDate());
-		uas.setReserve(simle.getReserve());
-		uas.setB2cDeliveryHKMaxTime(simle.getB2cMaxDelivery());
-		uas.setB2cDeliveryHKMinTime(simle.getB2cMinDelivery());
-		uas.setB2cDeliveryDemMaxTime(simle.getB2cMaxDelivery());
-		uas.setB2cDeliveryDemMinTime(simle.getB2cMinDelivery());
-		uas.setSampleQty(simle.getSampleQty());
-		uas.setUuid(simle.getUuid());
-		return uas;
-	}
+    /**
+     * 商城产品批次信息转换为uas批次简易信息
+     *
+     * @param simle 商城产品批次信息
+     * @return uas批次简易信息
+     */
+    public static GoodsSimpleUas convertUas(ComponentGoods simle) {
+        GoodsSimpleUas uas = new GoodsSimpleUas();
+        uas.setCode(simle.getCode());
+        uas.setUnit(simle.getUnit());
+        uas.setBatchCode(simle.getBatchCode());
+        uas.setMinBuyQty(simle.getMinBuyQty());
+        uas.setMinPackQty(simle.getMinPackQty());
+        uas.setOriginal(simle.getOriginal());
+        uas.setCurrencyName(simle.getCurrencyName());
+        uas.setQtyPrice(simle.getQtyPrice());
+        uas.setPackaging(simle.getPackaging());
+        uas.setProduceDate(simle.getProduceDate());
+        uas.setReserve(simle.getReserve());
+        uas.setB2cDeliveryHKMaxTime(simle.getB2cMaxDelivery());
+        uas.setB2cDeliveryHKMinTime(simle.getB2cMinDelivery());
+        uas.setB2cDeliveryDemMaxTime(simle.getB2cMaxDelivery());
+        uas.setB2cDeliveryDemMinTime(simle.getB2cMinDelivery());
+        uas.setSampleQty(simle.getSampleQty());
+        uas.setUuid(simle.getUuid());
+        return uas;
+    }
 
-	/**
-	 * 商城类目转换为uas类目信息
-	 * @param kind 商城类目
-	 * @return uas类目信息
-	 */
-	public static KindUas convertUas(Kind kind) {
-		KindUas uas = new KindUas();
-		uas.setComponentPrefix(kind.getComponentPrefix());
-		uas.setComponentsuffix(kind.getComponentsuffix());
-		uas.setCount(kind.getCount());
-		uas.setDetno(kind.getDetno());
-		uas.setId(kind.getId());
-		uas.setIsLeaf(kind.getIsLeaf());
-		uas.setLevel(kind.getLevel());
-		uas.setNameCn(kind.getNameCn());
-		uas.setNameEn(kind.getNameEn());
-		uas.setParentid(kind.getParentid());
-		return uas;
-	}
+    /**
+     * 商城类目转换为uas类目信息
+     *
+     * @param kind 商城类目
+     * @return uas类目信息
+     */
+    public static KindUas convertUas(Kind kind) {
+        KindUas uas = new KindUas();
+        uas.setComponentPrefix(kind.getComponentPrefix());
+        uas.setComponentsuffix(kind.getComponentsuffix());
+        uas.setCount(kind.getCount());
+        uas.setDetno(kind.getDetno());
+        uas.setId(kind.getId());
+        uas.setIsLeaf(kind.getIsLeaf());
+        uas.setLevel(kind.getLevel());
+        uas.setNameCn(kind.getNameCn());
+        uas.setNameEn(kind.getNameEn());
+        uas.setParentid(kind.getParentid());
+        return uas;
+    }
 
-	/**
-	 * 商城器件简易信息转换为uas器件简易信息
-	 * @param info 商城器件简易信息
-	 * @return uas器件简易信息
-	 */
-	public static ComponentInfoUas convertUas(ComponentInfo info) {
-		ComponentInfoUas uas = new ComponentInfoUas();
-		uas.setAttach(info.getAttach());
-		uas.setBrandid(info.getBrandid());
-		uas.setCode(info.getCode());
-		uas.setInactionStockQty(info.getInactionStockQty());
-		// uas.setWastageQty(info.getWastageQty());
-		uas.setId(info.getId());
-		uas.setImg(info.getImg());
-		uas.setKindid(info.getKindid());
-		uas.setMaxDelivery(info.getMaxDelivery());
-		uas.setMinBuyQty(info.getMinBuyQty());
-		uas.setMinDelivery(info.getMinDelivery());
-		uas.setMinPrice(info.getMinPrice());
-		uas.setMaxPrice(info.getMaxPrice());
-		uas.setOrderNumber(info.getOrderNumber());
-		uas.setOrderQty(info.getOrderQty());
-		uas.setOriginalQty(info.getOriginalQty());
-		uas.setPackaging(info.getEncapsulation());
-		uas.setReserve(info.getReserve());
-		uas.setReserveType(info.getReserveType());
-		uas.setSampleQty(info.getSampleQty());
-		uas.setSpec(info.getEncapsulation());
-		uas.setUnit(info.getUnit());
-		uas.setUuid(info.getUuid());
-		uas.setVersion(info.getVersion());
-		uas.setWeight(info.getWeight());
-		if (info.getBrand() != null) {
-			uas.setBrand(convertUas(info.getBrand()));
-		}
-		return uas;
-	}
+    /**
+     * 商城器件简易信息转换为uas器件简易信息
+     *
+     * @param info 商城器件简易信息
+     * @return uas器件简易信息
+     */
+    public static ComponentInfoUas convertUas(ComponentInfo info) {
+        ComponentInfoUas uas = new ComponentInfoUas();
+        uas.setAttach(info.getAttach());
+        uas.setBrandid(info.getBrandid());
+        uas.setCode(info.getCode());
+        uas.setInactionStockQty(info.getInactionStockQty());
+        // uas.setWastageQty(info.getWastageQty());
+        uas.setId(info.getId());
+        uas.setImg(info.getImg());
+        uas.setKindid(info.getKindid());
+        uas.setMaxDelivery(info.getMaxDelivery());
+        uas.setMinBuyQty(info.getMinBuyQty());
+        uas.setMinDelivery(info.getMinDelivery());
+        uas.setMinPrice(info.getMinPrice());
+        uas.setMaxPrice(info.getMaxPrice());
+        uas.setOrderNumber(info.getOrderNumber());
+        uas.setOrderQty(info.getOrderQty());
+        uas.setOriginalQty(info.getOriginalQty());
+        uas.setPackaging(info.getEncapsulation());
+        uas.setReserve(info.getReserve());
+        uas.setReserveType(info.getReserveType());
+        uas.setSampleQty(info.getSampleQty());
+        uas.setSpec(info.getEncapsulation());
+        uas.setUnit(info.getUnit());
+        uas.setUuid(info.getUuid());
+        uas.setVersion(info.getVersion());
+        uas.setWeight(info.getWeight());
+        if (info.getBrand() != null) {
+            uas.setBrand(convertUas(info.getBrand()));
+        }
+        return uas;
+    }
 
-	/**
-	 * 商城品牌简易信息转换为uas品牌简易信息
-	 * @param info 商城品牌简易信息
-	 * @return uas品牌简易信息
-	 */
-	public static BrandInfoUas convertUas(BrandInfo info) {
-		BrandInfoUas uas = new BrandInfoUas();
-		uas.setId(info.getId());
-		uas.setLogoUrl(info.getLogoUrl());
-		uas.setNameCn(info.getNameCn());
-		uas.setNameEn(info.getNameEn());
-		uas.setUuid(info.getUuid());
-		uas.setVersion(info.getVersion());
-		uas.setVenodr(info.getVendor());
-		uas.setWeight(info.getWeight());
-		return uas;
-	}
+    /**
+     * 商城品牌简易信息转换为uas品牌简易信息
+     *
+     * @param info 商城品牌简易信息
+     * @return uas品牌简易信息
+     */
+    public static BrandInfoUas convertUas(BrandInfo info) {
+        BrandInfoUas uas = new BrandInfoUas();
+        uas.setId(info.getId());
+        uas.setLogoUrl(info.getLogoUrl());
+        uas.setNameCn(info.getNameCn());
+        uas.setNameEn(info.getNameEn());
+        uas.setUuid(info.getUuid());
+        uas.setVersion(info.getVersion());
+        uas.setVenodr(info.getVendor());
+        uas.setWeight(info.getWeight());
+        return uas;
+    }
 
-	/**
-	 * 分页转换
-	 * @param page
-	 * @param <T>
-	 * @return
-	 */
-	public static <T> IPage<T> convertPage(final Page<T> page) {
-		IPage<T> iPage = new IPage<>();
-		iPage.setContent(page.getContent());
-		iPage.setFirst(page.isFirst());
-		iPage.setLast(page.isLast());
-		iPage.setNumber(page.getNumber());
-		iPage.setNumberOfElements(page.getNumberOfElements());
-		iPage.setSize(page.getSize());
-		iPage.setTotalElements(page.getTotalElements());
-		return iPage;
-	}
+    /**
+     * 分页转换
+     *
+     * @param page
+     * @param <T>
+     * @return
+     */
+    public static <T> IPage<T> convertPage(final Page<T> page) {
+        IPage<T> iPage = new IPage<>();
+        iPage.setContent(page.getContent());
+        iPage.setFirst(page.isFirst());
+        iPage.setLast(page.isLast());
+        iPage.setNumber(page.getNumber());
+        iPage.setNumberOfElements(page.getNumberOfElements());
+        iPage.setSize(page.getSize());
+        iPage.setTotalElements(page.getTotalElements());
+        return iPage;
+    }
 
-	/**
-	 * 商城属性信息转换为uas属性信息
-	 * @param property 商城属性信息
-	 * @return uas属性信息
-	 */
-	public static PropertyUas convertUas(Property property) {
-		PropertyUas propertyUas = new PropertyUas();
-		propertyUas.setId(property.getId());
-		propertyUas.setLabelCn(property.getLabelCn());
-		propertyUas.setLabelEn(property.getLabelEn());
-		return propertyUas;
-	}
+    /**
+     * 商城属性信息转换为uas属性信息
+     *
+     * @param property 商城属性信息
+     * @return uas属性信息
+     */
+    public static PropertyUas convertUas(Property property) {
+        PropertyUas propertyUas = new PropertyUas();
+        propertyUas.setId(property.getId());
+        propertyUas.setLabelCn(property.getLabelCn());
+        propertyUas.setLabelEn(property.getLabelEn());
+        return propertyUas;
+    }
 
-	/**
-	 * 商城标准参数信息转换为uas标准参数信息
-	 * @param kindProperty 商城标准参数信息
-	 * @return uas标准参数信息
-	 */
-	public static KindPropertyUas convertUas(KindProperty kindProperty) {
-		KindPropertyUas kindPropertyUas = new KindPropertyUas();
-		kindPropertyUas.setId(kindProperty.getId());
-		kindPropertyUas.setDetno(kindProperty.getDetno());
-		kindPropertyUas.setKindId(kindProperty.getKindId());
-		kindPropertyUas.setPropertyId(kindProperty.getPropertyId());
-		kindPropertyUas.setType(kindProperty.getType());
-		kindPropertyUas.setUnit(kindProperty.getUnit());
-		kindPropertyUas.setProperty(convertUas(kindProperty.getProperty()));
-		// 所有可能值
-		if ("A".equals(kindProperty.getType()) && !CollectionUtils.isEmpty(kindProperty.getValues())) {
-			List<String> values = new ArrayList<String>();
-			int i = 0;
-			for (KindPropertyValues value : kindProperty.getValues()) {
-				i++;
-				if (i > 50)
-					break;
-				values.add(value.getValue());
-			}
-			kindPropertyUas.setValues(values);
-		}
-		// 所有单位
-		if (!CollectionUtils.isEmpty(kindProperty.getMultiUnits())) {
-			List<KindPropertyUnitUas> kindPropertyUnitUas = new ArrayList<KindPropertyUnitUas>();
-			for (KindPropertyUnit kindPropertyUnit : kindProperty.getMultiUnits()) {
-				kindPropertyUnitUas.add(convertUas(kindPropertyUnit));
-			}
-			kindPropertyUas.setMultiUnits(kindPropertyUnitUas);
-		}
-		// 所有可选项
-		if (!CollectionUtils.isEmpty(kindProperty.getOptions())) {
-			List<KindPropertyOptionUas> kindPropertyOptionUas = new ArrayList<KindPropertyOptionUas>();
-			for (KindPropertyOption kindPropertyOption : kindProperty.getOptions()) {
-				kindPropertyOptionUas.add(convertUas(kindPropertyOption));
-			}
-			kindPropertyUas.setOptions(kindPropertyOptionUas);
-		}
-		return kindPropertyUas;
-	}
+    /**
+     * 商城标准参数信息转换为uas标准参数信息
+     *
+     * @param kindProperty 商城标准参数信息
+     * @return uas标准参数信息
+     */
+    public static KindPropertyUas convertUas(KindProperty kindProperty) {
+        KindPropertyUas kindPropertyUas = new KindPropertyUas();
+        kindPropertyUas.setId(kindProperty.getId());
+        kindPropertyUas.setDetno(kindProperty.getDetno());
+        kindPropertyUas.setKindId(kindProperty.getKindId());
+        kindPropertyUas.setPropertyId(kindProperty.getPropertyId());
+        kindPropertyUas.setType(kindProperty.getType());
+        kindPropertyUas.setUnit(kindProperty.getUnit());
+        kindPropertyUas.setProperty(convertUas(kindProperty.getProperty()));
+        // 所有可能值
+        if ("A".equals(kindProperty.getType()) && !CollectionUtils.isEmpty(kindProperty.getValues())) {
+            List<String> values = new ArrayList<String>();
+            int i = 0;
+            for (KindPropertyValues value : kindProperty.getValues()) {
+                i++;
+                if (i > 50)
+                    break;
+                values.add(value.getValue());
+            }
+            kindPropertyUas.setValues(values);
+        }
+        // 所有单位
+        if (!CollectionUtils.isEmpty(kindProperty.getMultiUnits())) {
+            List<KindPropertyUnitUas> kindPropertyUnitUas = new ArrayList<KindPropertyUnitUas>();
+            for (KindPropertyUnit kindPropertyUnit : kindProperty.getMultiUnits()) {
+                kindPropertyUnitUas.add(convertUas(kindPropertyUnit));
+            }
+            kindPropertyUas.setMultiUnits(kindPropertyUnitUas);
+        }
+        // 所有可选项
+        if (!CollectionUtils.isEmpty(kindProperty.getOptions())) {
+            List<KindPropertyOptionUas> kindPropertyOptionUas = new ArrayList<KindPropertyOptionUas>();
+            for (KindPropertyOption kindPropertyOption : kindProperty.getOptions()) {
+                kindPropertyOptionUas.add(convertUas(kindPropertyOption));
+            }
+            kindPropertyUas.setOptions(kindPropertyOptionUas);
+        }
+        return kindPropertyUas;
+    }
 
-	/**
-	 * 商城标准参数单位转换为uas标准参数单位
-	 * @param kindPropertyUnit 商城标准参数单位
-	 * @return uas标准参数单位
-	 */
-	public static KindPropertyUnitUas convertUas(KindPropertyUnit kindPropertyUnit) {
-		KindPropertyUnitUas kindPropertyUnitUas = new KindPropertyUnitUas();
-		kindPropertyUnitUas.setId(kindPropertyUnit.getId());
-		kindPropertyUnitUas.setDetno(kindPropertyUnit.getNumber());
-		kindPropertyUnitUas.setUnit(kindPropertyUnit.getUnit());
-		kindPropertyUnitUas.setRadix(kindPropertyUnit.getRadix());
-		return kindPropertyUnitUas;
-	}
+    /**
+     * 商城标准参数单位转换为uas标准参数单位
+     *
+     * @param kindPropertyUnit 商城标准参数单位
+     * @return uas标准参数单位
+     */
+    public static KindPropertyUnitUas convertUas(KindPropertyUnit kindPropertyUnit) {
+        KindPropertyUnitUas kindPropertyUnitUas = new KindPropertyUnitUas();
+        kindPropertyUnitUas.setId(kindPropertyUnit.getId());
+        kindPropertyUnitUas.setDetno(kindPropertyUnit.getNumber());
+        kindPropertyUnitUas.setUnit(kindPropertyUnit.getUnit());
+        kindPropertyUnitUas.setRadix(kindPropertyUnit.getRadix());
+        return kindPropertyUnitUas;
+    }
 
-	/**
-	 * 商城标准参数选项转换为uas标准参数选项
-	 * @param kindPropertyOption 商城标准参数选项
-	 * @return uas标准参数选项
-	 */
-	public static KindPropertyOptionUas convertUas(KindPropertyOption kindPropertyOption) {
-		KindPropertyOptionUas kindPropertyOptionUas = new KindPropertyOptionUas();
-		kindPropertyOptionUas.setId(kindPropertyOption.getId());
-		kindPropertyOptionUas.setDetno(kindPropertyOption.getNumber());
-		kindPropertyOptionUas.setOption(kindPropertyOption.getOption());
-		return kindPropertyOptionUas;
-	}
+    /**
+     * 商城标准参数选项转换为uas标准参数选项
+     *
+     * @param kindPropertyOption 商城标准参数选项
+     * @return uas标准参数选项
+     */
+    public static KindPropertyOptionUas convertUas(KindPropertyOption kindPropertyOption) {
+        KindPropertyOptionUas kindPropertyOptionUas = new KindPropertyOptionUas();
+        kindPropertyOptionUas.setId(kindPropertyOption.getId());
+        kindPropertyOptionUas.setDetno(kindPropertyOption.getNumber());
+        kindPropertyOptionUas.setOption(kindPropertyOption.getOption());
+        return kindPropertyOptionUas;
+    }
 
-	/**
-	 * 商城业务消息转换为uas业务消息
-	 * 
-	 * @author hejq
-	 * @param operationInfo 商城业务消息
-	 * @return uas业务消息
-	 */
-	public static OperationInfoUas convertUas(OperationInfo operationInfo) {
-		OperationInfoUas operationInfoUas = new OperationInfoUas();
-		operationInfoUas.setB2cId(operationInfo.getB2cid());
-		operationInfoUas.setOperationRemark(operationInfo.getOperationRemark());
-		operationInfoUas.setOperationResult(operationInfo.getOperationResult());
-		operationInfoUas.setServiceCode(operationInfo.getServiceCode());
-		operationInfoUas.setUuid(operationInfo.getUuid());
-		return operationInfoUas;
-	}
+    /**
+     * 商城业务消息转换为uas业务消息
+     *
+     * @param operationInfo 商城业务消息
+     * @return uas业务消息
+     * @author hejq
+     */
+    public static OperationInfoUas convertUas(OperationInfo operationInfo) {
+        OperationInfoUas operationInfoUas = new OperationInfoUas();
+        operationInfoUas.setB2cId(operationInfo.getB2cid());
+        operationInfoUas.setOperationRemark(operationInfo.getOperationRemark());
+        operationInfoUas.setOperationResult(operationInfo.getOperationResult());
+        operationInfoUas.setServiceCode(operationInfo.getServiceCode());
+        operationInfoUas.setUuid(operationInfo.getUuid());
+        return operationInfoUas;
+    }
 
-	/**
-	 * 转为平台的产品
-	 *
-	 * @return
-	 */
-	public static Product convert(Prod prod) {
-		Product product = new Product();
-		product.setProdNum(prod.getPr_code());
-		product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
-		product.setUserUU(SystemSession.getUser().getUserUU());
-		product.setProdName(prod.getPr_detail());
-		product.setSpec(prod.getPr_spec());
-		product.setUnit(prod.getPr_unit());
-		product.setSourceId(prod.getPr_id());
-		product.setBrand(prod.getPr_brand());
-		if (prod.getPr_orispeccode() != null) {
-			product.setCmpCode(prod.getPr_orispeccode());
-		} else {
-			product.setCmpCode(prod.getPr_spec());
-		}
-		int i = Constant.NO;
-		product.setStandard(i);// 默认设置为非标准，到平台做匹配更新
-		Enterprise enter = SystemSession.getUser().getEnterprise();
-		// erp上传的数据默认赋值给标准信息
-		product.setPbranden(product.getBrand());
-		product.setPbrand(product.getBrand());
-		product.setPcmpcode(product.getCmpCode());
-		product.setKind(product.getProdName());
-		product.setSourceApp("ERP");
-		product.setErpDate(new Date());
-		product.setB2cDownStatus(Status.NOT_UPLOAD.value());
-		return product;
-	}
+    /**
+     * 转为平台的产品
+     *
+     * @return
+     */
+    public static Product convert(Prod prod) {
+        Product product = new Product();
+        product.setProdNum(prod.getPr_code());
+        product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        product.setUserUU(SystemSession.getUser().getUserUU());
+        product.setProdName(prod.getPr_detail());
+        product.setSpec(prod.getPr_spec());
+        product.setUnit(prod.getPr_unit());
+        product.setSourceId(prod.getPr_id());
+        product.setBrand(prod.getPr_brand());
+        if (prod.getPr_orispeccode() != null) {
+            product.setCmpCode(prod.getPr_orispeccode());
+        } else {
+            product.setCmpCode(prod.getPr_spec());
+        }
+        int i = Constant.NO;
+        product.setStandard(i);// 默认设置为非标准，到平台做匹配更新
+        Enterprise enter = SystemSession.getUser().getEnterprise();
+        // erp上传的数据默认赋值给标准信息
+        product.setPbranden(product.getBrand());
+        product.setPbrand(product.getBrand());
+        product.setPcmpcode(product.getCmpCode());
+        product.setKind(product.getProdName());
+        product.setSourceApp("ERP");
+        product.setErpDate(new Date());
+        product.setB2cDownStatus(Status.NOT_UPLOAD.value());
+        return product;
+    }
+
+    /**
+     * 替代料转换
+     * @param replace
+     * @return
+     */
+    public static ProductReplace convert(ProductReplaceErp replace) {
+        ProductReplace productReplace = new ProductReplace();
+        //设置ERPid
+        productReplace.setErpId(replace.getBPR_ID());
+        //设置替代关系状态
+        productReplace.setStatus(replace.getBPR_STATUSCODE());
+        //TODO 设置物料号
+        productReplace.setProductId(Long.parseLong(replace.getBPR_PRODCODE()));
+        //设置替代料号
+        productReplace.setReplaceId(replace.getBPR_REPCODE());
+        //设置原品牌
+        productReplace.setpBranden(replace.getBPR_PRODBRAND());
+        //设置替代品牌
+        productReplace.setPtrBranden(replace.getBPR_REPBAND());
+        //设置原型号
+        productReplace.setpCmpcode(replace.getBPR_PRODOSCODE());
+        //设置替代型号
+        productReplace.setpCmpcode(replace.getBPR_REPOSCODE());
+        //设置更新时间
+        productReplace.setTime(replace.getBPR_DATE());
+        return productReplace;
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -278,7 +278,6 @@ public class ProductController {
 		return productService.getProductCount(isPerson);
 	}
 
-
 	/**
 	 * 批量删除所有的非标的产品
 	 */

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductReplaceDao.java

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import javax.persistence.ManyToOne;
 import javax.transaction.Transactional;
 import java.util.List;
 
@@ -20,4 +21,22 @@ public interface ProductReplaceDao extends JpaRepository<ProductReplace, Long>,
     @Transactional
     @Modifying
     void deleteByProductId(Long productId);
+
+    /**
+     * 查找表中是否已有该条erp传来的数据
+     * @param erpId
+     * @return
+     */
+    ProductReplace findByErpId(Long erpId);
+
+    /**
+     * 更新替代料替代关系
+     * @param erpId
+     * @param status
+     * @return
+     */
+    @Transactional
+    @Modifying
+    @Query(nativeQuery = true,value = "update product$replace set ptr_status = :status where ptr_erpid = :erpId")
+    void update(@Param("status")String status,@Param("erpId") Long erpId);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductReplace.java

@@ -1,25 +1,43 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
-import com.uas.platform.b2c.common.account.model.Role;
 import com.uas.platform.b2c.core.support.SystemSession;
-import org.apache.commons.collections.CollectionUtils;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.Date;
-import java.util.Set;
 
 /**
  * 存贮商城替代物料
  */
 @Entity
 @Table(name = "product$replace")
-public class ProductReplace {
+public class ProductReplace implements Serializable{
 
     @Id
     @GeneratedValue
     @Column(name = "id")
     private Long id;
 
+    /**
+     * erp数据库主键id
+     */
+    @Column(name = "ptr_erpid")
+    private Long erpId;
+
+    /**
+     * 替代关系状态
+     * ON/OFF
+     */
+    @Column(name = "ptr_status")
+    private String status;
+
+    /**
+     * 下载状态
+     */
+    @Column(name="ptr_downstatus")
+    private String downStatus;
+
+
     /**
      * 用户uu
      */
@@ -32,14 +50,20 @@ public class ProductReplace {
     @Column(name = "ptr_prid")
     private Long productId;
 
+    /***
+     * 替代料号
+     */
+    @Column(name = "ptr_replaceid")
+    private String replaceId;
+
     /**
-     * 原型号型号(冗余p字段)
+     * 原型号型号
      */
     @Column(name = "p_cmpcode" ,length = 800)
     private String pCmpcode;
 
     /**
-     * 原品牌品牌(冗余p字段)
+     * 原品牌品牌
      */
     @Column(name = "p_pbranden")
     private String pBranden;
@@ -83,6 +107,14 @@ public class ProductReplace {
     @Column(name = "ptr_detno", nullable = false)
     private Short detno;
 
+    public String getReplaceId() {
+        return replaceId;
+    }
+
+    public void setReplaceId(String replaceId) {
+        this.replaceId = replaceId;
+    }
+
     public Long getId() {
         return id;
     }
@@ -91,6 +123,30 @@ public class ProductReplace {
         this.id = id;
     }
 
+    public Long getErpId() {
+        return erpId;
+    }
+
+    public void setErpId(Long erpId) {
+        this.erpId = erpId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getDownStatus() {
+        return downStatus;
+    }
+
+    public void setDownStatus(String downStatus) {
+        this.downStatus = downStatus;
+    }
+
     public Long getUserUU() {
         return userUU;
     }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductReplaceServiceImpl.java

@@ -0,0 +1,43 @@
+package com.uas.platform.b2c.prod.commodity.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.uas.api.b2c_erp.seller.model.ProductReplaceErp;
+import com.uas.api.b2c_erp.seller.service.ProductReplaceService;
+import com.uas.platform.b2c.external.erp.product.util.ModelConverter;
+import com.uas.platform.b2c.prod.commodity.dao.ProductReplaceDao;
+import com.uas.platform.b2c.prod.commodity.model.ProductReplace;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 替代料传输接口实现类
+ * created by shicr on 2018/4/26
+ **/
+@Service
+public class ProductReplaceServiceImpl implements ProductReplaceService {
+
+    @Autowired
+    private ProductReplaceDao dao;
+
+    /**
+     * 更新替代料
+     *
+     * @param jsonStr
+     * @return
+     */
+    @Override
+    public void update(String jsonStr) {
+        List<ProductReplaceErp> list = (List<ProductReplaceErp>)JSONArray.parseArray(jsonStr,ProductReplaceErp.class);
+        for(ProductReplaceErp replace : list){
+            ProductReplace replace1 = ModelConverter.convert(replace);
+            ProductReplace p = dao.findByErpId(replace1.getErpId());
+            if(p == null){
+                dao.save(replace1);
+            }else{
+                dao.update(replace1.getStatus(),replace1.getErpId());
+            }
+        }
+    }
+}

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

@@ -67,9 +67,7 @@ public class StoreInFacadeImpl implements StoreInFacade {
 		if (resultMap != null) {
 			return resultMap;
 		}
-
 		Set<Qualification> qualifications = store.getQualifications();
-
 		if (!CollectionUtils.isEmpty(qualifications)) {
 			Iterator<Qualification> iterator = qualifications.iterator();
 			while (iterator.hasNext()) {
@@ -91,8 +89,11 @@ public class StoreInFacadeImpl implements StoreInFacade {
             enter.setEnQQ(store.getEnterprise().getEnQQ());
             enterpriseDao.save(enter);
         }
-
         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

@@ -168,22 +168,50 @@ public class StoreInServiceImpl implements StoreInService {
 		if (enUU == null) {
 			return null;
 		}
-
 		List<StoreIn> storeIns = storeDao.findByEnUU(enUU);
 		if(CollectionUtils.isEmpty(storeIns)) {
 			return null;
 		}else {
+			StoreIn returnStoreIn;
 			StoreIn storeInsOne = storeIns.get(0);
 			EnterpriseSimple enterpriseSimple = EnterpriseSimple.translateSimple(SystemSession.getUser().getEnterprise());
 			if (enterpriseSimple.getEnName().equals(storeInsOne.getEnterprise().getEnName())) {
-				return storeInsOne;
+				returnStoreIn = storeInsOne;
 			} else {
 				storeInsOne.setEnterprise(enterpriseSimple);
-				return storeDao.save(storeInsOne);
+				returnStoreIn = storeDao.save(storeInsOne);
 			}
+			Set<Qualification> qualifications = returnStoreIn.getQualifications();
+			Set<Qualification> qualificationsSort = getQualificationsSort();
+			qualificationsSort.addAll(qualifications);
+			returnStoreIn.setQualifications(qualificationsSort);
+			return returnStoreIn;
 		}
 	}
 
+	public Set<Qualification> getQualificationsSort() {
+		return new TreeSet<Qualification>(new Comparator()
+            {
+                public int compare(Object o1, Object o2) {
+                    Qualification time1 = (Qualification)o1;
+                    Qualification time2 = (Qualification)o2;
+                    if (time1.getId().intValue() > time2.getId().intValue())
+                    {
+                        return 1;
+                    }
+                    else if (time1.getId().intValue() == time2.getId().intValue())
+                    {
+                        return 0;
+                    }
+                    else
+                    {
+                        return -1;
+                    }
+                }
+
+            });
+	}
+
 	@Override
 	public String findUUidByEnUU(Long enUU) {
 		if (enUU == null) {
@@ -212,26 +240,7 @@ public class StoreInServiceImpl implements StoreInService {
 		logger.info("Start to execute find.");
 		StoreIn store = storeDao.findByUuid(uuid);
 		// 为了给前端返回一致的顺序
-		Set<Qualification> qualifications = new TreeSet<Qualification>(new Comparator()
-		{
-			public int compare(Object o1, Object o2) {
-				Qualification time1 = (Qualification)o1;
-				Qualification time2 = (Qualification)o2;
-				if (time1.getId().intValue() > time2.getId().intValue())
-				{
-					return 1;
-				}
-				else if (time1.getId().intValue() == time2.getId().intValue())
-				{
-					return 0;
-				}
-				else
-				{
-					return -1;
-				}
-			}
-
-		});
+		Set<Qualification> qualifications = getQualificationsSort();
 		if (!CollectionUtils.isEmpty(store.getQualifications())) {
 			qualifications.addAll(store.getQualifications());
 		}

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

@@ -17,6 +17,8 @@
 	<!-- ERP物料接口 -->
 	<bean id="api.ProdService" class="com.uas.platform.b2c.external.erp.prod.service.impl.ProdServiceImpl" />
 
+	<bean id="prodReplaceService" class="com.uas.platform.b2c.prod.commodity.service.impl.ProductReplaceServiceImpl"/>
+
 	<bean name="/api/service/seller/prod" class="com.uas.api.crypto.hessian.PermittedServiceExporter">
 		<property name="secretKeyService" ref="apiSecretKeyService" />
 		<property name="handlerInterceptor" ref="apiHandlerInterceptor" />
@@ -25,6 +27,14 @@
 				  value="com.uas.api.b2c_erp.seller.service.ProdService" />
 	</bean>
 
+	<bean name="/erp/productReplace/update" class="com.uas.api.crypto.hessian.PermittedServiceExporter">
+		<property name="secretKeyService" ref="apiSecretKeyService" />
+		<property name="handlerInterceptor" ref="apiHandlerInterceptor" />
+		<property name="service" ref="prodReplaceService" />
+		<property name="serviceInterface"
+				  value="com.uas.api.b2c_erp.seller.service.ProductReplaceService" />
+	</bean>
+
 	<!-- ERP库存接口 -->
 	<bean id="api.ProductDetailERPService" class="com.uas.platform.b2c.external.erp.commodity.service.impl.ProductDetailERPServiceImpl" />
 
@@ -213,4 +223,8 @@
 		<property name="serviceInterface"
 				  value="com.uas.api.b2c_erp.seller.service.BankInfoService"/>
 	</bean>
+	<!--获取ERP替代料-->
+	<bean  name="productreplace" class="com.uas.api.crypto.hessian.PermittedServiceExporter">
+
+	</bean>
 </beans>

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

@@ -116,6 +116,7 @@
 			<mvc:exclude-mapping path="/seek/getSeekPageInfo"/>
 			<mvc:exclude-mapping path="/seek/getSeekRanking"/>
 			<mvc:exclude-mapping path="/seek/release/template"/>
+			<mvc:exclude-mapping path="/erp/productReplace/update"/>
 			<bean class="com.uas.platform.b2c.core.filter.SSOInterceptor"></bean>
 		</mvc:interceptor>
 		<!-- 对所有的请求拦截，将Session中的User信息设置进SystemSession -->

src/main/webapp/resources/css/vendor/sell.css

@@ -3477,7 +3477,7 @@ body {
     color: #fff !important;
 }
 .com_tab:nth-of-type(1) ul li::after{
-    background: url('/static/img/vendor/images/downicon.png');
+    background: url('../../img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

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

@@ -9,10 +9,10 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	};
 
 	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ui.form', 'ui.jquery', 'toaster', 'ngDraggable', 'tool.directives', 'ngSanitize', 'common.query.kind', 'common.services', 'brandServices', 'componentServices', 'goodsServices',  'rateServices','cartServices', 'orderServices', 'addressServices', 'invoiceServices', 'common.query.propertyAdvice', 'propertyServices', 'returnServices' , 'changeServices',  'logisticsServices', 'common.query.kindAdvice', 'ngTable', 'ngDynamicInput', 'common.directives', 'angularFileUpload', 'urlencryptionServices', 'purchaseServices', 'vendorServices', 'goodsServices', 'bankTransfer', 'common.query.enterprise', 'billServices', 'receiptServices', 'collection', 'expressServices', 'bankInfo','Charge', 'statisticsServices', 'currencyService', 'responseLogisticsService', 'PriceServices', 'addressServices', 'searchService', 'urlencryptionServices', 'ReleaseProductByBatchService', 'makerDemand', 'afterSaleService', 'messageBoardServices', 'logisticsServices', 'table.directives', 'storeInfoServices', 'recommendation', 'common.query.user', 'logisticsPortService', 'cmsService', 'materialServices', 'StoreCmsServices', 'productImportModule', 'stockInOutModule', 'StoreCmsModule', 'WebChatModule', 'StandardPutOnAdminModule', 'StoreViolationsServices', 'internalMessageServices', 'installmentServices','common.query.product', 'ui.tour', 'seekPurchaseServices', 'UASBatchPutOnPropertyModule'])
-  .directive('onFinishRender', function ($timeout) {
+  app.directive('onFinishRender', function ($timeout) {
     return {
       restrict: 'A',
-      link: function (scope, element, attr) {
+      link: function (scope) {
         if (scope.$last === true) {
           $timeout(function () {
             scope.$emit('ngRepeatFinished');

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -35,29 +35,52 @@ define(['app/app'], function(app) {
                     }
                     //param.page = param.page;
                     param.size = param.count;
-                    param.spaceUU = $scope.userInfo.enterprise.uu;
+                    param.speaceUU = $scope.userInfo.enterprise.uu;
                     if (!($scope.searchParams.keyword.trim() == '')) {
                         param.keyword = $scope.searchParams.keyword.trim();
                     }
                     // 状态为申请中
                     param.status = 311;
-                    Enterprise.findApplyToMall(param, {}, function (page) {
-                        $defer.resolve(page.content || []);
-                        params.total(page.totalElements);
-                        $scope.page = page;
-                        $scope.totalPages = page.totalPages;
-                        $scope.content = page.content;
-                    }, function (error) {
-                        console.log(error);
-                        $defer.resolve([]);
-                        params.total(0);
-                        $scope.totalPages = 0;
-                        toaster.pop('error', '数据获取失败，请重新刷新页面！');
+                    $http({
+                        method: 'get',
+                        dataType: 'json',
+                        url: $scope.urlPrex + '/api/userspace/apply/info/mall',
+                        params: {speaceUU: param.speaceUU, page: param.page, size: param.size, status: param.status, keyword: param.keyword}
+                    }).success(function (page) {
+                        params.total(page.content.totalElements);
+                        $scope.page = page.content;
+                        $scope.totalPages = page.content.totalPages;
+                        $scope.content = page.content.content;
+                        $scope.totalElements = page.content.totalElements;
+                    }).error(function (response) {
+                        toaster.pop('error', '获取未处理审批数据失败');
                     });
+                    // Enterprise.findApplyToMall(param, {}, function (page) {
+                    //     $defer.resolve(page.content || []);
+                    //     params.total(page.totalElements);
+                    //     $scope.page = page;
+                    //     $scope.totalPages = page.totalPages;
+                    //     $scope.content = page.content;
+                    // }, function (error) {
+                    //     console.log(error);
+                    //     $defer.resolve([]);
+                    //     params.total(0);
+                    //     $scope.totalPages = 0;
+                    //     toaster.pop('error', '数据获取失败，请重新刷新页面！');
+                    // });
                 }
             });
         };
-        applyToEnterpriseTableParams();
+
+        if ($scope.isAdmin) {
+                User.isDevOrProd(null, function (data) {
+                    // $scope.isProd = data.data;
+                    $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://192.168.253.6:32323';
+                    applyToEnterpriseTableParams();
+                }, function (response) {
+                    toaster.pop('error', '获取运行环境失败');
+                });
+        }
         // 申请
         $scope.auditApply = function (status, id, UU) {
             var param = {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_index_ctrl.js

@@ -36,19 +36,34 @@ define(['app/app', 'calendar'], function(app) {
             var param = {};
             param.page = params.page;
             param.size = params.count;
-            param.spaceUU = $scope.userInfo.enterprise.uu;
+            param.speaceUU = $scope.userInfo.enterprise.uu;
             // 状态为申请中
             param.status = 311;
-            Enterprise.findApplyToMall(param, {}, function (page) {
-                $scope.totalPages = page.totalPages;
-                $scope.content = page.content;
-                $scope.totalElements = page.totalElements;
-            }, function (error) {
-                $scope.totalPages = 0;
-                toaster.pop('error', '数据获取失败，请重新刷新页面！');
+
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: $scope.urlPrex + '/api/userspace/apply/info/mall',
+                params: {speaceUU: param.speaceUU, page: param.page, size: param.size, status: param.status, keyword: null}
+            }).success(function (data) {
+                $scope.totalPages = data.content.totalPages;
+                $scope.content = data.content.content;
+                $scope.totalElements = data.content.totalElements;
+            }).error(function (response) {
+                toaster.pop('error', '获取未处理审批数据失败');
             });
+
+
+            // Enterprise.findApplyToMall(param, {}, function (page) {
+            //     $scope.totalPages = page.totalPages;
+            //     $scope.content = page.content;
+            //     $scope.totalElements = page.totalElements;
+            // }, function (error) {
+            //     $scope.totalPages = 0;
+            //     toaster.pop('error', '数据获取失败，请重新刷新页面！');
+            // });
         }
-        applyToEnterpriseTableParams();
+        // applyToEnterpriseTableParams();
 
         $scope.findMore = function () {
             window.location.href = '#/account/management/';
@@ -110,6 +125,9 @@ define(['app/app', 'calendar'], function(app) {
                 }).error(function (response) {
                     toaster.pop('error', '获取未处理审批数据失败');
                 });
+
+                // 查询企业绑定列表
+                applyToEnterpriseTableParams();
                 // VendorService.getNotDealApplyCount({spaceUU: $scope.userInfo.enterprise.uu}, function (data) {
                 //     console.log(data);
                 //     $scope.count = data.content[311];

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -1,6 +1,18 @@
 define([ 'app/app', 'jquery-uploadify' ], function(app) {
 	'use strict';
 	app.register.controller('vendor_materialCtrl', ['$scope', '$rootScope', 'Material', 'toaster', 'ComponentActive', 'Enterprise', '$q', 'NumberService', '$location', '$stateParams', 'Search', '$modal', 'ComponentActiveAPI', 'BrandSubmit', 'BrandActiveAPI', 'DistributionRule', 'prodRepositoryService', 'AuthenticationService', 'StoreInfo', 'ProductServiceQuery', 'StoreCms', 'ByteCountService', 'Goods', 'UASBatchPutOnPropertyServices', '$filter', function ($scope, $rootScope, Material, toaster, ComponentActive, Enterprise, $q, NumberService, $location, $stateParams, Search, $modal, ComponentActiveAPI, BrandSubmit, BrandActiveAPI, DistributionRule, prodRepositoryService, AuthenticationService, StoreInfo, ProductServiceQuery, StoreCms, ByteCountService, Goods, UASBatchPutOnPropertyServices, $filter) {
+    app.directive('onFinishRender', function ($timeout) {
+      return {
+        restrict: 'A',
+        link: function (scope) {
+          if (scope.$last === true) {
+            $timeout(function () {
+              scope.$emit('ngRepeatFinished');
+            });
+          }
+        }
+      }
+    })
 		$rootScope.active = 'vendor_material';
 		document.title = '卖家产品库-优软商城';
 		$scope.tab = 'material';
@@ -3242,7 +3254,9 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 				id: material.id
 			}, function(data) {
 				$scope.resultDatalistArray[material.id] = normalChangeArr(data)
-				$scope.resultDatalist = $scope.resultDatalistArray[material.id].arr
+				console.log(data)
+        $scope.resultDatalist = data
+				// $scope.resultDatalist = $scope.resultDatalistArray[material.id].arr
 				$scope.linearLength = $scope.resultDatalistArray[material.id].headlength
 			})
       // }

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_apply_ctrl.js

@@ -469,7 +469,8 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 					toaster.pop('success', '感谢您对优软商城的支持，我们会尽快对您提交的信息进行审核，预计审核时间为3个工作日，审核结果将以站内消息及邮件形式通知您！');
 					$rootScope.applyStatus = 'PREPARE';
 					$timeout(function () {
-						window.location.reload();
+						//window.location.href=$scope.rootPath+'/vendor#/store-apply/wait';
+                        $state.go('vendor_store_wait');
 					}, 1000);
 				} else {
 					if (result.code == 6) {

src/main/webapp/resources/view/admin/store_application_maintenance.html

@@ -202,7 +202,7 @@
 			<tr>
 				<th width="50">序号</th>
 				<th>店铺名称</th>
-				<th>店铺简称</th>
+			<!--	<th>店铺简称</th>-->
 				<th>店铺类型</th>
 				<th>
 					<p ng-click="changeShorting()" style="margin: 0;">申请日期
@@ -220,7 +220,7 @@
 			<tr ng-repeat="application in $data ">
 				<td ng-bind="$index + (applicationTableParams.page()-1 )* 10 + 1"></td>
 				<td ng-bind="application.storeName" class="text-left"></td>
-				<td ng-bind="application.storeShortName"></td>
+				<!--<td ng-bind="application.storeShortName"></td>-->
 				<td ng-bind="application.type | storeType"></td>
 				<td>{{application.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
 				<td>

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -549,6 +549,10 @@
 	.oder01 ul li{
 		margin-left: 0px;
 		position: relative;
+		min-width: 110px
+	}
+	.oder01 ul li a {
+		min-width: 110px
 	}
 	.oder01 ul li.active a{
 		border-bottom: #fff;

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

@@ -472,6 +472,7 @@
       <ul class="fl">
         <li ng-class="{'active': tab=='base'}"><a ng-click="checkTab('base')">基本信息</a></li>
         <li ng-class="{'active': tab=='safe'}"><a ng-click="checkTab('safe')">安全设置</a></li>
+        <li ng-class="{'active': tab=='bind'}"><a ng-click="checkTab('bind')" ng-if="isAdmin">申请绑定</a></li>
         <!--<li ng-class="{'active': tab=='logistic'}"><a href="#" ng-click="checkTab('logistic')">收货地址</a></li>-->
       </ul>
     </div>
@@ -493,13 +494,8 @@
             <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
-                    ng-bind="enterpriseInfo.enName || '暂无信息'"></ span>
+                <div class="fr"><span
+                    ng-bind="enterpriseInfo.enName || '暂无信息'"></span>
                 </div>
               </li>
               <!--<li>
@@ -518,18 +514,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
@@ -795,6 +787,45 @@
         </li>-->
       </ul>
     </div>
+      <!--申请绑定-->
+    <div class="clearfix bind-en" ng-if="tab=='bind'">
+          <div class="rt_menu">
+              <span class="pull-right"><input type="text" ng-model="searchParams.keyword" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
+          </div>
+        <table class="bind-enter-tab" ng-table="applyToEnterpriseTableParams">
+          <thead>
+          <tr>
+            <th>用户名</th>
+            <th>UU账号</th>
+            <th>手机号</th>
+            <th>邮箱</th>
+            <th>操作</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr class="default-row" ng-repeat="item in content">
+            <td class="user-name" ng-bind="item.user.vipName || '-'"></td>
+            <td ng-bind="item.user.userUU || '-'"></td>
+            <td ng-bind="item.user.mobile || '-'"></td>
+            <td ng-bind="item.user.email || '-'"></td>
+            <td>
+              <a class="operate-btn" ng-click="auditApply(1, item.id, item.user.userUU)">同意</a>
+              <a class="operate-btn" ng-click="auditApply(0, item.id, item.user.userUU)">|&nbsp;拒绝</a>
+            </td>
+          </tr>
+          <tr class="num" ng-if="content && content.length > 0">
+            <td colspan="5">
+              <span class="last-login pull-right">显示<span ng-bind="page.size * (page.number - 1) + 1"></span>-<span ng-bind="page.size * (page.number - 1) + page.numberOfElements"></span>条，共<span ng-bind="page.totalElements"></span>条</span>
+            </td>
+          </tr>
+          <tr ng-if="!content || !content.length">
+            <td colspan="5" class="grey white">
+              <img src="static/img/all/empty-cart.png">暂无申请信息
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
     <!--权限管理-->
     <div class="count01 clearfix" ng-if="tab=='auth'">
       <div class="power_title">员工账号及权限管理</div>

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

@@ -1531,7 +1531,7 @@
 		height: 32px;
 	}
 	.replace-row td > div > .Scrollactive {
-		height: 160px;
+		max-height: 160px;
 		overflow-y: auto;
 	}
 	.replace-row td > div > div .replace-item:nth-child(2n-1) {

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

@@ -1127,6 +1127,9 @@
 		position: relative;
 		min-width: 110px
 	}
+	.com_tab ul li a {
+		min-width: 110px
+	}
 
 	.com_tab ul li::after{
 		background: url('static/img/vendor/images/downicon.png');

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

@@ -505,15 +505,16 @@
 						<div class="row" style="margin: 0;">
 							<div class="col-md-5 col-md-offset-1 show_image_area show_image">
 								<div ng-if="qualifications[qType.businessLicense]">
-									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
+									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
 									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf" src="static/img/vendor/store/timg.png"/>
 									<div class="hover-show" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf">
 										<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 										<a target="_blank" ng-href="{{qualifications[qType.businessLicense].resourceUrl || 'javascript:void(0);'}}"><i class="fa fa-search"></i>查看</a>
 									</div>
+
 								</div>
-								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense]" non-preview="true"></div>
-								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf">
+								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense].resourceUrl" non-preview="true"></div>
+								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl">
 									<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 									<a ng-click="showQualification(qualifications[qType.businessLicense], true)"><i class="fa fa-search"></i>查看</a>
 								</div>
@@ -680,15 +681,15 @@
 						<div class="row" style="margin: 0;">
 							<div class="col-md-5 col-md-offset-1 show_image_area show_image">
 								<div ng-if="qualifications[qType.businessLicense]">
-									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
+									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
 									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf" src="static/img/vendor/store/timg.png"/>
 									<div class="hover-show" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf">
 										<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 										<a target="_blank" ng-href="{{qualifications[qType.businessLicense].resourceUrl || 'javascript:void(0);'}}" ><i class="fa fa-search"></i>查看</a>
 									</div>
 								</div>
-								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense]" non-preview="true"></div>
-								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf">
+								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense].resourceUrl" non-preview="true"></div>
+								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl">
 									<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 									<a ng-click="showQualification(qualifications[qType.businessLicense], true)"><i class="fa fa-search"></i>查看</a>
 								</div>
@@ -854,15 +855,15 @@
 						<div class="row" style="margin: 0;">
 							<div class="col-md-5 col-md-offset-1 show_image_area show_image">
 								<div ng-if="qualifications[qType.businessLicense]">
-									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
+									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
 									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf" src="static/img/vendor/store/timg.png"/>
 									<div class="hover-show" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf">
 										<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 										<a target="_blank" ng-href="{{qualifications[qType.businessLicense].resourceUrl || 'javascript:void(0);'}}"><i class="fa fa-search"></i>查看</a>
 									</div>
 								</div>
-								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense]" non-preview="true"></div>
-								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf">
+								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense].resourceUrl" non-preview="true"></div>
+								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl">
 									<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 									<a ng-click="showQualification(qualifications[qType.businessLicense], true)"><i class="fa fa-search"></i>查看</a>
 								</div>

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

@@ -761,7 +761,8 @@
 					<input type="text" class="form-control enQQ" style="border-radius: inherit;" title="enQQ" ng-pattern="/^[1-9][0-9]{4,10}$/" ng-blur="checkQQ()" ng-model="sampleStore.enterprise.enQQ" maxlength="11"/>
 				</div>
 			</div>
-		</div><!-- 店铺基础信息输入 end -->
+		</div>
+		<!-- 店铺基础信息输入 end -->
 		<!-- 店铺基础信息展示 start -->
 		<div style="margin-bottom: 20px;" ng-if="!editBasicInfo" class="width120">
 			<div class="row com_row title_row">
@@ -844,6 +845,36 @@
 					</div>
 				</div>
 			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>手&nbsp;&nbsp;&nbsp;&nbsp;机</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enPhone || '暂无信息'}}
+					</div>
+				</div>
+			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>微&nbsp;&nbsp;&nbsp;&nbsp;信</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enWeixin || '暂无信息'}}
+					</div>
+				</div>
+			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>Q&nbsp;&nbsp;&nbsp;&nbsp;Q</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enQQ || '暂无信息'}}
+					</div>
+				</div>
+			</div>
 		</div><!-- 店铺基础信息展示 end -->
 	</div>
 	<!-- 资质证明输入 start -->