From d98fc86d1bd39222af61a94ff1da0cf1fd12a0b6 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Tue, 19 Oct 2021 12:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=85=A5=E9=A9=BB=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E8=B4=B9=E7=94=A8=E5=86=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MySQL_change.sql                              | 21 +++++++++++++++++++
 .../Controllers/SupplierController.php        |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/MySQL_change.sql b/MySQL_change.sql
index 790f4cb..3ed8dd8 100644
--- a/MySQL_change.sql
+++ b/MySQL_change.sql
@@ -328,4 +328,25 @@ ALTER TABLE `agent_product_specs`
 ALTER TABLE `order_product_items`
 	CHANGE COLUMN `price` `price` DECIMAL(20,2) NOT NULL COMMENT '供应商成本价（成本单价*数量）' AFTER `num`;
 
+# 11:53 ‎2021/‎10/‎19
+CREATE TABLE `settled_orders` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`order_no` CHAR(22) NOT NULL COMMENT '订单号' COLLATE 'utf8_general_ci',
+	`username` VARCHAR(120) NOT NULL COMMENT '用户名' COLLATE 'utf8_general_ci',
+	`user_type` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '用户类型，1供应商，2代理商，3地接',
+	`transaction_id` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '微信支付订单号' COLLATE 'utf8mb4_general_ci',
+	`money` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '应付入驻费',
+	`paid_money` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '实际支付费用（微信回调后存入）',
+	`paid_at` TIMESTAMP NULL DEFAULT NULL COMMENT '支付时间',
+	`status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '状态，0未支付，1已支付',
+	`created_at` TIMESTAMP NULL DEFAULT NULL,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE,
+	UNIQUE INDEX `username_user_type` (`username`, `user_type`) USING BTREE,
+	UNIQUE INDEX `order_no` (`order_no`) USING BTREE
+)
+COMMENT='商家入驻支付记录'
+COLLATE='utf8_general_ci'
+ENGINE=InnoDB
+;
 
diff --git a/app/AdminSettled/Controllers/SupplierController.php b/app/AdminSettled/Controllers/SupplierController.php
index 3ad1f58..ea9ed8a 100644
--- a/app/AdminSettled/Controllers/SupplierController.php
+++ b/app/AdminSettled/Controllers/SupplierController.php
@@ -196,11 +196,13 @@ class SupplierController extends AdminController
 
 		//保存订单记录
 		SettledOrder::insertOrIgnore([
-			'out_trade_no' => $order_no,
+			'order_no' => $order_no,
 			'user_type' => 1,
 			'username' => $supplier->username,
 			'money' => $setting['settled_supplier_cost'],
 			'status' => 0,
+			'created_at' => now(),
+			'updated_at' => now(),
 		]);
 
 		return $app->order->unify([