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