| @@ -807,6 +807,914 @@ 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 '抵扣金额'; | |||
| alter table wx_bill_rent_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_manage_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_rent_deposit_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_property_deposit_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_daily_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_other_deposit_99 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_0 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_1 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_2 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_3 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_4 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_5 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_6 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_7 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_8 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_9 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_10 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_11 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_12 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_13 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_14 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_15 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_16 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_17 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_18 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_19 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_20 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_21 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_22 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_23 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_24 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_25 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_26 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_27 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_28 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_29 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_30 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_31 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_32 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_33 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_34 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_35 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_36 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_37 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_38 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_39 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_40 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_41 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_42 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_43 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_44 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_45 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_46 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_47 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_48 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_49 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_50 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_51 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_52 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_53 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_54 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_55 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_56 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_57 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_58 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_59 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_60 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_61 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_62 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_63 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_64 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_65 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_66 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_67 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_68 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_69 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_70 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_71 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_72 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_73 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_74 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_75 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_76 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_77 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_78 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_79 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_80 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_81 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_82 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_83 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_84 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_85 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_86 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_87 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_88 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_89 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_90 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_91 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_92 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_93 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_94 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_95 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_96 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_97 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_98 add column advance_id bigint(2) comment '收款单id';; | |||
| alter table wx_bill_advance_99 add column advance_id bigint(2) comment '收款单id';; | |||
| @@ -16,7 +16,7 @@ public class WxBillPayDTO extends TenantEntity{ | |||
| private Integer billTypeValue;// EnumBillAllType | |||
| private Long advanceId;//收款单单号 | |||
| private String addpay;//支付金额 | |||
| private String setOff;//冲抵金额 | |||
| private String setOff="0";//冲抵金额 | |||
| private WxBillPayWay payWayObject;//支付方式 | |||
| private Long payWay;//传值 | |||
| private String remark; | |||
| @@ -70,6 +70,9 @@ public class WxBillBaseEntity extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | |||
| public String pay; | |||
| @io.swagger.annotations.ApiModelProperty(value = "收款单ID", name = "advanceId") | |||
| public Long advanceId; | |||
| @io.swagger.annotations.ApiModelProperty(value = "支付方式", name = "payWay") | |||
| public Long payWay; | |||
| @@ -1,5 +1,8 @@ | |||
| package com.iformall.enums; | |||
| import java.math.BigDecimal; | |||
| import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; | |||
| import com.iformall.domain.po.WxBillPayWay; | |||
| /** | |||
| @@ -16,8 +19,7 @@ public enum EnumBillAction { | |||
| UPDATE_SERVICE_MONEY(9, "手续费变更"), | |||
| NOTIFY(10,"催缴"), | |||
| BAD(11,"坏账"), | |||
| STATUS_CHANGE(12,"状态变更"), | |||
| SETOFF(13,"冲抵"); | |||
| STATUS_CHANGE(12,"状态变更"); | |||
| public static EnumBillAction getEnum(Integer code) { | |||
| for (EnumBillAction value : values()) { | |||
| @@ -44,7 +46,7 @@ public enum EnumBillAction { | |||
| return message; | |||
| } | |||
| public String getDescription(String oldMoney,String newMoney,WxBillPayWay payWay,EnumBillStatus oldStatus,EnumBillStatus newStatus) { | |||
| public String getDescription(String oldMoney,String newMoney,String setoffMoney,WxBillPayWay payWay,EnumBillStatus oldStatus,EnumBillStatus newStatus) { | |||
| StringBuffer sb = new StringBuffer("[").append(this.message).append("]"); | |||
| if (code.intValue() == SELF_SERVICE_PAY.code.intValue()) { | |||
| if (null != payWay) { | |||
| @@ -58,6 +60,9 @@ public enum EnumBillAction { | |||
| sb.append(payWay.getName()).append("支付"); | |||
| } | |||
| sb.append(newMoney).append("元"); | |||
| if (StringUtils.isNotBlank(setoffMoney) && new BigDecimal(setoffMoney).compareTo(new BigDecimal(0)) > 0 ) { | |||
| sb.append(",预收冲抵").append(setoffMoney).append("元"); | |||
| } | |||
| }else if (code.intValue() == RETURN.code.intValue()) { | |||
| sb.append(newMoney).append("元"); | |||
| }else if (code.intValue() == UPDATE_LATE_PAY_MONEY.code.intValue()) { | |||
| @@ -70,8 +75,6 @@ public enum EnumBillAction { | |||
| sb.append("欠缴金额").append(oldMoney).append("元"); | |||
| }else if (code.intValue() == STATUS_CHANGE.code.intValue()){ | |||
| sb.append("状态由[").append(oldStatus.getMessage()).append("]变更为[").append(newStatus.getMessage()).append("]"); | |||
| }else if (code.intValue() == SETOFF.code.intValue()){ | |||
| sb.append("预收冲抵").append(newMoney).append("元"); | |||
| }else { | |||
| sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); | |||
| } | |||
| @@ -1112,7 +1112,7 @@ public class WxBillAllHelper { | |||
| action.setOldMoney(oldReceivePay); | |||
| action.setNewMoney(newReceivePay); | |||
| action.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,EnumBillStatus.getEnum(bill.getStatus()),realBillStatus)); | |||
| action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,null,EnumBillStatus.getEnum(bill.getStatus()),realBillStatus)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"]"+"系统自动变更状态,应收金额变为0"); | |||
| isUpdate = true; | |||
| //如果是已支付,则需退回全部费用 | |||
| @@ -1122,7 +1122,7 @@ public class WxBillAllHelper { | |||
| action.setOldMoney(oldReceivePay); | |||
| action.setNewMoney("0"); | |||
| action.setAction(EnumBillAction.UPDATE_BILL.getCode()); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(bill.getReceivePay(), "0", null,null,null)); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(bill.getReceivePay(), "0",null, null,null,null)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]"); | |||
| isUpdate = true; | |||
| }else { | |||
| @@ -1142,14 +1142,14 @@ public class WxBillAllHelper { | |||
| bill.setReceivePay(newReceivePay); | |||
| bill.setStatus(EnumBillStatus.STOP_TO_SETTLE.getCode()); | |||
| action.setAction(EnumBillAction.UPDATE_BILL.getCode()); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null,null,null)); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null,null,null,null)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]"); | |||
| isUpdate = true; | |||
| }else if (bill.getStatus().intValue() == EnumBillStatus.PAID.getCode().intValue()) { | |||
| bill.setReceivePay(newReceivePay); | |||
| bill.setStatus(EnumBillStatus.STOP_TO_SETTLE.getCode()); | |||
| action.setAction(EnumBillAction.UPDATE_BILL.getCode()); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null,null,null)); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null,null,null,null)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]"); | |||
| isUpdate = true; | |||
| }else { | |||
| @@ -1164,7 +1164,7 @@ public class WxBillAllHelper { | |||
| action.setOldMoney(oldReceivePay); | |||
| action.setNewMoney("0"); | |||
| action.setAction(EnumBillAction.UPDATE_BILL.getCode()); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null,null,null)); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null,null,null,null)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]"); | |||
| }else { | |||
| bill.setReceivePay("0"); | |||
| @@ -1172,7 +1172,7 @@ public class WxBillAllHelper { | |||
| action.setOldMoney(oldReceivePay); | |||
| action.setNewMoney("0"); | |||
| action.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,EnumBillStatus.getEnum(bill.getStatus()),EnumBillStatus.INVALID)); | |||
| action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,null,EnumBillStatus.getEnum(bill.getStatus()),EnumBillStatus.INVALID)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"]"+"系统自动变更状态,应收金额变为0"); | |||
| } | |||
| }else { | |||
| @@ -1180,7 +1180,7 @@ public class WxBillAllHelper { | |||
| action.setOldMoney(oldReceivePay); | |||
| action.setNewMoney("0"); | |||
| action.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,EnumBillStatus.getEnum(bill.getStatus()),EnumBillStatus.STOP_TO_SETTLE)); | |||
| action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,null,EnumBillStatus.getEnum(bill.getStatus()),EnumBillStatus.STOP_TO_SETTLE)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"]"+"系统自动变更状态"); | |||
| } | |||
| isUpdate = true; | |||
| @@ -1191,7 +1191,7 @@ public class WxBillAllHelper { | |||
| action.setOldMoney(oldReceivePay); | |||
| action.setNewMoney("0"); | |||
| action.setAction(EnumBillAction.UPDATE_BILL.getCode()); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null,null,null)); | |||
| action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null,null,null,null)); | |||
| action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]"); | |||
| isUpdate = true; | |||
| } | |||
| @@ -240,7 +240,7 @@ public class WxBillAdvanceServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillAdvanceMapper.updateById(wxBillRent); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为结清。"; | |||
| this.addBillAction(EnumBillAction.SETOFF, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark,null,null, user); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,null,remark,null,null, user); | |||
| }else { | |||
| // if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| // wxBillRent.setLatePayPrice(dto.getNewLatePrice()); | |||
| @@ -266,8 +266,8 @@ public class WxBillAdvanceServiceImpl extends WxBillBaseService implements WxBil | |||
| } | |||
| wxBillAdvanceMapper.updateById(wxBillRent); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.SETOFF, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark,null,null, user); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),null,payDate,payWay,remark,null,null, user); | |||
| // } | |||
| } | |||
| } | |||
| @@ -276,11 +276,8 @@ public class WxBillAdvanceServiceImpl extends WxBillBaseService implements WxBil | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillAdvance wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillAdvance updateBillPay(WxBillPayDTO dto) { | |||
| @@ -296,11 +293,11 @@ public class WxBillAdvanceServiceImpl extends WxBillBaseService implements WxBil | |||
| opay = opay.add(new BigDecimal(dto.getAddpay())); | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark("【系统】账单冲抵金额已大于等于预收金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillAdvanceMapper.updateById(wxBillRent); | |||
| @@ -317,7 +314,7 @@ public class WxBillAdvanceServiceImpl extends WxBillBaseService implements WxBil | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -333,7 +330,7 @@ public class WxBillAdvanceServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillAdvanceMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| // @Override | |||
| @@ -24,13 +24,13 @@ public class WxBillBaseService{ | |||
| @Autowired | |||
| private WxBillActionService wxBillActionService; | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,WxBillPayWay payWay,String remark, EnumBillStatus oldStatus,EnumBillStatus newStatus,MallUserInfo mallUserInfo) { | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,String setoff,Date payDate,WxBillPayWay payWay,String remark, EnumBillStatus oldStatus,EnumBillStatus newStatus,MallUserInfo mallUserInfo) { | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setBillId(billId); | |||
| wxBillAction.setBillType(billType); | |||
| wxBillAction.setOldMoney(oldMoney); | |||
| wxBillAction.setNewMoney(newMoney); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay,oldStatus,newStatus)); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,setoff,payWay,oldStatus,newStatus)); | |||
| wxBillAction.setAction(billAction.getCode()); | |||
| wxBillAction.setPayDate(payDate); | |||
| if (null != payWay) { | |||
| @@ -41,13 +41,13 @@ public class WxBillBaseService{ | |||
| wxBillActionService.modifyBill(wxBillAction, mallUserInfo); | |||
| } | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,WxBillPayWay payWay,String remark,EnumBillStatus oldStatus,EnumBillStatus newStatus, WxMerchantBUser bUser) { | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,String setoff,Date payDate,WxBillPayWay payWay,String remark,EnumBillStatus oldStatus,EnumBillStatus newStatus, WxMerchantBUser bUser) { | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setBillId(billId); | |||
| wxBillAction.setBillType(billType); | |||
| wxBillAction.setOldMoney(oldMoney); | |||
| wxBillAction.setNewMoney(newMoney); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay,oldStatus,newStatus)); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,setoff,payWay,oldStatus,newStatus)); | |||
| wxBillAction.setAction(billAction.getCode()); | |||
| wxBillAction.setPayDate(payDate); | |||
| if (null != payWay) { | |||
| @@ -495,18 +495,18 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillDaily.setStatus(EnumBillStatus.PAID.getCode()); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), | |||
| dbBill.getPay(),null,null, remark,null,null, user); | |||
| dbBill.getPay(),null,null,null, remark,null,null, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillDaily.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillDailyMapper.updateById(wxBillDaily); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillDaily.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillDailyMapper.updateById(wxBillDaily); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| } else { | |||
| //租赁账单更新 | |||
| wxBillDaily.setReceivePay(dto.getNewPrice()); | |||
| @@ -522,7 +522,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillDailyMapper.updateById(wxBillDaily); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,payDate, payWay,remark,null,null, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -537,18 +537,15 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillDailyMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(),null,null, user); | |||
| null, null,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDaily wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillDaily updateBillPay(WxBillPayDTO dto) { | |||
| @@ -568,7 +565,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -605,12 +602,13 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(latePayLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(latePayLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillDailyMapper.updateById(wxBillRent); | |||
| @@ -628,7 +626,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -644,7 +642,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillDailyMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -708,7 +706,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -445,12 +445,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillDepositMapper.updateById(wxBillDeposit); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, | |||
| billDepositNewPrce,payDate, null, remark,null,null,user); | |||
| billDepositNewPrce,null,payDate, null, remark,null,null,user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillDeposit.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillDepositMapper.updateById(wxBillDeposit); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else { | |||
| wxBillDeposit.setReceivePay(dto.getNewPrice()); | |||
| WxBillPayWay payWay = null; | |||
| @@ -463,7 +463,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| } | |||
| wxBillDepositMapper.updateById(wxBillDeposit); | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, | |||
| billDepositNewPrce,payDate,payWay,remark,null,null, user); | |||
| billDepositNewPrce,null,payDate,payWay,remark,null,null, user); | |||
| } | |||
| @@ -479,18 +479,15 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(),null,null, user); | |||
| null, null,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDeposit wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillDeposit updateBillPay(WxBillPayDTO dto) { | |||
| @@ -510,7 +507,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -528,12 +525,13 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(serviceLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(serviceLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillDepositMapper.updateById(wxBillRent); | |||
| @@ -551,7 +549,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -568,7 +566,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString()); | |||
| wxBillDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -582,7 +580,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillDepositMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -643,7 +641,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -453,12 +453,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),null,null, remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,null,null, remark,null,null, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillOtherDeposit.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else { | |||
| wxBillOtherDeposit.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| @@ -473,7 +473,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,payDate, payWay,remark,null,null, user); | |||
| } | |||
| } | |||
| @@ -489,18 +489,15 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillOtherDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(), null,null,user); | |||
| null,null, null,null,null,dto.getRemark(), null,null,user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOtherDeposit wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(), null,null,user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(), null,null,user); | |||
| } | |||
| private WxBillOtherDeposit updateBillPay(WxBillPayDTO dto) { | |||
| @@ -521,7 +518,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -539,12 +536,13 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(serviceLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(serviceLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillOtherDepositMapper.updateById(wxBillRent); | |||
| @@ -562,7 +560,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(), null,null,user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(), null,null,user); | |||
| } | |||
| @Override | |||
| @@ -581,7 +579,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString()); | |||
| wxBillOtherDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -597,7 +595,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillOtherDepositMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -661,7 +659,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -396,12 +396,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),null,null, remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,null,null, remark,null,null, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillOther.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillOtherMapper.updateById(wxBillOther); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else { | |||
| wxBillOther.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| @@ -416,7 +416,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillOtherMapper.updateById(wxBillOther); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,payDate, payWay,remark,null,null, user); | |||
| } | |||
| @@ -434,18 +434,15 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillOtherMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(),null,null, user); | |||
| null, null,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOther wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillOther updateBillPay(WxBillPayDTO dto) { | |||
| @@ -464,7 +461,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -482,12 +479,13 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(serviceLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(serviceLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillOtherMapper.updateById(wxBillRent); | |||
| @@ -505,7 +503,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -521,7 +519,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillOtherMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -585,7 +583,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -429,12 +429,12 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,null,null, remark,null,null, user); | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,null,null,null, remark,null,null, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillPropertyDeposit.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else { | |||
| wxBillPropertyDeposit.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| @@ -449,7 +449,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,payDate, payWay,remark,null,null, user); | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,null,payDate, payWay,remark,null,null, user); | |||
| } | |||
| } | |||
| @@ -464,18 +464,15 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(),null,null, user); | |||
| null, null,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillPropertyDeposit wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillPropertyDeposit updateBillPay(WxBillPayDTO dto) { | |||
| @@ -495,7 +492,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -513,11 +510,13 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(serviceLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(serviceLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | |||
| @@ -535,7 +534,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -554,7 +553,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString()); | |||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -570,7 +569,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -633,7 +632,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -534,18 +534,18 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dbBill.getPay(), dbBill.getPay(),null,null,remark,null,null, user); | |||
| dbBill.getPay(), dbBill.getPay(),null,null,null,remark,null,null, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillProperty.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillProperty.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| } else { | |||
| Date payDate = null; | |||
| WxBillPayWay payWay = null; | |||
| @@ -560,7 +560,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,payDate,payWay,remark,null,null, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -577,18 +577,15 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillPropertyMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(),null,null, user); | |||
| null,null, null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillProperty wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillProperty updateBillPay(WxBillPayDTO dto) { | |||
| @@ -608,7 +605,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -645,11 +642,13 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(latePayLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(latePayLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillPropertyMapper.updateById(wxBillRent); | |||
| @@ -667,7 +666,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -683,7 +682,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillPropertyMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -753,7 +752,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -446,18 +446,18 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark,null,null, user); | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,null,remark,null,null, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillRent.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillRent.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| } else { | |||
| //租赁账单更新 | |||
| wxBillRent.setReceivePay(dto.getNewPrice()); | |||
| @@ -473,7 +473,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,payDate,payWay,remark,null,null, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -490,18 +490,15 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(),null,null, user); | |||
| null, null,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillRentManage wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillRentManage updateBillPay(WxBillPayDTO dto) { | |||
| @@ -521,7 +518,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -558,12 +555,13 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(latePayLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(latePayLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| @@ -581,7 +579,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -597,7 +595,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -668,7 +666,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -642,18 +642,18 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark,null,null, user); | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,null,remark,null,null, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillRent.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillRent.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,null,dto.getRemark(),null,null, user); | |||
| }else { | |||
| //租赁账单更新 | |||
| wxBillRent.setReceivePay(dto.getNewPrice()); | |||
| @@ -669,7 +669,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark,null,null, user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,payDate,payWay,remark,null,null, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -686,18 +686,15 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,null,dto.getRemark(),null,null, user); | |||
| null, null,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillRent wxBillRent = updateBillPay(dto); | |||
| EnumBillAction action = EnumBillAction.OFFLINE_PAY; | |||
| if (dto.isSetOff()) { | |||
| action = EnumBillAction.SETOFF; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),dto.getSetOff(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| private WxBillRent updateBillPay(WxBillPayDTO dto) { | |||
| @@ -716,7 +713,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| servicePay = "0"; | |||
| } | |||
| StringBuffer sb = new StringBuffer(StringUtils.trimToEmpty(dto.getRemark())); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).subtract(new BigDecimal(servicePay)); | |||
| BigDecimal serviceLastMoney = new BigDecimal(dto.getAddpay()).add(new BigDecimal(dto.getSetOff())).subtract(new BigDecimal(servicePay)); | |||
| if (new BigDecimal(servicePay).compareTo(new BigDecimal(0)) > 0 ) { | |||
| if (serviceLastMoney.compareTo(new BigDecimal(0)) >= 0 ) { | |||
| wxBillRent.setServiceChargePay("0"); | |||
| @@ -753,12 +750,13 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| if (new BigDecimal(dto.getAddpay()).compareTo(latePayLastMoney) > 0 ) { | |||
| sb.append(";已付金额增加").append(latePayLastMoney.toPlainString()); | |||
| } | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| if (opay.compareTo(new BigDecimal(dbBill.getOwe())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| } | |||
| wxBillRent.setAdvanceId(dto.getAdvanceId()); | |||
| wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| @@ -776,7 +774,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| action = EnumBillAction.OFFLINE_PAY; | |||
| } | |||
| this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -792,7 +790,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| String badMoney = dbBill.getOwe(); | |||
| this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), | |||
| badMoney, badMoney,null,null,dto.getRemark(),null,null, user); | |||
| badMoney, badMoney,null,null,null,dto.getRemark(),null,null, user); | |||
| } | |||
| @Override | |||
| @@ -863,7 +861,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillAction.setBillId(b.getId()); | |||
| wxBillAction.setBillType(b.getBillType()); | |||
| wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode()); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID)); | |||
| wxBillAction.setRemark(wxMerchant.getBillCompleteRemark()); | |||
| this.addBillAction(wxBillAction, user); | |||
| } | |||
| @@ -22,11 +22,12 @@ | |||
| <result column="endtime" jdbcType="TIMESTAMP" property="endtime"/> | |||
| <result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/> | |||
| <result column="remark" jdbcType="VARCHAR" property="remark"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`rent_shop_type`,`createtime`,`create_by`,`create_by_name`,`updatetime`, | |||
| `update_by`,`update_by_name`,`pay_way`,`pay`,`receive_pay`,`pay_date`,`set_off`,`starttime`,`endtime`,`energy_fees_id`,`remark` | |||
| `update_by`,`update_by_name`,`pay_way`,`pay`,`receive_pay`,`pay_date`,`set_off`,`starttime`,`endtime`,`energy_fees_id`,`remark`,`advance_id` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -39,6 +40,7 @@ | |||
| and `parent_tenant_id` = #{parentTenantId} | |||
| </if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != receivePay ">and `receive_pay` = #{receivePay}</if> | |||
| <if test=" null != pay ">and `pay` = #{pay}</if> | |||
| <if test=" null != payDate ">and `pay_date` = #{payDate}</if> | |||
| @@ -94,6 +96,7 @@ | |||
| <if test=" null != status ">and br.`status` = #{status}</if> | |||
| <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> | |||
| <if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | |||
| <if test=" null != starttime">and br.`starttime` <= #{starttime}</if> | |||
| <if test=" null != endtime">and br.`endtime` >= #{endtime}</if> | |||
| @@ -116,7 +119,7 @@ | |||
| </sql> | |||
| <select id="queryBillRentList" parameterType="com.iformall.domain.po.WxBillAdvance" resultMap="BaseResultMap"> | |||
| br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`merchant_id`,br.`rent_shop_type`,br.`createtime`,br.`create_by`,br.`create_by_name`,br.`updatetime`, | |||
| br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`merchant_id`,br.`rent_shop_type`,br.`createtime`,br.`create_by`,br.`create_by_name`,br.`updatetime`,br.`advance_id`, | |||
| br.`update_by`,br.`update_by_name`,br.`pay_way`,br.`pay`,br.`receive_pay`,br.`pay_date`,br.`set_off`,br.`starttime`,br.`endtime`,br.`energy_fees_id`,br.`remark` | |||
| from wx_bill_advance br | |||
| <include refid="queryBillListCondition"/> | |||
| @@ -43,13 +43,14 @@ | |||
| <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"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </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`,`set_off` | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`,`energy_fees_id`,`set_off`,`advance_id` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -72,6 +73,7 @@ | |||
| <if test=" null != isDel "> and `is_del` = #{isDel} </if> | |||
| <if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != userId "> and `user_id` = #{userId} </if> | |||
| <if test=" null != updatetime "> and `updatetime` = #{updatetime} </if> | |||
| <if test=" null != type "> and `type` = #{type} </if> | |||
| @@ -126,6 +128,7 @@ | |||
| <if test=" null != id ">and br.`id` = #{id}</if> | |||
| <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> | |||
| <if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != status ">and br.`status` = #{status}</if> | |||
| <if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if> | |||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | |||
| @@ -173,7 +176,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.`set_off`, | |||
| br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`,br.`set_off`,br.`advance_id`, | |||
| 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` | |||
| @@ -267,14 +270,14 @@ | |||
| INSERT INTO wx_bill_daily (`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`status`,`is_del`, | |||
| `merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`rent_shop_type`,`apply_status`,`pay_way`,`price_detail`, | |||
| `starttime`,`endtime`,`freeze`,`build_way`,`service_charge_pay`,`apply_pay_img`,`apply_update_time`,`remark`,`create_by`,`update_by`, | |||
| `create_by_name`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`,`energy_fees_id`) | |||
| `create_by_name`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`,`energy_fees_id`,`advance_id`) | |||
| VALUES | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| ( | |||
| #{item.id},#{item.tenantId},#{item.parentTenantId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime},#{item.expiredDay},#{item.status},#{item.isDel}, | |||
| #{item.merchantId},#{item.userId},#{item.shopId},#{item.shopName},#{item.updatetime},#{item.type},#{item.rentShopType},#{item.applyStatus},#{item.payWay},#{item.priceDetail}, | |||
| #{item.starttime},#{item.endtime},#{item.freeze},#{item.buildWay},#{item.serviceChargePay},#{item.applyPayImg},#{item.applyUpdateTime},#{item.remark},#{item.createBy},#{item.updateBy}, | |||
| #{item.createByName},#{item.updateByName},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.energyFeesId} | |||
| #{item.createByName},#{item.updateByName},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.energyFeesId},#{item.advanceId} | |||
| ) | |||
| </foreach> | |||
| </insert> | |||
| @@ -39,10 +39,11 @@ | |||
| <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"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </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`,`set_off`, | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`,`set_off`,`advance_id`, | |||
| `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> | |||
| @@ -58,6 +59,7 @@ | |||
| </if> | |||
| <if test=" null != rentContractId "> and `rent_contract_id` = #{rentContractId} </if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != receivePay "> and `receive_pay` = #{receivePay} </if> | |||
| <if test=" null != pay "> and `pay` = #{pay} </if> | |||
| <if test=" null != receiveDate "> and `receive_date` = #{receiveDate} </if> | |||
| @@ -134,7 +136,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.`set_off`, | |||
| 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.`advance_id`, | |||
| 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"/> | |||
| @@ -158,6 +160,7 @@ | |||
| <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | |||
| <if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> | |||
| <if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | |||
| <if test=" null != contractDepoistDetail and '' != contractDepoistDetail"> | |||
| and br.`contract_depoist_detail` like concat('%', #{contractDepoistDetail},'%') | |||
| @@ -368,7 +371,7 @@ | |||
| INSERT INTO wx_bill_rent_deposit (id,rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, | |||
| expired_day,tenant_id, parent_tenant_id,status,is_del,need_pay, merchant_id, user_id, shop_id, updatetime, starttime, | |||
| endtime,rent_shop_type,return_price,shop_info,pay_way,freeze,service_charge_pay, | |||
| contract_depoist_detail,create_by,create_by_name,update_by,update_by_name,energy_fees_id | |||
| contract_depoist_detail,create_by,create_by_name,update_by,update_by_name,energy_fees_id,advance_id | |||
| ) | |||
| VALUES | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| @@ -377,7 +380,7 @@ | |||
| #{item.expiredDay},#{item.tenantId},#{item.parentTenantId},#{item.status},#{item.isDel},#{item.needPay}, | |||
| #{item.merchantId},#{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime}, | |||
| #{item.endtime},#{item.rentShopType},#{item.returnPrice},#{item.shopInfo},#{item.payWay},#{item.freeze},#{item.serviceChargePay}, | |||
| #{item.contractDepoistDetail},#{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName},#{item.energyFeesId} | |||
| #{item.contractDepoistDetail},#{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName},#{item.energyFeesId},#{item.advanceId} | |||
| ) | |||
| </foreach> | |||
| </insert> | |||
| @@ -40,13 +40,14 @@ | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/> | |||
| <result column="set_off" jdbcType="VARCHAR" property="setOff"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </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`,`set_off` | |||
| `energy_fees_id`,`set_off`,`advance_id` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -66,6 +67,7 @@ | |||
| <if test=" null != expiredDay ">and `expired_day` = #{expiredDay}</if> | |||
| <if test=" null != status ">and `status` = #{status}</if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != applyStatus ">and `apply_status` = #{applyStatus}</if> | |||
| <if test=" null != isDel ">and `is_del` = #{isDel}</if> | |||
| <if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if> | |||
| @@ -123,6 +125,7 @@ | |||
| <if test=" null != parentTenantId and '' != parentTenantId">and br.`parent_tenant_id` = #{parentTenantId}</if> | |||
| <if test=" null != freeze ">and br.`freeze` = #{freeze}</if> | |||
| <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != status ">and br.`status` = #{status}</if> | |||
| <if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if> | |||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | |||
| @@ -172,7 +175,7 @@ | |||
| <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`,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.`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.`advance_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 | |||
| <include refid="queryBillListConditions"/> | |||
| @@ -40,13 +40,14 @@ | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/> | |||
| <result column="set_off" jdbcType="VARCHAR" property="setOff"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </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`,`set_off` | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`,`set_off`,`advance_id` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -69,6 +70,7 @@ | |||
| <if test=" null != isDel "> and `is_del` = #{isDel} </if> | |||
| <if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != userId "> and `user_id` = #{userId} </if> | |||
| <if test=" null != shopId "> and `shop_id` = #{shopId} </if> | |||
| <if test=" null != updatetime "> and `updatetime` = #{updatetime} </if> | |||
| @@ -117,6 +119,7 @@ | |||
| <if test=" null != parentTenantId and '' != parentTenantId">and br.`parent_tenant_id` = #{parentTenantId}</if> | |||
| <if test=" null != freeze ">and br.`freeze` = #{freeze}</if> | |||
| <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != status ">and br.`status` = #{status}</if> | |||
| <if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if> | |||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | |||
| @@ -165,7 +168,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.`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.`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.`advance_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 | |||
| <include refid="queryBillListConditions" /> | |||
| @@ -40,13 +40,14 @@ | |||
| <result column="shop_number" property="shopNumber"/> | |||
| <result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/> | |||
| <result column="set_off" jdbcType="VARCHAR" property="setOff"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </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`,`set_off` | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`,`set_off`,`advance_id` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -60,6 +61,7 @@ | |||
| </if> | |||
| <if test=" null != propertyContractId "> and `property_contract_id` = #{propertyContractId} </if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != receivePay "> and `receive_pay` = #{receivePay} </if> | |||
| <if test=" null != pay "> and `pay` = #{pay} </if> | |||
| <if test=" null != receiveDate "> and `receive_date` = #{receiveDate} </if> | |||
| @@ -123,6 +125,7 @@ | |||
| and br.`parent_tenant_id` = #{parentTenantId} | |||
| </if> | |||
| <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != status ">and br.`status` = #{status}</if> | |||
| <if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if> | |||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | |||
| @@ -162,7 +165,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.`set_off`, | |||
| 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.`advance_id`, | |||
| 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"/> | |||
| @@ -53,6 +53,7 @@ | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/> | |||
| <result column="set_off" jdbcType="VARCHAR" property="setOff"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| @@ -60,7 +61,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`,`set_off` | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,`parent_bill_id`,`energy_fees_id`,`set_off`,`advance_id` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -74,6 +75,7 @@ | |||
| </if> | |||
| <if test=" null != propertyContractId ">and `property_contract_id` = #{propertyContractId}</if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != receivePay ">and `receive_pay` = #{receivePay}</if> | |||
| <if test=" null != pay ">and `pay` = #{pay}</if> | |||
| <if test=" null != receiveDate ">and `receive_date` = #{receiveDate}</if> | |||
| @@ -153,6 +155,7 @@ | |||
| <if test=" null != id ">and br.`id` = #{id}</if> | |||
| <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> | |||
| <if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != status ">and br.`status` = #{status}</if> | |||
| <if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if> | |||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | |||
| @@ -209,7 +212,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.`set_off` | |||
| 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`,br.`advance_id` | |||
| from wx_bill_property br | |||
| <include refid="queryBillPropertyListConditions"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| @@ -390,7 +393,7 @@ | |||
| tenant_id, parent_tenant_id, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, | |||
| endtime, | |||
| rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | |||
| pay_way, late_pay_status, comments,service_charge_pay,parent_bill_id,energy_fees_id) | |||
| pay_way, late_pay_status, comments,service_charge_pay,parent_bill_id,energy_fees_id,advance_id) | |||
| VALUES | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| ( | |||
| @@ -399,7 +402,7 @@ | |||
| #{item.tenantId},#{item.parentTenantId},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, | |||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | |||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | |||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId},#{item.energyFeesId} | |||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId},#{item.energyFeesId},#{item.advanceId} | |||
| ) | |||
| </foreach> | |||
| </insert> | |||
| @@ -45,6 +45,7 @@ | |||
| <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"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| @@ -52,7 +53,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`,`set_off` | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`,`set_off`,`advance_id` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -66,6 +67,7 @@ | |||
| </if> | |||
| <if test=" null != rentContractId ">and `rent_contract_id` = #{rentContractId}</if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != receivePay ">and `receive_pay` = #{receivePay}</if> | |||
| <if test=" null != pay ">and `pay` = #{pay}</if> | |||
| <if test=" null != receiveDate ">and `receive_date` = #{receiveDate}</if> | |||
| @@ -137,6 +139,7 @@ | |||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | |||
| <if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> | |||
| <if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | |||
| <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | |||
| <if test=" null != starttime">and br.`starttime` <= #{starttime}</if> | |||
| @@ -176,7 +179,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.`set_off` | |||
| br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`,br.`energy_fees_id`,br.`set_off`,br.`advance_id` | |||
| from wx_bill_rent_manage br | |||
| <include refid="queryBillManageListConditions"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| @@ -306,7 +309,7 @@ | |||
| rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, | |||
| status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, | |||
| rent_shop_type, late_pay_ratio, late_pay_time, late_pay_price, period, shop_info, | |||
| pay_way, late_pay_status, service_charge_pay,manage_fee_type,create_by,create_by_name,update_by,update_by_name,energy_fees_id) | |||
| pay_way, late_pay_status, service_charge_pay,manage_fee_type,create_by,create_by_name,update_by,update_by_name,energy_fees_id,advance_id) | |||
| VALUES | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| ( | |||
| @@ -316,7 +319,7 @@ | |||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType}, | |||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.shopInfo}, | |||
| #{item.payWay},#{item.latePayStatus},#{item.serviceChargePay},#{item.manageFeeType}, | |||
| #{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName,#{item.energyFeesId}} | |||
| #{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName,#{item.energyFeesId},#{item.advanceId}} | |||
| ) | |||
| </foreach> | |||
| </insert> | |||
| @@ -62,13 +62,14 @@ | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/> | |||
| <result column="set_off" jdbcType="VARCHAR" property="setOff"/> | |||
| <result column="advance_id" jdbcType="BIGINT" property="advanceId"/> | |||
| </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`,`set_off`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`last_owe_call_user`,`set_off`,`advance_id`, | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay,`energy_fees_id` | |||
| </sql> | |||
| @@ -83,6 +84,7 @@ | |||
| </if> | |||
| <if test=" null != rentContractId ">and `rent_contract_id` = #{rentContractId}</if> | |||
| <if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if> | |||
| <if test=" null != advanceId ">and `advance_id` = #{advanceId}</if> | |||
| <if test=" null != receivePay ">and `receive_pay` = #{receivePay}</if> | |||
| <if test=" null != pay ">and `pay` = #{pay}</if> | |||
| <if test=" null != receiveDate ">and `receive_date` = #{receiveDate}</if> | |||
| @@ -150,6 +152,7 @@ | |||
| <if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if> | |||
| <if test=" null != id ">and br.`id` = #{id}</if> | |||
| <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> | |||
| <if test=" null != advanceId ">and br.`advance_id` = #{advanceId}</if> | |||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | |||
| <if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> | |||
| <if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if> | |||
| @@ -196,7 +199,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.`set_off` | |||
| br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`,br.`set_off`,br.`advance_id` | |||
| from wx_bill_rent br | |||
| <include refid="queryBillRentListCondition"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| @@ -379,7 +382,7 @@ | |||
| rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day,create_by,create_by_name,update_by,update_by_name, | |||
| 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, starttime, endtime, | |||
| rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | |||
| pay_way, late_pay_status, comments,service_charge_pay,energy_fees_id) | |||
| pay_way, late_pay_status, comments,service_charge_pay,energy_fees_id,advance_id) | |||
| VALUES | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| ( | |||
| @@ -388,7 +391,7 @@ | |||
| #{item.status},#{item.isDel},#{item.contractNeedPay},#{item.rentPriceInfo},#{item.needPay},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay},#{item.merchantId}, | |||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | |||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | |||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.energyFeesId} | |||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.energyFeesId},#{item.advanceId} | |||
| ) | |||
| </foreach> | |||
| </insert> | |||