Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
599411d829
Se han modificado 2 ficheros con 3 adiciones y 0 borrados
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java Ver fichero

@@ -483,10 +483,12 @@ public class WxRentContractHelper {
//不是一个月的。但是按整月算的 //不是一个月的。但是按整月算的
int months = getMonths(sdM.format(start)+"-01",sdM.format(DateUtils.getDaySet(end,Calendar.DATE,1))+"-01"); int months = getMonths(sdM.format(start)+"-01",sdM.format(DateUtils.getDaySet(end,Calendar.DATE,1))+"-01");
for (int i = 0 ; i < months; i++) { for (int i = 0 ; i < months; i++) {
//当前时间到当前月底
Date currentMonthEnd = DateUtils.getLastDayForMonth(start); Date currentMonthEnd = DateUtils.getLastDayForMonth(start);
NeedPayDTO np = getMonthPay(start, currentMonthEnd, price, decimalSize, validDays, dayPriceCalcute, monthAvageDays); NeedPayDTO np = getMonthPay(start, currentMonthEnd, price, decimalSize, validDays, dayPriceCalcute, monthAvageDays);
start = DateUtils.getDaySet(currentMonthEnd,Calendar.DATE,1); start = DateUtils.getDaySet(currentMonthEnd,Calendar.DATE,1);
total = total.add(np.getMoney()); total = total.add(np.getMoney());
//TODO 这个月底到下个月
} }
return total.toPlainString(); return total.toPlainString();
} }


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Ver fichero

@@ -1018,6 +1018,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
record.setUpdateTime(date); record.setUpdateTime(date);
record.setUpdateBy(user.getId()); record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName()); record.setUpdateByName(user.getName());
record.setStatus(EnumFinanceFinishStatus.READY.getCode());
try { try {
wxFinanceFinishMapper.insert(record); wxFinanceFinishMapper.insert(record);
} catch (Exception e) { } catch (Exception e) {


Cargando…
Cancelar
Guardar