winter 10 месяцев назад
Родитель
Сommit
2abd08dc82
3 измененных файлов: 14 добавлений и 0 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java
  3. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java Просмотреть файл

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumFeesType;
import com.iformall.enums.EnumYesOrNo; import com.iformall.enums.EnumYesOrNo;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;


@@ -119,6 +120,8 @@ public class WxEnergyReadingCalcuteResult extends TenantEntity {
daily.setServiceChargePay("0"); daily.setServiceChargePay("0");
daily.setBillRemark(remark); daily.setBillRemark(remark);
daily.setIsPreview(EnumYesOrNo.NO.getCode()); daily.setIsPreview(EnumYesOrNo.NO.getCode());
daily.setIsDel(EnumYesOrNo.NO.getCode());
daily.setFeesType(EnumFeesType.NOMAL.getCode());
daily.setEnergyReadingCalcuteId(calcute.getId()); daily.setEnergyReadingCalcuteId(calcute.getId());
daily.setCanEdit(EnumYesOrNo.NO.getCode()); daily.setCanEdit(EnumYesOrNo.NO.getCode());
daily.setEnergyReadingId(id); daily.setEnergyReadingId(id);


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java Просмотреть файл

@@ -31,6 +31,7 @@ import com.iformall.domain.vo.WxRentContractYearsVo;
import com.iformall.enums.EnumBillExtraCreateFrom; import com.iformall.enums.EnumBillExtraCreateFrom;
import com.iformall.enums.EnumContractCustomersStatus; import com.iformall.enums.EnumContractCustomersStatus;
import com.iformall.enums.EnumFeesShopTimeType; import com.iformall.enums.EnumFeesShopTimeType;
import com.iformall.enums.EnumFeesType;
import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentContractAdjustPeriod;
import com.iformall.enums.EnumRentContractAgilPriceUnit; import com.iformall.enums.EnumRentContractAgilPriceUnit;
import com.iformall.enums.EnumRentContractAgilSettingMethod; import com.iformall.enums.EnumRentContractAgilSettingMethod;
@@ -698,6 +699,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
wxBillDeposit.setUpdateByName(user.getName()); wxBillDeposit.setUpdateByName(user.getName());
wxBillDeposit.setEnergyFeesId(deposit.getFeesId()); wxBillDeposit.setEnergyFeesId(deposit.getFeesId());
wxBillDeposit.setRentContractAgileFeesType(EnumRentContractAgileFeesType.DEPOSIT.getCode()); wxBillDeposit.setRentContractAgileFeesType(EnumRentContractAgileFeesType.DEPOSIT.getCode());
wxBillDeposit.setFeesType(EnumFeesType.NOMAL.getCode());
insertList.add(wxBillDeposit); insertList.add(wxBillDeposit);
} }
} }
@@ -826,6 +828,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
wxBillRent.setId(idWorker.nextId()); wxBillRent.setId(idWorker.nextId());
wxBillRent.setRentContractId(rentContractId); wxBillRent.setRentContractId(rentContractId);
wxBillRent.setRentContractAgileFeesType(EnumRentContractAgileFeesType.UN_DEPOSIT.getCode()); wxBillRent.setRentContractAgileFeesType(EnumRentContractAgileFeesType.UN_DEPOSIT.getCode());
wxBillRent.setFeesType(EnumFeesType.NOMAL.getCode());
wxBillRent.setEnergyFeesId(fees.getId()); wxBillRent.setEnergyFeesId(fees.getId());
//wxBillRent.setBillType(fees.getBillType()); //wxBillRent.setBillType(fees.getBillType());
wxBillRent.setPay("0"); wxBillRent.setPay("0");


+ 8
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Просмотреть файл

@@ -1547,6 +1547,14 @@ public class WxFinanceServiceImpl implements WxFinanceService {
advanceBill.setIsJoinRenevue(EnumYesOrNo.NO.getCode()); advanceBill.setIsJoinRenevue(EnumYesOrNo.NO.getCode());
advanceBill.setBillRemark(record.getBillRemark()); advanceBill.setBillRemark(record.getBillRemark());
advanceBill.setCanEdit(EnumYesOrNo.YES.getCode()); advanceBill.setCanEdit(EnumYesOrNo.YES.getCode());
WxFinanceFees fees = this.getFeesById(record.getEnergyFeesId(), record.getTenantId());
if (fees.getFeesType().intValue() == EnumFeesType.ADVANCE.getCode().intValue()) {
advanceBill.setFeesType(EnumFeesType.ADVANCE.getCode());
}else {
advanceBill.setFeesType(EnumFeesType.NOMAL.getCode());
}
advanceBill.setRentArea(wxShop.getRentArea()); advanceBill.setRentArea(wxShop.getRentArea());
wxBillAllHelper.saveOrUpdateBill(advanceBill, user); wxBillAllHelper.saveOrUpdateBill(advanceBill, user);
} }


Загрузка…
Отмена
Сохранить