调整代码规范

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

@@ -628,7 +628,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	public void setBreakUpByExcel(Object value) {
 		setBreakUpStr(StringUtilB2C.getStr(value));
-		if (!StringUtils.isEmpty(value) && ReleaseConstant.NO.equals(value.toString())) {
+		if (ReleaseConstant.NO.equals(value)) {
 			setBreakUp(Boolean.FALSE);
 		} else {
 			setBreakUp(Boolean.TRUE);
@@ -665,7 +665,9 @@ public class ReleaseProductByBatch implements Serializable {
 	}
 
 	public void setPackagingByExcel(Object value, boolean isAPerson) {
-		if (!StringUtils.isEmpty(value)) {
+		if (StringUtils.isEmpty(value)) {
+			setPackaging(PACKAGING_LIST.get(PACKAGING_LIST.size() - 1));
+		} else {
 			String packagingData = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(value));
 			if (!isAPerson) {
 				if (PACKAGING_LIST.contains(packagingData)) {
@@ -673,7 +675,8 @@ public class ReleaseProductByBatch implements Serializable {
 				}
 			} else {
 				try {
-					packagingData = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(packagingData, 150);
+					packagingData = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(packagingData,
+							ReleaseConstant.PACKAKING_MAX_LENGTH);
 				} catch (UnsupportedEncodingException e) {
 					throw new RuntimeException(e + "指定字符集不支持");
 				}
@@ -684,19 +687,19 @@ public class ReleaseProductByBatch implements Serializable {
 
 	/**
 	 * 规格信息
-	 * @param value
+	 * @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);
+			String str = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutStringIgnoreEncode(value.toString(), UploadConstant.SPEC_MAX_BYTE);
+			setSpec(str);
 		}
 	}
 
 	/**
 	 * 交期赋值逻辑较为复杂，在调用类进行赋值
-	 * @param minValue
-	 * @param maxValue
+	 * @param minValue 最小交期
+	 * @param maxValue 最大交期
 	 */
 	public void setDeliveryByExcel(Object minValue, Object maxValue) {
 		setSelfMinDeliveryStr(StringUtilB2C.getStr(minValue));

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

@@ -41,6 +41,7 @@ import com.uas.platform.b2c.prod.commodity.service.InOutboundDetailService;
 import com.uas.platform.b2c.prod.commodity.service.ProductPrivateService;
 import com.uas.platform.b2c.prod.commodity.service.ProductService;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
+import com.uas.platform.b2c.prod.commodity.type.ReleaseConstant;
 import com.uas.platform.b2c.prod.commodity.util.GoodsUtil;
 import com.uas.platform.b2c.prod.commodity.util.SheetUtil;
 import com.uas.platform.b2c.prod.product.brand.dao.BrandInfoDao;
@@ -871,21 +872,15 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 
 		Object breakValue = readWorkBookCell(row.getCell(ModifyConstant.BREAK_UP), Cell.CELL_TYPE_STRING,
 				rowNum, ModifyConstant.BREAK_UP);
-		if (!StringUtils.isEmpty(breakValue)) {
-            aProduct.setBreakUpByExcel(breakValue);
-        }
+		aProduct.setBreakUpByExcel(breakValue);
 
 		Object packageNumValue = readWorkBookCell(row.getCell(ModifyConstant.PACKAGE_NUMBER), Cell.CELL_TYPE_STRING,
 				rowNum, ModifyConstant.PACKAGE_NUMBER);
-		if (!StringUtils.isEmpty(packageNumValue)) {
-            aProduct.setMinPackageByExcel(packageNumValue);
-        }
+		aProduct.setMinPackageByExcel(packageNumValue);
 
 		Object buyQtyValue = readWorkBookCell(row.getCell(ModifyConstant.BUY_MIN_QTY), Cell.CELL_TYPE_STRING,
 				rowNum, ModifyConstant.BUY_MIN_QTY);
-		if (!StringUtils.isEmpty(buyQtyValue)) {
-            aProduct.setMinBuyQtyByExcel(buyQtyValue);
-        }
+		aProduct.setMinBuyQtyByExcel(buyQtyValue);
 
 		Object reserveValue = readWorkBookCell(row.getCell(ModifyConstant.RESERVE_NUMBER), Cell.CELL_TYPE_STRING,
 				rowNum, ModifyConstant.RESERVE_NUMBER);
@@ -1193,10 +1188,11 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 
 	/**
 	 * 设置交期的信息
+	 * @param releaseProductByBatch 批量导入临时表对象
+	 * @param minDelivery 最短交期
+	 * @param maxDelivery 最长交期
 	 */
 	private void setDeliveryTime(ReleaseProductByBatch releaseProductByBatch, Object minDelivery, Object maxDelivery) {
-		minDelivery = minDelivery == null ? maxDelivery : minDelivery;
-		maxDelivery = maxDelivery == null ? minDelivery : maxDelivery;
 		Short min = getDeliveryTime(minDelivery);
 		Short max = getDeliveryTime(maxDelivery);
 		if ((min != null) || (max != null)) {
@@ -1221,6 +1217,10 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			}
 			releaseProductByBatch.setSelfMinDelivery(min);
 			releaseProductByBatch.setSelfMaxDelivery(max);
+		} else {
+			// 设置默认值
+			releaseProductByBatch.setSelfMinDelivery(ReleaseConstant.DEFAULT_MIN_DELIVERY);
+			releaseProductByBatch.setSelfMaxDelivery(ReleaseConstant.DEFAULT_MAX_DELIVERY);
 		}
 	}
 
@@ -1318,16 +1318,14 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 
 			Object packageMethodValue = readWorkBookCell(row.getCell(UploadConstant.PACKAGE_METHOD), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.PACKAGE_METHOD);
-			aProduct.setPackagingByExcel(packageMethodValue , isAPerson);
+			aProduct.setPackagingByExcel(packageMethodValue, isAPerson);
 
 			Object minValue = readWorkBookCell(row.getCell(UploadConstant.MIN_DELIVERY), Cell.CELL_TYPE_STRING,
-					rowNum, UploadConstant.MIN_DELIVERY);
+					 rowNum, UploadConstant.MIN_DELIVERY);
 			Object maxValue = readWorkBookCell(row.getCell(UploadConstant.MAX_DELIVERY), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.MAX_DELIVERY);
 			aProduct.setDeliveryByExcel(minValue, maxValue);
-			if (!StringUtils.isEmpty(minValue) || !StringUtils.isEmpty(maxValue)) {
-				setDeliveryTime(aProduct, minValue, maxValue);
-			}
+			setDeliveryTime(aProduct, minValue, maxValue);
 
 			Object packageNumValue = readWorkBookCell(row.getCell(UploadConstant.PACKAGE_NUMBER), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.PACKAGE_NUMBER);
@@ -1361,7 +1359,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		} else {
 			Object packageMethodValue = readWorkBookCell(row.getCell(UploadConstant.SPECIFICATION), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.SPECIFICATION);
-			aProduct.setPackagingByExcel(packageMethodValue , isAPerson);
+			aProduct.setPackagingByExcel(packageMethodValue, isAPerson);
 		}
 		return result;
 	}

src/main/java/com/uas/platform/b2c/prod/commodity/type/ReleaseConstant.java

@@ -7,7 +7,28 @@ package com.uas.platform.b2c.prod.commodity.type;
  */
 public class ReleaseConstant {
 
-    public static final String YES= "是";
+    /**
+     * 是
+     */
+    public static final String YES = "是";
 
+    /**
+     * 否
+     */
     public static final String NO = "否";
+
+    /**
+     * 默认最长交期
+     */
+    public static final Short DEFAULT_MAX_DELIVERY = 10;
+
+    /**
+     * 默认最短交期
+     */
+    public static final Short DEFAULT_MIN_DELIVERY = 1;
+
+    /**
+     * 包装方式最长长度
+     */
+    public static final Integer PACKAKING_MAX_LENGTH = 150;
 }