diff --git a/mallinkAdmin/src/main/resources/db/migration/V2021111700001__addPay_vendor.sql b/mallinkAdmin/src/main/resources/db/migration/V2021111700001__addPay_vendor.sql index 626c1bccd..3490a37ca 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2021111700001__addPay_vendor.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2021111700001__addPay_vendor.sql @@ -210,4 +210,4 @@ ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTE ALTER TABLE `mallink`.`wx_order_98` ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `type`; ALTER TABLE `mallink`.`wx_order_99` -ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `type`; \ No newline at end of file +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `type`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V2021112300001__addPay_vendor.sql b/mallinkAdmin/src/main/resources/db/migration/V2021112300001__addPay_vendor.sql new file mode 100644 index 000000000..de2c49e08 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2021112300001__addPay_vendor.sql @@ -0,0 +1,201 @@ + +ALTER TABLE `mallink`.`wx_profit_sharing_order_0` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_1` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_2` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_3` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_4` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_5` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_6` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_7` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_8` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_9` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_10` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_11` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_12` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_13` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_14` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_15` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_16` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_17` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_18` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_19` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_20` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_21` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_22` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_23` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_24` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_25` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_26` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_27` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_28` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_29` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_30` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_31` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_32` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_33` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_34` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_35` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_36` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_37` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_38` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_39` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_40` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_41` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_42` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_43` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_44` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_45` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_46` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_47` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_48` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_49` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_50` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_51` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_52` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_53` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_54` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_55` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_56` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_57` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_58` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_59` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_60` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_61` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_62` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_63` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_64` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_65` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_66` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_67` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_68` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_69` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_70` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_71` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_72` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_73` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_74` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_75` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_76` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_77` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_78` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_79` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_80` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_81` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_82` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_83` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_84` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_85` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_86` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_87` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_88` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_89` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_90` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_91` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_92` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_93` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_94` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_95` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_96` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_97` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_98` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_99` +ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `order_id`; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java index 12fcd9a58..327be1221 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -18,6 +18,8 @@ public class WxProfitSharingOrder extends TenantEntity { private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; + @io.swagger.annotations.ApiModelProperty(value="支付渠道: ",name="payVendor") + private Integer payVendor; @io.swagger.annotations.ApiModelProperty(value="分账总金额(分)",name="payAmount") private Integer payAmount; @io.swagger.annotations.ApiModelProperty(value="分账结束时间(秒)",name="payTimeEnd") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java index b6ee77446..c239ca4c8 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java @@ -8,6 +8,7 @@ public enum EnumProfitSharingOrderType { PROFIT_SHARING_MULTI(1, "多次分账"), PROFIT_SHARING_MULTI_FINISH(2, "多次分账完结"), PROFIT_SHARING_SINGLE_FINISH(3, "单次分账完结"), + PROFIT_SHARING_DOUYIN_SINGLE(10, "抖音自主分账"),//不分账无法解冻资金 ; public static EnumProfitSharingOrderType getEnum(Integer code) { diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index e34ba9ae0..e58da177d 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -7,6 +7,7 @@ + @@ -21,7 +22,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`order_id`,`pay_amount`,`pay_time_end`,`pay_time_start`,`transaction_id`,`sharing_order_no`,`type`,`receivers`,`error_msg`,`sharing_status`,`update_time`,`create_time` + `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`order_id`,`pay_vendor`,`pay_amount`,`pay_time_end`,`pay_time_start`,`transaction_id`,`sharing_order_no`,`type`,`receivers`,`error_msg`,`sharing_status`,`update_time`,`create_time` @@ -49,6 +50,11 @@ + + and `pay_vendor` = #{payVendor} + + + and `type` = #{type}