Merge branch 'dev-mysql' into feature_release-tomysql

# Conflicts:
#	src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

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

@@ -2,11 +2,14 @@
 package com.uas.platform.b2c.common.account.v2.service.impl;
 
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
+import com.uas.platform.b2c.common.account.dao.RoleDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.Role;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
 import com.uas.platform.b2c.core.constant.IntegerConstant;
+import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserView;
@@ -16,6 +19,7 @@ import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Set;
 
 
 @Service("v2.UserService")
@@ -27,6 +31,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private EnterpriseDao enterpriseDao;
 
+    @Autowired
+    private RoleDao roleDao;
+
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
@@ -161,7 +168,7 @@ public class UserServiceImpl implements UserService {
     }*/
 
     @Override
-    public void bindOrUnbind(Long uu, Long enuu, Integer type) {
+    public void bindOrUnbind(Long uu, Long enuu, Integer type)  {
         User user = userDao.findOne(uu);
         Enterprise enterprise = enterpriseDao.findByUu(enuu);
         if (null == user) {
@@ -175,6 +182,14 @@ public class UserServiceImpl implements UserService {
         if (null != type) {
             if (type.equals(IntegerConstant.YES_SHORT)) { //1为绑定，0为解绑
                 user.addEnterprise(enterprise);
+                List<Role> roles = roleDao.findByEnUUAndDesc(enterprise.getUu(),"普通用户");
+                if(roles.size()>0){
+                    Set<Role> set = user.getRoles();
+                    set.add(roles.get(0));
+                    user.setRoles(set);
+                }else{
+                    enterpriseDao.callInitProcedure(enterprise.getUu());
+                }
                 userDao.save(user);
             } else {
                 user.removeEnterprise(enterprise);

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -208,13 +208,14 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         // 暂时在正式 过滤admin访问权限
         if (needPermission != null) {
             if ("prod".equals(profile)) {
-                //暂时放行所有权限,发布权限时打开注释;
-              /*  if (!user.getEnterprise().getUu().toString().equals(enUU)) {
+                //暂时放行所有权限拦截, 权限发布时候再开放注释;
+               /* if (!user.getEnterprise().getUu().toString().equals(enUU)) {
                     throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
                 } else {
                     if (user.getEnterprise().getUu().toString().equals(enUU)) {
                         if (!"登录商城后台进行运维管理".equals(needPermission)) {
                             throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
+
                         }
                     }
                 }*/

src/main/java/com/uas/platform/b2c/fa/payment/utils/StringUtils.java

@@ -99,4 +99,22 @@ public class StringUtils {
 		builder.deleteCharAt(builder.length() - 1);
 		return builder.toString();
 	}
+
+
+
+	/**
+	 *	截取指定字节长度的字符串忽略编码格式
+	 *
+	 * @param original 截取的字符串
+	 * @param length 截取的字节长度
+	 * @return
+	 */
+	public static String cutOutStringIgnoreEncode(String original, int length) {
+		if (org.springframework.util.StringUtils.isEmpty(original)) {
+			return original;
+		} else {
+			String substring = original.substring(0, length);
+			return substring;
+		}
+	}
 }

src/main/java/com/uas/platform/b2c/prod/commodity/constant/UploadConstant.java

@@ -66,39 +66,44 @@ public final class UploadConstant {
     public static final int MAX_DELIVERY = 7;
 
     /**
-     * 包装数量
+     * 规格
      */
-    public static final int PACKAGE_NUMBER = 8;
+    public static final int SPEC = 8;
+
+    /**
+     * 最小包装数量
+     */
+    public static final int PACKAGE_NUMBER = 9;
 
     /**
      * 最小起订量
      */
-    public static final int BUY_MIN_QTY = 9;
+    public static final int BUY_MIN_QTY = 10;
 
     /**
      * 分段价格开始
      */
-    public static final int PRICE_START = 10;
+    public static final int PRICE_START = 11;
 
     /**
      * 第二个分段
      */
-    public static final int QTY_SECOND_START = 11;
+    public static final int QTY_SECOND_START = 12;
 
     /**
      * 第二个分段
      */
-    public static final int PRICE_SECOND = 12;
+    public static final int PRICE_SECOND = 13;
 
     /**
      * 第三个分段
      */
-    public static final int QTY_THIRD_START = 13;
+    public static final int QTY_THIRD_START = 14;
 
     /**
      * 第三个分段
      */
-    public static final int PRICE_THIRD = 14;
+    public static final int PRICE_THIRD = 15;
 
     /**
      * 分段价格结束
@@ -108,17 +113,17 @@ public final class UploadConstant {
     /**
      * 自定义标签
      */
-    public static final int CUSTOM_LABEL = 15;
+    public static final int CUSTOM_LABEL = 16;
 
     /**
      * 导入表的最大列数
      */
-    public static final int TOTAL_COLUMN = 16;
+    public static final int TOTAL_COLUMN = 17;
 
     /**
      * 用户可能直接用导入失败的表格进行导入
      */
-    public static final int MAX_TOTAL_COLUMN = 17;
+    public static final int MAX_TOTAL_COLUMN = 18;
 
     /**
      * 个人导入表的最大列数
@@ -129,4 +134,9 @@ public final class UploadConstant {
      * 个人用户可能直接用导入失败的表格进行导入
      */
     public static final int MAX_TOTAL_COLUMN_PERSON = 4;
+
+    /**
+     * 规格的最大长度
+     */
+    public static final int SPEC_MAX_BYTE = 20;
 }

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

@@ -527,6 +527,12 @@ public class Goods implements Serializable {
 	@Column(name = "go_audited_time")
 	private Date auditedTime;
 
+	/**
+	 * 规格信息
+	 */
+	@Column(name = "go_spec")
+	private String spec;
+
 	@Transient
 	private String selfSale;
 
@@ -1661,4 +1667,13 @@ public class Goods implements Serializable {
 		this.minBuyQty = minBuyQty;
 		return new ResultMap(CodeType.OK, "成功");
 	}
+
+	public String getSpec() {
+		return spec;
+	}
+
+	public Goods setSpec(String spec) {
+		this.spec = spec;
+		return this;
+	}
 }

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

@@ -409,6 +409,12 @@ public class GoodsHistory {
 	@Column(name = "go_down_msg")
 	private String downMsg;
 
+	/**
+	 * 规格信息
+	 */
+	@Column(name = "go_spec")
+	private String spec;
+
 	/**
 	 * 分段价格
 	 */
@@ -1055,6 +1061,7 @@ public class GoodsHistory {
 		this.breakUp = goods.getBreakUp();
 		this.tag = goods.getTag();
 		this.prodNum = goods.getProdNum();
+		this.spec = goods.getSpec();
     }
 
 	public Short getSelfDeliveryDemMinTime() {
@@ -1170,4 +1177,13 @@ public class GoodsHistory {
 	public void setProdNum(String prodNum) {
 		this.prodNum = prodNum;
 	}
+
+	public String getSpec() {
+		return spec;
+	}
+
+	public GoodsHistory setSpec(String spec) {
+		this.spec = spec;
+		return this;
+	}
 }

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

@@ -8,6 +8,7 @@ import com.uas.platform.b2c.core.utils.RegexConstant;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
+import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
 import com.uas.platform.b2c.prod.commodity.type.ReleaseConstant;
 import com.uas.platform.b2c.trade.order.StringConstant.Currency;
 import org.apache.commons.collections.CollectionUtils;
@@ -32,7 +33,7 @@ import java.util.regex.Pattern;
  * @time 创建时间：2016年9月24日
  */
 @Entity
-@Table(name = "trade$releasebybatch")
+	@Table(name = "trade$releasebybatch")
 public class ReleaseProductByBatch implements Serializable {
 
 	/**
@@ -511,6 +512,12 @@ public class ReleaseProductByBatch implements Serializable {
 	@Column(name = "rel_storename")
 	private String storeName;
 
+	/**
+	 * 规格信息
+	 */
+	@Column(name = "rel_spec")
+	private String spec;
+
 //	private Short repeat;
 
 	@Override
@@ -667,6 +674,17 @@ public class ReleaseProductByBatch implements Serializable {
 		setPackaging(packagingData);
 	}
 
+	/**
+	 * 交期赋值逻辑较为复杂，在调用类进行赋值
+	 * @param value
+	 */
+	public void setSpecByExcel(Object value) {
+		if (!StringUtils.isEmpty(value)) {
+				String str = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutStringIgnoreEncode(value.toString(), UploadConstant.SPEC_MAX_BYTE);
+				setSpec(str);
+		}
+	}
+
 	/**
 	 * 交期赋值逻辑较为复杂，在调用类进行赋值
 	 * @param minValue
@@ -1648,4 +1666,13 @@ public class ReleaseProductByBatch implements Serializable {
 	public void setSaleMethod(String saleMethod) {
 		this.saleMethod = saleMethod;
 	}
+
+	public String getSpec() {
+		return spec;
+	}
+
+	public ReleaseProductByBatch setSpec(String spec) {
+		this.spec = spec;
+		return this;
+	}
 }

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

@@ -24,6 +24,7 @@ import com.uas.platform.b2c.external.erp.commodity.util.ModelConverter;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.IntegerConstant;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
+import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsHistoryDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsModifyInfoDao;
@@ -296,6 +297,10 @@ public class GoodsServiceImpl implements GoodsService {
 //        if (!PatternUtil.matchChineseAndEnglish(goods.getPackaging())) {
 //            throw new IllegalOperatorException("包装信息只能包含中文和英文");
 //        }
+        if (!StringUtils.isEmpty(goods.getSpec())) {
+                String spec = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutStringIgnoreEncode(goods.getSpec().toString(), UploadConstant.SPEC_MAX_BYTE);
+                goods.setSpec(spec);
+        }
         if (StringUtils.isEmpty(goods.getProduceDate())) {
             throw new IllegalOperatorException("型号" + goods.getCode()+"品牌" + goods.getBrandNameEn() +"的产品生产日期为空");
         } else {
@@ -1784,6 +1789,7 @@ public class GoodsServiceImpl implements GoodsService {
         nowGoods.setBreakUp(oldGoods.getBreakUp());
         nowGoods.setPerQty();
         nowGoods.setReserve(oldGoods);
+        nowGoods.setSpec(oldGoods.getSpec());
         nowGoods.setPackaging(oldGoods.getPackaging());
         nowGoods.setProduceDate(oldGoods.getProduceDate());
         // 用含税单价同步未含税单价

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

@@ -1016,6 +1016,10 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 				setDeliveryTime(aProduct, minValue, maxValue);
 			}
 
+			Object specValue = readWorkBookCell(row.getCell(UploadConstant.SPEC), Cell.CELL_TYPE_STRING,
+					rowNum, UploadConstant.SPEC);
+			aProduct.setSpecByExcel(specValue);
+
 			Object packageNumValue = readWorkBookCell(row.getCell(UploadConstant.PACKAGE_NUMBER), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.PACKAGE_NUMBER);
 			aProduct.setMinPackageByExcel(packageNumValue);

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentGoods.java

@@ -260,6 +260,12 @@ public class ComponentGoods implements Serializable {
 	@Column(name = "go_storename")
 	private String storeName;
 
+	/**
+	 * 视图
+	 */
+	@Column(name = "go_spec")
+	private String spec;
+
 	public Long getCmpId() {
 		return cmpId;
 	}
@@ -591,7 +597,16 @@ public class ComponentGoods implements Serializable {
 		return this;
 	}
 
-    public ComponentGoods() {
+	public String getSpec() {
+		return spec;
+	}
+
+	public ComponentGoods setSpec(String spec) {
+		this.spec = spec;
+		return this;
+	}
+
+	public ComponentGoods() {
     }
 	public ComponentGoods(Goods goods) {
 		this.cmpId = 0L;
@@ -641,5 +656,6 @@ public class ComponentGoods implements Serializable {
 		this.shipArea = goods.getShipArea();
 		this.storeId = goods.getStoreid();
 		this.storeName = goods.getStoreName();
+		this.spec = goods.getSpec();
 	}
 }

src/main/resources/dev/redis.properties

@@ -1,2 +1,2 @@
-redis.host=10.10.100.200
+redis.host=192.168.253.6
 redis.port=6379

src/main/resources/test/redis.properties

@@ -1,3 +1,3 @@
-#redis.host=192.168.253.6
-redis.host=10.10.100.200
+redis.host=192.168.253.6
+#redis.host=10.10.100.200
 redis.port=6379

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

@@ -213,7 +213,7 @@ define(['app/app'], function (app) {
                   $scope.isShowSayPriceBox = false;
                   $scope.seekPurchaseTableParams.reload();
                 }, function (response) {
-                  toaster.pop('error', '请勿重复报价或报价自己的求购2');
+                  toaster.pop('error', '请勿重复报价或报价自己的求购');
                 });
               }
             } else {

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

@@ -1127,7 +1127,10 @@
 	}
 	.edit-contents .content .title span:last-child {
 		float: left;
-		width: 65px;
+		width: 75px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 	.edit-contents .content p.noBreak{
 		color: #f15601;

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

@@ -743,6 +743,10 @@
     }
     .edit-form td div span.marginL5{
         margin-left: 5px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: 100%;
     }
     .filter i {
         font-size: 16px;