From b4ee04b14d289262fc303967412a56202b6e002f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Sep 2021 16:41:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 sql/xc_mall.sql |   81 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/sql/xc_mall.sql b/sql/xc_mall.sql
index 1b723cd..7b8eaa3 100644
--- a/sql/xc_mall.sql
+++ b/sql/xc_mall.sql
@@ -144,3 +144,84 @@
       is_default INT    COMMENT '是否默认;1-是2-否' ,
       PRIMARY KEY (ID)
 )  COMMENT = '用户地址';
+
+DROP TABLE IF EXISTS mall_order_info;
+CREATE TABLE mall_order_info(
+    REVISION INT    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(32)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(32)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    ID BIGINT NOT NULL AUTO_INCREMENT  COMMENT '主键' ,
+    order_no VARCHAR(32)    COMMENT '订单号' ,
+    member_id BIGINT    COMMENT '用户ID' ,
+    order_time DATETIME    COMMENT '下单时间' ,
+    pay_time DATETIME    COMMENT '支付时间' ,
+    amount DECIMAL(20,2)    COMMENT '订单金额' ,
+    pay_method VARCHAR(32)    COMMENT '支付方式' ,
+    status INT    COMMENT '状态;1-待支付2-待发货3-待收货4-已完成5-退款中6-已退款7-已取消' ,
+    cancel_type INT    COMMENT '取消类型;1-超时未支付2-主动取消' ,
+    name VARCHAR(32)    COMMENT '联系人' ,
+    phone VARCHAR(32)    COMMENT '联系方式' ,
+    address TEXT    COMMENT '收货地址' ,
+    longitude VARCHAR(255)    COMMENT '经度' ,
+    latitude VARCHAR(255)    COMMENT '纬度' ,
+    remark TEXT    COMMENT '备注' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '订单表';
+
+DROP TABLE IF EXISTS mall_order_item;
+CREATE TABLE mall_order_item(
+    REVISION INT    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(32)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(32)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    ID BIGINT NOT NULL AUTO_INCREMENT  COMMENT '主键' ,
+    order_id BIGINT    COMMENT '订单ID' ,
+    sku_id BIGINT    COMMENT 'skuID' ,
+    goods_id BIGINT    COMMENT '商品ID' ,
+    goods_name VARCHAR(255)    COMMENT '商品名称' ,
+    style_name VARCHAR(255)    COMMENT '样式名称' ,
+    sku_name VARCHAR(255)    COMMENT 'sku名称' ,
+    cnt INT    COMMENT '数量' ,
+    price DECIMAL(20,2)    COMMENT '单价' ,
+    amount DECIMAL(20,2)    COMMENT '金额' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '订单明细表';
+
+DROP TABLE IF EXISTS mall_money_flow;
+CREATE TABLE mall_money_flow(
+    REVISION INT    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(32)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(32)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    ID BIGINT NOT NULL AUTO_INCREMENT  COMMENT '主键' ,
+    member_id BIGINT    COMMENT '用户ID' ,
+    amount DECIMAL(20,2)    COMMENT '金额' ,
+    type INT    COMMENT '流水类型;1-分红收入2-业绩奖励3-订单支付4-退款' ,
+    order_no VARCHAR(32)    COMMENT '订单号' ,
+    description TEXT    COMMENT '描述' ,
+    remark TEXT    COMMENT '备注' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '资金流水';
+alter table mall_order_info add del_flag int default 2 null comment '1-已删除2-未删除' after latitude;
+alter table mall_order_info add pay_order_no varchar(500) null comment '支付订单号' after pay_method;
+alter table mall_order_info add pay_result int null comment '支付结果 1-成功2-未成功' after pay_order_no;
+
+alter table mall_member add trade_password varchar(500) null comment '支付密码' after password;
+
+DROP TABLE IF EXISTS mall_member_wallet;
+CREATE TABLE mall_member_wallet(
+   REVISION INT    COMMENT '乐观锁' ,
+   CREATED_BY VARCHAR(32)    COMMENT '创建人' ,
+   CREATED_TIME DATETIME    COMMENT '创建时间' ,
+   UPDATED_BY VARCHAR(32)    COMMENT '更新人' ,
+   UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+   ID BIGINT NOT NULL AUTO_INCREMENT  COMMENT '主键' ,
+   balance DECIMAL(20,2)    COMMENT '余额' ,
+   member_id    bigint         null comment '用户ID',
+   PRIMARY KEY (ID)
+)  COMMENT = '用户钱包';
+

--
Gitblit v1.9.1