diff --git a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql index 23a314e31..33db037c3 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql @@ -2528,4 +2528,93 @@ CREATE TABLE `wx_finance_advance_type_fees` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; - +insert into wx_energy_fees_3 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1003',null,now(),now(),0,'租金',1,1,0), +(2,'1003',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1003',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1003',null,now(),now(),0,'物业费',1,1,0), +(6,'1003',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_8 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1008','1028',now(),now(),0,'租金',1,1,0), +(2,'1008','1028',now(),now(),0,'商业管理费',1,1,0), +(3,'1008','1028',now(),now(),0,'运营管理费',1,1,0), +(5,'1008','1028',now(),now(),0,'物业费',1,1,0), +(6,'1008','1028',now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_9 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1009',null,now(),now(),0,'租金',1,1,0), +(2,'1009',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1009',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1009',null,now(),now(),0,'物业费',1,1,0), +(6,'1009',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_10 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1010',null,now(),now(),0,'租金',1,1,0), +(2,'1010',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1010',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1010',null,now(),now(),0,'物业费',1,1,0), +(6,'1010',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_12 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1012',null,now(),now(),0,'租金',1,1,0), +(2,'1012',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1012',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1012',null,now(),now(),0,'物业费',1,1,0), +(6,'1012',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_13 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1013',null,now(),now(),0,'租金',1,1,0), +(2,'1013',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1013',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1013',null,now(),now(),0,'物业费',1,1,0), +(6,'1013',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_19 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1019',null,now(),now(),0,'租金',1,1,0), +(2,'1019',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1019',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1019',null,now(),now(),0,'物业费',1,1,0), +(6,'1019',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_20 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1020','1028',now(),now(),0,'租金',1,1,0), +(2,'1020','1028',now(),now(),0,'商业管理费',1,1,0), +(3,'1020','1028',now(),now(),0,'运营管理费',1,1,0), +(5,'1020','1028',now(),now(),0,'物业费',1,1,0), +(6,'1020','1028',now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_22 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1022',null,now(),now(),0,'租金',1,1,0), +(2,'1022',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1022',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1022',null,now(),now(),0,'物业费',1,1,0), +(6,'1022',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_24 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1024',null,now(),now(),0,'租金',1,1,0), +(2,'1024',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1024',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1024',null,now(),now(),0,'物业费',1,1,0), +(6,'1024',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_42 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1042',null,now(),now(),0,'租金',1,1,0), +(2,'1042',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1042',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1042',null,now(),now(),0,'物业费',1,1,0), +(6,'1042',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_63 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1063',null,now(),now(),0,'租金',1,1,0), +(2,'1063',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1063',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1063',null,now(),now(),0,'物业费',1,1,0), +(6,'1063',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_95 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1095',null,now(),now(),0,'租金',1,1,0), +(2,'1095',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1095',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1095',null,now(),now(),0,'物业费',1,1,0), +(6,'1095',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_96 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'1096',null,now(),now(),0,'租金',1,1,0), +(2,'1096',null,now(),now(),0,'商业管理费',1,1,0), +(3,'1096',null,now(),now(),0,'运营管理费',1,1,0), +(5,'1096',null,now(),now(),0,'物业费',1,1,0), +(6,'1096',null,now(),now(),0,'物业押金',1,1,1); +insert into wx_energy_fees_89 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values +(1,'789',null,now(),now(),0,'租金',1,1,0), +(2,'789',null,now(),now(),0,'商业管理费',1,1,0), +(3,'789',null,now(),now(),0,'运营管理费',1,1,0), +(5,'789',null,now(),now(),0,'物业费',1,1,0), +(6,'789',null,now(),now(),0,'物业押金',1,1,1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index e6ae38343..65afc239a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -316,6 +316,11 @@ public class WxEnergyServiceImpl implements WxEnergyService { fees.setIsSystem(EnumYesOrNo.YES.getCode()); fees.setBillType(t.getCode()); fees.setIsDel(EnumYesOrNo.NO.getCode()); + if (t.isFixedPrice()) { + fees.setFixedPrice(EnumYesOrNo.YES.getCode()); + }else { + fees.setFixedPrice(EnumYesOrNo.NO.getCode()); + } Date date = new Date(); fees.setCreateTime(date); fees.setUpdateTime(date);