From a27c45a501d059bca456bac7b561786232d3ecf3 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:30:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/config/db/increment/推广员.sql | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git "a/zq-erp/src/main/resources/config/db/increment/\346\216\250\345\271\277\345\221\230.sql" "b/zq-erp/src/main/resources/config/db/increment/\346\216\250\345\271\277\345\221\230.sql"
index a4ff4a9..dd70f9d 100644
--- "a/zq-erp/src/main/resources/config/db/increment/\346\216\250\345\271\277\345\221\230.sql"
+++ "b/zq-erp/src/main/resources/config/db/increment/\346\216\250\345\271\277\345\221\230.sql"
@@ -207,7 +207,6 @@
ADD COLUMN `total_score_count` decimal(20, 2) NULL COMMENT '支付总积分' AFTER `score_count`;
ALTER TABLE `shop_order`
-DROP COLUMN `score_pay`,
ADD COLUMN `score_pay` int(20) NULL COMMENT '支付积分' AFTER `company_id`;
@@ -223,6 +222,13 @@
ADD COLUMN `self_commission` double(20,2) NULL COMMENT '自购返佣比例%' AFTER `company_id`;
+ALTER TABLE `money_card_use_flow`
+ADD COLUMN `pay_no` varchar(32) NULL COMMENT '微信充值订单号';
+
+
+ALTER TABLE `shop_order`
+ ADD COLUMN `pay_method` int(2) NULL COMMENT '支付方式1微信，2 vipCard余额';
+update shop_order set pay_method=1;
ALTER TABLE `sys_vip_info`
ADD COLUMN `fenxiao_state` int(11) NULL DEFAULT NULL COMMENT '分销审核状态' AFTER `recommend_id`,
--
Gitblit v1.9.1