From 9e86658d3317abab906127f0fd44ac899ffe2323 Mon Sep 17 00:00:00 2001
From: winter <664946893@qq.com>
Date: Sat, 23 Nov 2024 16:30:27 +0800
Subject: [PATCH] fix
---
.../java/com/iformall/service/impl/WxFinanceServiceImpl.java | 3 ++-
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
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 f5fed5916..b6e0da85b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
@@ -368,7 +368,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
}
WxAllBill abq = new WxAllBill();
abq.updateTenantInfo(dto);
- abq.setFeesStandarsId(dto.getFeesId());
+ abq.setEnergyFeesId(dto.getFeesId());
abq.setBillType(EnumBillAllType.ADVANCE.getCode());
abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode());
abq.setSortColumns(SortField.Createtime_ASC);
@@ -1251,6 +1251,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
advanceBill.setIsPreview(EnumYesOrNo.NO.getCode());
advanceBill.setBillRemark(record.getBillRemark());
advanceBill.setCanEdit(EnumYesOrNo.YES.getCode());
+ advanceBill.setRentArea(wxShop.getRentArea());
wxBillAllHelper.saveOrUpdateBill(advanceBill, user);
}
diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
index 146f728ba..27ad222c2 100644
--- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
@@ -83,7 +83,7 @@
and `endtime` = #{endtimeEqual}
and `extra_create_from` = #{extraCreateFrom}
and `extra_create_from` is null
- and bill_type = 6 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0
+ and bill_type = 6 and IFNULL(`pay`,'0') -IFNULL(`return_pay`,'0') - IFNULL(`use_money`,'0') > 0
and `can_edit` = #{canEdit}
and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month}