diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java
index 8d1cb541..e566a7c7 100644
--- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java
+++ b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java
@@ -125,7 +125,7 @@ public class WeiOrderApiController extends BaseController {
                         oi.setChangePrice(item.getChange_price());
                         oi.setOutWarehouseId(item.getOut_warehouse_id());
                         oi.setUseDeduction(item.getUse_deduction() + "");
-
+                        oi.setMerchantDiscountedPrice(item.getMerchant_discounted_price());
                         oi.setSkuAttrs(JSONObject.toJSONString(item.getSku_attrs()));
                         oi.setSkuDeliverInfo(JSONObject.toJSONString(item.getSku_deliver_info()));
                         oi.setExtraService(JSONObject.toJSONString(item.getExtra_service()));
diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql
index d72da08b..91efe245 100644
--- a/docs/qihang-erp.sql
+++ b/docs/qihang-erp.sql
@@ -842,12 +842,12 @@ CREATE TABLE `o_order`  (
   `buyer_memo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家留言信息',
   `seller_memo` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '卖家留言信息',
   `tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签',
-  `refund_status` int NOT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ',
-  `order_status` int NOT NULL COMMENT '订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除，101部分发货',
   `goods_amount` double NULL DEFAULT NULL COMMENT '订单商品金额',
   `post_fee` double NULL DEFAULT NULL COMMENT '订单运费',
   `seller_discount` double NULL DEFAULT 0 COMMENT '商家优惠金额，单位：元',
   `platform_discount` double NULL DEFAULT 0 COMMENT '平台优惠金额，单位：元',
+  `change_amount` double NULL DEFAULT 0 COMMENT '改价金额，单位：元',
+  `pay_discount` double NULL DEFAULT 0 COMMENT '支付优惠金额，单位：元',
   `amount` double NOT NULL COMMENT '订单实际金额',
   `payment` double NULL DEFAULT NULL COMMENT '实付金额',
   `receiver_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名',
@@ -856,7 +856,11 @@ CREATE TABLE `o_order`  (
   `province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省',
   `city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市',
   `town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区',
-  `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间',
+  `order_create_time` datetime NULL DEFAULT NULL COMMENT '订单创建时间',
+  `order_update_time` datetime NULL DEFAULT NULL COMMENT '订单更新时间',
+  `order_finish_time` datetime NULL DEFAULT NULL COMMENT '订单完成时间',
+  `order_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单状态（平台）',
+  `order_status_text` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单状态文本（平台）',
   `shipper` bigint NOT NULL DEFAULT 0 COMMENT '发货人',
   `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货方式2供应商代发0仓库发货',
   `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货 1 已分配供应商发货 2全部发货',
@@ -972,14 +976,17 @@ CREATE TABLE `o_order_item`  (
   `goods_spec` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格',
   `sku_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码',
   `goods_price` double NOT NULL COMMENT '商品单价',
+  `goods_amount` double NOT NULL COMMENT '商品总价',
   `item_amount` double NULL DEFAULT NULL COMMENT '子订单金额',
-  `discount_amount` double NULL DEFAULT 0 COMMENT '子订单优惠金额',
+  `seller_discount` double NULL DEFAULT 0 COMMENT '卖家优惠',
+  `platform_discount` double NULL DEFAULT 0 COMMENT '平台优惠',
+  `pay_discount` double NULL DEFAULT 0 COMMENT '支付优惠',
+  `change_amount` double NULL DEFAULT 0 COMMENT '改价金额',
   `payment` double NULL DEFAULT NULL COMMENT '实际支付金额',
   `quantity` int NOT NULL COMMENT '商品数量',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   `refund_count` int NULL DEFAULT 0 COMMENT '已退货数量',
   `refund_status` int NULL DEFAULT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ',
-  `order_status` int NULL DEFAULT NULL COMMENT '订单状态1：待发货，2：已发货，3：已完成，11已取消；21待付款',
   `shipper` bigint NOT NULL DEFAULT 0 COMMENT '发货人',
   `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货方式 0 自己发货或待处理2供应商发货',
   `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货  2全部发货',
@@ -4699,6 +4706,7 @@ CREATE TABLE `oms_wei_order_item`  (
   `extra_service` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品额外服务信息JSON',
   `use_deduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否使用了会员积分抵扣\r\n',
   `deduction_price` int NULL DEFAULT NULL COMMENT '会员积分抵扣金额，单位为分',
+  `merchant_discounted_price` int NULL DEFAULT NULL COMMENT '商家优惠金额，单位为分',
   `order_product_coupon_info_list` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品优惠券信息，逐步替换 order.order_detail.coupon_info',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 35 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OAfterSaleMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OAfterSaleMapper.java
similarity index 89%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OAfterSaleMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OAfterSaleMapper.java
index cdb63191..c8a68359 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OAfterSaleMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OAfterSaleMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.OAfterSale;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OOrderItemMapper.java
similarity index 95%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OOrderItemMapper.java
index 1cc65fd5..3a918bbc 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OOrderItemMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.OOrderItem;
 import cn.qihangerp.model.bo.OrderItemListBo;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OOrderMapper.java
similarity index 94%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OOrderMapper.java
index a16b531a..a11765b0 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OOrderMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.OOrder;
 import cn.qihangerp.model.vo.OrderDiscountVo;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OOrderShipListItemMapper.java
similarity index 91%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OOrderShipListItemMapper.java
index a7aa7338..bbb64b06 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OOrderShipListItemMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.OOrderShipListItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OOrderShipListMapper.java
similarity index 91%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OOrderShipListMapper.java
index ae2b056a..8968bd7f 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OOrderShipListMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.OOrderShipList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ORefundMapper.java
similarity index 89%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/ORefundMapper.java
index a988052d..40189183 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/ORefundMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.ORefund;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipWaybillMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OShipWaybillMapper.java
similarity index 90%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipWaybillMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OShipWaybillMapper.java
index df928152..e3216b49 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipWaybillMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OShipWaybillMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.OShipWaybill;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OShipmentItemMapper.java
similarity index 90%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OShipmentItemMapper.java
index 21cdee45..7bd74f98 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OShipmentItemMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.OShipmentItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OShipmentMapper.java
similarity index 89%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OShipmentMapper.java
index cf2ab5bb..5ce82380 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OShipmentMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.OShipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineGoodsSkuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OfflineGoodsSkuMapper.java
similarity index 90%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineGoodsSkuMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OfflineGoodsSkuMapper.java
index b81af378..52ed443c 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineGoodsSkuMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OfflineGoodsSkuMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.OfflineGoodsSku;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OfflineOrderItemMapper.java
similarity index 90%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderItemMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OfflineOrderItemMapper.java
index a7f7626c..49626df2 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderItemMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OfflineOrderItemMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.OfflineOrderItem;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OfflineOrderMapper.java
similarity index 90%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OfflineOrderMapper.java
index e122776a..18a8d59e 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OfflineOrderMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.OfflineOrder;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineRefundMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OfflineRefundMapper.java
similarity index 90%
rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineRefundMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/OfflineRefundMapper.java
index a54f0165..16c07a70 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineRefundMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OfflineRefundMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.order.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.OfflineRefund;
diff --git a/serviceImpl/order/src/main/resources/mapper/OAfterSaleMapper.xml b/mapper/src/main/resources/mapper/OAfterSaleMapper.xml
similarity index 98%
rename from serviceImpl/order/src/main/resources/mapper/OAfterSaleMapper.xml
rename to mapper/src/main/resources/mapper/OAfterSaleMapper.xml
index 9e664ddb..daaf3596 100644
--- a/serviceImpl/order/src/main/resources/mapper/OAfterSaleMapper.xml
+++ b/mapper/src/main/resources/mapper/OAfterSaleMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OAfterSaleMapper">
+<mapper namespace="cn.qihangerp.mapper.OAfterSaleMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OAfterSale">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml b/mapper/src/main/resources/mapper/OOrderItemMapper.xml
similarity index 84%
rename from serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml
rename to mapper/src/main/resources/mapper/OOrderItemMapper.xml
index 80bffa3d..f51917bf 100644
--- a/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml
+++ b/mapper/src/main/resources/mapper/OOrderItemMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OOrderItemMapper">
+<mapper namespace="cn.qihangerp.mapper.OOrderItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrderItem">
             <id property="id" column="id" jdbcType="BIGINT"/>
@@ -11,6 +11,7 @@
             <result property="orderId" column="order_id" jdbcType="BIGINT"/>
             <result property="orderNum" column="order_num" jdbcType="VARCHAR"/>
             <result property="subOrderNum" column="sub_order_num" jdbcType="VARCHAR"/>
+            <result property="productId" column="product_id" jdbcType="VARCHAR"/>
             <result property="skuId" column="sku_id" jdbcType="VARCHAR"/>
             <result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
             <result property="goodsSkuId" column="goods_sku_id" jdbcType="BIGINT"/>
@@ -20,14 +21,18 @@
             <result property="goodsSpec" column="goods_spec" jdbcType="VARCHAR"/>
             <result property="skuNum" column="sku_num" jdbcType="VARCHAR"/>
             <result property="goodsPrice" column="goods_price" jdbcType="DOUBLE"/>
+            <result property="goodsAmount" column="goods_amount" jdbcType="DOUBLE"/>
             <result property="itemAmount" column="item_amount" jdbcType="DOUBLE"/>
-            <result property="discountAmount" column="discount_amount" jdbcType="DOUBLE"/>
+            <result property="sellerDiscount" column="seller_discount" jdbcType="DOUBLE"/>
+            <result property="platformDiscount" column="platform_discount" jdbcType="DOUBLE"/>
+            <result property="payDiscount" column="pay_discount" jdbcType="DOUBLE"/>
+            <result property="changeAmount" column="change_amount" jdbcType="DOUBLE"/>
+
             <result property="payment" column="payment" jdbcType="DOUBLE"/>
             <result property="quantity" column="quantity" jdbcType="INTEGER"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
             <result property="refundCount" column="refund_count" jdbcType="INTEGER"/>
             <result property="refundStatus" column="refund_status" jdbcType="INTEGER"/>
-            <result property="orderStatus" column="order_status" jdbcType="INTEGER"/>
             <result property="shipper" column="shipper" jdbcType="BIGINT"/>
             <result property="shipType" column="ship_type" jdbcType="INTEGER"/>
             <result property="shipStatus" column="ship_status" jdbcType="INTEGER"/>
@@ -40,13 +45,12 @@
     <sql id="Base_Column_List">
         id,shop_id,shop_type,
         order_id,order_num,sub_order_num,
-        sku_id,goods_id,goods_sku_id,
+        product_id,sku_id,goods_id,goods_sku_id,
         goods_title,goods_img,goods_num,
-        goods_spec,sku_num,goods_price,
-        item_amount,discount_amount,payment,
-        quantity,remark,refund_count,
-        refund_status,order_status,shipper,
-        ship_type,ship_status,create_time,
+        goods_spec,sku_num,goods_price,goods_amount,
+        item_amount,seller_discount,platform_discount,pay_discount,change_amount,payment,
+        quantity,remark,refund_count,refund_status,
+          shipper,ship_type,ship_status,create_time,
         create_by,update_time,update_by
     </sql>
 
diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml b/mapper/src/main/resources/mapper/OOrderMapper.xml
similarity index 82%
rename from serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml
rename to mapper/src/main/resources/mapper/OOrderMapper.xml
index c049cf9f..239782b1 100644
--- a/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml
+++ b/mapper/src/main/resources/mapper/OOrderMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OOrderMapper">
+<mapper namespace="cn.qihangerp.mapper.OOrderMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrder">
             <id property="id" column="id" jdbcType="BIGINT"/>
@@ -13,21 +13,25 @@
             <result property="buyerMemo" column="buyer_memo" jdbcType="VARCHAR"/>
             <result property="sellerMemo" column="seller_memo" jdbcType="VARCHAR"/>
             <result property="tag" column="tag" jdbcType="VARCHAR"/>
-            <result property="refundStatus" column="refund_status" jdbcType="INTEGER"/>
-            <result property="orderStatus" column="order_status" jdbcType="INTEGER"/>
             <result property="goodsAmount" column="goods_amount" jdbcType="DOUBLE"/>
             <result property="postFee" column="post_fee" jdbcType="DOUBLE"/>
             <result property="sellerDiscount" column="seller_discount" jdbcType="DOUBLE"/>
             <result property="platformDiscount" column="platform_discount" jdbcType="DOUBLE"/>
+            <result property="changeAmount" column="change_amount" jdbcType="DOUBLE"/>
             <result property="amount" column="amount" jdbcType="DOUBLE"/>
             <result property="payment" column="payment" jdbcType="DOUBLE"/>
+            <result property="payDiscount" column="pay_discount" jdbcType="DOUBLE"/>
             <result property="receiverName" column="receiver_name" jdbcType="VARCHAR"/>
             <result property="receiverMobile" column="receiver_mobile" jdbcType="VARCHAR"/>
             <result property="address" column="address" jdbcType="VARCHAR"/>
             <result property="province" column="province" jdbcType="VARCHAR"/>
             <result property="city" column="city" jdbcType="VARCHAR"/>
             <result property="town" column="town" jdbcType="VARCHAR"/>
-            <result property="orderTime" column="order_time" jdbcType="TIMESTAMP"/>
+            <result property="orderCreateTime" column="order_create_time" jdbcType="TIMESTAMP"/>
+            <result property="orderUpdateTime" column="order_update_time" jdbcType="TIMESTAMP"/>
+            <result property="orderFinishTime" column="order_finish_time" jdbcType="TIMESTAMP"/>
+            <result property="orderStatus" column="order_status" jdbcType="VARCHAR"/>
+            <result property="orderStatusText" column="order_status_text" jdbcType="VARCHAR"/>
             <result property="shipper" column="shipper" jdbcType="BIGINT"/>
             <result property="shipType" column="ship_type" jdbcType="INTEGER"/>
             <result property="shipStatus" column="ship_status" jdbcType="INTEGER"/>
@@ -43,14 +47,12 @@
 
     <sql id="Base_Column_List">
         id,order_num,shop_type,
-        shop_id,remark,buyer_memo,
-        seller_memo,tag,refund_status,
-        order_status,goods_amount,post_fee,
-        seller_discount,platform_discount,amount,
-        payment,receiver_name,receiver_mobile,
-        address,province,city,
-        town,order_time,shipper,
-        ship_type,ship_status,ship_company,
+        shop_id,remark,buyer_memo,seller_memo,tag,
+          goods_amount,post_fee,seller_discount,platform_discount,change_amount,amount,payment,pay_discount,
+          receiver_name,receiver_mobile,
+        address,province,city,town,
+          order_create_time,order_update_time,order_finish_time,order_status,
+          shipper,ship_type,ship_status,ship_company,
         ship_code,ship_time,create_time,
         create_by,update_time,update_by,cancel_reason
     </sql>
diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderShipListItemMapper.xml b/mapper/src/main/resources/mapper/OOrderShipListItemMapper.xml
similarity index 96%
rename from serviceImpl/order/src/main/resources/mapper/OOrderShipListItemMapper.xml
rename to mapper/src/main/resources/mapper/OOrderShipListItemMapper.xml
index 9fd66881..bd846d11 100644
--- a/serviceImpl/order/src/main/resources/mapper/OOrderShipListItemMapper.xml
+++ b/mapper/src/main/resources/mapper/OOrderShipListItemMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OOrderShipListItemMapper">
+<mapper namespace="cn.qihangerp.mapper.OOrderShipListItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrderShipListItem">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderShipListMapper.xml b/mapper/src/main/resources/mapper/OOrderShipListMapper.xml
similarity index 97%
rename from serviceImpl/order/src/main/resources/mapper/OOrderShipListMapper.xml
rename to mapper/src/main/resources/mapper/OOrderShipListMapper.xml
index e73fae68..f94d074b 100644
--- a/serviceImpl/order/src/main/resources/mapper/OOrderShipListMapper.xml
+++ b/mapper/src/main/resources/mapper/OOrderShipListMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OOrderShipListMapper">
+<mapper namespace="cn.qihangerp.mapper.OOrderShipListMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrderShipList">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml b/mapper/src/main/resources/mapper/ORefundMapper.xml
similarity index 98%
rename from serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml
rename to mapper/src/main/resources/mapper/ORefundMapper.xml
index 6b8fa4ff..944b0780 100644
--- a/serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml
+++ b/mapper/src/main/resources/mapper/ORefundMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.ORefundMapper">
+<mapper namespace="cn.qihangerp.mapper.ORefundMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ORefund">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OShipWaybillMapper.xml b/mapper/src/main/resources/mapper/OShipWaybillMapper.xml
similarity index 95%
rename from serviceImpl/order/src/main/resources/mapper/OShipWaybillMapper.xml
rename to mapper/src/main/resources/mapper/OShipWaybillMapper.xml
index 89b71d79..7921d871 100644
--- a/serviceImpl/order/src/main/resources/mapper/OShipWaybillMapper.xml
+++ b/mapper/src/main/resources/mapper/OShipWaybillMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OShipWaybillMapper">
+<mapper namespace="cn.qihangerp.mapper.OShipWaybillMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OShipWaybill">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OShipmentItemMapper.xml b/mapper/src/main/resources/mapper/OShipmentItemMapper.xml
similarity index 97%
rename from serviceImpl/order/src/main/resources/mapper/OShipmentItemMapper.xml
rename to mapper/src/main/resources/mapper/OShipmentItemMapper.xml
index 683ccdca..5210dd71 100644
--- a/serviceImpl/order/src/main/resources/mapper/OShipmentItemMapper.xml
+++ b/mapper/src/main/resources/mapper/OShipmentItemMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OShipmentItemMapper">
+<mapper namespace="cn.qihangerp.mapper.OShipmentItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OShipmentItem">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OShipmentMapper.xml b/mapper/src/main/resources/mapper/OShipmentMapper.xml
similarity index 98%
rename from serviceImpl/order/src/main/resources/mapper/OShipmentMapper.xml
rename to mapper/src/main/resources/mapper/OShipmentMapper.xml
index cd3b6f5e..7b22409e 100644
--- a/serviceImpl/order/src/main/resources/mapper/OShipmentMapper.xml
+++ b/mapper/src/main/resources/mapper/OShipmentMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OShipmentMapper">
+<mapper namespace="cn.qihangerp.mapper.OShipmentMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OShipment">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineGoodsSkuMapper.xml b/mapper/src/main/resources/mapper/OfflineGoodsSkuMapper.xml
similarity index 96%
rename from serviceImpl/order/src/main/resources/mapper/OfflineGoodsSkuMapper.xml
rename to mapper/src/main/resources/mapper/OfflineGoodsSkuMapper.xml
index 350c2650..975073b0 100644
--- a/serviceImpl/order/src/main/resources/mapper/OfflineGoodsSkuMapper.xml
+++ b/mapper/src/main/resources/mapper/OfflineGoodsSkuMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OfflineGoodsSkuMapper">
+<mapper namespace="cn.qihangerp.mapper.OfflineGoodsSkuMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OfflineGoodsSku">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineOrderItemMapper.xml b/mapper/src/main/resources/mapper/OfflineOrderItemMapper.xml
similarity index 97%
rename from serviceImpl/order/src/main/resources/mapper/OfflineOrderItemMapper.xml
rename to mapper/src/main/resources/mapper/OfflineOrderItemMapper.xml
index 3788f50c..80bea7bc 100644
--- a/serviceImpl/order/src/main/resources/mapper/OfflineOrderItemMapper.xml
+++ b/mapper/src/main/resources/mapper/OfflineOrderItemMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OfflineOrderItemMapper">
+<mapper namespace="cn.qihangerp.mapper.OfflineOrderItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OfflineOrderItem">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineOrderMapper.xml b/mapper/src/main/resources/mapper/OfflineOrderMapper.xml
similarity index 97%
rename from serviceImpl/order/src/main/resources/mapper/OfflineOrderMapper.xml
rename to mapper/src/main/resources/mapper/OfflineOrderMapper.xml
index 46a950cd..c7ed61b3 100644
--- a/serviceImpl/order/src/main/resources/mapper/OfflineOrderMapper.xml
+++ b/mapper/src/main/resources/mapper/OfflineOrderMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OfflineOrderMapper">
+<mapper namespace="cn.qihangerp.mapper.OfflineOrderMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OfflineOrder">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineRefundMapper.xml b/mapper/src/main/resources/mapper/OfflineRefundMapper.xml
similarity index 97%
rename from serviceImpl/order/src/main/resources/mapper/OfflineRefundMapper.xml
rename to mapper/src/main/resources/mapper/OfflineRefundMapper.xml
index 753f4d69..6aae9fb4 100644
--- a/serviceImpl/order/src/main/resources/mapper/OfflineRefundMapper.xml
+++ b/mapper/src/main/resources/mapper/OfflineRefundMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.order.mapper.OfflineRefundMapper">
+<mapper namespace="cn.qihangerp.mapper.OfflineRefundMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OfflineRefund">
             <id property="id" column="id" jdbcType="BIGINT"/>
diff --git a/model/src/main/java/cn/qihangerp/model/entity/OOrder.java b/model/src/main/java/cn/qihangerp/model/entity/OOrder.java
index 01add479..ec3b23de 100644
--- a/model/src/main/java/cn/qihangerp/model/entity/OOrder.java
+++ b/model/src/main/java/cn/qihangerp/model/entity/OOrder.java
@@ -61,15 +61,6 @@ public class OOrder implements Serializable {
      */
     private String tag;
 
-    /**
-     * 售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 
-     */
-    private Integer refundStatus;
-
-    /**
-     * 订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除，101部分发货
-     */
-    private Integer orderStatus;
 
     /**
      * 订单商品金额
@@ -90,6 +81,8 @@ public class OOrder implements Serializable {
      * 平台优惠金额，单位：元
      */
     private Double platformDiscount;
+    private Double payDiscount;
+    private Double changeAmount;
 
     /**
      * 订单实际金额
@@ -134,7 +127,11 @@ public class OOrder implements Serializable {
     /**
      * 订单时间
      */
-    private LocalDateTime orderTime;
+    private LocalDateTime orderCreateTime;
+    private LocalDateTime orderUpdateTime;
+    private LocalDateTime orderFinishTime;
+    private String orderStatus;
+    private String orderStatusText;
 
     /**
      * 发货方 0 自己发货1联合发货2供应商发货
diff --git a/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java b/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java
index 53fd564d..40e79422 100644
--- a/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java
+++ b/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java
@@ -50,6 +50,7 @@ public class OOrderItem implements Serializable {
      * 第三方平台skuId
      */
     private String skuId;
+    private String productId;
 
     /**
      * 商品id(o_goods外键)
@@ -95,11 +96,15 @@ public class OOrderItem implements Serializable {
      * 子订单金额
      */
     private Double itemAmount;
+    private Double goodsAmount;
 
     /**
-     * 子订单优惠金额
+     * 卖家优惠
      */
-    private Double discountAmount;
+    private Double sellerDiscount;
+    private Double platformDiscount;
+    private Double payDiscount;
+    private Double changeAmount;
 
     /**
      * 实际支付金额
@@ -126,10 +131,6 @@ public class OOrderItem implements Serializable {
      */
     private Integer refundStatus;
 
-    /**
-     * 订单状态1：待发货，2：已发货，3：已完成，11已取消；21待付款
-     */
-    private Integer orderStatus;
 
     /**
      * 发货人
diff --git a/model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java b/model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java
index 5e6b9dc2..d618de1e 100644
--- a/model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java
+++ b/model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java
@@ -151,6 +151,7 @@ public class WeiOrderItem implements Serializable {
      * 商品优惠券信息，逐步替换 order.order_detail.coupon_info
      */
     private String orderProductCouponInfoList;
+    private Integer merchantDiscountedPrice;//商家优惠金额，单位为分
 
 
 
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java
index d392b42b..fc1d9983 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.qihangerp.module.order.service.impl;
 
 import cn.qihangerp.model.entity.OShipmentItem;
-import cn.qihangerp.module.order.mapper.OShipmentItemMapper;
+import cn.qihangerp.mapper.OShipmentItemMapper;
 import cn.qihangerp.module.order.service.ErpShipmentItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java
index 50ab0ddc..9a8e8673 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java
@@ -10,8 +10,8 @@ import cn.qihangerp.mapper.OShopMapper;
 import cn.qihangerp.model.entity.OShipment;
 import cn.qihangerp.model.entity.OShipmentItem;
 import cn.qihangerp.model.bo.OrderShipBo;
-import cn.qihangerp.module.order.mapper.OShipmentItemMapper;
-import cn.qihangerp.module.order.mapper.OShipmentMapper;
+import cn.qihangerp.mapper.OShipmentItemMapper;
+import cn.qihangerp.mapper.OShipmentMapper;
 import cn.qihangerp.module.order.service.ErpShipmentService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java
index f939f192..ed8629cd 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java
@@ -3,7 +3,7 @@ package cn.qihangerp.module.order.service.impl;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.model.entity.OAfterSale;
-import cn.qihangerp.module.order.mapper.OAfterSaleMapper;
+import cn.qihangerp.mapper.OAfterSaleMapper;
 import cn.qihangerp.module.order.service.OAfterSaleService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java
index 93a17e32..f8871003 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java
@@ -7,7 +7,7 @@ import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
 import cn.qihangerp.model.bo.OrderItemListBo;
 import cn.qihangerp.model.vo.OrderItemListVo;
 import cn.qihangerp.model.vo.SalesTopSkuVo;
-import cn.qihangerp.module.order.mapper.OOrderItemMapper;
+import cn.qihangerp.mapper.OOrderItemMapper;
 import cn.qihangerp.module.order.service.OOrderItemService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
index ee2ad8e6..aa441bc4 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
@@ -1,16 +1,15 @@
 package cn.qihangerp.module.order.service.impl;
 
+import cn.qihangerp.mapper.*;
 import cn.qihangerp.model.entity.*;
 import cn.qihangerp.model.request.OrderSearchRequest;
 import cn.qihangerp.module.goods.mapper.OGoodsMapper;
 import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
 import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper;
-import cn.qihangerp.mapper.OLogisticsCompanyMapper;
 import cn.qihangerp.model.bo.OrderAllocateShipRequest;
 import cn.qihangerp.model.bo.OrderShipRequest;
 import cn.qihangerp.model.vo.OrderDiscountVo;
 import cn.qihangerp.model.vo.SalesDailyVo;
-import cn.qihangerp.module.order.mapper.*;
 import cn.qihangerp.module.order.service.OOrderService;
 import cn.qihangerp.module.order.service.msg.PddOrderMessageService;
 import com.alibaba.fastjson2.JSONObject;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java
index eacdcabe..bc1b9ac2 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.qihangerp.model.entity.OOrderShipListItem;
 import cn.qihangerp.module.order.service.OOrderShipListItemService;
-import cn.qihangerp.module.order.mapper.OOrderShipListItemMapper;
+import cn.qihangerp.mapper.OOrderShipListItemMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java
index 77e5dcfc..a9776da1 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java
@@ -12,15 +12,15 @@ import cn.qihangerp.mapper.OLogisticsCompanyMapper;
 import cn.qihangerp.model.entity.OOrderShipListItem;
 import cn.qihangerp.model.bo.ShipStockUpBo;
 import cn.qihangerp.model.bo.SupplierOrderShipBo;
-import cn.qihangerp.module.order.mapper.OOrderItemMapper;
-import cn.qihangerp.module.order.mapper.OOrderMapper;
-import cn.qihangerp.module.order.mapper.OOrderShipListItemMapper;
+import cn.qihangerp.mapper.OOrderItemMapper;
+import cn.qihangerp.mapper.OOrderMapper;
+import cn.qihangerp.mapper.OOrderShipListItemMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.qihangerp.model.entity.OOrderShipList;
 import cn.qihangerp.module.order.service.OOrderShipListService;
-import cn.qihangerp.module.order.mapper.OOrderShipListMapper;
+import cn.qihangerp.mapper.OOrderShipListMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java
index 67c41796..a3ee0429 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java
@@ -15,10 +15,10 @@ import cn.qihangerp.model.entity.OOrderItem;
 import cn.qihangerp.model.entity.ORefund;
 import cn.qihangerp.model.bo.RefundProcessingBo;
 import cn.qihangerp.model.bo.RefundSearchBo;
-import cn.qihangerp.module.order.mapper.OAfterSaleMapper;
-import cn.qihangerp.module.order.mapper.OOrderItemMapper;
-import cn.qihangerp.module.order.mapper.OOrderMapper;
-import cn.qihangerp.module.order.mapper.ORefundMapper;
+import cn.qihangerp.mapper.OAfterSaleMapper;
+import cn.qihangerp.mapper.OOrderItemMapper;
+import cn.qihangerp.mapper.OOrderMapper;
+import cn.qihangerp.mapper.ORefundMapper;
 import cn.qihangerp.module.order.service.ORefundService;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java
index 784f9be8..4a3d5b7e 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.qihangerp.module.order.service.impl;
 
 import cn.qihangerp.model.entity.OShipWaybill;
-import cn.qihangerp.module.order.mapper.OShipWaybillMapper;
+import cn.qihangerp.mapper.OShipWaybillMapper;
 import cn.qihangerp.module.order.service.OShipWaybillService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java
index 1ef11185..7700727b 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java
@@ -6,7 +6,7 @@ package cn.qihangerp.module.order.service.impl;
 import cn.qihangerp.model.entity.OGoodsSku;
 import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
 import cn.qihangerp.model.entity.OfflineGoodsSku;
-import cn.qihangerp.module.order.mapper.OfflineGoodsSkuMapper;
+import cn.qihangerp.mapper.OfflineGoodsSkuMapper;
 import cn.qihangerp.module.order.service.OfflineGoodsSkuService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java
index 48afee00..a3de8423 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.qihangerp.module.order.service.impl;
 
 import cn.qihangerp.model.entity.OfflineOrderItem;
-import cn.qihangerp.module.order.mapper.OfflineOrderItemMapper;
+import cn.qihangerp.mapper.OfflineOrderItemMapper;
 import cn.qihangerp.module.order.service.OfflineOrderItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java
index 3b95e298..2561c7ae 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java
@@ -6,8 +6,8 @@ import cn.qihangerp.model.entity.OfflineOrderItem;
 import cn.qihangerp.model.bo.OfflineOrderCreateBo;
 import cn.qihangerp.model.bo.OfflineOrderCreateItemBo;
 import cn.qihangerp.model.bo.OfflineOrderShipBo;
-import cn.qihangerp.module.order.mapper.OfflineOrderItemMapper;
-import cn.qihangerp.module.order.mapper.OfflineOrderMapper;
+import cn.qihangerp.mapper.OfflineOrderItemMapper;
+import cn.qihangerp.mapper.OfflineOrderMapper;
 import cn.qihangerp.module.order.service.OfflineOrderService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java
index e599ec99..397a8de1 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java
@@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.model.request.RefundSearchRequest;
 import cn.qihangerp.model.entity.OfflineRefund;
-import cn.qihangerp.module.order.mapper.OfflineRefundMapper;
+import cn.qihangerp.mapper.OfflineRefundMapper;
 import cn.qihangerp.module.order.service.OfflineRefundService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/msg/PddOrderMessageService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/msg/PddOrderMessageService.java
index 9a05009f..0f055440 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/msg/PddOrderMessageService.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/msg/PddOrderMessageService.java
@@ -6,8 +6,8 @@ import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.utils.StringUtils;
 import cn.qihangerp.model.entity.OOrder;
 import cn.qihangerp.model.entity.OOrderItem;
-import cn.qihangerp.module.order.mapper.OOrderItemMapper;
-import cn.qihangerp.module.order.mapper.OOrderMapper;
+import cn.qihangerp.mapper.OOrderItemMapper;
+import cn.qihangerp.mapper.OOrderMapper;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java
index 9da5ab6d..30a3c938 100644
--- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java
+++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java
@@ -17,6 +17,8 @@ import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper;
 import cn.qihangerp.module.open.wei.mapper.WeiOrderItemMapper;
 import cn.qihangerp.module.open.wei.mapper.WeiOrderMapper;
 import cn.qihangerp.module.open.wei.service.WeiOrderService;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -179,23 +181,44 @@ public class WeiOrderServiceImpl extends ServiceImpl<WeiOrderMapper, WeiOrder>
         order.setShipType(0);
         order.setBuyerMemo("");
         order.setSellerMemo("");
-        order.setRefundStatus(1);
-        order.setOrderStatus(1);
         order.setGoodsAmount(weiOrder.getProductPrice()!=null?weiOrder.getProductPrice().doubleValue()/100:0.0);
         order.setPostFee(weiOrder.getFreight()!=null?weiOrder.getFreight().doubleValue()/100:0.0);
         order.setSellerDiscount(weiOrder.getDiscountedPrice()!=null?weiOrder.getDiscountedPrice().doubleValue()/100:0.0);
         order.setPlatformDiscount(0.0);
+        order.setChangeAmount(0.0);
         order.setAmount(weiOrder.getOrderPrice()!=null?weiOrder.getOrderPrice().doubleValue()/100:0.0);
-        order.setPayment(order.getAmount());
+        order.setPayment(order.getPayment().doubleValue()/100);
+        order.setPayDiscount(0.0);
         order.setReceiverName(confirmBo.getReceiver());
         order.setReceiverMobile(confirmBo.getMobile());
         order.setAddress(confirmBo.getAddress());
         order.setProvince(confirmBo.getProvince());
         order.setCity(confirmBo.getCity());
         order.setTown(confirmBo.getTown());
+        order.setOrderStatus(weiOrder.getStatus().toString());
+        if(weiOrder.getStatus().intValue()==10){
+            order.setOrderStatusText("待付款");
+        }else if(weiOrder.getStatus().intValue()==12){
+            order.setOrderStatusText("礼物待收下");
+        }else if(weiOrder.getStatus().intValue()==13){
+            order.setOrderStatusText("一起买待成团");
+        }else if(weiOrder.getStatus().intValue()==20){
+            order.setOrderStatusText("待发货");
+        }else if(weiOrder.getStatus().intValue()==21){
+            order.setOrderStatusText("部分发货");
+        }else if(weiOrder.getStatus().intValue()==30){
+            order.setOrderStatusText("待收货");
+        }else if(weiOrder.getStatus().intValue()==100){
+            order.setOrderStatusText("完成");
+        }else if(weiOrder.getStatus().intValue()==200){
+            order.setOrderStatusText("全部商品售后之后，订单取消");
+        }else if(weiOrder.getStatus().intValue()==250){
+            order.setOrderStatusText("未付款用户主动取消或超时未付款订单自动取消");
+        }
+
+        order.setOrderCreateTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(weiOrder.getCreateTime()), ZoneId.systemDefault()));
+        order.setOrderUpdateTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(weiOrder.getUpdateTime()), ZoneId.systemDefault()));
 
-        LocalDateTime orderTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(weiOrder.getCreateTime()), ZoneId.systemDefault());
-        order.setOrderTime(weiOrder.getCreateTime()!=null?orderTime:LocalDateTime.now());
         order.setShipper(0l);
         order.setShipStatus(0);
         order.setCreateTime(new Date());
@@ -217,21 +240,59 @@ public class WeiOrderServiceImpl extends ServiceImpl<WeiOrderMapper, WeiOrder>
             oOrderItem.setSubOrderNum(order.getOrderNum()+"-"+item.getSkuId());
             oOrderItem.setShopType(EnumShopType.WEI.getIndex());
             oOrderItem.setShopId(weiOrder.getShopId());
+            // 商品信息
+            oOrderItem.setProductId(item.getProductId());
             oOrderItem.setSkuId(item.getSkuId());
-
             oOrderItem.setGoodsTitle(item.getTitle());
             oOrderItem.setGoodsImg(item.getThumbImg());
             oOrderItem.setGoodsNum(item.getOutProductId());
-            oOrderItem.setGoodsSpec("");
+            if(StringUtils.hasText(item.getSkuAttrs())) {
+                try {
+                    String skuName = "";
+                    JSONArray jsonArray = JSONArray.parseArray(item.getSkuAttrs());
+                    for (int i = 0; i < jsonArray.size(); i++) {
+                        JSONObject it = jsonArray.getJSONObject(i);
+                        skuName += " "+it.getString("attr_value");
+                    }
+                    oOrderItem.setGoodsSpec(skuName);
+                } catch (Exception e) {
+                    oOrderItem.setGoodsSpec("");
+                }
+            }else oOrderItem.setGoodsSpec("");
+
             oOrderItem.setSkuNum(item.getOutSkuId());
             oOrderItem.setGoodsPrice(item.getSalePrice()!=null?item.getSalePrice().doubleValue()/100:0.0);
             oOrderItem.setQuantity(item.getSkuCnt());
-            oOrderItem.setItemAmount(oOrderItem.getGoodsPrice()*oOrderItem.getQuantity());
-            oOrderItem.setDiscountAmount(0.0);
-            oOrderItem.setPayment(0.0);
+            // 价格信息
+            Integer goodsAmount = item.getSalePrice() * item.getSkuCnt();
+            oOrderItem.setGoodsAmount(goodsAmount.doubleValue()/100);
+            oOrderItem.setItemAmount(item.getRealPrice().doubleValue()/100);
+            oOrderItem.setSellerDiscount(item.getMerchantDiscountedPrice().doubleValue()/100);
+            //优惠后
+//            Integer discountAfter = item.getEstimatePrice()!=null? item.getEstimatePrice():0;
+//            if(discountAfter==0) oOrderItem.setSellerDiscount(0.0);
+//            else{
+//               Integer discount = goodsAmount - discountAfter;
+//               oOrderItem.setSellerDiscount(discount.doubleValue()/100);
+//            }
+            oOrderItem.setPlatformDiscount(0.0);
+            //改价后
+            Integer changeAfter = item.getChangePrice()!=null?item.getChangePrice():0;
+            if(changeAfter==0) oOrderItem.setChangeAmount(0.0);
+            else{
+                Integer change = goodsAmount - changeAfter;
+                oOrderItem.setChangeAmount(change.doubleValue()/100);
+            }
 
-            oOrderItem.setRefundCount(0);
-            oOrderItem.setRefundStatus(1);
+            oOrderItem.setPayDiscount(0.0);
+            oOrderItem.setPayment(item.getRealPrice().doubleValue()/100);
+
+            oOrderItem.setRefundCount(item.getOnAftersaleSkuCnt()+item.getFinishAftersaleSkuCnt());
+            if(oOrderItem.getRefundCount().intValue()<oOrderItem.getQuantity().intValue()) {
+                oOrderItem.setRefundStatus(1);
+            }else{
+                oOrderItem.setRefundStatus(4);
+            }
             oOrderItem.setShipper(0l);
             oOrderItem.setShipType(order.getShipType());
             oOrderItem.setShipStatus(0);
diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml b/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml
index d2915ff2..143cdab6 100644
--- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml
+++ b/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml
@@ -31,6 +31,7 @@
             <result property="extraService" column="extra_service" jdbcType="VARCHAR"/>
             <result property="useDeduction" column="use_deduction" jdbcType="VARCHAR"/>
             <result property="deductionPrice" column="deduction_price" jdbcType="INTEGER"/>
+            <result property="merchantDiscountedPrice" column="merchant_discounted_price" jdbcType="INTEGER"/>
             <result property="orderProductCouponInfoList" column="order_product_coupon_info_list" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -43,6 +44,6 @@
         out_product_id,out_sku_id,is_discounted,
         estimate_price,is_change_price,change_price,
         out_warehouse_id,sku_deliver_info,extra_service,
-        use_deduction,deduction_price,order_product_coupon_info_list
+        use_deduction,deduction_price,order_product_coupon_info_list,merchant_discounted_price
     </sql>
 </mapper>
diff --git a/vue/src/views/wei/order/index.vue b/vue/src/views/wei/order/index.vue
index 47471bc9..f3b7bcda 100644
--- a/vue/src/views/wei/order/index.vue
+++ b/vue/src/views/wei/order/index.vue
@@ -175,6 +175,14 @@
           <el-tag style="margin-top: 5px" type="warning" v-if="scope.row.auditStatus === 0 " size="small">待确认</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="确认状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.auditStatus === 0 " size="small">待确认</el-tag>
+          <el-tag v-if="scope.row.auditStatus === 1 " size="small">已确认</el-tag>
+          <br/>
+          <el-tag style="margin-top: 5px" type="warning" v-if="scope.row.auditStatus === 0 " size="small">待确认</el-tag>
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="快递单号" align="center" prop="logisticsCode" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">