|
|
|
@@ -25,6 +25,7 @@ import com.iformall.enums.EnumRentContractAgilPriceUnit; |
|
|
|
import com.iformall.enums.EnumRentContractAgilSettingMethod; |
|
|
|
import com.iformall.enums.EnumRentContractAgilTimeUnit; |
|
|
|
import com.iformall.enums.EnumRentContractStatus; |
|
|
|
import com.iformall.enums.EnumRentDayPriceCalcute; |
|
|
|
import com.iformall.enums.EnumShopUsersPrincipalType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
@@ -273,7 +274,7 @@ public class WxAgileContractController extends WxContractBaseController { |
|
|
|
|
|
|
|
private boolean isResetFees(WxRentContract newContract,WxRentContract oldContract) { |
|
|
|
if (newContract.getType().intValue() != oldContract.getType().intValue() || newContract.getDayPriceCalcute().intValue() != oldContract.getDayPriceCalcute().intValue() |
|
|
|
|| (newContract.getDayPriceCalcute().intValue() == oldContract.getDayPriceCalcute().intValue() && newContract.getMonthAverageDays().intValue() != oldContract.getMonthAverageDays().intValue()) |
|
|
|
|| (newContract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode().intValue() && oldContract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode().intValue() && newContract.getMonthAverageDays().intValue() != oldContract.getMonthAverageDays().intValue()) |
|
|
|
|| newContract.getRentalStartDate().compareTo(oldContract.getRentalStartDate()) != 0 || newContract.getRentalEndDate().compareTo(oldContract.getRentalEndDate()) != 0) { |
|
|
|
return true; |
|
|
|
} |
|
|
|
|