From 1fd5181d2e5ea90cdd2cdc2ce1aef65f8b05ab4f Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 2 Sep 2024 10:50:40 +0800 Subject: [PATCH 1/7] 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} ) From 92dea452c59b26cc6242881d0f9fb663f50176db Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 2 Sep 2024 11:25:33 +0800 Subject: [PATCH 2/7] fix --- .../controller/rent/WxAllBillController.java | 1 + .../com/iformall/domain/vo/WxMerchantBillVo.java | 2 ++ .../java/com/iformall/domain/vo/WxShopVo.java | 4 ++++ .../data/impl/PrintMerchantSettleDataHandler.java | 2 ++ .../iformall/service/helper/WxBillAllHelper.java | 15 +++++++++++++++ .../src/main/resources/mapper/WxShopMapper.xml | 2 +- 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index cd1b1b014..3710393ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -227,6 +227,7 @@ public class WxAllBillController extends BillBaseController { vo.setMerchantId(m.getId()); vo.setMerchantName(m.getName()); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); + vo.setRentArea(billAllHelper.getMerchantShopRentArea(m)); wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index e7aa89fc5..6c387bf3b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -26,6 +26,8 @@ public class WxMerchantBillVo implements Serializable { @Excel(name = "商铺号", width = 20, orderNum = "3") @TableField(exist = false) private String shopNumber; + @TableField(exist = false) + private String rentArea; private String needPay; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java index 61ff98b0a..6f785f82e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java @@ -41,4 +41,8 @@ public class WxShopVo extends WxShop { @io.swagger.annotations.ApiModelProperty(value="经营业态",name="business") @Excel(name="经营业态",width = 20,orderNum = "9") private String business; + + @io.swagger.annotations.ApiModelProperty(value="计租面积",name="operationArea") + @Excel(name="计租面积",width = 20,orderNum = "13") + private String operationArea; } diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java index 3f9860664..90757771a 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java @@ -43,6 +43,8 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ return receive.getShopNumber(); }else if (name.equals("merchantName")) { return receive.getMerchantName(); + }else if (name.equals("rentArea")) { + return receive.getRentArea(); }else if (name.equals("merchantId")) { if (null != merchantMap) { WxMerchant m = merchantMap.get(receive.getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 54403b316..7dd8595c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -196,6 +196,21 @@ public class WxBillAllHelper { return null; } + public String getMerchantShopRentArea(WxMerchant merchant) { + List shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId()); + if (null != shopList && shopList.size() > 0 ) { + BigDecimal rs = new BigDecimal(0); + for (int i = 0 ; i < shopList.size() ; i ++) { + WxShopVo v = shopList.get(i); + if (null != v.getOperationArea()) { + rs = rs.add(new BigDecimal(v.getOperationArea())); + } + } + return rs.toPlainString(); + } + return "0"; + } + public List getOwdMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { WxAllBill br = new WxAllBill(); updateQueryParm(wxMerchant, br,starttime,enttime); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index ce93b90d3..e709aad93 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -650,7 +650,7 @@