From 1fd5181d2e5ea90cdd2cdc2ce1aef65f8b05ab4f Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 2 Sep 2024 10:50:40 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/domain/po/WxAllBill.java | 3 +++ .../service/impl/WxPropertyContractServiceImpl.java | 2 ++ .../iformall/service/impl/WxRentContractServiceImpl.java | 3 +++ .../src/main/resources/mapper/WxAllBillMapper.xml | 6 +++--- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index 4b7e10341..dfc929d58 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -266,6 +266,9 @@ public class WxAllBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "账单额外生成来源EnumBillExtraCreateFrom", name = "extraCreateFrom") private Integer extraCreateFrom; + @io.swagger.annotations.ApiModelProperty(value = "计费面积", name = "rentArea") + private String rentArea; + @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") @TableField(exist = false) public Long building; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index eac59a262..b176e5f4b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -569,6 +569,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //wxBillDeposit.setUpdateByName(user.getName()); wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType()); wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract)); + wxBillDeposit.setRentArea(wxPropertyContract.getRentArea()); wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId()); try { wxAllBillMapper.insert(wxBillDeposit); @@ -864,6 +865,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (shopInfo != null) { wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); } + wxBillProperty.setRentArea(wxPropertyContract.getRentArea()); //wxBillProperty.setLatePayRatio(0); wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); wxBillProperty.setBillRemark(remark); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index da7ab0cb2..254b815b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -857,6 +857,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (wxRentContract.shopIdsByRentInfo().size()==1) { wxBillDeposit.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); } + wxBillDeposit.setRentArea(wxRentContract.getRentArea()); wxBillDeposit.setCreatetime(date); if (null != user) { wxBillDeposit.setCreateBy(user.getId()); @@ -1320,6 +1321,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size() == 1) { wxBillRent.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); } + wxBillRent.setRentArea(wxRentContract.getRentArea()); wxBillRent.setCreatetime(date); wxBillRent.setCreateBy(user.getId()); wxBillRent.setCreateByName(user.getName()); @@ -1381,6 +1383,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { manage.setUpdatetime(wxBillRent.getUpdatetime()); manage.setUpdateByName(wxBillRent.getUpdateByName()); manage.setRentShopType(wxBillRent.getRentShopType()); + manage.setRentArea(wxBillRent.getRentArea()); if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode().intValue()){ manage.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId()); manage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index edc3b491e..10980a2dd 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -43,14 +43,14 @@ - + `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`rent_shop_type`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`, `price_detail`,`need_pay`,`receive_pay`,`pay`,`bill_type`,`pay_way`,`pay_date`,`set_off`,`use_money`,`starttime`,`endtime`,`status`,`energy_fees_id`,`return_pay`, `bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`shop_id`,`shop_number`, - `is_preview`,`shop_info`,`rent_contract_id`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from` + `is_preview`,`shop_info`,`rent_contract_id`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from`,`rent_area` @@ -350,7 +350,7 @@ #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, #{item.shopId},#{item.shopNumber},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.propertyContractId}, - #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.extraCreateFrom} + #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea} )