搬家调试

ms-biz/src/main/java/com/ms/api/biz/MoveService.java

@@ -262,10 +262,10 @@ public class MoveService {
         if (price <= 0) {
             return 99999;
         }
-        double pricePercent = condition.getPricePercent().doubleValue();
-        double priceAdd = condition.getPriceAdd().doubleValue();
-        double priceSub = condition.getPriceSub().doubleValue();
-        int priceTail = condition.getPriceTail();
+        double pricePercent = ObjectUtil.isNotEmpty(condition.getPricePercent())? condition.getPricePercent().doubleValue():0;
+        double priceAdd = ObjectUtil.isNotEmpty(condition.getPriceAdd())?condition.getPriceAdd().doubleValue():0;
+        double priceSub = ObjectUtil.isNotEmpty(condition.getPriceSub())?condition.getPriceSub().doubleValue():0;
+        int priceTail = ObjectUtil.isNotEmpty(condition.getPriceTail())?condition.getPriceTail():0;
         String priceDecimal = condition.getPriceDecimal();
         double priceDecimalDiyValue = !ObjectUtil.isEmpty(condition.getPriceDecimalDiyValue()) ? Double.valueOf(condition.getPriceDecimalDiyValue()) : 0.00;
         return getConditionDdPrice(price, pricePercent, priceAdd, priceSub, priceTail, priceDecimal, priceDecimalDiyValue);