Просмотр исходного кода

/、主题

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
48497c55ae
6 измененных файлов: 11 добавлений и 3 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  2. +6
    -2
      mallinkAdmin/src/main/resources/db/migration/V2021111700001__addPay_vendor.sql
  3. +1
    -0
      mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  4. +1
    -0
      mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  5. +1
    -0
      mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -97,6 +97,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_question_oneself_user", "wx_question_oneself_user",
"sys_config", "sys_config",
"wx_theme_mall", "wx_theme_mall",
"wx_miniapp_theme",
"wx_customize_module" "wx_customize_module"
}; };


+ 6
- 2
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 = 3 pay_vendor = 13
type = 4 pay_vendor = 1 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 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` ALTER TABLE `mallink`.`wx_order_0`
ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `type`; ADD COLUMN `pay_vendor` smallint(3) COMMENT '订单渠道,EnumPayWay.class' AFTER `type`;


+ 1
- 0
mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -77,6 +77,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_component_verify_ticket", "wx_component_verify_ticket",
"sys_config", "sys_config",
"wx_theme_mall", "wx_theme_mall",
"wx_miniapp_theme",
"wx_customize_module" "wx_customize_module"
}; };


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -88,6 +88,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_question_oneself_user", "wx_question_oneself_user",
"sys_config", "sys_config",
"wx_theme_mall", "wx_theme_mall",
"wx_miniapp_theme",
"wx_customize_module" "wx_customize_module"
}; };


+ 1
- 0
mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -88,6 +88,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_question_oneself_user", "wx_question_oneself_user",
"sys_config", "sys_config",
"wx_theme_mall", "wx_theme_mall",
"wx_miniapp_theme",
"wx_customize_module" "wx_customize_module"
}; };


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java Просмотреть файл

@@ -18,7 +18,7 @@ public class WxProfitSharingOrder extends TenantEntity {
private Long merchantId; private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId")
private Long orderId; private Long orderId;
@io.swagger.annotations.ApiModelProperty(value="支付渠道: ",name="payVendor")
@io.swagger.annotations.ApiModelProperty(value="支付渠道: (抖音分账用)",name="payVendor")
private Integer payVendor; private Integer payVendor;
@io.swagger.annotations.ApiModelProperty(value="分账总金额(分)",name="payAmount") @io.swagger.annotations.ApiModelProperty(value="分账总金额(分)",name="payAmount")
private Integer payAmount; private Integer payAmount;


Загрузка…
Отмена
Сохранить