Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
ae9d433484
3 ha cambiato i file con 13 aggiunte e 5 eliminazioni
  1. +6
    -2
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 6
- 2
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java Vedi File

@@ -479,7 +479,7 @@ public class WxRentContractHelper {
}
//其他标准计费项
public static List<WxBillFeesStandardsListVo> getStandardsBillList(Integer decimalSize,List<WxEnergyFees> feesStandarsList,Date billStartDate,Date billEndDate,boolean isFixed) {
public static List<WxBillFeesStandardsListVo> getStandardsBillList(Integer decimalSize,List<WxEnergyFees> feesStandarsList,Date billStartDate,Date billEndDate,boolean isFixed,String rentArea) {
if (null == feesStandarsList || feesStandarsList.size() <= 0 ) {
return null;
}
@@ -493,7 +493,11 @@ public class WxRentContractHelper {
if (fees.getFixedPrice().intValue() == EnumYesOrNo.YES.getCode().intValue() && null != billStartDate && null != billEndDate) {
vo.setStart(billStartDate);
vo.setEnd(billEndDate);
vo.setTotal(fees.calcuteTotalMoney(decimalSize, billStartDate, billEndDate, "1",true,null,null));
String count = "1";
if (null != fees.getCalcuteUnit() && fees.getCalcuteUnit().intValue() == EnumFeesStandardsCalcuteUnit.MM.getCode().intValue()) {
count = rentArea;
}
vo.setTotal(fees.calcuteTotalMoney(decimalSize, billStartDate, billEndDate, count,true,null,null));
vo.setReceiveDate(DateUtils.getDaySet(billStartDate,Calendar.DATE,-1));
vo.setFeeStandards(fees);
retList.add(vo);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Vedi File

@@ -724,7 +724,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
billEndDate = billTimeVoList.get(billTimeVoList.size()-1).getEndDate();
}
//一次性费用的,只有一个账单。
List<WxBillFeesStandardsListVo> fixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),billStartDate,billEndDate,true);
List<WxBillFeesStandardsListVo> fixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),billStartDate,billEndDate,true,wxPropertyContract.getRentArea());

int index = 0;
@@ -735,7 +735,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
String standarsTotal = "0";
//非一次性费用的,跟随物业账单的周期
List<WxBillFeesStandardsListVo> unFixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),null,null,false);
List<WxBillFeesStandardsListVo> unFixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),null,null,false,null);

boolean flag = false;


+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Vedi File

@@ -971,7 +971,11 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
wxBillDeposit.setPay("0");
//String needpay = wxRentContract.getDeposit();
String needpay = depositFee.calcuteTotalMoney(wxRentContract.getDecimalSize(), null, null, "1", true, null, null);
String count = "1";
if (null != depositFee.getCalcuteUnit() && depositFee.getCalcuteUnit().intValue() == EnumFeesStandardsCalcuteUnit.MM.getCode().intValue()) {
count = wxRentContract.getRentArea();
}
String needpay = depositFee.calcuteTotalMoney(wxRentContract.getDecimalSize(), null, null, count, true, null, null);
wxBillDeposit.setReceivePay(needpay);
wxBillDeposit.setNeedPay(needpay);
//wxBillDeposit.setOwe(needpay);


Caricamento…
Annulla
Salva