| @@ -266,6 +266,9 @@ public class WxAllBill extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "账单额外生成来源EnumBillExtraCreateFrom", name = "extraCreateFrom") | @io.swagger.annotations.ApiModelProperty(value = "账单额外生成来源EnumBillExtraCreateFrom", name = "extraCreateFrom") | ||||
| private Integer extraCreateFrom; | private Integer extraCreateFrom; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "计费面积", name = "rentArea") | |||||
| private String rentArea; | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| public Long building; | public Long building; | ||||
| @@ -569,6 +569,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| //wxBillDeposit.setUpdateByName(user.getName()); | //wxBillDeposit.setUpdateByName(user.getName()); | ||||
| wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType()); | wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType()); | ||||
| wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract)); | wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract)); | ||||
| wxBillDeposit.setRentArea(wxPropertyContract.getRentArea()); | |||||
| wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId()); | wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId()); | ||||
| try { | try { | ||||
| wxAllBillMapper.insert(wxBillDeposit); | wxAllBillMapper.insert(wxBillDeposit); | ||||
| @@ -864,6 +865,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| if (shopInfo != null) { | if (shopInfo != null) { | ||||
| wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); | wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); | ||||
| } | } | ||||
| wxBillProperty.setRentArea(wxPropertyContract.getRentArea()); | |||||
| //wxBillProperty.setLatePayRatio(0); | //wxBillProperty.setLatePayRatio(0); | ||||
| wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); | wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); | ||||
| wxBillProperty.setBillRemark(remark); | wxBillProperty.setBillRemark(remark); | ||||
| @@ -857,6 +857,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (wxRentContract.shopIdsByRentInfo().size()==1) { | if (wxRentContract.shopIdsByRentInfo().size()==1) { | ||||
| wxBillDeposit.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); | wxBillDeposit.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); | ||||
| } | } | ||||
| wxBillDeposit.setRentArea(wxRentContract.getRentArea()); | |||||
| wxBillDeposit.setCreatetime(date); | wxBillDeposit.setCreatetime(date); | ||||
| if (null != user) { | if (null != user) { | ||||
| wxBillDeposit.setCreateBy(user.getId()); | wxBillDeposit.setCreateBy(user.getId()); | ||||
| @@ -1320,6 +1321,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size() == 1) { | if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size() == 1) { | ||||
| wxBillRent.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); | wxBillRent.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); | ||||
| } | } | ||||
| wxBillRent.setRentArea(wxRentContract.getRentArea()); | |||||
| wxBillRent.setCreatetime(date); | wxBillRent.setCreatetime(date); | ||||
| wxBillRent.setCreateBy(user.getId()); | wxBillRent.setCreateBy(user.getId()); | ||||
| wxBillRent.setCreateByName(user.getName()); | wxBillRent.setCreateByName(user.getName()); | ||||
| @@ -1381,6 +1383,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| manage.setUpdatetime(wxBillRent.getUpdatetime()); | manage.setUpdatetime(wxBillRent.getUpdatetime()); | ||||
| manage.setUpdateByName(wxBillRent.getUpdateByName()); | manage.setUpdateByName(wxBillRent.getUpdateByName()); | ||||
| manage.setRentShopType(wxBillRent.getRentShopType()); | manage.setRentShopType(wxBillRent.getRentShopType()); | ||||
| manage.setRentArea(wxBillRent.getRentArea()); | |||||
| if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode().intValue()){ | if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode().intValue()){ | ||||
| manage.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId()); | manage.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId()); | ||||
| manage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | manage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | ||||
| @@ -43,14 +43,14 @@ | |||||
| <result column="energy_reading_calcuteId" jdbcType="BIGINT" property="energyReadingCalcuteId" /> | <result column="energy_reading_calcuteId" jdbcType="BIGINT" property="energyReadingCalcuteId" /> | ||||
| <result column="energy_reading_id" jdbcType="BIGINT" property="energyReadingId" /> | <result column="energy_reading_id" jdbcType="BIGINT" property="energyReadingId" /> | ||||
| <result column="extra_create_from" jdbcType="INTEGER" property="extraCreateFrom" /> | <result column="extra_create_from" jdbcType="INTEGER" property="extraCreateFrom" /> | ||||
| <result column="rent_area" jdbcType="VARCHAR" property="rentArea" /> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`rent_shop_type`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`, | `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`, | `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`, | `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -350,7 +350,7 @@ | |||||
| #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, | #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, | ||||
| #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, | #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, | ||||
| #{item.shopId},#{item.shopNumber},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.propertyContractId}, | #{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} | |||||
| ) | ) | ||||
| </foreach> | </foreach> | ||||
| </insert> | </insert> | ||||