diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index e0086ef88..074ace279 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; +import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentShopType; import com.iformall.enums.EnumShopType; import com.iformall.service.WxBillRentService; @@ -67,7 +68,7 @@ public class WxRentContractController extends BaseController { //目前只有多经点位租赁合同 WxShop wxShop = wxShopService.getById(wxRentContract.getShopId()); - if(wxRentContract.getMonthHandleType() != null && wxRentContract.getMonthHandleType().intValue()==3 + if(wxRentContract.getMonthHandleType() != null && EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode().equals(wxRentContract.getMonthHandleType().intValue()) && EnumRentShopType.POINT.getCode().equals(wxShop.getType())){ wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType()); } @@ -81,7 +82,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(getTenantId()); //目前只有多经点位租赁合同 WxShop wxShop = wxShopService.getById(wxRentContract.getShopId()); - if(wxRentContract.getMonthHandleType() != null && wxRentContract.getMonthHandleType().intValue()==3 + if(wxRentContract.getMonthHandleType() != null && EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode().equals(wxRentContract.getMonthHandleType().intValue()) && EnumRentShopType.POINT.getCode().equals(wxShop.getType())){ wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType()); } @@ -95,7 +96,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(getTenantId()); //目前只有多经点位租赁合同 WxShop wxShop = wxShopService.getById(wxRentContract.getShopId()); - if(wxRentContract.getMonthHandleType() != null && wxRentContract.getMonthHandleType().intValue()==3 + if(wxRentContract.getMonthHandleType() != null &&EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode().equals(wxRentContract.getMonthHandleType().intValue()) && EnumRentShopType.POINT.getCode().equals(wxShop.getType())){ wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType()); } @@ -109,7 +110,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(getTenantId()); //目前只有多经点位租赁合同 WxShop wxShop = wxShopService.getById(wxRentContract.getShopId()); - if(wxRentContract.getMonthHandleType() != null && wxRentContract.getMonthHandleType().intValue()==3 + if(wxRentContract.getMonthHandleType() != null && EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode().equals(wxRentContract.getMonthHandleType().intValue()) && EnumRentShopType.POINT.getCode().equals(wxShop.getType())){ wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType()); }