Browse Source

处理单个物料上传未设置价格出现上架的异常

hejq 7 years ago
parent
commit
e763225e70

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

@@ -2750,7 +2750,7 @@ public class ProductServiceImpl implements ProductService {
         if (size == 1) {
         if (size == 1) {
             GoodsQtyPrice qtyPrice = goods.getOriginalPrices().get(0);
             GoodsQtyPrice qtyPrice = goods.getOriginalPrices().get(0);
             // 前端设置的默认值,不用保存
             // 前端设置的默认值,不用保存
-            if (null == qtyPrice.getPrice()) {
+            if (null == qtyPrice.getUSDPrice() && null == qtyPrice.getRMBPrice()) {
                 goods.setQtyPrice("");
                 goods.setQtyPrice("");
             }
             }
         } else if (size > 1) {
         } else if (size > 1) {
@@ -2764,7 +2764,7 @@ public class ProductServiceImpl implements ProductService {
                 throw new IllegalOperatorException("第 " + errMsg.toString() + " 行价格未填写");
                 throw new IllegalOperatorException("第 " + errMsg.toString() + " 行价格未填写");
             }
             }
         }
         }
-        if (!StringUtils.isEmpty(qtyPrices)) {
+        if (!StringUtils.isEmpty(qtyPrices) && !StringUtils.isEmpty(goods.getQtyPrice())) {
             if (CollectionUtils.isNotEmpty(goods.getOriginalPrices())) {
             if (CollectionUtils.isNotEmpty(goods.getOriginalPrices())) {
                 qtyPrices.forEach(qtyPrice -> {
                 qtyPrices.forEach(qtyPrice -> {
                     // 分段数量不能超过最大数量
                     // 分段数量不能超过最大数量