From fa9927db35725365866ca4e883602de493453686 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 6 May 2024 16:32:30 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/domain/po/WxBillDaily.java | 3 +++ .../src/main/java/com/iformall/domain/po/WxBillDeposit.java | 3 +++ .../src/main/java/com/iformall/domain/po/WxBillOther.java | 3 +++ .../main/java/com/iformall/domain/po/WxBillOtherDeposit.java | 3 +++ .../src/main/java/com/iformall/domain/po/WxBillProperty.java | 3 +++ .../java/com/iformall/domain/po/WxBillPropertyDeposit.java | 3 +++ .../src/main/java/com/iformall/domain/po/WxBillRent.java | 3 +++ .../src/main/java/com/iformall/domain/po/WxBillRentManage.java | 3 +++ mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml | 1 + .../src/main/resources/mapper/WxBillDepositMapper.xml | 1 + .../src/main/resources/mapper/WxBillOtherDepositMapper.xml | 1 + mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml | 1 + .../src/main/resources/mapper/WxBillPropertyDepositMapper.xml | 1 + .../src/main/resources/mapper/WxBillPropertyMapper.xml | 1 + .../src/main/resources/mapper/WxBillRentManageMapper.xml | 3 ++- mallinkService/src/main/resources/mapper/WxBillRentMapper.xml | 1 + 16 files changed, 33 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 0766e6d75..4e5346fe6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -134,4 +134,7 @@ public class WxBillDaily extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index ce54de005..60a8c3668 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -102,4 +102,7 @@ public class WxBillDeposit extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 1c391b8c0..d59dc4cb7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -166,5 +166,8 @@ public class WxBillOther extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index ed63627aa..44ad6a504 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -169,4 +169,7 @@ public class WxBillOtherDeposit extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index a08558c32..13bd8c5a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -234,4 +234,7 @@ public class WxBillProperty extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 702de6208..cc0258a91 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -101,4 +101,7 @@ public class WxBillPropertyDeposit extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 9ef9449f1..ae568e40d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -286,5 +286,8 @@ public class WxBillRent extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java index 8d4455f0b..be9dc9ad5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java @@ -221,5 +221,8 @@ public class WxBillRentManage extends TenantEntity { @TableField(exist = false) private String month; + + @TableField(exist = false) + private Integer onlyOwe; } diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 2551f5e95..a31b005bc 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -101,6 +101,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + and br.`owe` > 0 and br.`build_way` = #{buildWay} and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 3ce7e42b6..95191e243 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -123,6 +123,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + and br.`owe` > 0 and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 017146f7d..ba7a889c8 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -107,6 +107,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + and br.`owe` > 0 and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index b44bf62c5..48dbd1344 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -102,6 +102,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + and br.`owe` > 0 and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index f91412b4c..fe06d1fc6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -113,6 +113,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + and br.`owe` > 0 and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index c2b2a8a30..fa3fdb5d4 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -134,6 +134,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + and br.`owe` > 0 and br.`rent_shop_type` = #{rentShopType} and br.`property_contract_id` = #{propertyContractId} and br.`pay_way` = #{payWay} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index 14ae7bf93..29f6160b9 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -119,7 +119,8 @@ and br.`endtime` >= #{endtime} and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - + + and br.`owe` > 0 and br.`manage_fee_type` = #{manageFeeType} and br.`merchant_id` is not null diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index b0448358b..132e1ed4d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -140,6 +140,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + and br.`owe` > 0 and br.`rent_contract_id` in