diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 6c47dc4da..f2c286447 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -479,8 +479,6 @@ public class WxAgileContractController extends WxContractBaseController { rentContract.setSignDate(wxRentContract.getSignDate()); rentContract.setStartDate(wxRentContract.getStartDate()); rentContract.setEndDate(wxRentContract.getStartDate()); - rentContract.setFixStartDate(wxRentContract.getFixStartDate()); - rentContract.setFixEndDate(wxRentContract.getFixEndDate()); try { rentContractValidShop(rentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index 65f461d30..028f0f86c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -1031,8 +1031,6 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { } } - //WxContractCustomers ccq = new WxContractCustomers(); - WxRentContractAgileDeposit cadq = new WxRentContractAgileDeposit(); cadq.updateTenantInfo(rentContract); cadq.setRentContractId(rentContract.getId()); @@ -1092,9 +1090,50 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { } } -// WxRentContractRevenue -// WxRentContractRevenueItem -// WxRentContractRevenueFees + WxRentContractAgileRenevue rq = new WxRentContractAgileRenevue(); + rq.updateTenantInfo(rentContract); + rq.setRentContractId(rentContract.getId()); + List renevueList = wxRentContractAgileRenevueMapper.findList(rq); + Long renevueId = null; + if (null != renevueList && renevueList.size() > 0 ) { + for (int i = 0 ; i < renevueList.size() ; i++) { + WxRentContractAgileRenevue ar = renevueList.get(i); + ar.setRentContractId(newContractId); + ar.setId(idWorker.nextId()); + ar.setCreatetime(new Date()); + ar.setUpdatetime(new Date()); + wxRentContractAgileRenevueMapper.insert(ar); + renevueId = ar.getId(); + } + } + if (null != renevueId) { + WxRentContractAgileRenevueItem ari = new WxRentContractAgileRenevueItem(); + ari.setRentContractId(newContractId); + ari.setRenevueId(renevueId); + ari.setBeginTime(rentContract.getRentalStartDate()); + ari.setBeginTime(rentContract.getRentalEndDate()); + ari.setRate("0"); + ari.setIsFree(EnumYesOrNo.NO.getCode()); + ari.setId(idWorker.nextId()); + ari.setCreatetime(new Date()); + ari.setUpdatetime(new Date()); + wxRentContractAgileRenevueItemMapper.insert(ari); + } + WxRentContractAgileRenevueFees fq = new WxRentContractAgileRenevueFees(); + fq.updateTenantInfo(rentContract); + fq.setRentContractId(rentContract.getId()); + List renevueFeesList = wxRentContractAgileRenevueFeesMapper.findList(fq); + if (null != renevueFeesList && renevueFeesList.size() > 0 && null != renevueId ) { + for (int i = 0 ; i < renevueFeesList.size() ; i++) { + WxRentContractAgileRenevueFees arf = renevueFeesList.get(i); + arf.setRentContractId(newContractId); + arf.setAgileRenevueId(renevueId); + arf.setId(idWorker.nextId()); + arf.setCreatetime(new Date()); + arf.setUpdatetime(new Date()); + wxRentContractAgileRenevueFeesMapper.insert(arf); + } + } WxRentContractRevenueJump crjq = new WxRentContractRevenueJump(); crjq.updateTenantInfo(rentContract); @@ -1118,17 +1157,11 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { rentContract.setUpdatetime(new Date()); rentContract.setUpdateBy(user.getId()); rentContract.setUpdateByName(user.getName()); - rentContract.setStatus(EnumRentContractStatus.DRAFT.getCode()); + rentContract.setStatus(EnumRentContractStatus.UNWRITE.getCode()); rentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); rentContract.setEndContractTime(null); - //rentContract.setFirstBillDateStart(null); - //rentContract.setFirstBillDateEnd(null); - //rentContract.setFirstBillReceiveDate(null); int[] array = DateUtils.getDiff(rentContract.getRentalStartDate(),rentContract.getRentalEndDate()); rentContract.setLease(array[0]); - //rentContract.setAdjustRatio(); - //rentContract.setRevenueRatioSet(); - //rentContract.set wxRentContractMapper.insert(rentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 0ed136829..c27c68977 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1111,7 +1111,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxRentContractAgileRenevueFees fee = fees.get(i); //更新账单费用 BigDecimal fneedpay = new BigDecimal(needpay).multiply(new BigDecimal(fee.getRate()).divide(new BigDecimal(100))).setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP); - List renBill = generateRenevueBill(user,shopIdList,shopMap,shopUserMap,shopAreaRateMap,rentcontract,fneedpay,fee.getRate(),startDate,endDate,createFrom); + List renBill = generateRenevueBill(fee.getFeesId(),user,shopIdList,shopMap,shopUserMap,shopAreaRateMap,rentcontract,fneedpay,fee.getRate(),startDate,endDate,createFrom); allbill.addAll(renBill); } @@ -1121,22 +1121,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { return vo; } - - private void createBillAction(WxAllBill bill,String oldMoney,String newMoney,MallUserInfo user) { - WxBillAction wxBillAction = new WxBillAction(); - wxBillAction.setBillId(bill.getId()); - //wxBillAction.setBillType(bill.getBillType()); - wxBillAction.setOldMoney(oldMoney); - wxBillAction.setNewMoney(newMoney); - wxBillAction.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldMoney, newMoney,null,null,null,null)); - wxBillAction.setAction(EnumBillAction.UPDATE_BILL.getCode()); - wxBillAction.setRemark(bill.getBillRemark()); - wxBillAction.setUserType(EnumSystemUserType.ADMIN.getCode()); - wxBillActionService.modifyBill(wxBillAction, user); - } - @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public List generateRenevueBill(MallUserInfo user,List shopIds,Map shopMap,Map shopUserMap,Map shopAreaRateMap,WxRentContract rentcontract, + public List generateRenevueBill(Long feesId,MallUserInfo user,List shopIds,Map shopMap,Map shopUserMap,Map shopAreaRateMap,WxRentContract rentcontract, BigDecimal moneyb,String rate,Date starttime,Date endtime,EnumBillExtraCreateFrom createFrom) { List billList = new ArrayList(); for (int i = 0 ; i < shopIds.size(); i++) { @@ -1149,8 +1135,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { final IdWorker idWorker = IdWorker.get(); bmbill.setId(idWorker.nextId()); bmbill.updateTenantInfo(rentcontract); - //bmbill.setBillType(EnumBillAllType.RENT.getCode()); - //bmbill.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); + bmbill.setEnergyFeesId(feesId); bmbill.setRentContractId(rentcontract.getId()); bmbill.setIsPreview(EnumYesOrNo.NO.getCode()); bmbill.setCanEdit(EnumYesOrNo.NO.getCode());