瀏覽代碼

处理导入bug

hulh 7 年之前
父節點
當前提交
713f33dc8a

+ 3 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -657,6 +657,9 @@ public class ReleaseProductByBatch implements Serializable {
 			if (minBuy <= 0) {
 				setMinBuyQty(getMinPackage());
 			} else {
+				if (NumberUtil.compare(minBuy, DoubleConstant.maxMinPackageQty) > 0) {
+					minBuy = DoubleConstant.maxMinPackageQty;
+				}
 				setMinBuyQty(minBuy);
 				if ((breakUp != null) && !breakUp && minPackage != null) {
 					double remainder = minBuy % minPackage;

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

@@ -614,7 +614,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			aProduct.setReserveByExcel(reserveValue);
 
 			Cell productCell = row.getCell(UploadConstant.PRODUCE_DATE);
-			if (productCell.getCellType() == 0) {
+			if (productCell != null && productCell.getCellType() == 0) {
 				if (HSSFDateUtil.isCellDateFormatted(productCell)) {
 					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 					String productStr = sdf.format(productCell.getDateCellValue());