Procházet zdrojové kódy

//add poi

release_toaliyun_real
xhxu před 4 roky
rodič
revize
07bf1dc0b1
9 změnil soubory, kde provedl 139 přidání a 115 odebrání
  1. +100
    -100
      mallinkAdmin/src/main/resources/db/migration/V2022032400001__ttpoi.sql
  2. +6
    -0
      mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java
  3. +18
    -0
      mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideProductPushMsg.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java
  5. +8
    -4
      mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  7. +3
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  8. +1
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java

+ 100
- 100
mallinkAdmin/src/main/resources/db/migration/V2022032400001__ttpoi.sql Zobrazit soubor

@@ -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`;
ADD COLUMN `tt_spu_id` varchar(255) COMMENT '抖音平台SPU ID(poi同步)' AFTER `tt_qr_code`;

+ 6
- 0
mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java Zobrazit soubor

@@ -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);
/**


+ 18
- 0
mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideProductPushMsg.java Zobrazit soubor

@@ -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;

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java Zobrazit soubor

@@ -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) {


+ 8
- 4
mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java Zobrazit soubor

@@ -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(),"同步失败");
}

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java Zobrazit soubor

@@ -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());
}
}


+ 3
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Zobrazit soubor

@@ -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())) {


+ 1
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Zobrazit soubor

@@ -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());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java Zobrazit soubor

@@ -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 ) {


Načítá se…
Zrušit
Uložit