|
|
|
@@ -61,43 +61,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
@Autowired |
|
|
|
WxBillAllHelper wxBillAllHelper; |
|
|
|
|
|
|
|
// @GetMapping("/list") |
|
|
|
// @ApiImplicitParams({ |
|
|
|
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
// public ResultData list(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::list"); |
|
|
|
// if (null == wxRentContract) { |
|
|
|
// wxRentContract = new WxRentContract(); |
|
|
|
// } |
|
|
|
// wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxRentContract.setSortColumns(" updatetime desc"); |
|
|
|
// //Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); |
|
|
|
// WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
// if (null != dataRule) { |
|
|
|
// wxRentContract.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
// wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
// wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
// } |
|
|
|
// wxRentContract.setAgileType(EnumRentAgileType.STANDARDS_YEAR.getCode()); |
|
|
|
// PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); |
|
|
|
// Integer hasFlow = null; |
|
|
|
// if (null != page && null != page.getList()) { |
|
|
|
// for (WxRentContract wrc: page.getList()) { |
|
|
|
// if (null == hasFlow) { |
|
|
|
// if(rentContractHasWorkFlow(wrc)) { |
|
|
|
// hasFlow = 1; |
|
|
|
// }else { |
|
|
|
// hasFlow = 0; |
|
|
|
// } |
|
|
|
// } |
|
|
|
// wrc.setFlowHas(hasFlow); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// |
|
|
|
// return new ResultData(page); |
|
|
|
// } |
|
|
|
|
|
|
|
@GetMapping("getDateDiff") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true), |
|
|
|
@@ -112,45 +75,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(map); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 新增第一步 |
|
|
|
* @param wxRentContract |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
// @PostMapping("add") |
|
|
|
// public ResultData add(@RequestBody WxRentContract wxRentContract) { |
|
|
|
// //WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
// //wxMerchant.setName(wxRentContract.getMerchantName()); |
|
|
|
// //wxMerchant.setId(wxRentContract.getMerchantId()); |
|
|
|
//// if (wxMerchantService.hasMerchant(wxMerchant)) { |
|
|
|
//// return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); |
|
|
|
//// } |
|
|
|
// MallUserInfo user = getUser(); |
|
|
|
// wxRentContract.updateTenantInfo(user); |
|
|
|
// wxRentContract.setAdjustPeriodHandle(); |
|
|
|
// Date oldDate = wxRentContract.getRentalStartDate(); |
|
|
|
// wxRentContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); |
|
|
|
//// if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
//// wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
//// } |
|
|
|
// try { |
|
|
|
// rentContractValidShop(wxRentContract); |
|
|
|
// } catch (Exception e) { |
|
|
|
// return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
// } |
|
|
|
// return wxRentContractService.save(wxRentContract, user,user.getName(),oldDate); |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
// /** |
|
|
|
// * 计算价格 |
|
|
|
// */ |
|
|
|
// @PostMapping("calcutePrice") |
|
|
|
// public ResultData calcutePrice(@RequestBody WxRentContract wxRentContract) { |
|
|
|
// wxRentContract.calcutePrice(); |
|
|
|
// return new ResultData(wxRentContract.getPrice()); |
|
|
|
// } |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取免租期 |
|
|
|
*/ |
|
|
|
@@ -161,143 +85,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(wxRentContractService.getFreePeriods(contract)); |
|
|
|
} |
|
|
|
|
|
|
|
// /** |
|
|
|
// * 设置免租期 |
|
|
|
// * @param wxRentContract |
|
|
|
// * @return |
|
|
|
// */ |
|
|
|
// @PostMapping("setFreePeriod") |
|
|
|
// public ResultData setFreePeriod(@RequestBody WxRentContract wxRentContract) { |
|
|
|
// wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxRentContractService.saveFreePeriods(wxRentContract); |
|
|
|
// return new ResultData(); |
|
|
|
// } |
|
|
|
// |
|
|
|
/** |
|
|
|
* 新增第二步 防止前端3秒重复提交 |
|
|
|
* @param wxRentContract |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
// @PostMapping("updateMoney") |
|
|
|
// public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney"); |
|
|
|
// if (null != wxRentContract.getDecimalSize() && wxRentContract.getDecimalSize() <= 0 ) { |
|
|
|
// wxRentContract.setDecimalSize(Constant.default_short_decimal_size); |
|
|
|
// } |
|
|
|
// WxRentContract contract = wxRentContractService.selectById(wxRentContract.getId()); |
|
|
|
// wxRentContract.setRentArea(contract.getRentArea()); |
|
|
|
// |
|
|
|
// MallUserInfo user = getUser(); |
|
|
|
// wxRentContract.updateTenantInfo(user); |
|
|
|
// wxRentContract.setAdjustPeriodHandle(); |
|
|
|
// wxRentContract.calcutePrice(); |
|
|
|
// //wxRentContract.setRentPriceHandle(); |
|
|
|
// wxRentContract.calcuteDepositTotal(); |
|
|
|
// Date oldDate = wxRentContract.getRentalStartDate(); |
|
|
|
// if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
// wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
// } |
|
|
|
// wxRentContract.setOperationType(null); |
|
|
|
// if (null == wxRentContract.getDayPriceCalcute()){ |
|
|
|
// wxRentContract.setDayPriceCalcute(EnumRentDayPriceCalcute.REAL_DAYS.getCode()); |
|
|
|
// } |
|
|
|
// if (wxRentContract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode().intValue() && null == wxRentContract.getMonthAverageDays()) { |
|
|
|
// return new ResultData(Result.ERROR,"请填写月平均天数"); |
|
|
|
// } |
|
|
|
// |
|
|
|
// return wxRentContractService.update(wxRentContract, user,user.getName(),EnumFromType.OTHER.getCode(),oldDate,false,true); |
|
|
|
// } |
|
|
|
|
|
|
|
// //切换生成账单方式 |
|
|
|
// @PostMapping("updateRentStartTime") |
|
|
|
// public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { |
|
|
|
// MallUserInfo user = getUser(); |
|
|
|
// wxRentContract.updateTenantInfo(user); |
|
|
|
// return wxRentContractService.updateRentStartTime(wxRentContract, user); |
|
|
|
// } |
|
|
|
|
|
|
|
/** |
|
|
|
* 新增第三步 |
|
|
|
* @param wxRentContract |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
// @PostMapping("updateFile") |
|
|
|
// public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); |
|
|
|
// MallUserInfo user = getUser(); |
|
|
|
// wxRentContract.updateTenantInfo(user); |
|
|
|
// //wxRentContract.setAdjustPeriodHandle(); |
|
|
|
// //wxRentContract.setRentPriceHandle(); |
|
|
|
//// Date oldDate = wxRentContract.getRentalStartDate(); |
|
|
|
//// if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
//// wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
//// } |
|
|
|
// //wxRentContract.setRentShopType(null); |
|
|
|
// //wxRentContract.setOperationType(null); |
|
|
|
// |
|
|
|
// return wxRentContractService.updateFile(wxRentContract, user,user.getName(),true); |
|
|
|
// } |
|
|
|
|
|
|
|
// @GetMapping("/findById") |
|
|
|
// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) |
|
|
|
// public ResultData findById(Long id,Integer noBillList) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); |
|
|
|
// // 同步欠缴状态 |
|
|
|
//// WxAllBill wxBillRent = new WxAllBill(); |
|
|
|
//// wxBillRent.updateTenantInfo(getTenantInfo()); |
|
|
|
//// wxBillRentService.updateBillStatus(wxBillRent); |
|
|
|
// try { |
|
|
|
// Map<String, Object> data = wxRentContractService.getById(id,noBillList); |
|
|
|
// return new ResultData(data); |
|
|
|
// } catch (MallinkException e) { |
|
|
|
// logger.error(e.getMessage()); |
|
|
|
// return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
// } |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
// @PostMapping("update") |
|
|
|
// @SystemControllerLog(description = "租赁合同-更新") |
|
|
|
// public ResultData update(@RequestBody WxRentContract rentContract) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::update"); |
|
|
|
// |
|
|
|
// WxRentContract cure = wxRentContractService.getSimpleDeatil(rentContract.getId()); |
|
|
|
// if (null == cure) { |
|
|
|
// return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"租赁合同未查询到"); |
|
|
|
// } |
|
|
|
// |
|
|
|
// if (cure.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue()|| |
|
|
|
// cure.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || |
|
|
|
// (cure.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() |
|
|
|
// && (cure.getApplyStatus().intValue()== EnumRentContractAppStatus.REJECT.getCode().intValue() || |
|
|
|
// cure.getApplyStatus().intValue()== EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { |
|
|
|
// MallUserInfo user = getUser(); |
|
|
|
// rentContract.updateTenantInfo(user); |
|
|
|
// rentContract.setAdjustPeriodHandle(); |
|
|
|
// //rentContract.setRentPriceHandle(); |
|
|
|
// Date oldDate = rentContract.getRentalStartDate(); |
|
|
|
// if(rentContract.getRentStartType()!=null && rentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
// rentContract.setRentalStartDate(rentContract.getStartDate()); |
|
|
|
// } |
|
|
|
// |
|
|
|
// try { |
|
|
|
// rentContractValidShop(rentContract); |
|
|
|
// } catch (Exception e) { |
|
|
|
// return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
// } |
|
|
|
// |
|
|
|
// ResultData update = null; |
|
|
|
// try { |
|
|
|
// update = wxRentContractService.updateOneStep(rentContract, user, user.getName(), EnumFromType.OTHER.getCode(), oldDate,false); |
|
|
|
// } catch (MallinkException e) { |
|
|
|
// return new ResultData(update.code,update.message); |
|
|
|
// } |
|
|
|
// return update; |
|
|
|
// }else { |
|
|
|
// return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"当前合同状态不允许修改"); |
|
|
|
// } |
|
|
|
// } |
|
|
|
|
|
|
|
/** |
|
|
|
* 作废 |
|
|
|
* @param wxRentContract |
|
|
|
@@ -419,130 +206,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return wxRentContractService.apply(rentContract,user); |
|
|
|
} |
|
|
|
|
|
|
|
//续签 |
|
|
|
@PostMapping("renewal") |
|
|
|
public ResultData renewal(@RequestBody WxRentContract wxRentContract) { |
|
|
|
if (null == wxRentContract.getId()){ |
|
|
|
return new ResultData(Result.ERROR, "合同ID不能为空"); |
|
|
|
} |
|
|
|
|
|
|
|
if (null == wxRentContract.getRentalStartDate() || null == wxRentContract.getRentalEndDate()){ |
|
|
|
return new ResultData(Result.ERROR, "请选择租赁开始日期和截止日期"); |
|
|
|
} |
|
|
|
|
|
|
|
if (null == wxRentContract.getStartDate()){ |
|
|
|
return new ResultData(Result.ERROR, "请选择计租日期"); |
|
|
|
} |
|
|
|
|
|
|
|
if (null == wxRentContract.getSignDate()){ |
|
|
|
return new ResultData(Result.ERROR, "请选择签约日期"); |
|
|
|
} |
|
|
|
|
|
|
|
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); |
|
|
|
if (null == rentContract) { |
|
|
|
return new ResultData(Result.ERROR, "未找到租金合同"); |
|
|
|
} |
|
|
|
|
|
|
|
if (!(rentContract.getRentalEndDate().before(wxRentContract.getRentalStartDate()))) { |
|
|
|
return new ResultData(Result.ERROR, "续租合同开始日期要大于原合同截止日期"); |
|
|
|
} |
|
|
|
|
|
|
|
if (rentContract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue()) { |
|
|
|
return new ResultData(Result.ERROR,"租金合同未完善,请先完善。"); |
|
|
|
} |
|
|
|
|
|
|
|
MallUserInfo user = getUser(); |
|
|
|
|
|
|
|
rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); |
|
|
|
rentContract.setRentalEndDate(wxRentContract.getRentalEndDate()); |
|
|
|
rentContract.setSignDate(wxRentContract.getSignDate()); |
|
|
|
rentContract.setStartDate(wxRentContract.getStartDate()); |
|
|
|
rentContract.setEndDate(wxRentContract.getStartDate()); |
|
|
|
rentContract.setFixStartDate(wxRentContract.getFixStartDate()); |
|
|
|
rentContract.setFixEndDate(wxRentContract.getFixEndDate()); |
|
|
|
|
|
|
|
try { |
|
|
|
rentContractValidShop(rentContract); |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
try { |
|
|
|
wxRentContractService.renewal(rentContract,user); |
|
|
|
}catch(Exception e) { |
|
|
|
logger.error("renewal error.",e); |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(rentContract); |
|
|
|
} |
|
|
|
|
|
|
|
//转签 |
|
|
|
@PostMapping("transfer") |
|
|
|
public ResultData transfer(@RequestBody WxRentContract wxRentContract) { |
|
|
|
if (null == wxRentContract.getId() || null == wxRentContract.getCustomerType() || |
|
|
|
StringUtils.isBlank(wxRentContract.getCustomerName()) || StringUtils.isBlank(wxRentContract.getCustomerPhone())){ |
|
|
|
return new ResultData(Result.ERROR, "缺少参数"); |
|
|
|
} |
|
|
|
|
|
|
|
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); |
|
|
|
if (null == rentContract) { |
|
|
|
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); |
|
|
|
} |
|
|
|
|
|
|
|
MallUserInfo user = getUser(); |
|
|
|
|
|
|
|
try { |
|
|
|
rentContract.setCustomersId(wxRentContract.getCustomersId()); |
|
|
|
rentContract.setCustomerType(wxRentContract.getCustomerType()); |
|
|
|
rentContract.setCustomerName(wxRentContract.getCustomerName()); |
|
|
|
rentContract.setCustomerLinkPerson(wxRentContract.getCustomerLinkPerson()); |
|
|
|
rentContract.setCustomerPhone(wxRentContract.getCustomerPhone()); |
|
|
|
rentContract.setCustomerLegalPerson(wxRentContract.getCustomerLegalPerson()); |
|
|
|
|
|
|
|
wxRentContractService.transfer(rentContract,user); |
|
|
|
}catch(Exception e) { |
|
|
|
logger.error("transfer error.",e); |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(rentContract); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// @GetMapping("getRentContractList") |
|
|
|
// @ApiImplicitParams({ |
|
|
|
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
// public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer validStatus, Integer pageNum, Integer pageSize) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); |
|
|
|
// if (null == wxRentContract) wxRentContract = new WxRentContract(); |
|
|
|
// wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
// if (StringUtils.isNotBlank(wxRentContract.getOnlyPropertyContractId()) && (!"undefined".equals(wxRentContract.getOnlyPropertyContractId()))) { |
|
|
|
// try { |
|
|
|
// Long contractId = Long.parseLong(wxRentContract.getOnlyPropertyContractId()); |
|
|
|
// if (contractId > 0 ) { |
|
|
|
// wxRentContract.setId(contractId); |
|
|
|
// } |
|
|
|
// } catch (NumberFormatException e) { |
|
|
|
// } |
|
|
|
// |
|
|
|
// } else { |
|
|
|
// //正常状态, 物业合同 |
|
|
|
// if (validStatus != null && 1 == validStatus) { |
|
|
|
// wxRentContract.setStatuss(EnumRentContractStatus.getValidStatus()); |
|
|
|
// //续签的合同,包括正常到期 |
|
|
|
// }else if (validStatus != null && 2== validStatus) { |
|
|
|
// List<Integer> statuss = EnumRentContractStatus.getValidStatus(); |
|
|
|
// statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); |
|
|
|
// wxRentContract.setStatuss(statuss); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// |
|
|
|
// wxRentContract.setSortColumns(SortField.Createtime_DESC); |
|
|
|
// return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); |
|
|
|
// } |
|
|
|
|
|
|
|
@GetMapping("getPayAccountInfo") |
|
|
|
@SystemControllerLog(description = "租赁合同-获取甲方账户") |
|
|
|
public ResultData getPayAccountInfo() { |
|
|
|
@@ -565,31 +228,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(map); |
|
|
|
} |
|
|
|
|
|
|
|
// @GetMapping("/hasRentStatus") |
|
|
|
// public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus"); |
|
|
|
// wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
// return wxRentContractService.hasRentStatus(wxRentContract); |
|
|
|
// } |
|
|
|
|
|
|
|
// @GetMapping("/hasContractNumber") |
|
|
|
// public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber"); |
|
|
|
// wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
// return wxRentContractService.hasContractNumber(wxRentContract); |
|
|
|
// } |
|
|
|
|
|
|
|
// @GetMapping("getMerchantList") |
|
|
|
// @ApiImplicitParams({ |
|
|
|
// @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) |
|
|
|
// public ResultData getMerchantList(Integer shopType) throws Exception{ |
|
|
|
// WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
// wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxMerchant.setRentShopType(shopType); |
|
|
|
// wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
|
// return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant)); |
|
|
|
// } |
|
|
|
|
|
|
|
@PostMapping("savePayAccountInfo") |
|
|
|
public ResultData savePayAccountInfo(@RequestBody WxPayAccountBill payAccountBill) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxRentContractController::savePayAccountInfo"); |
|
|
|
@@ -612,34 +250,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
// @GetMapping("/getContractByContractNumber") |
|
|
|
// public ResultData getContractByContractNumber(@ModelAttribute WxRentContract wxRentContract) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxRentContractController::getContractByContractNumber"); |
|
|
|
// wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
// return wxRentContractService.getContractByContractNumber(wxRentContract); |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
// @GetMapping("/init") |
|
|
|
// @TenantIgnore |
|
|
|
// public ResultData init() { |
|
|
|
// List<WxRentContract> clist = wxRentContractService.findList(new WxRentContract()); |
|
|
|
// for (WxRentContract wrc: clist) { |
|
|
|
// List<Long> shopIds = wrc.shopIdsByRentInfo(); |
|
|
|
// if (null != shopIds) { |
|
|
|
// List<WxShop> shops = wxShopService.getByIds(this.getTenantInfo(),shopIds); |
|
|
|
// String shopIdstr = ""; |
|
|
|
// for (WxShop shop : shops) { |
|
|
|
// shopIdstr = shopIdstr +","+shop.getId(); |
|
|
|
// } |
|
|
|
// if(!StringUtils.isBlank(shopIdstr)) { |
|
|
|
// wrc.setShopIdStr(shopIdstr); |
|
|
|
// wxRentContractService.updateRentContract(wrc); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } |
|
|
|
// return new ResultData(); |
|
|
|
// } |
|
|
|
|
|
|
|
//查询联营扣点,联营取高的合同 |
|
|
|
@GetMapping("getRevenueContractList") |
|
|
|
|