Sfoglia il codice sorgente

fix(物料删除):处理删除物料报错的问题。

yuj 7 anni fa
parent
commit
9a1074f9c8

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

@@ -643,17 +643,19 @@ public class ProductServiceImpl implements ProductService {
                     }
                     }
                 }
                 }
             }
             }
-
-            List<ProductPerson> productPersons = productPersonDao.findByProductIds(ids);
-            for (ProductPerson productPerson : productPersons) {
-                if (!message.contains("存在物料已被个人收录,不能删除")) {
-                    if (org.apache.commons.lang.StringUtils.isNotEmpty(message)) {
-                        message += ",";
+            if (CollectionUtils.isNotEmpty(ids)) {
+                List<ProductPerson> productPersons = productPersonDao.findByProductIds(ids);
+                for (ProductPerson productPerson : productPersons) {
+                    if (!message.contains("存在物料已被个人收录,不能删除")) {
+                        if (org.apache.commons.lang.StringUtils.isNotEmpty(message)) {
+                            message += ",";
+                        }
+                        message += "存在物料已被个人收录,不能删除";
                     }
                     }
-                    message += "存在物料已被个人收录,不能删除";
+                    StringUtilB2C.removeFromList(ids, productPerson.getProductId());
                 }
                 }
-                StringUtilB2C.removeFromList(ids, productPerson.getProductId());
             }
             }
+
             if (CollectionUtils.isNotEmpty(ids)) {
             if (CollectionUtils.isNotEmpty(ids)) {
                 //删除匹配结果信息
                 //删除匹配结果信息
                 productMatchResultDao.deleteByProductids(ids);
                 productMatchResultDao.deleteByProductids(ids);

+ 1 - 1
src/main/resources/dev/redisson.yaml

@@ -13,7 +13,7 @@ singleServerConfig:
   password: null
   password: null
   subscriptionsPerConnection: 5
   subscriptionsPerConnection: 5
   clientName: null
   clientName: null
-  address: ["redis://188.131.128.107:6379"]
+  address: ["redis://127.0.0.1:6379"]
   subscriptionConnectionMinimumIdleSize: 1
   subscriptionConnectionMinimumIdleSize: 1
   subscriptionConnectionPoolSize: 25
   subscriptionConnectionPoolSize: 25
   connectionMinimumIdleSize: 5
   connectionMinimumIdleSize: 5