Эх сурвалжийг харах

处理删除物料报错的bug。

yujia 7 жил өмнө
parent
commit
b0e922c729

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

@@ -603,34 +603,39 @@ public class ProductServiceImpl implements ProductService {
                 }
                 StringUtilB2C.removeFromList(ids, productPerson.getProductId());
             }
-            //删除匹配结果信息
-            productMatchResultDao.deleteByProductids(ids);
-
-            //更新在售产品信息
-            List<Goods> goodses = goodsService.findByProductids(ids);
-            goodsService.deleteGoods(goodses);
-
-            //调整物料为禁用状态。
-            List<ProductPrivate> productPrivates = productPrivateService.findByPrIds(ids);
-            for (ProductPrivate productPrivate : productPrivates) {
-                productPrivate.setB2cEnabled(IntegerConstant.NO_SHORT);
-                StringUtilB2C.removeFromList(ids, productPrivate.getPrId());
-            }
-            ProductPrivate pPrivate = null;
-            for (Long id : ids) {
-                pPrivate = new ProductPrivate(id);
-                if (CollectionUtils.isEmpty(productPrivates)) {
-                    productPrivates = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(ids)) {
+                //删除匹配结果信息
+                productMatchResultDao.deleteByProductids(ids);
+
+                //更新在售产品信息
+                List<Goods> goodses = goodsService.findByProductids(ids);
+                goodsService.deleteGoods(goodses);
+
+                //调整物料为禁用状态。
+                List<ProductPrivate> productPrivates = productPrivateService.findByPrIds(ids);
+                for (ProductPrivate productPrivate : productPrivates) {
+                    productPrivate.setB2cEnabled(IntegerConstant.NO_SHORT);
+                    StringUtilB2C.removeFromList(ids, productPrivate.getPrId());
+                }
+                ProductPrivate pPrivate = null;
+                for (Long id : ids) {
+                    pPrivate = new ProductPrivate(id);
+                    if (CollectionUtils.isEmpty(productPrivates)) {
+                        productPrivates = new ArrayList<>();
+                    }
+                    productPrivates.add(pPrivate);
+                }
+                if (CollectionUtils.isNotEmpty(productPrivates)) {
+                    productPrivateDao.save(productPrivates);
                 }
-                productPrivates.add(pPrivate);
-            }
-            if (CollectionUtils.isNotEmpty(productPrivates)) {
-                productPrivateDao.save(productPrivates);
             }
+            int code = 1;
             if (StringUtils.isEmpty(message)) {
                 message = "删除成功";
+            } else {
+                code = CodeType.NOT_PERMIT.code();
             }
-            return ResultMap.success(message);
+            return new ResultMap(code, message);
         }
     }