diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022011100001__couponOrder_export.sql b/mallinkAdmin/src/main/resources/db/migration/V2022011100001__couponOrder_export.sql new file mode 100644 index 000000000..4ffac2929 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022011100001__couponOrder_export.sql @@ -0,0 +1,205 @@ +alter table wx_coupon_order_0 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_1 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_2 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_3 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_4 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_5 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_6 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_7 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_8 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_9 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_10 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_11 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_12 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_13 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_14 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_15 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_16 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_17 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_18 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_19 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_20 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_21 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_22 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_23 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_24 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_25 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_26 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_27 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_28 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_29 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_30 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_31 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_32 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_33 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_34 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_35 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_36 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_37 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_38 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_39 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_40 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_41 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_42 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_43 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_44 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_45 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_46 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_47 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_48 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_49 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_50 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_51 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_52 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_53 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_54 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_55 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_56 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_57 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_58 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_59 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_60 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_61 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_62 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_63 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_64 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_65 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_66 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_67 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_68 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_69 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_70 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_71 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_72 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_73 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_74 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_75 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_76 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_77 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_78 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_79 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_80 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_81 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_82 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_83 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_84 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_85 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_86 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_87 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_88 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_89 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_90 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_91 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_92 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_93 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_94 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_95 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_96 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_97 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_98 add column subsidy int(11) COMMENT '补贴'; +alter table wx_coupon_order_99 add column subsidy int(11) COMMENT '补贴'; + + +UPDATE wx_coupon_order_0 co, wx_merchant_subsidy_0 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_1 co, wx_merchant_subsidy_1 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_2 co, wx_merchant_subsidy_2 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_3 co, wx_merchant_subsidy_3 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_4 co, wx_merchant_subsidy_4 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_5 co, wx_merchant_subsidy_5 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_6 co, wx_merchant_subsidy_6 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_7 co, wx_merchant_subsidy_7 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_8 co, wx_merchant_subsidy_8 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_9 co, wx_merchant_subsidy_9 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_10 co, wx_merchant_subsidy_10 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_11 co, wx_merchant_subsidy_11 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_12 co, wx_merchant_subsidy_12 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_13 co, wx_merchant_subsidy_13 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_14 co, wx_merchant_subsidy_14 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_15 co, wx_merchant_subsidy_15 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_16 co, wx_merchant_subsidy_16 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_17 co, wx_merchant_subsidy_17 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_18 co, wx_merchant_subsidy_18 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_19 co, wx_merchant_subsidy_19 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_20 co, wx_merchant_subsidy_20 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_21 co, wx_merchant_subsidy_21 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_22 co, wx_merchant_subsidy_22 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_23 co, wx_merchant_subsidy_23 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_24 co, wx_merchant_subsidy_24 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_25 co, wx_merchant_subsidy_25 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_26 co, wx_merchant_subsidy_26 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_27 co, wx_merchant_subsidy_27 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_28 co, wx_merchant_subsidy_28 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_29 co, wx_merchant_subsidy_29 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_30 co, wx_merchant_subsidy_30 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_31 co, wx_merchant_subsidy_31 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_32 co, wx_merchant_subsidy_32 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_33 co, wx_merchant_subsidy_33 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_34 co, wx_merchant_subsidy_34 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_35 co, wx_merchant_subsidy_35 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_36 co, wx_merchant_subsidy_36 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_37 co, wx_merchant_subsidy_37 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_38 co, wx_merchant_subsidy_38 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_39 co, wx_merchant_subsidy_39 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_40 co, wx_merchant_subsidy_40 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_41 co, wx_merchant_subsidy_41 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_42 co, wx_merchant_subsidy_42 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_43 co, wx_merchant_subsidy_43 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_44 co, wx_merchant_subsidy_44 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_45 co, wx_merchant_subsidy_45 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_46 co, wx_merchant_subsidy_46 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_47 co, wx_merchant_subsidy_47 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_48 co, wx_merchant_subsidy_48 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_49 co, wx_merchant_subsidy_49 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_50 co, wx_merchant_subsidy_50 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_51 co, wx_merchant_subsidy_51 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_52 co, wx_merchant_subsidy_52 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_53 co, wx_merchant_subsidy_53 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_54 co, wx_merchant_subsidy_54 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_55 co, wx_merchant_subsidy_55 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_56 co, wx_merchant_subsidy_56 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_57 co, wx_merchant_subsidy_57 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_58 co, wx_merchant_subsidy_58 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_59 co, wx_merchant_subsidy_59 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_60 co, wx_merchant_subsidy_60 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_61 co, wx_merchant_subsidy_61 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_62 co, wx_merchant_subsidy_62 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_63 co, wx_merchant_subsidy_63 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_64 co, wx_merchant_subsidy_64 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_65 co, wx_merchant_subsidy_65 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_66 co, wx_merchant_subsidy_66 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_67 co, wx_merchant_subsidy_67 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_68 co, wx_merchant_subsidy_68 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_69 co, wx_merchant_subsidy_69 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_70 co, wx_merchant_subsidy_70 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_71 co, wx_merchant_subsidy_71 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_72 co, wx_merchant_subsidy_72 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_73 co, wx_merchant_subsidy_73 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_74 co, wx_merchant_subsidy_74 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_75 co, wx_merchant_subsidy_75 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_76 co, wx_merchant_subsidy_76 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_77 co, wx_merchant_subsidy_77 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_78 co, wx_merchant_subsidy_78 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_79 co, wx_merchant_subsidy_79 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_80 co, wx_merchant_subsidy_80 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_81 co, wx_merchant_subsidy_81 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_82 co, wx_merchant_subsidy_82 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_83 co, wx_merchant_subsidy_83 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_84 co, wx_merchant_subsidy_84 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_85 co, wx_merchant_subsidy_85 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_86 co, wx_merchant_subsidy_86 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_87 co, wx_merchant_subsidy_87 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_88 co, wx_merchant_subsidy_88 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_89 co, wx_merchant_subsidy_89 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_90 co, wx_merchant_subsidy_90 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_91 co, wx_merchant_subsidy_91 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_92 co, wx_merchant_subsidy_92 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_93 co, wx_merchant_subsidy_93 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_94 co, wx_merchant_subsidy_94 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_95 co, wx_merchant_subsidy_95 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_96 co, wx_merchant_subsidy_96 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_97 co, wx_merchant_subsidy_97 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_98 co, wx_merchant_subsidy_98 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; +UPDATE wx_coupon_order_99 co, wx_merchant_subsidy_99 ms SET co.subsidy = ms.`subsidy` WHERE co.`id` = ms.`coupon_order_id` ; + + + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 8994f0573..e5091c925 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -70,6 +70,9 @@ public class WxCouponOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商品数量",name="couponNumber") private Integer couponNumber; + + @io.swagger.annotations.ApiModelProperty(value="补贴",name="subsidy") + private Integer subsidy; @TableField(exist = false) private String couponName; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index 319b5030f..cf0f42237 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -22,6 +22,8 @@ public interface WxCUserBasicInfoMapper extends CommonMapper findList(WxCUserBasicInfo wxCUserBasicInfo); List findList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo wxCUserBasicInfo); + List findListPhoneAndName(WxCUserBasicInfo wxCUserBasicInfo); + WxCUserBasicInfo selectById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId); void updateScore(WxCUserBasicInfo record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 0e5b49390..76f654515 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -32,6 +32,7 @@ public interface WxCouponOrderMapper extends CommonMapper { int updateVerifyCouponOrderStatus(WxCouponOrder wxCouponOrder); int updateVerifyCouponOrderStatusForMicroPay(WxCouponOrder wxCouponOrder); int cancelVerifyCouponOrder(WxCouponOrder wxCouponOrder); + int updateVerifyCouponOrderSubsidy(WxCouponOrder wxCouponOrder); //统一的计数接口 int findCount(WxCouponOrder wxCouponOrder); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java index 03b1a391d..0ab899346 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java @@ -8,7 +8,10 @@ import com.iformall.domain.vo.WxMerchantBuInfoVo; public interface WxMerchantBUserMapper extends CommonMapper { List findList(WxMerchantBUser wxMerchantBUser); + List findIdList(WxMerchantBUser wxMerchantBUser); + + List findMerchantIdList(WxMerchantBUser wxMerchantBUser); List findSelMerchantList(WxMerchantBUser wxMerchantBUser); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 6594442f4..d778dcfcc 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -44,6 +44,8 @@ public interface WxCUserBasicInfoService { */ PageInfo listAsPage(WxCUserBasicInfo record, Integer pageIndex, Integer pageSize); PageInfo listAsPage(TenantEntity tenantInfo, WxCUserBasicInfo wxCUserBasicInfo, Integer pageIndex, Integer pageSize); + + List listPhoneAndName(WxCUserBasicInfo record); /** * 根据实体查询列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 0eb208181..40923612f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -585,6 +585,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList(wxCUserBasicInfo)); } } + + @Override + public List listPhoneAndName(WxCUserBasicInfo record) { + return wxCUserBasicInfoMapper.findListPhoneAndName(record); + } @Override public int countUser(WxCUserBasicInfo record) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 7e9e49bcd..f058a0702 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -560,6 +560,48 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { long times4 = System.currentTimeMillis(); logger.info(">>>>>>>>>>>>>>>>>>>>>> query merchantProductVos :"+(times4-times3)); + //循环list,获取 cUserId + List cUserIdList = new ArrayList(); + List bUserIdList = new ArrayList(); + for (int i = 0 ; i < list.size() ; i ++ ) { + WxCouponOrderBVo bo = list.get(i); + Long cusrid = bo.getcUserId(); + if (null != cusrid && (!cUserIdList.contains(cusrid))) { + cUserIdList.add(cusrid); + } + Long busrid = bo.getBUserId(); + if (null != busrid && (!bUserIdList.contains(busrid))) { + bUserIdList.add(busrid); + } + } + Map cUserMap = new HashMap(); + if (cUserIdList.size() > 0) { + WxCUserBasicInfo cUserBasicInfoQ = new WxCUserBasicInfo(); + cUserBasicInfoQ.setIds(cUserIdList); + List cuserList = wxCUserBasicInfoService.listPhoneAndName(cUserBasicInfoQ); + if (null != cuserList) { + for (int i = 0 ; i < cuserList.size() ; i++) { + WxCUserBasicInfo cbi = cuserList.get(i); + cUserMap.put(cbi.getId(), cbi); + } + } + } + long times5 = System.currentTimeMillis(); + logger.info(">>>>>>>>>>>>>>>>>>>>>> query cUserBasicInfo :"+(times5-times4)); + + WxMerchantBUser merchantBUserQ = new WxMerchantBUser(); + merchantBUserQ.setIds(bUserIdList); + List busrlist = wxMerchantBUserMapper.findMerchantIdList(merchantBUserQ); + Map buserMerchantIdMap = new HashMap(); + if (null != busrlist ) { + for (int i = 0 ; i < busrlist.size() ; i ++) { + WxMerchantBUser buser = busrlist.get(i); + buserMerchantIdMap.put(buser.getId(), buser.getMerchantId()); + } + } + long times6 = System.currentTimeMillis(); + logger.info(">>>>>>>>>>>>>>>>>>>>>> query buserMerchantId :"+(times6-times5)); + list.parallelStream().forEach(co -> { if (co.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { co.setUpdateDate(null); @@ -579,19 +621,20 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setSourceType(coupon.getSourceType()); } - WxMerchantSubsidy merchantSubsidyQ = new WxMerchantSubsidy(); - merchantSubsidyQ.setCouponOrderId(co.getId()); - merchantSubsidyQ.setCouponType(co.getCouponType()); - merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); - merchantSubsidyQ.updateTenantInfo(co); - List msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(merchantSubsidyQ)); - if (msList.size() > 0) { - co.setSubsidyNum(msList.get(0).getSubsidy()); - } + co.setSubsidyNum(co.getSubsidy()); +// WxMerchantSubsidy merchantSubsidyQ = new WxMerchantSubsidy(); +// merchantSubsidyQ.setCouponOrderId(co.getId()); +// merchantSubsidyQ.setCouponType(co.getCouponType()); +// merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); +// merchantSubsidyQ.updateTenantInfo(co); +// List msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(merchantSubsidyQ)); +// if (msList.size() > 0) { +// co.setSubsidyNum(msList.get(0).getSubsidy()); +// } Long merchanId = merchantProductIdMap.get(co.getCouponId()); if (null != merchanId) { - if (merchanId == 999L) { + if (merchanId == -999L) { co.setMerchantName("多商户通用"); co.setMerchantId(0L); }else { @@ -600,15 +643,19 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } - WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(co.getCUserId(), co.getFinalTenantId()); + + +// WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(co.getCUserId(), co.getFinalTenantId()); + WxCUserBasicInfo basicInfo = cUserMap.get(co.getCUserId()); if (null != basicInfo) { co.setcuserPhone(basicInfo.getPhone()); co.setUserNickName(basicInfo.getNickName()); } - WxMerchantBUser buser = wxMerchantBUserService.getById(co.getBUserId()); - if (null != buser) { - co.setVerifyMerchantName(merchantNameMap.get(buser.getMerchantId())); + //WxMerchantBUser buser = wxMerchantBUserService.getById(co.getBUserId()); + Long buserMechantId = buserMerchantIdMap.get(co.getBUserId()); + if (null != buserMechantId) { + co.setVerifyMerchantName(merchantNameMap.get(buserMechantId)); } //co.setChannelType();) @@ -1280,7 +1327,15 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { try { wxMerchantSubsidyMapper.insert(merchantSubsidy); } catch (Exception e) { - logger.error("数据库插入错误:" + e.getMessage()); + logger.error("数据库插入错误:" + e.getMessage(),e); + throw new MallinkException(ErrorCode.DB_FAIL); + } + + try { + couponOrder.setSubsidy(subsidyNum); + wxCouponOrderMapper.updateVerifyCouponOrderSubsidy(couponOrder); + } catch (Exception e) { + logger.error("数据库插入错误:" + e.getMessage(),e); throw new MallinkException(ErrorCode.DB_FAIL); } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 75df9a432..e02581647 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -155,6 +155,12 @@ and r.level =#{level} + + where 1 = 1 diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 2a6485666..634b74216 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -27,6 +27,7 @@ + @@ -38,7 +39,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type`,`verify_remark`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`,`parent_coupon_order_id`,`coupon_number`, - `freight_price`,`shipping_type`,`shipping_address`,`shipping_status`,`delivery_info` + `freight_price`,`shipping_type`,`shipping_address`,`shipping_status`,`delivery_info`,`subsidy` @@ -241,6 +242,12 @@ and `parent_tenant_id` = #{parentTenantId} + + + update wx_coupon_order + set `subsidy` = #{subsidy} + where id=#{id} + select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.expired_time,co.coupon_order_status,co.order_id, co.create_date,co.update_date,co.coupon_price, co.verify_type, co.verify_remark,co.pay_vendor, - co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.send_merchant_id + co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.send_merchant_id,co.subsidy FROM wx_coupon_order co WHERE 1=1 and co.`tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 476c5caa7..19fdaa499 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -100,6 +100,12 @@ from wx_merchant_b_user + +