From f66d0c5b11c63d3bbff7669aa39a645e209420c4 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 12:46:03 +0800 Subject: [PATCH] fix --- .../db/migration/V202408000000001.sql | 200 +++++++++--------- .../service/impl/WxFinanceServiceImpl.java | 25 ++- 2 files changed, 120 insertions(+), 105 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index 40d4c1404..a76ff86f5 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -673,106 +673,106 @@ alter table wx_finance_receive_payway_98 add column pay varchar(30) comment alter table wx_finance_receive_payway_99 add column pay varchar(30) comment '支付给商户金额'; -alter table wx_finance_receive_0 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_1 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_2 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_3 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_4 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_5 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_6 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_7 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_8 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_9 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_10 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_11 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_12 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_13 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_14 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_15 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_16 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_17 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_18 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_19 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_20 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_21 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_22 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_23 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_24 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_25 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_26 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_27 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_28 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_29 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_30 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_31 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_32 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_33 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_34 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_35 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_36 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_37 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_38 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_39 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_40 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_41 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_42 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_43 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_44 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_45 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_46 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_47 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_48 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_49 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_50 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_51 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_52 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_53 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_54 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_55 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_56 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_57 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_58 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_59 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_60 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_61 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_62 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_63 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_64 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_65 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_66 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_67 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_68 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_69 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_70 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_71 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_72 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_73 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_74 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_75 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_76 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_77 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_78 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_79 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_80 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_81 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_82 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_83 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_84 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_85 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_86 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_87 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_88 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_89 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_90 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_91 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_92 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_93 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_94 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_95 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_96 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_97 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_98 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; -alter table wx_finance_receive_99 add column rent_shop_type int(1) not null comment '店铺多经'; comment '支付给商户金额'; +alter table wx_finance_receive_0 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_1 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_2 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_3 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_4 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_5 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_6 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_7 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_8 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_9 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_10 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_11 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_12 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_13 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_14 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_15 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_16 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_17 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_18 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_19 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_20 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_21 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_22 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_23 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_24 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_25 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_26 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_27 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_28 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_29 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_30 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_31 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_32 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_33 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_34 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_35 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_36 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_37 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_38 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_39 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_40 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_41 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_42 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_43 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_44 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_45 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_46 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_47 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_48 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_49 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_50 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_51 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_52 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_53 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_54 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_55 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_56 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_57 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_58 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_59 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_60 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_61 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_62 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_63 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_64 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_65 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_66 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_67 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_68 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_69 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_70 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_71 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_72 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_73 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_74 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_75 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_76 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_77 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_78 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_79 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_80 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_81 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_82 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_83 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_84 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_85 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_86 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_87 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_88 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_89 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_90 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_91 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_92 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_93 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_94 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_95 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_96 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_97 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_98 add column rent_shop_type int(1) not null comment '店铺多经'; +alter table wx_finance_receive_99 add column rent_shop_type int(1) not null comment '店铺多经'; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 9757d53bc..8fdd0c8d5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -29,6 +29,7 @@ import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.FinanceSetOffDetailVo; import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumFinanceCashierType; import com.iformall.enums.EnumFinanceReceiveStatus; import com.iformall.enums.EnumFinanceReceiveType; @@ -48,6 +49,8 @@ import com.iformall.service.WxMerchantService; import com.iformall.service.WxShopService; import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.Constant; +import com.iformall.utils.DateUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -830,16 +833,28 @@ public class WxFinanceServiceImpl implements WxFinanceService { record.getMerchantId(), record.getFeesId(), record.getRemark()); wxFinanceReceiveMapper.insert(addreceive); //创建预收账单? WxBillAdvance - //WxAllBill advance = generateBillByReceive(record); - //wxBillAllHelper.saveOrUpdateBill(advance, user); + WxAllBill advance = generateAdvanceBillByReceive(record); + wxBillAllHelper.saveOrUpdateBill(advance, user); + createFinanceReceiveBill(addreceive, advance, record.getReceiveMoney(), null, null); } - public WxAllBill generateBillByReceive(WxFinanceReceive record) { + public WxAllBill generateAdvanceBillByReceive(WxFinanceReceive record) { WxAllBill advanceBill = new WxAllBill(); advanceBill.updateTenantInfo(record); advanceBill.setMerchantId(record.getMerchantId()); - //advanceBill.setRentShopType(); - return null; + advanceBill.setRentShopType(record.getRentShopType()); + advanceBill.setNeedPay(record.getReceiveMoney()); + advanceBill.setReceivePay(record.getReceiveMoney()); + advanceBill.setPay("0"); + advanceBill.setBillType(EnumBillAllType.ADVANCE.getCode()); + //advanceBill.setPayWay(); + advanceBill.setPayDate(new Date()); + advanceBill.setStarttime(DateUtils.getDayBegin(new Date())); + advanceBill.setEndtime(DateUtils.getDayEnd(new Date())); + advanceBill.setStatus(EnumBillStatus.SET_OFF.getCode()); + advanceBill.setEnergyFeesId(record.getFeesId()); + advanceBill.setIsPreview(EnumYesOrNo.NO.getCode()); + return advanceBill; } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})