Browse Source

处理31期迭代的bug。

yujia 7 years ago
parent
commit
df89f3b1b4

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

@@ -1739,7 +1739,7 @@ public class ProductServiceImpl implements ProductService {
                     return new ResultMap(CodeType.NOT_EXiST, "数据库找不到对应的信息,请重新操作");
                 }
                 Product persistProduct = productDao.findOne(id);
-                if (productPrivate.getB2cEnabled() != IntegerConstant.YES_SHORT) {
+                if (IntegerConstant.NO_SHORT.equals(productPrivate.getB2cEnabled())) {
                     return new ResultMap(CodeType.NOT_PERMIT, "该物料商城未启用,不能操作");
                 }
                 persistProduct.setMinPackQty(product.getMinPackQty());
@@ -2680,7 +2680,7 @@ public class ProductServiceImpl implements ProductService {
     private void bindToPerson(Product productInfo, Long userUU, Long enUU) {
         List<ProductPerson> productPersonList = productPersonDao.findByProductIdAndUserUU(productInfo.getId(), userUU);
         if (CollectionUtils.isEmpty(productPersonList)) {
-            ProductPerson productPerson = new ProductPerson(userUU, enUU, productInfo.getId());
+            ProductPerson productPerson = new ProductPerson(enUU, userUU, productInfo.getId());
             productPerson = productPersonDao.save(productPerson);
             logger.info("个人物料", "新增个人物料", "通过卖家中心单个物料上传绑定个人物料", productInfo.getProdNum(), productPerson.getId());
         }

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

@@ -2026,7 +2026,6 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		List<ProductPrivate> productPrivates = new ArrayList<>();
 		Set<Long> prIds = new HashSet<>();
 		//需要更新的规格、最小包数量、包装方式
-		Set<ReleaseProductByBatch> updateProducts = new HashSet<>();
 		Map<String, List<PCBPropertyValue>> propertyMap = new HashedMap();
 
         String importNum = createNumberService.getTimeNumber("trade$product_import_num", 8, releaseProductByBatchList.size());
@@ -2090,7 +2089,8 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		}
 		//保存新生成的物料私有字段
 		if (CollectionUtils.isNotEmpty(productPrivates)) {
-            commonDao.save(productPrivates, ProductPrivate.class);
+			commonDao.save(productPrivates, ProductPrivate.class);
+			productPrivateService.saveProductPrivates(productPrivates);
 		}
 		//将本次临时表中的数据更新到物料表中
 		productService.updateProductsByReleaseProductByBatch(prIds, releaseProductByBatchList, ignoreImport, newInOutboundDetail);