Browse Source

合同续签

release_toaliyun_real
furunxin 5 years ago
parent
commit
a472daf0a9
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java

+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java View File

@@ -50,7 +50,7 @@ public class WxRentContractExtensionController extends BaseController {
@SystemControllerLog(description = "商户搜索") @SystemControllerLog(description = "商户搜索")
public ResultData searchMerchant(String merchantName) throws Exception{ public ResultData searchMerchant(String merchantName) throws Exception{
WxRentContract wxRentContract = new WxRentContract(); WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setTenantId("789");
wxRentContract.updateTenantInfo(getTenantInfo());
wxRentContract.setMerchantName(merchantName); wxRentContract.setMerchantName(merchantName);
List<Map<String,Object>> result = wxRentContractService.searchMerchantByname(wxRentContract); List<Map<String,Object>> result = wxRentContractService.searchMerchantByname(wxRentContract);
return new ResultData(result); return new ResultData(result);
@@ -90,11 +90,11 @@ public class WxRentContractExtensionController extends BaseController {
wxRentContract.setBusDiscountTime(new Integer(0)); wxRentContract.setBusDiscountTime(new Integer(0));
} }
MallUserInfo user = getUser(); 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(); wxRentContract.setAdjustPeriodHandle();
Date oldDate = wxRentContract.getRentalStartDate(); Date oldDate = wxRentContract.getRentalStartDate();
if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){


Loading…
Cancel
Save