From 839f847300ee61124458640a485e935aca15eb5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com>
Date: Sun, 18 Jan 2026 17:35:45 +0800
Subject: [PATCH] =?UTF-8?q?dou=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/qihang-erp.sql                           |  46 ++---
 .../qihangerp/model/entity/DouOrderItem.java  |   8 -
 .../cn/qihangerp/model/entity/OOrder.java     |   2 +-
 .../cn/qihangerp/model/entity/OOrderItem.java |   2 +-
 .../module/service/OOrderService.java         |   5 -
 .../service/impl/OOrderServiceImpl.java       | 189 +-----------------
 .../dou/service/impl/DouOrderServiceImpl.java |  70 +++++--
 7 files changed, 84 insertions(+), 238 deletions(-)

diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql
index 12ce373c..6a753556 100644
--- a/docs/qihang-erp.sql
+++ b/docs/qihang-erp.sql
@@ -863,7 +863,7 @@ CREATE TABLE `o_order`  (
   `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全部发货',
+  `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货 1 已分配供应商发货 2全部发货 11已取消无需发货',
   `ship_company` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '发货快递公司',
   `ship_code` varchar(33) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货物流公司',
   `ship_time` datetime NULL DEFAULT NULL COMMENT '发货时间',
@@ -989,7 +989,7 @@ CREATE TABLE `o_order_item`  (
   `refund_status` int NULL DEFAULT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ',
   `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全部发货',
+  `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货  2全部发货 11已取消无需发货',
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
   `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
@@ -2287,8 +2287,6 @@ CREATE TABLE `oms_dou_order_item`  (
   `update_time` int NULL DEFAULT NULL COMMENT '订单更新时间，时间戳，秒',
   `create_time` int NULL DEFAULT NULL COMMENT '下单时间，时间戳，秒',
   `video_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频id，有值则代表订单来自短视频video_id',
-  `o_goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)',
-  `o_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `order_id_index`(`order_id` ASC) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 90 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '抖店订单明细表' ROW_FORMAT = DYNAMIC;
@@ -2296,26 +2294,26 @@ CREATE TABLE `oms_dou_order_item`  (
 -- ----------------------------
 -- Records of oms_dou_order_item
 -- ----------------------------
-INSERT INTO `oms_dou_order_item` VALUES (22, '6921497618860834061', '6921497618860834061', NULL, '', 12, 1, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092922001454231458313285', '', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3777656114016026758, 3565179609033218, '【测试商品勿拍】【测试】THREE.js 2025实战课程', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/png_m_19d5039e2e0bb8deb4ef98a8aaac77cf_sx_856118_www992-992', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"套餐类型\",\"value\":\"标准版 - 视频课程\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (23, '6946059443096458667', '6946059443096458667', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509120502537876591012', 'MQL000025058/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774537802461609985, 3551675625798914, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (24, '6946161523578312107', '6946161523578312107', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509150502311789779025', 'JINGU000000060', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774020370663866599, 3549519084210434, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (25, '6946199662331172267', '6946199662331172267', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509160502673157647232', 'SIOECHOY0005/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3775102360922227137, 3553832070819586, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品2', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (26, '6946185895022761387', '6946185895022761387', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509160502658250653540', 'SIOECHOY0005', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3775104366671954225, 3553850395099138, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子舒淇轮胎', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (27, '6946161548473734571', '6946161548473734571', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509150502314237447777', 'MQL000025058/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774537802461609985, 3551675625798914, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (28, '6946157501303494059', '6946157501303494059', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509150502630035242902', 'MQL000025058/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774537802461609985, 3551675625798914, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (31, '6921160422267125024', '6921160422267125024', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509100600980829435593', 'FQ4109_700', NULL, NULL, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562562, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (33, '6921468105543351451', '6921468105543351451', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455177168', 'EE6262_510', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562306, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (34, '6921468105543416987', '6921468105543351451', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455177168', 'BY9961_290', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562050, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"S\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (35, '6921459271215119515', '6921459271215119515', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455262181', 'BY9961_250', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054561794, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"XS\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (36, '6921466225005329563', '6921466225005329563', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841458572890', 'FQ4109_700', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562562, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (37, '6921461665048394907', '6921461665048394907', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455252884', 'DU0404_690', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562818, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"XL\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (38, '6921335415919443411', '6921335415919443411', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509230601046284578595', 'FQ4109_680', NULL, NULL, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054563074, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"3XL\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (39, '6921291986960743891', '6921291986960743891', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509220601041777413200', 'EE6262_510', NULL, NULL, NULL, NULL, NULL, 4, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562306, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (71, '6921377343921159820', '6921377343921159820', NULL, '', 28, 3, 0, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'DU0404_690', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562818, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"XL\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (72, '6921377343921225356', '6921377343921159820', NULL, '', 28, 0, 1, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'FQ4109_700', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562562, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (73, '6921377343921290892', '6921377343921159820', NULL, '', 12, 1, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'EE6262_510', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562306, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (74, '6921377343921356428', '6921377343921159820', NULL, '', 0, 0, 0, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'BY9961_290', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562050, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"S\"}]', '-', NULL, NULL, '', NULL, NULL);
-INSERT INTO `oms_dou_order_item` VALUES (75, '6946646239948707088', '6946646239948707088', NULL, '', 0, 0, 0, NULL, NULL, '', NULL, '小店自卖', '', '2105012509300502776975064759', '520667', NULL, NULL, NULL, NULL, NULL, 4, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3763623848264728892, 3515165148530178, '【测试商品勿拍】DKT EMILY测试专用勿动勿动勿动勿动', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_e4556eb3e48eececc2973af5cc29c74c_sx_208191_www800-800', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"白色\"},{\"name\":\"尺码大小\",\"value\":\"MP(单品520667)\"}]', '-', NULL, NULL, '', NULL, NULL);
+INSERT INTO `oms_dou_order_item` VALUES (22, '6921497618860834061', '6921497618860834061', NULL, '', 12, 1, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092922001454231458313285', '', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3777656114016026758, 3565179609033218, '【测试商品勿拍】【测试】THREE.js 2025实战课程', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/png_m_19d5039e2e0bb8deb4ef98a8aaac77cf_sx_856118_www992-992', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"套餐类型\",\"value\":\"标准版 - 视频课程\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (23, '6946059443096458667', '6946059443096458667', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509120502537876591012', 'MQL000025058/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774537802461609985, 3551675625798914, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (24, '6946161523578312107', '6946161523578312107', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509150502311789779025', 'JINGU000000060', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774020370663866599, 3549519084210434, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (25, '6946199662331172267', '6946199662331172267', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509160502673157647232', 'SIOECHOY0005/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3775102360922227137, 3553832070819586, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品2', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (26, '6946185895022761387', '6946185895022761387', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509160502658250653540', 'SIOECHOY0005', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3775104366671954225, 3553850395099138, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子舒淇轮胎', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (27, '6946161548473734571', '6946161548473734571', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509150502314237447777', 'MQL000025058/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774537802461609985, 3551675625798914, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (28, '6946157501303494059', '6946157501303494059', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509150502630035242902', 'MQL000025058/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3774537802461609985, 3551675625798914, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (31, '6921160422267125024', '6921160422267125024', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509100600980829435593', 'FQ4109_700', NULL, NULL, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562562, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (33, '6921468105543351451', '6921468105543351451', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455177168', 'EE6262_510', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562306, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (34, '6921468105543416987', '6921468105543351451', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455177168', 'BY9961_290', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562050, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"S\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (35, '6921459271215119515', '6921459271215119515', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455262181', 'BY9961_250', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054561794, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"XS\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (36, '6921466225005329563', '6921466225005329563', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841458572890', 'FQ4109_700', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562562, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (37, '6921461665048394907', '6921461665048394907', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092822001408841455252884', 'DU0404_690', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562818, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"XL\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (38, '6921335415919443411', '6921335415919443411', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509230601046284578595', 'FQ4109_680', NULL, NULL, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054563074, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"3XL\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (39, '6921291986960743891', '6921291986960743891', NULL, '', 12, 2, 3, NULL, NULL, '', NULL, '小店自卖', '', '2105012509220601041777413200', 'EE6262_510', NULL, NULL, NULL, NULL, NULL, 4, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562306, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (71, '6921377343921159820', '6921377343921159820', NULL, '', 28, 3, 0, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'DU0404_690', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562818, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"XL\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (72, '6921377343921225356', '6921377343921159820', NULL, '', 28, 0, 1, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'FQ4109_700', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562562, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (73, '6921377343921290892', '6921377343921159820', NULL, '', 12, 1, 3, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'EE6262_510', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562306, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (74, '6921377343921356428', '6921377343921159820', NULL, '', 0, 0, 0, NULL, NULL, '', NULL, '小店自卖', '', '2025092422001442321408983531', 'BY9961_290', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054562050, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"S\"}]', '-', NULL, NULL, '');
+INSERT INTO `oms_dou_order_item` VALUES (75, '6946646239948707088', '6946646239948707088', NULL, '', 0, 0, 0, NULL, NULL, '', NULL, '小店自卖', '', '2105012509300502776975064759', '520667', NULL, NULL, NULL, NULL, NULL, 4, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3763623848264728892, 3515165148530178, '【测试商品勿拍】DKT EMILY测试专用勿动勿动勿动勿动', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_e4556eb3e48eececc2973af5cc29c74c_sx_208191_www800-800', NULL, NULL, NULL, NULL, NULL, '[{\"name\":\"颜色分类\",\"value\":\"白色\"},{\"name\":\"尺码大小\",\"value\":\"MP(单品520667)\"}]', '-', NULL, NULL, '');
 INSERT INTO `oms_dou_order_item` VALUES (81, '6921346817299348947', '6921346817299348947', NULL, '', NULL, NULL, NULL, NULL, NULL, '', NULL, '小店自卖', '', '2105012509230601045874042782', 'DU0404_680', NULL, NULL, NULL, NULL, NULL, 3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3704250147174219802, 3415147054563330, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', NULL, NULL, NULL, NULL, NULL, NULL, '-', NULL, NULL, '', NULL, NULL);
 INSERT INTO `oms_dou_order_item` VALUES (84, '6946198576192755115', '6946198576192755115', NULL, '', NULL, NULL, NULL, NULL, NULL, '', NULL, '小店自卖', '', '2105012509170502687255456156', 'SIOECHOY0005/00', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3775102360922227137, 3553832070819586, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品2', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, NULL, '-', NULL, NULL, '', NULL, NULL);
 INSERT INTO `oms_dou_order_item` VALUES (85, '6946198576192820651', '6946198576192755115', NULL, '', NULL, NULL, NULL, NULL, NULL, '', NULL, '小店自卖', '', '2105012509170502687255456156', 'SIOECHOY0005', NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '', 3775104366671954225, 3553850395099138, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子舒淇轮胎', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', NULL, NULL, NULL, NULL, NULL, NULL, '-', NULL, NULL, '', NULL, NULL);
diff --git a/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java b/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java
index 680cb47c..426a424d 100644
--- a/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java
+++ b/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java
@@ -285,15 +285,7 @@ public class DouOrderItem implements Serializable {
      */
     private String videoId;
 
-    /**
-     * 商品id(o_goods外键)
-     */
-    private String oGoodsId;
 
-    /**
-     * 商品skuid(o_goods_sku外键)
-     */
-    private String oGoodsSkuId;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
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 ec3b23de..575f00d3 100644
--- a/model/src/main/java/cn/qihangerp/model/entity/OOrder.java
+++ b/model/src/main/java/cn/qihangerp/model/entity/OOrder.java
@@ -144,7 +144,7 @@ public class OOrder implements Serializable {
     private Integer shipType;
 
     /**
-     * 发货状态 0 待发货 1 已分配供应商发货 2全部发货
+     * 发货状态 0 待发货 1 已分配供应商发货 2全部发货 11已取消无需发货
      */
     private Integer shipStatus;
 
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 40e79422..280774fc 100644
--- a/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java
+++ b/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java
@@ -143,7 +143,7 @@ public class OOrderItem implements Serializable {
     private Integer shipType;
 
     /**
-     * 发货状态 0 待发货  2全部发货
+     * 发货状态 0 待发货  2全部发货 11已取消无需发货
      */
     private Integer shipStatus;
 
diff --git a/service/src/main/java/cn/qihangerp/module/service/OOrderService.java b/service/src/main/java/cn/qihangerp/module/service/OOrderService.java
index 357c0e5a..aeaa576c 100644
--- a/service/src/main/java/cn/qihangerp/module/service/OOrderService.java
+++ b/service/src/main/java/cn/qihangerp/module/service/OOrderService.java
@@ -22,12 +22,7 @@ import java.util.List;
 * @createDate 2024-03-09 13:15:57
 */
 public interface OOrderService extends IService<OOrder> {
-    ResultVo<Integer> jdOrderMessage(String orderId, JSONObject orderDetail);
 
-    ResultVo<Integer> taoOrderMessage(String tid,JSONObject orderDetail );
-    ResultVo<Integer> douOrderMessage(String orderId,JSONObject orderDetail );
-    ResultVo<Integer> offlineOrderMessage(String orderNum);
-    ResultVo<Integer> weiOrderMessage(String orderNum,JSONObject orderDetail );
 
     /**
      * 获取待发货list（去除处理过的）
diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java
index 4ae91dda..faad6cf2 100644
--- a/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java
+++ b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java
@@ -63,167 +63,6 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
     private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN);
 
 
-    @Transactional
-    @Override
-    public ResultVo<Integer> jdOrderMessage(String orderId,JSONObject orderDetail) {
-        log.info("京东订单消息处理"+orderId);
-        return ResultVo.success();
-    }
-
-
-
-    @Transactional
-    @Override
-    public ResultVo<Integer> taoOrderMessage(String tid,JSONObject orderDetail ) {
-        log.info("Tao订单消息处理"+tid);
-        return ResultVo.success();
-    }
-
-
-    @Transactional
-    @Override
-    public ResultVo<Integer> douOrderMessage(String orderId,JSONObject orderDetail ) {
-        log.info("Dou订单消息处理" + orderId);
-
-        return ResultVo.success();
-    }
-
-    @Transactional
-    @Override
-    public ResultVo<Integer> weiOrderMessage(String orderId,JSONObject orderDetail ) {
-        log.info("WEI订单消息处理" + orderId);
-
-
-        return ResultVo.success();
-    }
-    /**
-     * 线下订单通知
-     * @param
-     * @return
-     */
-    @Transactional
-    @Override
-    public ResultVo<Integer> offlineOrderMessage(String orderNum) {
-        log.info("Offline订单消息处理" + orderNum);
-        List<OfflineOrder> originOrders = offlineOrderMapper.selectList(new LambdaQueryWrapper<OfflineOrder>().eq(OfflineOrder::getOrderNum, orderNum));
-
-        if (originOrders == null || originOrders.size() == 0) {
-            // 没有找到订单信息
-            return ResultVo.error(ResultVoEnum.NotFound, "没有找到OFFLINE原始订单：" + orderNum);
-        }
-        OfflineOrder originOrder = originOrders.get(0);
-
-        List<OOrder> oOrders = orderMapper.selectList(new LambdaQueryWrapper<OOrder>().eq(OOrder::getOrderNum, orderNum));
-        if (oOrders == null || oOrders.isEmpty()) {
-            // 新增订单
-            OOrder insert = new OOrder();
-            insert.setOrderNum(originOrder.getOrderNum());
-            insert.setShopType(EnumShopType.OFFLINE.getIndex());
-            insert.setShopId(originOrder.getShopId());
-            insert.setBuyerMemo(originOrder.getBuyerMemo());
-            insert.setSellerMemo(originOrder.getSellerMemo());
-            insert.setRefundStatus(originOrder.getRefundStatus());
-            insert.setOrderStatus(originOrder.getOrderStatus());
-
-            insert.setGoodsAmount(originOrder.getGoodsAmount());
-            insert.setPostFee(originOrder.getPostFee());
-            insert.setAmount(originOrder.getAmount());
-            insert.setPayment(originOrder.getPayment());
-            insert.setPlatformDiscount(originOrder.getPlatformDiscount());
-            insert.setSellerDiscount(originOrder.getSellerDiscount());
-
-            insert.setReceiverName(originOrder.getReceiverName());
-            insert.setReceiverMobile(originOrder.getReceiverMobile());
-            insert.setAddress(originOrder.getAddress());
-            insert.setProvince(originOrder.getProvince());
-            insert.setCity(originOrder.getCity());
-            insert.setTown(originOrder.getTown());
-            insert.setOrderTime(originOrder.getOrderTime());
-            insert.setShipType(0);
-            insert.setCreateTime(new Date());
-            insert.setCreateBy("ORDER_MESSAGE");
-
-            orderMapper.insert(insert);
-            // 插入orderItem
-            addOfflineOrderItem(insert.getId(), originOrder.getOrderNum(), originOrder.getOrderStatus(), originOrder.getRefundStatus(),insert.getShopId());
-
-            //更新推送状态
-            OfflineOrder offlineUpdate = new OfflineOrder();
-            offlineUpdate.setId(originOrder.getId());
-            offlineUpdate.setOmsPushStatus(1);
-            offlineUpdate.setUpdateTime(new Date());
-            offlineUpdate.setUpdateBy("推送状态更新");
-            offlineOrderMapper.updateById(offlineUpdate);
-        } else {
-            // 修改订单 (修改：)
-            OOrder update = new OOrder();
-            update.setId(oOrders.get(0).getId());
-            update.setShopType(EnumShopType.OFFLINE.getIndex());
-            update.setShopId(originOrder.getShopId());
-            update.setRefundStatus(originOrder.getRefundStatus());
-            update.setOrderStatus(originOrder.getOrderStatus());
-            update.setReceiverName(originOrder.getReceiverName());
-            update.setReceiverMobile(originOrder.getReceiverMobile());
-            update.setAddress(originOrder.getAddress());
-            update.setProvince(originOrder.getProvince());
-            update.setCity(originOrder.getCity());
-            update.setTown(originOrder.getTown());
-            update.setUpdateTime(new Date());
-            update.setUpdateBy("ORDER_MESSAGE");
-            orderMapper.updateById(update);
-        }
-        return ResultVo.success();
-    }
-    private void addOfflineOrderItem(String oOrderId,String originOrderNum,Integer orderStatus,Integer refundStatus,Long shopId){
-        List<OfflineOrderItem> originOrderItems = offlineOrderItemMapper.selectList(new LambdaQueryWrapper<OfflineOrderItem>().eq(OfflineOrderItem::getOrderNum, originOrderNum));
-        if(originOrderItems!=null && originOrderItems.size()>0) {
-            for (var item : originOrderItems) {
-                OOrderItem orderItem = new OOrderItem();
-                orderItem.setOrderId(oOrderId);
-                orderItem.setShopType(EnumShopType.OFFLINE.getIndex());
-                orderItem.setShopId(shopId);
-                orderItem.setOrderNum(originOrderNum);
-                orderItem.setSubOrderNum(item.getSubOrderNum());
-                // 这里将订单商品skuid转换成erp系统的skuid
-                Long erpGoodsId = 0L;
-                String erpSkuId = "0";
-
-//                DouGoodsSku douGoodsSku = douGoodsSkuMapper.selectById(item.getSkuId());
-//                if (douGoodsSku != null ) {
-//                    erpGoodsId = douGoodsSku.getOGoodsId();
-//                    erpSkuId = douGoodsSku.getOGoodsSkuId();
-////                        orderItem.setGoodsImg(taoGoodsSku.get(0).getLogo());
-////                        orderItem.setGoodsSpec(jdGoodsSkus.get(0).getSkuName());
-////                    orderItem.setSkuNum(taoGoodsSku.get(0).getOuterId());
-//                }
-//                List<DouGoodsSku> douGoodsSku = douGoodsSkuMapper.selectList(new LambdaQueryWrapper<DouGoodsSku>().eq(DouGoodsSku::getId, item.getSkuId()));
-//                if (douGoodsSku != null && !douGoodsSku.isEmpty()) {
-//                    erpGoodsId = douGoodsSku.get(0).getOGoodsId();
-//                    erpSkuId = douGoodsSku.get(0).getOGoodsSkuId();
-////                        orderItem.setGoodsImg(taoGoodsSku.get(0).getLogo());
-////                        orderItem.setGoodsSpec(jdGoodsSkus.get(0).getSkuName());
-////                    orderItem.setSkuNum(taoGoodsSku.get(0).getOuterId());
-//                }
-                orderItem.setSkuNum(item.getSkuNum());
-                orderItem.setSkuId(item.getSkuId());
-                orderItem.setGoodsId(item.getGoodsId());
-                orderItem.setGoodsSkuId(item.getGoodsSkuId());
-                orderItem.setGoodsImg(item.getGoodsImg());
-                orderItem.setGoodsSpec(item.getGoodsSpec());
-                orderItem.setGoodsTitle(item.getGoodsTitle());
-                orderItem.setGoodsPrice(item.getGoodsPrice());
-                orderItem.setItemAmount(item.getItemAmount());
-                orderItem.setPayment(item.getPayment());
-                orderItem.setQuantity(item.getQuantity());
-                orderItem.setOrderStatus(orderStatus);
-                orderItem.setRefundStatus(refundStatus);
-                orderItem.setRefundCount(0);
-                orderItem.setCreateTime(new Date());
-                orderItem.setCreateBy("ORDER_MESSAGE");
-                orderItemMapper.insert(orderItem);
-            }
-        }
-    }
     /**
      * 获取待发货list（去除处理过的）
      * @param bo
@@ -236,12 +75,10 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         LambdaQueryWrapper<OOrder> queryWrapper = new LambdaQueryWrapper<OOrder>()
                 .eq(bo.getShopId()!=null,OOrder::getShopId,bo.getShopId())
                 .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType())
-                .eq(OOrder::getOrderStatus,1)
-                .eq(OOrder::getRefundStatus,1)
                 .eq(OOrder::getShipStatus,0)//发货状态 0 待发货 1 已分配供应商发货 2全部发货
 //                .lt(ErpOrder::getShipType,2)//ship_type发货方式 0 自己发货1联合发货2供应商发货
-                .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime())
-                .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime())
+                .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderCreateTime,bo.getStartTime())
+                .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderCreateTime,bo.getEndTime())
                 .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum())
                 ;
         Page<OOrder> pages = orderMapper.selectPage(pageQuery.build(), queryWrapper);
@@ -282,8 +119,8 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
                 .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType())
                 .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum())
                 .eq(bo.getOrderStatus()!=null,OOrder::getOrderStatus,bo.getOrderStatus())
-                .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime()+" 00:00:00")
-                .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime()+" 23:59:59")
+                .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderCreateTime,bo.getStartTime()+" 00:00:00")
+                .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderCreateTime,bo.getEndTime()+" 23:59:59")
 
                 .eq(org.springframework.util.StringUtils.hasText(bo.getReceiverName()),OOrder::getReceiverName,bo.getReceiverName())
                 .like(org.springframework.util.StringUtils.hasText(bo.getReceiverMobile()),OOrder::getReceiverMobile,bo.getReceiverMobile())
@@ -388,8 +225,6 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         OOrder erpOrder = orderMapper.selectById(shipBo.getId());
         if (erpOrder == null) {
             return ResultVo.error("找不到订单数据");
-        } else if (erpOrder.getOrderStatus().intValue() != 1 && erpOrder.getRefundStatus().intValue() != 1) {
-            return ResultVo.error("订单状态不对，不允许发货");
         }
         if(erpOrder.getShipStatus()!=0){
             return ResultVo.error("订单已分配供应商发货，不允许手动发货");
@@ -435,7 +270,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         oShipment.setShopType(erpOrder.getShopType());
         oShipment.setOrderId(Long.parseLong(erpOrder.getId()));
         oShipment.setOrderNum(erpOrder.getOrderNum());
-        oShipment.setOrderTime(erpOrder.getOrderTime());
+        oShipment.setOrderTime(erpOrder.getOrderCreateTime());
         oShipment.setShipType(1);//发货类型（1订单发货2商品补发3商品换货）
         oShipment.setShipCompany(erpLogisticsCompany.getName());
         oShipment.setShipCompanyCode(erpLogisticsCompany.getCode());
@@ -528,7 +363,6 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         update.setId(erpOrder.getId());
         update.setShipper(0L);
         update.setShipStatus(2);//发货状态 0 待发货 1 已分配供应商发货 2全部发货
-        update.setOrderStatus(2);
         update.setShipType(0);//发货方式2供应商代发0仓库发货
         update.setShipCompany(erpLogisticsCompany.getName());
         update.setShipCode(shipBo.getShippingNumber());
@@ -553,8 +387,6 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         OOrder erpOrder = orderMapper.selectById(shipBo.getId());
         if (erpOrder == null) {
             return ResultVo.error("找不到订单数据");
-        } else if (erpOrder.getOrderStatus().intValue() != 1 && erpOrder.getRefundStatus().intValue() != 1) {
-            return ResultVo.error("订单状态不对，不允许分配发货");
         }
         if(erpOrder.getShipStatus()!=0){
             return ResultVo.error("订单发货已处理，不允许分配发货");
@@ -692,7 +524,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
     public ResultVo cancelOrder(Long id, String cancelReason, String man) {
         OOrder shopOrder = this.baseMapper.selectById(id);
         if (shopOrder == null) return ResultVo.error("找不到订单数据");
-        else if (shopOrder.getOrderStatus().intValue() == 3) return ResultVo.error("已完成的单不可以取消");
+        else if (shopOrder.getShipStatus().intValue() != 0) return ResultVo.error("已发货的单不可以取消");
 
         // 取消订单
         OOrder update = new OOrder();
@@ -700,12 +532,13 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         update.setCancelReason(cancelReason);
         update.setUpdateBy(man + " 操作取消订单");
         update.setUpdateTime(new Date());
-        update.setOrderStatus(11);
+        update.setShipStatus(11);//已取消
+
         this.baseMapper.updateById(update);
 
         // 更新子订单order_status字段值
         OOrderItem itemUpdate = new OOrderItem();
-        itemUpdate.setOrderStatus(11);
+        itemUpdate.setShipStatus(11);
         itemUpdate.setUpdateBy(update.getUpdateBy());
         itemUpdate.setUpdateTime(new Date());
         orderItemMapper.update(itemUpdate, new LambdaQueryWrapper<OOrderItem>().eq(OOrderItem::getOrderId, id));
@@ -734,7 +567,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
 
         OOrder shopOrder = this.baseMapper.selectById(shopOrderItem.getOrderId());
         if(shopOrder==null) return ResultVo.error("找不到订单数据");
-        else if(shopOrder.getOrderStatus().intValue()==3) return ResultVo.error("已完成的单不可以取消");
+        else if(shopOrder.getShipStatus().intValue()!=0) return ResultVo.error("已发货的单不可以取消");
 
         // 取消子订单
         OOrderItem orderItemUpdate = new OOrderItem();
@@ -758,7 +591,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
             update.setCancelReason(cancelReason);
             update.setUpdateBy(man+" 操作取消子订单");
             update.setUpdateTime(new Date());
-            update.setOrderStatus(11);
+            update.setShipStatus(11);
             this.baseMapper.updateById(update);
 
 
diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java
index bc47fbcc..c4cf52ae 100644
--- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java
+++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java
@@ -150,11 +150,11 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
                 itemMapper.delete(new LambdaQueryWrapper<DouOrderItem>().eq(DouOrderItem::getParentOrderId,order.getOrderId()));
                 for (var item : order.getItems()) {
                     // 新增
-                    DouGoodsSku goodsSku = goodsSkuMapper.selectById(item.getSkuId());
-                    if (goodsSku != null) {
-                        item.setOGoodsId(goodsSku.getErpGoodsId());
-                        item.setOGoodsSkuId(goodsSku.getErpGoodsSkuId());
-                    }
+//                    DouGoodsSku goodsSku = goodsSkuMapper.selectById(item.getSkuId());
+//                    if (goodsSku != null) {
+//                        item.setOGoodsId(goodsSku.getErpGoodsId());
+//                        item.setOGoodsSkuId(goodsSku.getErpGoodsSkuId());
+//                    }
                     itemMapper.insert(item);
                 }
                 return ResultVo.error(ResultVoEnum.DataExist, "订单已经存在，更新成功");
@@ -166,11 +166,11 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
                 mapper.insert(order);
                 // 添加item
                 for (var item : order.getItems()) {
-                    DouGoodsSku goodsSku = goodsSkuMapper.selectById(item.getSkuId());
-                    if (goodsSku != null) {
-                        item.setOGoodsId(goodsSku.getErpGoodsId());
-                        item.setOGoodsSkuId(goodsSku.getErpGoodsSkuId());
-                    }
+//                    DouGoodsSku goodsSku = goodsSkuMapper.selectById(item.getSkuId());
+//                    if (goodsSku != null) {
+//                        item.setOGoodsId(goodsSku.getErpGoodsId());
+//                        item.setOGoodsSkuId(goodsSku.getErpGoodsSkuId());
+//                    }
                     itemMapper.insert(item);
                 }
 
@@ -216,22 +216,30 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
         order.setShipType(0);
         order.setBuyerMemo(douOrder.getBuyerWords());
         order.setSellerMemo(douOrder.getSellerWords());
-        order.setRefundStatus(1);
-        order.setOrderStatus(1);
+
         order.setGoodsAmount(douOrder.getOrderAmount()!=null?douOrder.getOrderAmount().doubleValue()/100:0.0);
         order.setPostFee(douOrder.getPostAmount()!=null?douOrder.getPostAmount().doubleValue()/100:0.0);
         order.setSellerDiscount(douOrder.getPromotionShopAmount()!=null?douOrder.getPromotionShopAmount().doubleValue()/100:0.0);
         order.setPlatformDiscount(douOrder.getPromotionPlatformAmount()!=null?douOrder.getPromotionPlatformAmount().doubleValue()/100:0.0);
-        order.setAmount(douOrder.getOrderAmount()!=null?douOrder.getOrderAmount().doubleValue()/100:0.0);
+        order.setAmount(douOrder.getPayAmount()!=null?douOrder.getPayAmount().doubleValue()/100:0.0);
         order.setPayment(douOrder.getPayAmount()!=null?douOrder.getPayAmount().doubleValue()/100:0.0);
+        order.setPayDiscount(douOrder.getPromotionPayAmount()!=null?douOrder.getPromotionPayAmount().doubleValue()/100:0.0);
+        order.setChangeAmount(douOrder.getModifyAmount()!=null?douOrder.getModifyAmount().doubleValue()/100: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());
-        LocalDateTime orderTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(douOrder.getCreateTime()), ZoneId.systemDefault());
-        order.setOrderTime(douOrder.getCreateTime()!=null?orderTime:LocalDateTime.now());
+        //订单状态
+        order.setOrderStatus(douOrder.getOrderStatus().toString());
+        order.setOrderStatusText(douOrder.getOrderStatusDesc());
+
+//        LocalDateTime orderTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(douOrder.getCreateTime()), ZoneId.systemDefault());
+        order.setOrderCreateTime(douOrder.getCreateTime()!=null?LocalDateTime.ofInstant(Instant.ofEpochSecond(douOrder.getCreateTime()), ZoneId.systemDefault()):null);
+        order.setOrderUpdateTime(douOrder.getUpdateTime()!=null?LocalDateTime.ofInstant(Instant.ofEpochSecond(douOrder.getUpdateTime()), ZoneId.systemDefault()):null);
+        order.setOrderCreateTime(douOrder.getFinishTime()!=null?LocalDateTime.ofInstant(Instant.ofEpochSecond(douOrder.getFinishTime()), ZoneId.systemDefault()):null);
 //        order.setOrderTime(douOrder.getCreateTime()!=null?new Date(douOrder.getCreateTime()*1000):new Date());
         order.setShipper(0L);
         order.setShipStatus(0);
@@ -241,26 +249,46 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
         //插入item
         for (var item : douOrderItems) {
             OOrderItem oOrderItem = new OOrderItem();
+            DouGoodsSku goodsSku = goodsSkuMapper.selectById(item.getSkuId());
+            if (goodsSku != null) {
+                oOrderItem.setGoodsId(Long.parseLong(goodsSku.getErpGoodsId()));
+                oOrderItem.setGoodsSkuId(Long.parseLong(goodsSku.getErpGoodsSkuId()));
+            }else {
+                return ResultVo.error("店铺商品找不到绑定的商品库商品");
+            }
             oOrderItem.setOrderId(order.getId());
             oOrderItem.setOrderNum(douOrder.getOrderId());
             oOrderItem.setSubOrderNum(item.getOrderId());
             oOrderItem.setShopType(EnumShopType.DOU.getIndex());
             oOrderItem.setShopId(douOrder.getSShopId());
             oOrderItem.setSkuId(item.getSkuId().toString());
-            oOrderItem.setGoodsId(StringUtils.hasText(item.getOGoodsId())?Long.parseLong(item.getOGoodsId()):0L);
-            oOrderItem.setGoodsSkuId(StringUtils.hasText(item.getOGoodsSkuId())?Long.parseLong(item.getOGoodsSkuId()):0L);
             oOrderItem.setGoodsTitle(item.getProductName());
             oOrderItem.setGoodsImg(item.getProductPic());
             oOrderItem.setGoodsNum(item.getOutProductId());
             oOrderItem.setGoodsSpec(item.getSpec());
             oOrderItem.setSkuNum(item.getOutSkuId());
+            oOrderItem.setQuantity(item.getItemNum());
+
             oOrderItem.setGoodsPrice(item.getGoodsPrice()!=null?item.getGoodsPrice().doubleValue()/100:0.0);
             oOrderItem.setItemAmount(item.getOrderAmount()!=null?item.getOrderAmount().doubleValue()/100:0.0);
-            oOrderItem.setDiscountAmount(item.getPromotionAmount()!=null?item.getPromotionAmount().doubleValue()/100:0.0);
+            oOrderItem.setSellerDiscount(douOrder.getPromotionShopAmount()!=null?douOrder.getPromotionShopAmount().doubleValue()/100:0.0);
+            oOrderItem.setPlatformDiscount(douOrder.getPromotionPlatformAmount()!=null?douOrder.getPromotionPlatformAmount().doubleValue()/100:0.0);
+            oOrderItem.setChangeAmount(douOrder.getModifyAmount()!=null?douOrder.getModifyAmount().doubleValue()/100:0.0);
+            oOrderItem.setPayDiscount(douOrder.getPromotionPayAmount()!=null?douOrder.getPromotionPayAmount().doubleValue()/100:0.0);
             oOrderItem.setPayment(item.getPayAmount()!=null?item.getPayAmount().doubleValue()/100:0.0);
-            oOrderItem.setQuantity(item.getItemNum());
-            oOrderItem.setRefundCount(0);
-            oOrderItem.setRefundStatus(1);
+
+            //售后状态；6-售后申请；27-拒绝售后申请；12-售后成功；7-售后退货中；11-售后已发货；29-售后退货拒绝；
+            // 13-【换货返回：换货售后换货商家发货】，【补寄返回：补寄待用户收货】； 14-【换货返回：（换货）售后换货用户收货】，【补寄返回：（补寄）用户已收货】 ；
+            // 28-售后失败；51-订单取消成功；53-逆向交易已完成；
+            if(item.getAfterSaleStatus()==null||item.getAfterSaleStatus()==0){
+                oOrderItem.setRefundCount(0);
+                oOrderItem.setRefundStatus(1);
+            }else {
+                oOrderItem.setRefundCount(item.getItemNum());
+                oOrderItem.setRefundStatus(4);
+            }
+
+
             oOrderItem.setShipper(0L);
             oOrderItem.setShipType(order.getShipType());
             oOrderItem.setShipStatus(0);