diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java index 9cdb98d97..2387143a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java @@ -50,7 +50,7 @@ public class WxRentContractExtensionController extends BaseController { @SystemControllerLog(description = "商户搜索") public ResultData searchMerchant(String merchantName) throws Exception{ WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId("789"); + wxRentContract.updateTenantInfo(getTenantInfo()); wxRentContract.setMerchantName(merchantName); List> result = wxRentContractService.searchMerchantByname(wxRentContract); return new ResultData(result); @@ -90,11 +90,11 @@ public class WxRentContractExtensionController extends BaseController { wxRentContract.setBusDiscountTime(new Integer(0)); } MallUserInfo user = getUser(); - //wxRentContract.updateTenantInfo(user); - wxRentContract.setTenantId("789"); - wxRentContract.setParentTenantId("788"); - user.setId(Long.parseLong("321127266275430400")); - user.setUsername("alitest"); + wxRentContract.updateTenantInfo(user); + //wxRentContract.setTenantId("789"); + //wxRentContract.setParentTenantId("788"); + //user.setId(Long.parseLong("321127266275430400")); + //user.setUsername("alitest"); wxRentContract.setAdjustPeriodHandle(); Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){