diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 6f10fe39b..d98cc2850 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -97,6 +97,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_question_oneself_user", "sys_config", "wx_theme_mall", + "wx_miniapp_theme", "wx_customize_module" }; 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 3490a37ca..29e6e82e8 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2021111700001__addPay_vendor.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2021111700001__addPay_vendor.sql @@ -5,11 +5,15 @@ type = 1 pay_vendor = 12 type = 3 pay_vendor = 13 type = 4 pay_vendor = 1 - - +update wx_order set pay_vendor = 11 where type = 10; +update wx_order set pay_vendor = 12 where type = 1; +update wx_order set pay_vendor = 13 where type = 3; +update wx_order set pay_vendor = 1 where type = 4; type = 0 pay_vendor = 1???根据wx_coupon_order pay_vendor +update wx_order o left join wx_coupon_order co on co.order_id = o.id set o.pay_vendor = co.pay_vendor where o.type = 0; + ALTER TABLE `mallink`.`wx_order_0` ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `type`; diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 9032be08b..087639e4d 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -77,6 +77,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_component_verify_ticket", "sys_config", "wx_theme_mall", + "wx_miniapp_theme", "wx_customize_module" }; diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 58af8f638..2dad7c00d 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -88,6 +88,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_question_oneself_user", "sys_config", "wx_theme_mall", + "wx_miniapp_theme", "wx_customize_module" }; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 58af8f638..2dad7c00d 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -88,6 +88,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_question_oneself_user", "sys_config", "wx_theme_mall", + "wx_miniapp_theme", "wx_customize_module" }; 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 327be1221..09e96d863 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -18,7 +18,7 @@ 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") + @io.swagger.annotations.ApiModelProperty(value="支付渠道: (抖音分账用)",name="payVendor") private Integer payVendor; @io.swagger.annotations.ApiModelProperty(value="分账总金额(分)",name="payAmount") private Integer payAmount;