diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java
index b93bc86..3c2d73d 100644
--- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java
+++ b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java
@@ -50,6 +50,6 @@ public class MemberCart extends BaseAudit {
 
     @ApiModelProperty("商品数量")
     @Excel(name = "商品数量")
-    private Integer cartNum;
+    private Integer quantity;
 
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java
index 8ef837c..85bae6d 100644
--- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java
+++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java
@@ -34,6 +34,6 @@ public class MemberCartQuery {
     private String spData;
 
     @ApiModelProperty("商品数量 精确匹配")
-    private Integer cartNum;
+    private Integer quantity;
 
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java
index ea3b2c1..3fdcc04 100644
--- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java
+++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java
@@ -36,5 +36,5 @@ public class MemberCartVO extends BaseAudit {
     private String spData;
    /** 商品数量 */
     @Excel(name = "商品数量")
-    private Integer cartNum;
+    private Integer quantity;
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java
index 16ccdb4..8e03747 100644
--- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java
@@ -74,9 +74,9 @@ public class MemberCartService {
         if (!StringUtils.isEmpty(spData)) {
             qw.eq("sp_data", spData);
         }
-        Integer cartNum = query.getCartNum();
-        if (cartNum != null) {
-            qw.eq("cart_num", cartNum);
+        Integer quantity = query.getQuantity();
+        if (quantity != null) {
+            qw.eq("quantity", quantity);
         }
         return memberCartMapper.selectList(qw);
     }
diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml
index 34f7fd7..f55d92a 100644
--- a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml
+++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml
@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="skuId" column="sku_id"/>
         <result property="productName" column="product_name"/>
         <result property="spData" column="sp_data"/>
-        <result property="cartNum" column="cart_num"/>
+        <result property="quantity" column="quantity"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberCartVo">
-        select id, status, member_id, product_id, pic, sku_id, product_name, sp_data, cart_num, create_by, create_time, update_by, update_time   from ums_member_cart
+        select id, status, member_id, product_id, pic, sku_id, product_name, sp_data, quantity, create_by, create_time, update_by, update_time   from ums_member_cart
     </sql>
 
     <select id="selectByEntity" parameterType="MemberCart" resultMap="MemberCartResult">
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="skuId != null "> and sku_id = #{skuId}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="spData != null  and spData != ''"> and sp_data = #{spData}</if>
-            <if test="cartNum != null "> and cart_num = #{cartNum}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
         </where>
     </select>
 </mapper>
diff --git a/sql/mall_oms结构.sql b/sql/mall_oms结构.sql
index 943b2af..52d658f 100644
--- a/sql/mall_oms结构.sql
+++ b/sql/mall_oms结构.sql
@@ -5,18 +5,14 @@ DROP TABLE IF EXISTS `oms_order`;
 CREATE TABLE `oms_order`  (
     `id` bigint(20) NOT NULL COMMENT '订单id',
     `member_id` bigint(20) NOT NULL,
-    `order_sn` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号',
-    `create_time` datetime(0) NULL DEFAULT NULL COMMENT '提交时间',
     `member_username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户帐号',
     `total_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '订单总金额',
     `purchase_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '采购价',
     `pay_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '应付金额（实际支付金额）',
     `freight_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '运费金额',
-    `consumption_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '消费金抵扣金额',
     `pay_type` int(1) NULL DEFAULT NULL COMMENT '支付方式：0->未支付；1->支付宝；2->微信',
     `status` int(1) NULL DEFAULT NULL COMMENT '订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单',
     `refund_status` int(1) NULL DEFAULT NULL COMMENT '退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功',
-    `order_type` int(1) NULL DEFAULT NULL COMMENT '订单类型：1：普通商品，2：活动商品，3：精品抢购商品',
     `delivery_company` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司(配送方式)',
     `delivery_sn` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号',
     `auto_confirm_day` int(11) NULL DEFAULT NULL COMMENT '自动确认时间（天）',
@@ -25,10 +21,10 @@ CREATE TABLE `oms_order`  (
     `receiver_post_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收货人邮编',
     `receiver_province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省份/直辖市',
     `receiver_city` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '城市',
-    `receiver_region` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区',
+    `receiver_district` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区',
     `receiver_province_id` bigint(20) NULL DEFAULT NULL COMMENT '省份/直辖市id',
     `receiver_city_id` bigint(20) NULL DEFAULT NULL COMMENT '城市id',
-    `receiver_region_id` bigint(20) NULL DEFAULT NULL COMMENT '区id',
+    `receiver_district_id` bigint(20) NULL DEFAULT NULL COMMENT '区id',
     `receiver_detail_address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '详细地址',
     `note` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单备注',
     `confirm_status` int(1) NULL DEFAULT NULL COMMENT '确认收货状态：0->未确认；1->已确认',
@@ -36,7 +32,10 @@ CREATE TABLE `oms_order`  (
     `payment_time` datetime(0) NULL DEFAULT NULL COMMENT '支付时间',
     `delivery_time` datetime(0) NULL DEFAULT NULL COMMENT '发货时间',
     `receive_time` datetime(0) NULL DEFAULT NULL COMMENT '确认收货时间',
-    `modify_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+    `create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
+    `update_by` bigint(20) DEFAULT NULL COMMENT '修改人',
+    `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单表' ROW_FORMAT = Dynamic;
 
@@ -49,7 +48,10 @@ CREATE TABLE `oms_order_delivery_history`  (
     `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id',
     `delivery_company` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司(配送方式)',
     `delivery_sn` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号',
-    `create_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
+    `create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
+    `update_by` bigint(20) DEFAULT NULL COMMENT '修改人',
+    `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单发货记录' ROW_FORMAT = Dynamic;
 
@@ -60,19 +62,23 @@ DROP TABLE IF EXISTS `oms_order_item`;
 CREATE TABLE `oms_order_item`  (
     `id` bigint(20) NOT NULL,
     `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id',
-    `order_sn` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号',
     `product_id` bigint(20) NULL DEFAULT NULL,
-    `product_pic` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+    `out_product_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品编码',
+    `sku_id` bigint(20) NULL DEFAULT NULL COMMENT '商品sku id',
+    `out_sku_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'sku编码',
+    `product_snapshot_id` bigint(20) NULL DEFAULT NULL COMMENT '商品快照id',
+    `sku_snapshot_id` bigint(20) NULL DEFAULT NULL  COMMENT 'sku快照id',
+    `pic` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '展示图片',
     `product_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-    `product_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '销售价格',
+    `sale_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '销售价格',
     `purchase_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '采购价',
-    `product_quantity` int(11) NULL DEFAULT NULL COMMENT '购买数量',
-    `product_sku_id` bigint(20) NULL DEFAULT NULL COMMENT '商品sku id',
-    `product_sku_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品sku code',
+    `quantity` int(11) NULL DEFAULT NULL COMMENT '购买数量',
     `product_category_id` bigint(20) NULL DEFAULT NULL COMMENT '商品分类id',
-    `promotion_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品促销名称',
-    `consumption_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '消费金使用金额',
-    `product_attr` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]',
+    `sp_data` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]',
+    `create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
+    `update_by` bigint(20) DEFAULT NULL COMMENT '修改人',
+    `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单中所包含的商品' ROW_FORMAT = Dynamic;
 
@@ -84,9 +90,12 @@ CREATE TABLE `oms_order_operate_history`  (
     `id` bigint(20) NOT NULL,
     `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id',
     `operate_man` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作人：用户；系统；后台管理员',
-    `create_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
     `order_status` int(1) NULL DEFAULT NULL COMMENT '订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单',
     `note` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    `create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
+    `update_by` bigint(20) DEFAULT NULL COMMENT '修改人',
+    `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单操作历史记录' ROW_FORMAT = Dynamic;
 
@@ -96,24 +105,13 @@ CREATE TABLE `oms_order_operate_history`  (
 DROP TABLE IF EXISTS `oms_order_return_apply`;
 CREATE TABLE `oms_order_return_apply`  (
     `id` bigint(20) NOT NULL,
+    `member_id` bigint(20) NOT NULL,
     `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id',
-    `company_address_id` bigint(20) NULL DEFAULT NULL COMMENT '收货地址表id',
-    `product_id` bigint(20) NULL DEFAULT NULL COMMENT '退货商品id',
-    `order_sn` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号',
-    `create_time` datetime(0) NULL DEFAULT NULL COMMENT '申请时间',
-    `member_username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会员用户名',
+    `order_item_id` bigint(20) NULL DEFAULT NULL COMMENT '子订单id',
     `return_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '退款金额',
-    `return_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货人姓名',
-    `return_phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货人电话',
     `status` int(1) NULL DEFAULT NULL COMMENT '申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝',
     `handle_time` datetime(0) NULL DEFAULT NULL COMMENT '处理时间',
-    `product_pic` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片',
-    `product_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称',
-    `product_brand` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品品牌',
-    `product_attr` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品销售属性：颜色：红色；尺码：xl;',
-    `product_count` int(11) NULL DEFAULT NULL COMMENT '退货数量',
-    `product_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '商品单价',
-    `product_real_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '商品实际支付单价',
+    `quantity` int(11) NULL DEFAULT NULL COMMENT '退货数量',
     `reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原因',
     `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
     `proof_pics` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '凭证图片，以逗号隔开',
@@ -122,5 +120,9 @@ CREATE TABLE `oms_order_return_apply`  (
     `receive_man` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收货人',
     `receive_time` datetime(0) NULL DEFAULT NULL COMMENT '收货时间',
     `receive_note` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收货备注',
+    `create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
+    `update_by` bigint(20) DEFAULT NULL COMMENT '修改人',
+    `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单退货申请' ROW_FORMAT = Dynamic;
diff --git a/sql/mall_ums结构.sql b/sql/mall_ums结构.sql
index e0c550c..4105406 100644
--- a/sql/mall_ums结构.sql
+++ b/sql/mall_ums结构.sql
@@ -82,7 +82,7 @@ CREATE TABLE `ums_member_cart` (
      `sku_id` bigint unsigned COMMENT 'SKU ID',
      `product_name`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
      `sp_data` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '商品属性',
-     `cart_num` smallint unsigned NOT NULL DEFAULT '0' COMMENT '商品数量',
+     `quantity` smallint unsigned NOT NULL DEFAULT '0' COMMENT '商品数量',
      `create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
      `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
      `update_by` bigint(20) DEFAULT NULL COMMENT '修改人',