From 6d9f0811e96f08e50dbd57619e5bfc7c7d5a125b Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 15 Aug 2024 18:53:24 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/rent/WxAllBillController.java | 1 + .../src/main/java/com/iformall/domain/po/WxAllBill.java | 2 ++ .../src/main/java/com/iformall/domain/po/WxMerchant.java | 2 ++ .../java/com/iformall/service/helper/WxBillAllHelper.java | 1 + .../src/main/resources/mapper/WxAllBillMapper.xml | 7 +++++++ 5 files changed, 13 insertions(+) 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 c035d521f..7c744e679 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -637,6 +637,7 @@ public class WxAllBillController extends BillBaseController { wxMerchant.updateTenantInfo(getTenantInfo()); //放开时间 //wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); + wxMerchant.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); List list = billAllHelper.getMerchantBillList(wxMerchant); if (null != list && list.size() > 0 ) { List merchnatIds = new ArrayList(); 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 5b861495f..e5acd9c1a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -362,4 +362,6 @@ public class WxAllBill extends TenantEntity { public String moneyChangeDetail; @TableField(exist = false) public Integer noExtraCreateFrom; + @TableField(exist = false) + private Integer needPayNoDays; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 90895dd74..ff48f263d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -471,6 +471,8 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) private Integer needPayPreDays; + @TableField(exist = false) + private Integer needPayNoDays; @TableField(exist = false) public Integer onlyOweOrNear; 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 a3b15c1a0..80c453872 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -101,6 +101,7 @@ public class WxBillAllHelper { } bill.setToPayMerchant(wxMerchant.getToPayMerchant()); bill.setIsPreview(wxMerchant.getIsPreview()); + bill.setNeedPayNoDays(wxMerchant.getNeedPayNoDays()); } public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) { diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 62a90ce18..66a542c2f 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -98,6 +98,13 @@ (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) ) + + and ( + ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7,9) and bill_type not in (13,21,5)) + or + ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) + ) + and ( ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5))