diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java index a293b5d9b..d84efe08e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java +++ b/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.iformall.common.IdWorker; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumFeesType; import com.iformall.enums.EnumYesOrNo; import com.iformall.utils.DateUtils; @@ -119,6 +120,8 @@ public class WxEnergyReadingCalcuteResult extends TenantEntity { daily.setServiceChargePay("0"); daily.setBillRemark(remark); daily.setIsPreview(EnumYesOrNo.NO.getCode()); + daily.setIsDel(EnumYesOrNo.NO.getCode()); + daily.setFeesType(EnumFeesType.NOMAL.getCode()); daily.setEnergyReadingCalcuteId(calcute.getId()); daily.setCanEdit(EnumYesOrNo.NO.getCode()); daily.setEnergyReadingId(id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index 61165977c..1d9e7e743 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/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.EnumContractCustomersStatus; import com.iformall.enums.EnumFeesShopTimeType; +import com.iformall.enums.EnumFeesType; import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentContractAgilPriceUnit; import com.iformall.enums.EnumRentContractAgilSettingMethod; @@ -698,6 +699,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { wxBillDeposit.setUpdateByName(user.getName()); wxBillDeposit.setEnergyFeesId(deposit.getFeesId()); wxBillDeposit.setRentContractAgileFeesType(EnumRentContractAgileFeesType.DEPOSIT.getCode()); + wxBillDeposit.setFeesType(EnumFeesType.NOMAL.getCode()); insertList.add(wxBillDeposit); } } @@ -826,6 +828,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { wxBillRent.setId(idWorker.nextId()); wxBillRent.setRentContractId(rentContractId); wxBillRent.setRentContractAgileFeesType(EnumRentContractAgileFeesType.UN_DEPOSIT.getCode()); + wxBillRent.setFeesType(EnumFeesType.NOMAL.getCode()); wxBillRent.setEnergyFeesId(fees.getId()); //wxBillRent.setBillType(fees.getBillType()); wxBillRent.setPay("0"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index ed4ff541c..63a13f9dd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/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.setBillRemark(record.getBillRemark()); 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()); wxBillAllHelper.saveOrUpdateBill(advanceBill, user); }