|
|
|
@@ -296,6 +296,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
fpq.setSortColumn("year_index asc,start_date asc");
|
|
|
|
List<WxRentContractFreePeriod> freePeroids = wxRentContractFreePeriodMapper.findList(fpq);
|
|
|
|
wxRentContract.setFreeVo(freePeroids);
|
|
|
|
|
|
|
|
//跳点设置
|
|
|
|
WxRentContractRevenueJump jq = new WxRentContractRevenueJump();
|
|
|
|
jq.updateTenantInfo(wxRentContract);
|
|
|
|
jq.setRentContractId(wxRentContract.getId());
|
|
|
|
wxRentContract.setRevenueJumps(wxRentContractRevenueJumpMapper.findList(jq));
|
|
|
|
result.put("wxRentContract", wxRentContract);
|
|
|
|
//关联的商户
|
|
|
|
if (wxRentContract.getMerchantId() != null) {
|
|
|
|
|