From 2a0d677e3f780d5f3078b6c0fd99371f51556c0c Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 1 Jul 2025 17:17:32 +0800 Subject: [PATCH] fix --- .../controller/contract/WxAgileContractController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 822e115df..a45351433 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -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; }