Ver a proveniência

fix

release_toaliyun_real
winter há 1 ano
ascendente
cometimento
9468cca414
1 ficheiros alterados com 6 adições e 5 eliminações
  1. +6
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java

+ 6
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java Ver ficheiro

@@ -453,7 +453,9 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
}
WxEnergyFees fees = wxEnergyService.getFeesById(unDeposit.getFeesId(), unDeposit.getTenantId());
EnumFeesShopTimeType creatRule = EnumFeesShopTimeType.getEnum(unDeposit.getFeesCreateRule());
EnumRentContractAgilTimeUnit timeUnit = EnumRentContractAgilTimeUnit.getEnum(unDeposit.getTimeUnit());
WxRentContract contract = wxRentContractMapper.selectById(unDeposit.getRentContractId());
EnumRentDayPriceCalcute dayPriceCalcute = EnumRentDayPriceCalcute.getEnum(contract.getDayPriceCalcute());
List<Date> yearsBeginList = WxRentContractAgileHelper.getYearsBeginList(contract.getRentalStartDate(), contract.getRentalEndDate());
List<WxAllBill> insertList = new ArrayList<WxAllBill>();
@@ -465,14 +467,13 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
if (StringUtils.isBlank(shopNumber)) {
shopNumber = contract.getShopName();
}
EnumRentContractAgilPriceUnit itemPriceUnit = EnumRentContractAgilPriceUnit.getEnum(item.getPriceUnit());
//根据每一个的开始日期,结束日期来生成账单
List<BillTimeVo> timeVoList = WxRentContractAgileHelper.initBillTimeList(yearsBeginList, item.getBeginTime(), item.getEndTime(), creatRule, null, i, i);
List<BillTimeVo> timeVoList = WxRentContractAgileHelper.initBillTimeList(yearsBeginList, item.getBeginTime(), item.getEndTime(), creatRule, timeUnit, unDeposit.getTimePeriod(), unDeposit.getCalcuteTime());
for (int j = 0 ; j < timeVoList.size() ; j ++) {
BillTimeVo timeVo = timeVoList.get(j);
String needpay = WxRentContractAgileHelper.getNeedPayMoney(null, contract.getDecimalSize(),
EnumRentContractAgilPriceUnit.getEnum(item.getPriceUnit()),item.getPrice(), item.getRentArea(),
item.getBeginTime(), item.getEndTime(), EnumRentDayPriceCalcute.getEnum(contract.getDayPriceCalcute()),
contract.getMonthAverageDays(), unDeposit.getTimePeriod(), EnumRentContractAgilTimeUnit.getEnum(unDeposit.getTimeUnit()));
String needpay = WxRentContractAgileHelper.getNeedPayMoney(null, contract.getDecimalSize(), itemPriceUnit,item.getPrice(), item.getRentArea(),
item.getBeginTime(), item.getEndTime(), dayPriceCalcute, contract.getMonthAverageDays(), unDeposit.getTimePeriod(), timeUnit);
WxAllBill wxBillRent = new WxAllBill();
wxBillRent.setIsPreview(EnumYesOrNo.YES.getCode());
wxBillRent.setId(idWorker.nextId());


Carregando…
Cancelar
Guardar