Browse Source

处理PCB上传报错的问题。

yujia 7 years ago
parent
commit
55d8b29c80

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/dao/ReleaseProductByBatchDao.java

@@ -107,7 +107,7 @@ public interface ReleaseProductByBatchDao
 	 * @param batchid
 	 */
 	@Procedure(procedureName = "PRODUCT_RELEASE_VALID_V2_PCB")
-	String callValidProcedurePcb(Long publisherUu, String batchid);
+	void callValidProcedurePcb(Long publisherUu, String batchid);
 
     /**
      * 创建时间 :2017年1月6日 下午8:25:57

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

@@ -86,13 +86,14 @@ public class ProductPrivateServiceImpl implements ProductPrivateService {
         List<ProductPrivate> privateList = findByPrIds(prIds);
         Boolean isExist = false;
         ProductPrivate productPrivate = null;
-        int batchCount = 0;
+        Integer batchCount = 0;
         Map<Long, Integer> goodsCountByProductId = goodsService.batchGetCountByProductId(prIds);
         for (Long productId : prIds) {
             isExist = false;
             batchCount = 0;
             if ((goodsCountByProductId != null) && (goodsCountByProductId.size() != 0)) {
                 batchCount = goodsCountByProductId.get(productId);
+                batchCount = (batchCount == null) ? 0 : batchCount;
             }
             for (ProductPrivate productPri : privateList) {
                 if (productPri.getPrId().longValue() == productId.longValue()) {

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

@@ -303,9 +303,9 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			}
 		}
 		Long l5 = 0l;
-		String strCount = "";
+		String strCount = "0";
 		if (isPcb) {
-			strCount = releaseProductByBatchDao.callValidProcedurePcb(enUU, batch);
+			 releaseProductByBatchDao.callValidProcedurePcb(enUU, batch);
 		} else {
 			final Object[] obj = new Object[]{enUU, batch};
 			String sql = "/*#mycat:db_type=master*/ set @enuu = %s; set @batch = '%s'; call PRODUCT_RELEASE_VALID_V5(@enuu, @batch, @out); select @out";