Merge branch 'master-fix' into release

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -2663,7 +2663,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 if (yfPriceUnit.equals(addYfPriceUnit) && yfVolumeUnit.equals(addYfVolumeUnit)) {
                     update = true;
                     yf = yf.add(addYf);
-                    dbItem.setTransportPrice(yf);
+                    dbItem.setTransportPrice(yf.compareTo(BigDecimal.ZERO) < 0? BigDecimal.ZERO: yf);
                 }
             }
 
@@ -2678,7 +2678,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 if (qgfPriceUnit.equals(addQgfPriceUnit) && qgfVolumeUnit.equals(addQgfVolumeUnit)) {
                     update = true;
                     qgf = qgf.add(addQgf);
-                    dbItem.setClearancePrice(qgf);
+                    dbItem.setClearancePrice(qgf.compareTo(BigDecimal.ZERO) < 0? BigDecimal.ZERO: qgf);
                 }
             }
         }
@@ -2694,7 +2694,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 if (qbjPriceUnit.equals(addQbjPriceUnit) && qbjVolumeUnit.equals(addQbjVolumeUnit)) {
                     update = true;
                     qbj = qbj.add(addQbj);
-                    dbItem.setAllPrice(qbj);
+                    dbItem.setAllPrice(qbj.compareTo(BigDecimal.ZERO) < 0? BigDecimal.ZERO: qbj);
                 }
             }
         }
@@ -2710,7 +2710,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 if (qgfPriceUnit.equals(addQgfPriceUnit) && qgfVolumeUnit.equals(addQgfVolumeUnit)) {
                     update = true;
                     qgf = qgf.add(addQgf);
-                    dbItem.setClearancePrice(qgf);
+                    dbItem.setClearancePrice(qgf.compareTo(BigDecimal.ZERO) < 0? BigDecimal.ZERO: qgf);
                 }
             }
         }