diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql
index acf71a606..c4932235b 100644
--- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql
+++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql
@@ -4,3 +4,106 @@ ALTER TABLE wx_property_contract ADD COLUMN day_price_calcute INT(1) NOT NULL DE
ALTER TABLE wx_property_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数';
ALTER TABLE wx_rent_contract ADD COLUMN revenue_fixed_rent_price INT(1) NOT NULL DEFAULT 0 COMMENT '联营扣点租金取高租金固定价格';
ALTER TABLE wx_rent_contract ADD COLUMN revenue_rent_price VARCHAR(30) COMMENT '联营扣点租金取高租金固定价格';
+
+create table wx_all_bill_0 like wx_all_bill;
+create table wx_all_bill_1 like wx_all_bill;
+create table wx_all_bill_2 like wx_all_bill;
+create table wx_all_bill_3 like wx_all_bill;
+create table wx_all_bill_4 like wx_all_bill;
+create table wx_all_bill_5 like wx_all_bill;
+create table wx_all_bill_6 like wx_all_bill;
+create table wx_all_bill_7 like wx_all_bill;
+create table wx_all_bill_8 like wx_all_bill;
+create table wx_all_bill_9 like wx_all_bill;
+create table wx_all_bill_10 like wx_all_bill;
+create table wx_all_bill_11 like wx_all_bill;
+create table wx_all_bill_12 like wx_all_bill;
+create table wx_all_bill_13 like wx_all_bill;
+create table wx_all_bill_14 like wx_all_bill;
+create table wx_all_bill_15 like wx_all_bill;
+create table wx_all_bill_16 like wx_all_bill;
+create table wx_all_bill_17 like wx_all_bill;
+create table wx_all_bill_18 like wx_all_bill;
+create table wx_all_bill_19 like wx_all_bill;
+create table wx_all_bill_20 like wx_all_bill;
+create table wx_all_bill_21 like wx_all_bill;
+create table wx_all_bill_22 like wx_all_bill;
+create table wx_all_bill_23 like wx_all_bill;
+create table wx_all_bill_24 like wx_all_bill;
+create table wx_all_bill_25 like wx_all_bill;
+create table wx_all_bill_26 like wx_all_bill;
+create table wx_all_bill_27 like wx_all_bill;
+create table wx_all_bill_28 like wx_all_bill;
+create table wx_all_bill_29 like wx_all_bill;
+create table wx_all_bill_30 like wx_all_bill;
+create table wx_all_bill_31 like wx_all_bill;
+create table wx_all_bill_32 like wx_all_bill;
+create table wx_all_bill_33 like wx_all_bill;
+create table wx_all_bill_34 like wx_all_bill;
+create table wx_all_bill_35 like wx_all_bill;
+create table wx_all_bill_36 like wx_all_bill;
+create table wx_all_bill_37 like wx_all_bill;
+create table wx_all_bill_38 like wx_all_bill;
+create table wx_all_bill_39 like wx_all_bill;
+create table wx_all_bill_40 like wx_all_bill;
+create table wx_all_bill_41 like wx_all_bill;
+create table wx_all_bill_42 like wx_all_bill;
+create table wx_all_bill_43 like wx_all_bill;
+create table wx_all_bill_44 like wx_all_bill;
+create table wx_all_bill_45 like wx_all_bill;
+create table wx_all_bill_46 like wx_all_bill;
+create table wx_all_bill_47 like wx_all_bill;
+create table wx_all_bill_48 like wx_all_bill;
+create table wx_all_bill_49 like wx_all_bill;
+create table wx_all_bill_50 like wx_all_bill;
+create table wx_all_bill_51 like wx_all_bill;
+create table wx_all_bill_52 like wx_all_bill;
+create table wx_all_bill_53 like wx_all_bill;
+create table wx_all_bill_54 like wx_all_bill;
+create table wx_all_bill_55 like wx_all_bill;
+create table wx_all_bill_56 like wx_all_bill;
+create table wx_all_bill_57 like wx_all_bill;
+create table wx_all_bill_58 like wx_all_bill;
+create table wx_all_bill_59 like wx_all_bill;
+create table wx_all_bill_60 like wx_all_bill;
+create table wx_all_bill_61 like wx_all_bill;
+create table wx_all_bill_62 like wx_all_bill;
+create table wx_all_bill_63 like wx_all_bill;
+create table wx_all_bill_64 like wx_all_bill;
+create table wx_all_bill_65 like wx_all_bill;
+create table wx_all_bill_66 like wx_all_bill;
+create table wx_all_bill_67 like wx_all_bill;
+create table wx_all_bill_68 like wx_all_bill;
+create table wx_all_bill_69 like wx_all_bill;
+create table wx_all_bill_70 like wx_all_bill;
+create table wx_all_bill_71 like wx_all_bill;
+create table wx_all_bill_72 like wx_all_bill;
+create table wx_all_bill_73 like wx_all_bill;
+create table wx_all_bill_74 like wx_all_bill;
+create table wx_all_bill_75 like wx_all_bill;
+create table wx_all_bill_76 like wx_all_bill;
+create table wx_all_bill_77 like wx_all_bill;
+create table wx_all_bill_78 like wx_all_bill;
+create table wx_all_bill_79 like wx_all_bill;
+create table wx_all_bill_80 like wx_all_bill;
+create table wx_all_bill_81 like wx_all_bill;
+create table wx_all_bill_82 like wx_all_bill;
+create table wx_all_bill_83 like wx_all_bill;
+create table wx_all_bill_84 like wx_all_bill;
+create table wx_all_bill_85 like wx_all_bill;
+create table wx_all_bill_86 like wx_all_bill;
+create table wx_all_bill_87 like wx_all_bill;
+create table wx_all_bill_88 like wx_all_bill;
+create table wx_all_bill_89 like wx_all_bill;
+create table wx_all_bill_90 like wx_all_bill;
+create table wx_all_bill_91 like wx_all_bill;
+create table wx_all_bill_92 like wx_all_bill;
+create table wx_all_bill_93 like wx_all_bill;
+create table wx_all_bill_94 like wx_all_bill;
+create table wx_all_bill_95 like wx_all_bill;
+create table wx_all_bill_96 like wx_all_bill;
+create table wx_all_bill_97 like wx_all_bill;
+create table wx_all_bill_98 like wx_all_bill;
+create table wx_all_bill_99 like wx_all_bill;
+
+drop table wx_all_bill;
diff --git a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java
index 8fa3dacf3..1f6a8951b 100644
--- a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java
+++ b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java
@@ -372,62 +372,6 @@ public class BaseMyBatisConfiguration {
wxBillActionSharding.setRule(EnumShardingRule.HASH.getCode());
shardingList.add(wxBillActionSharding);
- ShardingSphere wxBillRentSharding = new ShardingSphere();
- wxBillRentSharding.setColumn("tenant_id");
- wxBillRentSharding.setTableName("wx_bill_rent");
- wxBillRentSharding.setCount(100);
- wxBillRentSharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillRentSharding);
-
- ShardingSphere wxBillRentManageSharding = new ShardingSphere();
- wxBillRentManageSharding.setColumn("tenant_id");
- wxBillRentManageSharding.setTableName("wx_bill_rent_manage");
- wxBillRentManageSharding.setCount(100);
- wxBillRentManageSharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillRentManageSharding);
-
- ShardingSphere wxBillRentDepositSharding = new ShardingSphere();
- wxBillRentDepositSharding.setColumn("tenant_id");
- wxBillRentDepositSharding.setTableName("wx_bill_rent_deposit");
- wxBillRentDepositSharding.setCount(100);
- wxBillRentDepositSharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillRentDepositSharding);
-
- ShardingSphere wxBillPropertySharding = new ShardingSphere();
- wxBillPropertySharding.setColumn("tenant_id");
- wxBillPropertySharding.setTableName("wx_bill_property");
- wxBillPropertySharding.setCount(100);
- wxBillPropertySharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillPropertySharding);
-
- ShardingSphere wxBillPropertyDepositSharding = new ShardingSphere();
- wxBillPropertyDepositSharding.setColumn("tenant_id");
- wxBillPropertyDepositSharding.setTableName("wx_bill_property_deposit");
- wxBillPropertyDepositSharding.setCount(100);
- wxBillPropertyDepositSharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillPropertyDepositSharding);
-
- ShardingSphere wxBillDailySharding = new ShardingSphere();
- wxBillDailySharding.setColumn("tenant_id");
- wxBillDailySharding.setTableName("wx_bill_daily");
- wxBillDailySharding.setCount(100);
- wxBillDailySharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillDailySharding);
-
- ShardingSphere wxBillOtherSharding = new ShardingSphere();
- wxBillOtherSharding.setColumn("tenant_id");
- wxBillOtherSharding.setTableName("wx_bill_other");
- wxBillOtherSharding.setCount(100);
- wxBillOtherSharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillOtherSharding);
-
- ShardingSphere wxBillOtherDepositSharding = new ShardingSphere();
- wxBillOtherDepositSharding.setColumn("tenant_id");
- wxBillOtherDepositSharding.setTableName("wx_bill_other_deposit");
- wxBillOtherDepositSharding.setCount(100);
- wxBillOtherDepositSharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillOtherDepositSharding);
-
ShardingSphere wxEnergyMeterReadingSharding = new ShardingSphere();
wxEnergyMeterReadingSharding.setColumn("tenant_id");
wxEnergyMeterReadingSharding.setTableName("wx_energy_meter_reading");
@@ -449,13 +393,6 @@ public class BaseMyBatisConfiguration {
wxEnergyFeesSharding.setRule(EnumShardingRule.HASH.getCode());
shardingList.add(wxEnergyFeesSharding);
- ShardingSphere wxBillAdvanceSharding = new ShardingSphere();
- wxBillAdvanceSharding.setColumn("tenant_id");
- wxBillAdvanceSharding.setTableName("wx_bill_advance");
- wxBillAdvanceSharding.setCount(100);
- wxBillAdvanceSharding.setRule(EnumShardingRule.HASH.getCode());
- shardingList.add(wxBillAdvanceSharding);
-
ShardingSphere wxEnergyFeesSetoffSharding = new ShardingSphere();
wxEnergyFeesSetoffSharding.setColumn("tenant_id");
wxEnergyFeesSetoffSharding.setTableName("wx_energy_fees_setoff");
@@ -491,6 +428,13 @@ public class BaseMyBatisConfiguration {
wxFinanceReceivePaywaySharding.setRule(EnumShardingRule.HASH.getCode());
shardingList.add(wxFinanceReceivePaywaySharding);
+ ShardingSphere wxAllBillSharding = new ShardingSphere();
+ wxAllBillSharding.setColumn("tenant_id");
+ wxAllBillSharding.setTableName("wx_all_bill");
+ wxAllBillSharding.setCount(100);
+ wxAllBillSharding.setRule(EnumShardingRule.HASH.getCode());
+ shardingList.add(wxAllBillSharding);
+
//初始化
shardingSpherePlugin.setShardingSpheres(shardingList);
Properties properties = new Properties();
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 dd19d099f..c1a33e104 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
@@ -23,6 +23,7 @@ import java.util.List;
/**
*/
+@TableName(value = "wx_all_bill")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
index 2120c4161..5a68364fa 100644
--- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
@@ -207,13 +207,28 @@
- delete from wx_all_bill where rent_contract_id = #{rentContractId}
- and is_preview = #{isPreview}
+ delete from wx_all_bill where is_preview = 1
+
+ and rent_contract_id = #{rentContractId}
+
+
+ and property_contract_id = #{propertyContractId}
+
delete from wx_all_bill where rent_contract_id = #{rentContractId} and is_preview = 0 and status = 2
and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 and IFNULL(`return_pay`,'0') <= 0
+
+ and rent_contract_id = #{rentContractId}
+
+
+ and property_contract_id = #{propertyContractId}
+
+
+ and merchant_id = #{merchantId}
+
+