Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
ee3cf97201
10 changed files with 890 additions and 67 deletions
  1. +811
    -0
      mallinkAdmin/src/main/resources/db/migration/V202407019.sql
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java
  3. +10
    -9
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  4. +11
    -10
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  5. +9
    -8
      mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
  6. +9
    -8
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  7. +9
    -8
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  8. +9
    -8
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  9. +9
    -8
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  10. +9
    -8
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 811
- 0
mallinkAdmin/src/main/resources/db/migration/V202407019.sql View File

@@ -0,0 +1,811 @@
alter table wx_bill_rent_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_99 add column set_off varchar(30) COMMENT '抵扣金额';

alter table wx_bill_rent_manage_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_manage_99 add column set_off varchar(30) COMMENT '抵扣金额';

alter table wx_bill_rent_deposit_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_rent_deposit_99 add column set_off varchar(30) COMMENT '抵扣金额';

alter table wx_bill_property_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_99 add column set_off varchar(30) COMMENT '抵扣金额';

alter table wx_bill_property_deposit_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_property_deposit_99 add column set_off varchar(30) COMMENT '抵扣金额';

alter table wx_bill_daily_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_daily_99 add column set_off varchar(30) COMMENT '抵扣金额';

alter table wx_bill_other_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_99 add column set_off varchar(30) COMMENT '抵扣金额';

alter table wx_bill_other_deposit_0 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_1 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_2 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_3 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_4 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_5 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_6 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_7 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_8 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_9 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_10 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_11 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_12 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_13 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_14 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_15 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_16 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_17 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_18 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_19 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_20 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_21 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_22 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_23 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_24 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_25 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_26 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_27 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_28 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_29 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_30 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_31 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_32 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_33 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_34 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_35 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_36 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_37 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_38 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_39 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_40 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_41 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_42 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_43 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_44 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_45 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_46 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_47 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_48 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_49 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_50 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_51 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_52 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_53 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_54 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_55 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_56 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_57 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_58 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_59 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_60 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_61 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_62 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_63 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_64 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_65 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_66 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_67 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_68 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_69 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_70 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_71 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_72 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_73 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_74 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_75 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_76 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_77 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_78 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_79 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_80 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_81 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_82 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_83 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_84 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_85 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_86 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_87 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_88 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_89 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_90 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_91 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_92 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_93 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_94 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_95 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_96 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_97 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_98 add column set_off varchar(30) COMMENT '抵扣金额';
alter table wx_bill_other_deposit_99 add column set_off varchar(30) COMMENT '抵扣金额';





+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java View File

@@ -68,6 +68,10 @@ public class WxBillBaseEntity extends TenantEntity {
@Excel(name = "实收账款(元)", width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
public String pay;
@Excel(name = "实收账款(元)", width = 20, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value="冲抵金额",name="setOff")
public String setOff;

@Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")


+ 10
- 9
mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml View File

@@ -42,13 +42,14 @@
<result column="energy_reading_calcuteId" jdbcType="BIGINT" property="energyReadingCalcuteId" />
<result column="energy_reading_id" jdbcType="BIGINT" property="energyReadingId" />
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>
<sql id="allColumns">
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`tenant_id`,`parent_tenant_id`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`last_owe_call_time`,
`rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`remark`,`last_owe_call_user`,
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`,`energy_fees_id`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`,`energy_fees_id`,`set_off`
</sql>

<sql id="dynamicWhereConditions">
@@ -79,7 +80,7 @@
<if test=" null != buildWay ">and `build_way` = #{buildWay}</if>
<if test=" null != energyReadingCalcuteId ">and `energy_reading_calcuteId` = #{energyReadingCalcuteId}</if>
<if test=" null != energyReadingId ">and `energy_reading_id` = #{energyReadingId}</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != statusList ">
and status in
@@ -137,18 +138,18 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != buildWay ">and br.`build_way` = #{buildWay}</if>
<if test=" null != energyReadingCalcuteId ">and br.`energy_reading_calcuteId` = #{energyReadingCalcuteId}</if>
<if test=" null != energyReadingId ">and br.`energy_reading_id` = #{energyReadingId}</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -172,7 +173,7 @@
<select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` ,
br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`,br.`set_off`,
br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`remark`,br.`energy_fees_id`,
br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_reading_calcuteId`,br.`energy_reading_id`
@@ -215,7 +216,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillDaily" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_daily br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_daily br
<include refid="queryBillDailyListConditions"/>
</select>
@@ -279,7 +280,7 @@
</insert>
<delete id = "deleteEnergyReadingBills" parameterType="HashMap">
delete from wx_bill_daily where energy_reading_calcuteId = #{energyReadingCalcuteId} and tenant_id = #{tenantId} and status = 2 and pay &lt;= 0
delete from wx_bill_daily where energy_reading_calcuteId = #{energyReadingCalcuteId} and tenant_id = #{tenantId} and status = 2 and pay &lt;= 0 and set_off &lt;= 0
</delete>
</mapper>

+ 11
- 10
mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml View File

@@ -38,10 +38,11 @@
<result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/>
<result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`,
`id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`,`set_off`,
`expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`,`energy_fees_id`,
`last_owe_call_user`,`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,contract_depoist_detail,`create_by`,`create_by_name`,`update_by`,`update_by_name`
</sql>
@@ -83,12 +84,12 @@
and date_format(starttime,'%Y-%m') &lt;= #{month} and date_format(endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (`starttime` &lt;= #{oweBillLastTime} and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7))
and (`starttime` &lt;= #{oweBillLastTime} and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (`starttime` &gt; #{oweBillLastTime} and `starttime` &lt;= #{nearBillLastTime} and status not in (3,6,7))
and (`starttime` &gt; #{oweBillLastTime} and `starttime` &lt;= #{nearBillLastTime} and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7))
</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and `merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -133,7 +134,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`rent_contract_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_time`,
br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`contract_depoist_detail`,br.`last_owe_call_user`,
br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`contract_depoist_detail`,br.`last_owe_call_user`,br.`set_off`,
br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`
from wx_bill_rent_deposit br
<include refid="queryBillRentListCondition"/>
@@ -167,15 +168,15 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -225,7 +226,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_rent_deposit br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_rent_deposit br
<include refid="queryBillRentListCondition"/>
</select>


+ 9
- 8
mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml View File

@@ -39,13 +39,14 @@
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_time`,`last_owe_call_user`,
`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay,`create_by`,`create_by_name`,`update_by`,`update_by_name`,
`energy_fees_id`
`energy_fees_id`,`set_off`
</sql>
<sql id="dynamicWhereConditions">
@@ -76,7 +77,7 @@
<if test=" null != name ">and `name` = #{name}</if>
<if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if>
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -136,15 +137,15 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -170,7 +171,7 @@
</sql>
<select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_user`,
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_user`,br.`set_off`,
br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`last_owe_call_time`,br.`energy_fees_id`,
br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
from wx_bill_other_deposit br
@@ -212,7 +213,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_other_deposit br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_other_deposit br
<include refid="queryBillListConditions"/>
</select>


+ 9
- 8
mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml View File

@@ -39,13 +39,14 @@
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_user`,
`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`last_owe_call_time`,
`rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`,
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`,`set_off`
</sql>

<sql id="dynamicWhereConditions">
@@ -74,7 +75,7 @@
<if test=" null != name "> and `name` = #{name} </if>
<if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if>
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -129,15 +130,15 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -163,7 +164,7 @@
<select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`,
br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`,br.`last_owe_call_time`,br.`last_owe_call_user`,br.`set_off`,
br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.`energy_fees_id`,
br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
from wx_bill_other br
@@ -205,7 +206,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillOther" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_other br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_other br
<include refid="queryBillListConditions"/>
</select>


+ 9
- 8
mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml View File

@@ -39,13 +39,14 @@
<result column="merchant_name" property="merchantName"/>
<result column="shop_number" property="shopNumber"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`starttime`,`endtime`,
`pay_date`,`createtime`,`expired_day`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_user`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay,
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`,`set_off`
</sql>

<sql id="dynamicWhereConditions">
@@ -75,7 +76,7 @@
<if test=" null != updatetime ">and `updatetime` = #{updatetime}</if>
<if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if>
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != propertyContractIdList ">
and property_contract_id in
<foreach collection="propertyContractIdList" index="index" item="pidItem" open="(" separator="," close=")">
@@ -135,15 +136,15 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -161,7 +162,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`property_contract_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`status`,
br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`,br.`last_owe_call_user`,
br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`,br.`last_owe_call_user`,,br.`set_off`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`
from wx_bill_property_deposit br
<include refid="queryBillDepositListConditions"/>
@@ -201,7 +202,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_property_deposit br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_property_deposit br
<include refid="queryBillDepositListConditions"/>
</select>


+ 9
- 8
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml View File

@@ -52,6 +52,7 @@
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>

<sql id="allColumns">
@@ -59,7 +60,7 @@
`createtime`,`expired_day`,`tenant_id`,`status`,`is_del`,`need_pay`,`last_owe_call_time`,`last_owe_call_user`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,`parent_bill_id`,`energy_fees_id`
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,`parent_bill_id`,`energy_fees_id`,`set_off`
</sql>

<sql id="dynamicWhereConditions">
@@ -97,7 +98,7 @@
<if test=" 1 == hasFeesStardarsId ">and `energy_fees_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and `energy_fees_id` is null</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != propertyContractIds ">
and property_contract_id in
<foreach collection="propertyContractIds" index="index" item="pidItem" open="(" separator="," close=")">
@@ -161,13 +162,13 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if>
@@ -179,7 +180,7 @@
<if test=" 1 == hasFeesStardarsId ">and br.`energy_fees_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and br.`energy_fees_id` is null</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != propertyContractIds ">
and br.property_contract_id in
<foreach collection="propertyContractIds" index="index" item="pidItem" open="(" separator="," close=")">
@@ -208,7 +209,7 @@
br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status,br.`energy_fees_id`,
br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay,
br.`late_pay_ratio`,br.`parent_bill_id`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
br.`late_pay_ratio`,br.`parent_bill_id`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`set_off`
from wx_bill_property br
<include refid="queryBillPropertyListConditions"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>
@@ -253,7 +254,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillProperty" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_property br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_property br
<include refid="queryBillPropertyListConditions"/>
</select>


+ 9
- 8
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml View File

@@ -44,6 +44,7 @@
<result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/>
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>

<sql id="allColumns">
@@ -51,7 +52,7 @@
`createtime`,`expired_day`,`status`,`apply_status`,`apply_pay_img`,`apply_update_time`,`is_del`,`is_preview`,`need_pay`,
`last_owe_call_time`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`late_pay_ratio`,`late_pay_time`,
`late_pay_price`,`period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type,
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`,`set_off`
</sql>

<sql id="dynamicWhereConditions">
@@ -84,7 +85,7 @@
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if>
<if test=" null != manageFeeType ">and `manage_fee_type` = #{manageFeeType}</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -144,17 +145,17 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if>
<if test=" null != hasMerchant ">and br.`merchant_id` is not null</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and br.merchant_id in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -175,7 +176,7 @@
br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,
br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`,br.`energy_fees_id`
br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`,br.`energy_fees_id`,br.`set_off`
from wx_bill_rent_manage br
<include refid="queryBillManageListConditions"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>
@@ -222,7 +223,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillRentManage" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_rent_manage br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_rent_manage br
<include refid="queryBillManageListConditions"/>
</select>


+ 9
- 8
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -61,13 +61,14 @@
<result column="join_rent_price" property="joinRentPrice"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,
`createtime`,`expired_day`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`need_pay`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_time`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`last_owe_call_user`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`last_owe_call_user`,`set_off`,
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay,`energy_fees_id`
</sql>

@@ -108,7 +109,7 @@
<if test=" null != endtimeEnd">
and endtime &lt; #{endtimeEnd}
</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != statusList ">
and status in
<foreach collection="statusList" index="index" item="stItem" open="(" separator="," close=")">
@@ -160,15 +161,15 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay`- br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != rentContractIdList ">
and br.`rent_contract_id` in
<foreach collection="rentContractIdList" index="index" item="ridItem" open="(" separator="," close=")">
@@ -195,7 +196,7 @@
br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,br.`bussiness_manage_fee_need_pay`,br.`operating_manage_fee_need_pay`,br.`last_owe_call_time`,
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`revenue`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay,
br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`
br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`,br.`set_off`
from wx_bill_rent br
<include refid="queryBillRentListCondition"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>
@@ -242,7 +243,7 @@
<result column="min_begin_time" jdbcType="TIMESTAMP" property="minBeginTime"/>
</resultMap>
<select id="getBillHotNotify" parameterType="com.iformall.domain.po.WxBillRent" resultMap="HotNotifyBaseResultMap">
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_rent br
select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2)) - CAST(IFNULL(br.`set_off`,"0") AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_rent br
<include refid="queryBillRentListCondition"/>
</select>


Loading…
Cancel
Save