From 7e1f10dd7e0e3b47de7cd45e997623af169fbbf9 Mon Sep 17 00:00:00 2001
From: winter <664946893@qq.com>
Date: Mon, 16 Dec 2024 23:14:39 +0800
Subject: [PATCH] fix
---
.../src/main/java/com/iformall/domain/po/WxAllBill.java | 3 +++
.../iformall/service/impl/WxRentContractServiceImpl.java | 3 +++
.../src/main/resources/mapper/WxAllBillMapper.xml | 7 ++++---
3 files changed, 10 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 6d24bb4ea..e52a924b8 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
@@ -81,6 +81,9 @@ public class WxAllBill extends TenantEntity {
}
return "0";
}
+
+ @io.swagger.annotations.ApiModelProperty(value="历史实际应收金额(销售录入,汇算时用)",name="historyReceivePay")
+ public String historyReceivePay;
@Excel(name = "实收账款(元)", width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
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 86ae51922..45c795a28 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -2842,6 +2842,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
for (int i = 0 ; i < bmbillList.size() ; i ++) {
WxAllBill b = bmbillList.get(i);
//把原有的账单应收金额变为0
+ b.setHistoryReceivePay(b.getReceivePay());
b.setNeedPay("0");//如不设置会影响减免统计
b.setReceivePay("0");
b.setBillRemark("账单金额重新计算生成新账单,原账单金额变为0");
@@ -2918,6 +2919,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
for (int i = 0 ; i < propertyBillList.size(); i++){
WxAllBill _rb = propertyBillList.get(i);
//把原有的账单应收金额变为0
+ _rb.setHistoryReceivePay(_rb.getReceivePay());
_rb.setNeedPay("0");
_rb.setReceivePay("0");
_rb.setBillRemark("账单金额重新计算生成新账单,原账单金额变为0");
@@ -2996,6 +2998,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
for (int i = 0 ; i < rentBillList.size() ; i ++) {
WxAllBill b = rentBillList.get(i);
//把原有的账单应收金额变为0
+ b.setHistoryReceivePay(b.getReceivePay());//设置此值,供录入销售额的页面显示应收金额
b.setNeedPay("0");//如不设置会影响减免统计
b.setReceivePay("0");
b.setBillRemark("账单金额重新计算生成新账单,原账单金额变为0");
diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
index 069278cf0..22639b16e 100644
--- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
@@ -15,6 +15,7 @@
+
@@ -52,8 +53,8 @@
`id`,`tenant_id`,`parent_tenant_id`,`shop_id`,`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`,`receive_date`,`period`,
+ `price_detail`,`need_pay`,`receive_pay`,`history_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`,`receive_date`,`period`,
`is_preview`,`shop_info`,`rent_contract_id`,`rent_contract_agile_fees_type`,`property_contract_id`,`parent_bill_id`,`virtual_compose_id`,`parent_virtual_compose_id`,
`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from`,`rent_area`,`can_edit`,`cus_name`
@@ -420,7 +421,7 @@
(
#{item.id},#{item.tenantId},#{item.parentTenantId},#{item.shopId},#{item.createtime},
#{item.createBy},#{item.createByName},#{item.updatetime},#{item.updateBy},#{item.updateByName},#{item.priceDetail},
- #{item.needPay},#{item.receivePay},#{item.pay},#{item.billType},#{item.payWay},#{item.payDate},#{item.setOff},#{item.useMoney},
+ #{item.needPay},#{item.receivePay},#{item.historyReceivePay},#{item.pay},#{item.billType},#{item.payWay},#{item.payDate},#{item.setOff},#{item.useMoney},
#{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark},
#{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay},
#{item.receiveDate},#{item.period},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.rentContractAgileFeesType},#{item.propertyContractId},