From b8a0825b8087631d4f641b80fefc8e9e5a2d8bb4 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sat, 9 Oct 2021 20:28:05 +0800
Subject: [PATCH] =?UTF-8?q?fastjson=E5=8D=87=E7=BA=A7=E4=B8=BA1.2.78,?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93yx=5Fstore=5Forder=5Fcart=5Finfo?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=A2=9E=E5=8A=A0order=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml               | 2 +-
 sql/3.1升级3.2sql.sql | 2 ++
 sql/yshop3.2.sql      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1fdef1cb..d66bb4f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <java.version>1.8</java.version>
         <jedis.version>2.9.0</jedis.version>
         <swagger.version>2.9.2</swagger.version>
-        <fastjson.version>1.2.75</fastjson.version>
+        <fastjson.version>1.2.78</fastjson.version>
         <druid.version>1.2.6</druid.version>
         <hutool.version>5.5.7</hutool.version>
         <commons-pool2.version>2.5.0</commons-pool2.version>
diff --git a/sql/3.1升级3.2sql.sql b/sql/3.1升级3.2sql.sql
index fe4f6981..cc628646 100644
--- a/sql/3.1升级3.2sql.sql
+++ b/sql/3.1升级3.2sql.sql
@@ -21,6 +21,8 @@ ALTER TABLE yx_store_visit modify column product_id bigint(20) NULL DEFAULT NULL
 
 ALTER TABLE yx_store_visit modify column uid bigint(20) NULL DEFAULT NULL COMMENT '用户ID';
 
+ALTER TABLE yx_store_order_cart_info ADD COLUMN order_id  varchar(32) NULL DEFAULT NULL COMMENT '订单号' AFTER oid;
+
 INSERT INTO `menu` VALUES (264, b'0', '终端装修', NULL, 0, 0, 'theme', 'theme', b'0', b'0', '--', '2021-02-25 19:33:17', '', 1, '2021-02-25 19:33:32', 0);
 INSERT INTO `menu` VALUES (265, b'1', '商城装修', NULL, 264, 999, 'theme', 'https://demo2.yixiang.co/container', b'0', b'0', '-', '2021-02-25 19:35:13', NULL, 1, NULL, 0);
 INSERT INTO `roles_menus` VALUES (264, 1);
diff --git a/sql/yshop3.2.sql b/sql/yshop3.2.sql
index a25bacf6..2b606da3 100644
--- a/sql/yshop3.2.sql
+++ b/sql/yshop3.2.sql
@@ -2284,6 +2284,7 @@ DROP TABLE IF EXISTS `yx_store_order_cart_info`;
 CREATE TABLE `yx_store_order_cart_info`  (
   `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `oid` bigint(20) UNSIGNED NOT NULL COMMENT '订单id',
+  `order_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '订单号',
   `cart_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '购物车id',
   `product_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID',
   `cart_info` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '购买东西的详细信息',