Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -377,8 +377,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String price = busSalesOrderDiscountList.get(i).getPrice();
                 Integer num = busSalesOrderDiscountList.get(i).getNum();
                 String totalValue = busSalesOrderDiscountList.get(i).getTotalValue();
-                if (new BigDecimal(totalValue).compareTo(new BigDecimal(price).multiply(new BigDecimal(num.toString()))) != 0) {
-                    return rb.setMsg("主车优惠明细中总价值数值计算错误");
+                if(StringUtils.isNotBlank(price) && StringUtils.isNotBlank(totalValue) && num != 0){
+                    if (new BigDecimal(totalValue).compareTo(new BigDecimal(price).multiply(new BigDecimal(num.toString()))) != 0) {
+                        return rb.setMsg("主车优惠明细中总价值数值计算错误");
+                    }
                 }
             }
         }