Kaynağa Gözat

fix

release_toaliyun_real
winter 1 yıl önce
ebeveyn
işleme
edd4409486
2 değiştirilmiş dosya ile 46 ekleme ve 27 silme
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +45
    -27
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Dosyayı Görüntüle

@@ -964,6 +964,7 @@ public class WxRentContractController extends WxContractBaseController {
if (null == jumpList || jumpList.size() <= 0 ) { if (null == jumpList || jumpList.size() <= 0 ) {
return new ResultData(Result.ERROR, "合同未设置跳点,不用做汇算"); return new ResultData(Result.ERROR, "合同未设置跳点,不用做汇算");
} }
rentContract.setPropertyContractId(wxRentContract.getPropertyContractId());
return new ResultData(wxRentContractService.calcuteYearsRevenueRentUp(rentContract)); return new ResultData(wxRentContractService.calcuteYearsRevenueRentUp(rentContract));
} }


+ 45
- 27
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Dosyayı Görüntüle

@@ -2926,23 +2926,38 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }
//查询对应的物业账单 //查询对应的物业账单
WxPropertyContract bq = new WxPropertyContract();
bq.updateTenantInfo(rentcontract);
bq.setMerchantId(rentcontract.getMerchantId());
bq.setRentContractId(rentcontract.getId());
bq.setOperationType(EnumContractOperationType.WHOLE.getCode());
List<Integer> statusList = new ArrayList<Integer>();
//包括提前终止的,租金+物业合同是一对一的
statusList.add(EnumRentContractStatus.PAING.getCode());
statusList.add(EnumRentContractStatus.TERMINATE.getCode());
bq.setStatuss(statusList);
//bq.setStatus(EnumRentContractStatus.PAING.getCode());
List<WxPropertyContract> propertyList = wxPropertyContractService.findList(bq);
if (null != propertyList && propertyList.size() > 0 ) {
WxPropertyContract pc = propertyList.get(0);
if (null != rentcontract.getPropertyContractId()) {
/**
WxPropertyContract bq = new WxPropertyContract();
bq.updateTenantInfo(rentcontract);
bq.setMerchantId(rentcontract.getMerchantId());
bq.setRentContractId(rentcontract.getId());
bq.setOperationType(EnumContractOperationType.WHOLE.getCode());
List<Integer> statusList = new ArrayList<Integer>();
//包括提前终止的,租金+物业合同是一对一的
statusList.add(EnumRentContractStatus.PAING.getCode());
statusList.add(EnumRentContractStatus.TERMINATE.getCode());
bq.setStatuss(statusList);
//bq.setStatus(EnumRentContractStatus.PAING.getCode());
List<WxPropertyContract> propertyList = wxPropertyContractService.findList(bq);
if (null != propertyList && propertyList.size() > 0 ) {
WxPropertyContract pc = propertyList.get(0);
WxAllBill propertyBillq = new WxAllBill();
propertyBillq.updateTenantInfo(rentcontract);
propertyBillq.setPropertyContractId(pc.getId());
propertyBillq.setBillType(EnumBillAllType.PROPERTY.getCode());
propertyBillq.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
propertyBillq.setIsPreview(EnumYesOrNo.NO.getCode());
propertyBillq.setStarttime(rentcontract.getYearsBegin());
propertyBillq.setEndtime(rentcontract.getYearsEnd());
WxBillSum propertyBillSum = wxAllBillMapper.getBillMonthSum(propertyBillq);
if (null != propertyBillSum) {
receivepay = receivepay.add(propertyBillSum.getNeedPayNumber());
}
}*/
WxAllBill propertyBillq = new WxAllBill(); WxAllBill propertyBillq = new WxAllBill();
propertyBillq.updateTenantInfo(rentcontract); propertyBillq.updateTenantInfo(rentcontract);
propertyBillq.setPropertyContractId(pc.getId());
propertyBillq.setPropertyContractId(rentcontract.getPropertyContractId());
propertyBillq.setBillType(EnumBillAllType.PROPERTY.getCode()); propertyBillq.setBillType(EnumBillAllType.PROPERTY.getCode());
propertyBillq.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId()); propertyBillq.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
propertyBillq.setIsPreview(EnumYesOrNo.NO.getCode()); propertyBillq.setIsPreview(EnumYesOrNo.NO.getCode());
@@ -2955,18 +2970,21 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }
//查询设置销售额增加的物业账单 //查询设置销售额增加的物业账单
WxAllBill prpoertyBillq = new WxAllBill();
prpoertyBillq.updateTenantInfo(rentcontract);
prpoertyBillq.setRentContractId(rentcontract.getId());
prpoertyBillq.setBillType(EnumBillAllType.PROPERTY.getCode());
prpoertyBillq.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
prpoertyBillq.setIsPreview(EnumYesOrNo.NO.getCode());
prpoertyBillq.setStarttime(rentcontract.getYearsBegin());
prpoertyBillq.setEndtime(rentcontract.getYearsEnd());
prpoertyBillq.setExtraCreateFrom(EnumBillExtraCreateFrom.RNET_REVENUE_SALES.getCode());
WxBillSum propertyBillSum = wxAllBillMapper.getBillMonthSum(prpoertyBillq);
if (null != propertyBillSum) {
receivepay = receivepay.add(propertyBillSum.getNeedPayNumber());
if (null != rentcontract.getPropertyContractId()) {
WxAllBill prpoertyBillq = new WxAllBill();
prpoertyBillq.updateTenantInfo(rentcontract);
prpoertyBillq.setRentContractId(rentcontract.getId());
prpoertyBillq.setPropertyContractId(rentcontract.getPropertyContractId());
prpoertyBillq.setBillType(EnumBillAllType.PROPERTY.getCode());
prpoertyBillq.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
prpoertyBillq.setIsPreview(EnumYesOrNo.NO.getCode());
prpoertyBillq.setStarttime(rentcontract.getYearsBegin());
prpoertyBillq.setEndtime(rentcontract.getYearsEnd());
prpoertyBillq.setExtraCreateFrom(EnumBillExtraCreateFrom.RNET_REVENUE_SALES.getCode());
WxBillSum propertyBillSum = wxAllBillMapper.getBillMonthSum(prpoertyBillq);
if (null != propertyBillSum) {
receivepay = receivepay.add(propertyBillSum.getNeedPayNumber());
}
} }
WxRentContractYearsSumVo vo = new WxRentContractYearsSumVo(); WxRentContractYearsSumVo vo = new WxRentContractYearsSumVo();


Yükleniyor…
İptal
Kaydet