From 07bf1dc0b1ac40c19c8f22572cb1099f07f702e1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 28 Mar 2022 09:58:49 +0800 Subject: [PATCH] //add poi --- .../db/migration/V2022032400001__ttpoi.sql | 200 +++++++++--------- .../java/com/iformall/mq/MqBaseConsumer.java | 6 + .../domain/po/msg/FmInsideProductPushMsg.java | 18 ++ .../com/iformall/enums/EnumMsgRecordType.java | 1 + .../impl/TtMerchantPoiServiceImpl.java | 12 +- .../service/impl/WxCouponSendServiceImpl.java | 2 +- .../service/impl/WxCouponServiceImpl.java | 7 +- .../service/impl/WxOrderServiceImpl.java | 6 +- .../miniApp/TtMiniAppPayAdapterService.java | 2 +- 9 files changed, 139 insertions(+), 115 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideProductPushMsg.java diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022032400001__ttpoi.sql b/mallinkAdmin/src/main/resources/db/migration/V2022032400001__ttpoi.sql index 7a477ef4c..cae19a376 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2022032400001__ttpoi.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2022032400001__ttpoi.sql @@ -1,200 +1,200 @@ ALTER TABLE `mallink`.`wx_coupon_channel_0` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_1` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_2` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_3` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_4` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_5` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_6` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_7` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_8` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_9` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_10` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_11` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_12` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_13` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_14` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_15` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_16` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_17` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_18` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_19` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_20` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_21` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_22` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_23` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_24` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_25` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_26` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_27` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_28` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_29` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_30` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_31` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_32` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_33` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_34` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_35` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_36` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_37` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_38` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_39` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_40` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_41` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_42` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_43` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_44` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_45` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_46` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_47` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_48` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_49` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_50` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_51` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_52` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_53` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_54` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_55` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_56` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_57` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_58` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_59` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_60` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_61` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_62` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_63` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_64` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_65` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_66` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_67` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_68` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_69` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_70` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_71` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_72` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_73` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_74` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_75` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_76` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_77` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_78` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_79` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_80` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_81` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_82` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_83` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_84` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_85` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_86` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_87` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_88` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_89` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_90` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_91` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_92` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_93` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_94` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_95` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_96` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_97` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_98` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; ALTER TABLE `mallink`.`wx_coupon_channel_99` -ADD COLUMN `tt_spu_id` varchar(255) COMMENT ''抖音平台SPU ID(poi同步)'' AFTER `tt_qr_code`; \ No newline at end of file +ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`; \ No newline at end of file diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index e7a8dc5d4..6e21e4f46 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -131,6 +131,12 @@ public class MqBaseConsumer { //baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode()); //wxMsgRecordMapper.updateByBaseMsg(baseMsg); + else if(EnumMsgRecordType.CASH_OUT.getCode().equals(baseMsg.getMsgType())) { + // 内部消息 - 商户提现通知 + FmInsideCashOutMsg msg = (FmInsideCashOutMsg)JsonUtil.readValue(message,FmInsideCashOutMsg.class); + fmInsideCashOutMsgService.send(msg); + } + }catch (Throwable e){ log.error("consum received error: ", e); /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideProductPushMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideProductPushMsg.java new file mode 100644 index 000000000..959fa04df --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideProductPushMsg.java @@ -0,0 +1,18 @@ +package com.iformall.domain.po.msg; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class FmInsideProductPushMsg extends BaseMsg{ + + @io.swagger.annotations.ApiModelProperty(value = "卷Id", name = "couponChannelId") + private Long couponChannelId; + + @io.swagger.annotations.ApiModelProperty(value = "同步类型", name = "syncType") + private Integer syncType; + +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java index 877c3b7f9..fa0472022 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java @@ -22,6 +22,7 @@ public enum EnumMsgRecordType { CASH_OUT(106,"商户提现"), INSIDE_ORDER_REFUND(107, "退款提交成功"), INSIDE_ORDER_PUSH(108, "订单同步"), + INSIDE_PRODUCT_PUSH(109, "商品状态或库存同步"), ; public static EnumMsgRecordType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java index ce56e187c..2cbeb486a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java @@ -696,9 +696,11 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { } } catch (WxErrorException e) { logger.error("couponChannelId:"+couponChannelId +" 多门店SPU状态同步error "+e.getMessage()); - return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR.getCode(),e.getMessage()); + throw new MallinkException(ErrorCode.MSG_METHOD_REQUEST_ERROR.getCode(),e.getMessage()); +// return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR.getCode(),e.getMessage()); } - return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); +// return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); } @Override @@ -724,9 +726,11 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { } } catch (WxErrorException e) { logger.error("couponChannelId:"+couponChannelId +" 多门店SPU状态同步error "+e.getMessage()); - return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR.getCode(),e.getMessage()); + throw new MallinkException(ErrorCode.MSG_METHOD_REQUEST_ERROR.getCode(),e.getMessage()); +// return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR.getCode(),e.getMessage()); } - return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); +// return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 8476fc91c..642562e7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -369,7 +369,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { logger.error(" updateInvalid 解析异常:{}", e.getMessage()); } //退回coupon库存 - if(merchantRemain!=0) { + if(merchantRemain != 0) { wxCouponService.backRemainInventory(queryById.getId(),wxCouponOfDb.getTenantId(), merchantRemain, wxCouponOfDb.getRemainInventory()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 6b0ad6260..e6b0c31d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -585,11 +585,9 @@ public class WxCouponServiceImpl implements WxCouponService { (record.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()))) { //下架所有投放频道 - wxCouponChannelService - .updateStatusByCouponId(record.getId(), record, EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); + wxCouponChannelService.updateStatusByCouponId(record.getId(), record, EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); //下架所有场景投放 - wxCouponSendService - .updateStatusByCouponId(record.getId(), record, EnumCouponSendStatus.INVALID.getCode()); + wxCouponSendService.updateStatusByCouponId(record.getId(), record, EnumCouponSendStatus.INVALID.getCode()); //下架所有已砍价券 wxOrderService.updateStatusByPressCouponId(record.getId(), record, EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); //下架所有相关广告 @@ -895,6 +893,7 @@ public class WxCouponServiceImpl implements WxCouponService { if(ret != 1) { throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "数据库更新数量错误"); } + //todo 更新库存后同步 // 5. 更新coupon channel 有效期 if(wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index e7f859309..05aa336fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1072,11 +1072,7 @@ public class WxOrderServiceImpl implements WxOrderService { } try { - int num = wxCouponMapper.backInventory(coupon.getId(),coupon.getTenantId(), updateOrder.getCouponNumber(), coupon.getRemainInventory()); - if (num <= 0) { - logger.error("此券加库存失败, couponId: " + couponIdStr); - throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"券couponId:["+couponIdStr+"]库存回滚失败,更新记录条数小于等于0."); - } + wxCouponService.backRemainInventory(coupon.getId(),coupon.getTenantId(), updateOrder.getCouponNumber(), coupon.getRemainInventory()); redisLock.increase(EnumCacheKey.COUPON_STOCK.getMessage()+coupon.getId(), updateOrder.getCouponNumber()); } catch (Exception e) { logger.error("数据库更新失败,库存+1失败, e:" + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java index db59a2956..67834e20a 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java @@ -131,7 +131,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen try { String response = ttappService.post(ttappService.ORDER_PUSH, map); - log.info("订单同步结果{}"+response); + log.info("订单同步结果{}"+response +"参数 {}"+map.toString()); JSONObject jsonObject = JSON.parseObject(response); Integer code = jsonObject.getInteger("err_code"); if (null != code && code.intValue() == 0 ) {