From de6bc6e9a87f450a3765306882d5a153ceb15fc6 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Mon, 19 May 2025 18:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96jd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/qihang-oms.sql | 306 +----- .../feign/JdOrderFeignController.java | 20 +- .../feign/JdRefundFeignController.java | 21 +- .../module/open/jd/domain/JdOrderAfter.java | 881 ------------------ .../module/open/jd/domain/JdVcGoods.java | 77 -- .../module/open/jd/domain/JdVcOrder.java | 217 ----- .../module/open/jd/domain/JdVcOrderItem.java | 87 -- .../open/jd/domain/JdVcPurchaseOrder.java | 220 ----- .../open/jd/domain/JdVcPurchaseOrderItem.java | 90 -- .../module/open/jd/domain/JdVcRefund.java | 138 --- .../open/jd/domain/bo/JdVcRefundBo.java | 11 - .../open/jd/mapper/JdOrderAfterMapper.java | 18 - .../open/jd/mapper/JdVcGoodsMapper.java | 19 - .../open/jd/mapper/JdVcOrderItemMapper.java | 19 - .../open/jd/mapper/JdVcOrderMapper.java | 19 - .../mapper/JdVcPurchaseOrderItemMapper.java | 18 - .../jd/mapper/JdVcPurchaseOrderMapper.java | 18 - .../open/jd/mapper/JdVcRefundMapper.java | 19 - .../open/jd/mapper/JdVcReturnItemMapper.java | 18 - .../open/jd/mapper/JdVcReturnMapper.java | 18 - .../open/jd/service/JdOrderAfterService.java | 19 - .../open/jd/service/JdVcGoodsService.java | 19 - .../open/jd/service/JdVcOrderItemService.java | 13 - .../open/jd/service/JdVcOrderService.java | 19 - .../service/JdVcPurchaseOrderItemService.java | 13 - .../jd/service/JdVcPurchaseOrderService.java | 18 - .../open/jd/service/JdVcRefundService.java | 19 - .../jd/service/JdVcReturnItemService.java | 13 - .../open/jd/service/JdVcReturnService.java | 19 - .../service/impl/JdOrderAfterServiceImpl.java | 93 -- .../jd/service/impl/JdVcGoodsServiceImpl.java | 67 -- .../impl/JdVcOrderItemServiceImpl.java | 22 - .../jd/service/impl/JdVcOrderServiceImpl.java | 170 ---- .../JdVcPurchaseOrderItemServiceImpl.java | 22 - .../impl/JdVcPurchaseOrderServiceImpl.java | 129 --- .../service/impl/JdVcRefundServiceImpl.java | 96 -- .../impl/JdVcReturnItemServiceImpl.java | 22 - .../service/impl/JdVcReturnServiceImpl.java | 96 -- .../resources/mapper/jd/JdVcGoodsMapper.xml | 28 - .../mapper/jd/JdVcOrderItemMapper.xml | 30 - .../resources/mapper/jd/JdVcOrderMapper.xml | 64 -- .../resources/mapper/jd/JdVcRefundMapper.xml | 42 - update_log.md | 8 +- vue/src/views/shop/online_shop.vue | 1 + 44 files changed, 22 insertions(+), 3254 deletions(-) delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java delete mode 100644 module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java delete mode 100644 module/jd/src/main/resources/mapper/jd/JdVcGoodsMapper.xml delete mode 100644 module/jd/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml delete mode 100644 module/jd/src/main/resources/mapper/jd/JdVcOrderMapper.xml delete mode 100644 module/jd/src/main/resources/mapper/jd/JdVcRefundMapper.xml diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql index 32985bf2..a1878339 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -11,7 +11,7 @@ Target Server Version : 80200 File Encoding : 65001 - Date: 19/05/2025 14:36:06 + Date: 19/05/2025 18:37:52 */ SET NAMES utf8mb4; @@ -1285,7 +1285,6 @@ INSERT INTO `o_shop` VALUES (1, '天猫旗舰店测试', 100, NULL, 9, 0, 172638 INSERT INTO `o_shop` VALUES (2, '京东旗舰店测试', 200, NULL, 9, 0, 1726389632, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 102, NULL, 0); INSERT INTO `o_shop` VALUES (3, '抖音旗舰店测试', 400, 'http://openapi.jinritemai.com', 87, 0, 1726389870, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2', 103, NULL, 0); INSERT INTO `o_shop` VALUES (4, '启航电商ERP拼多多店', 300, NULL, 9, 0, 1726389225, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0); -INSERT INTO `o_shop` VALUES (5, '京东自营测试店铺', 280, NULL, 10, 0, 1726389888, NULL, 0, NULL, NULL, NULL, 31535999, NULL, 'af8befdefa064283a6b62189419d8cebzgvm', NULL, NULL, NULL, NULL, 0); INSERT INTO `o_shop` VALUES (6, '微信小店测试', 500, NULL, 9, 0, 1730899509, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'https://api.weixin.qq.com/', NULL, NULL, 0); INSERT INTO `o_shop` VALUES (999, '线下渠道测试店铺AA', 999, NULL, 9, 1, 1730899519, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0); INSERT INTO `o_shop` VALUES (1001, 'aa', 100, NULL, 9, 1, 1730899353, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0); @@ -2657,7 +2656,7 @@ INSERT INTO `oms_dou_refund` VALUES (1798648692590739457, 3, 146457846900419718, -- ---------------------------- DROP TABLE IF EXISTS `oms_jd_goods`; CREATE TABLE `oms_jd_goods` ( - `id` bigint NOT NULL, + `id` bigint NOT NULL AUTO_INCREMENT, `ware_id` bigint NULL DEFAULT NULL COMMENT '商品id', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', `ware_status` int NULL DEFAULT NULL COMMENT '商品状态 -1：删除 1:从未上架 2:自主下架 4:系统下架 8:上架 513:从未上架待审 514:自主下架待审 516:系统下架待审 520:上架待审核 1028:系统下架审核失败', @@ -2771,7 +2770,7 @@ INSERT INTO `oms_jd_goods` VALUES (1792513667892297730, 10025727542665, '曲美 -- ---------------------------- DROP TABLE IF EXISTS `oms_jd_goods_sku`; CREATE TABLE `oms_jd_goods_sku` ( - `id` bigint NOT NULL, + `id` bigint NOT NULL AUTO_INCREMENT, `ware_id` bigint NULL DEFAULT NULL COMMENT '平台商品id', `sku_id` bigint NULL DEFAULT NULL, `status` int NULL DEFAULT NULL, @@ -11182,303 +11181,6 @@ INSERT INTO `oms_jd_refund` VALUES (1836017790901936130, 2, 0, 24624381996, 2462 INSERT INTO `oms_jd_refund` VALUES (1836017790956462082, 2, 0, 24623687761, 24623687761, 296729715111, '2024-06-07 17:18:15', 169899, 1, '订单取消', NULL, NULL, NULL, '取消订单', NULL, NULL, NULL, NULL, NULL, NULL, 10099460014021, NULL, NULL, NULL, '曲美家居（QM）床 双人床 皮床 卧室软床排骨架头层牛皮泡芙皮艺床 框架床（白茶杏色） 1.8*2.0m', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '307839459_m', '307839459_m', '2024-06-08 09:17:51', 3, NULL, 'QM20231013', '商家同意退款', '不想要了', 28, '2024-09-17 20:22:08', '拉取插入', NULL, NULL, 0, 1782645561600049153, '[{\"skuCount\":1,\"skuId\":10099460014021,\"skuName\":\"曲美家居（QM）床 双人床 皮床 卧室软床排骨架头层牛皮泡芙皮艺床 框架床（白茶杏色） 1.8*2.0m\",\"skuUuid\":\"1012_F2t2td1355925809386639360\"}]', 1, NULL); INSERT INTO `oms_jd_refund` VALUES (1836017790956462083, 2, 0, 24619690087, 24619690087, 293221344349, '2024-06-07 12:08:38', 0, 1, '订单取消', NULL, NULL, NULL, '取消订单', NULL, NULL, NULL, NULL, NULL, NULL, 10099344503818, NULL, NULL, NULL, '曲美家居豆腐块沙发真皮沙发网红方块模块客厅懒人沙发森屿沙发 耐猫抓科技皮-卡其色 多人位 3.2m', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'jd_692149ef448c1', 'jd_692149ef448c1', '2024-06-07 18:37:42', 11, NULL, NULL, '用户撤销取消订单成功', '发货时间问题', 28, '2024-09-17 20:22:08', '拉取插入', NULL, NULL, 0, 1784836478042423297, '[{\"skuCount\":1,\"skuId\":10099344503818,\"skuName\":\"曲美家居豆腐块沙发真皮沙发网红方块模块客厅懒人沙发森屿沙发 耐猫抓科技皮-卡其色 多人位 3.2m\",\"skuUuid\":\"1012_F2g4Q3j1350060157339897856\"}]', 1, NULL); --- ---------------------------- --- Table structure for oms_jd_vc_goods --- ---------------------------- -DROP TABLE IF EXISTS `oms_jd_vc_goods`; -CREATE TABLE `oms_jd_vc_goods` ( - `id` bigint NOT NULL, - `ware_id` bigint NULL DEFAULT NULL COMMENT '商品编号', - `ware_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `sale_state` int NULL DEFAULT NULL COMMENT '上下柜状态 0：下柜，1：上柜，2:可上柜', - `modify_time` datetime NULL DEFAULT NULL COMMENT '修改时间', - `is_primary` int NULL DEFAULT NULL COMMENT '是否有主图', - `is_gaea` int NULL DEFAULT NULL COMMENT '是否盖亚 0:非盖亚 1：盖亚', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间', - `o_goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)', - `o_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)', - `shop_id` int NULL DEFAULT NULL COMMENT '店铺id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of oms_jd_vc_goods --- ---------------------------- -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784633602050, 100091911384, '曲美家居（QM）沙发 皮沙发头层牛皮大直排-四人位-2.7m 烟雨灰', 0, '2024-09-03 20:43:55', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784675545090, 100085057003, '曲美家居（QM）沙发 真皮沙发头层牛皮大小户型直排-四人位-2.7m 砂砾白', 0, '2024-09-03 20:43:54', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784704905218, 100109940892, '曲美家居真皮双人床 黑色靠包简约框架床1.8*2米', 0, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784734265345, 100109940874, '曲美家居（QM）床 皮艺床卧室大床意式简约单人床1.5*2米', 0, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784763625473, 100097068103, '曲美家居（QM）床 皮床 意式拉点大床单人床1.5*2.0m', 1, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784801374209, 100097068085, '曲美家居（QM）双人床 卧室大床意式现代牛皮床网红方块拉点床1.8*2米', 1, '2024-08-28 08:58:49', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784826540034, 100104914490, '曲美家居（QM）床 双人床 真皮信封床卧室皮艺软床1.5*2.0m', 0, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784851705857, 100093712745, '曲美家居（QM）床 双人床 真皮信封床卧室皮艺软床1.8*2.0m', 0, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794271784868483073, 100093712743, '曲美家居床 双人床 皮床 卧室软床奶油风仙女床卷装排骨架单人床1.5*2.0m', 0, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:38:24', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794272653290749954, 100079179856, '曲美家居床头柜 弯曲木白石纹板胡桃色储物柜', 0, '2024-09-01 18:04:30', 1, 0, '2024-05-25 15:41:51', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050608705538, 100093712721, '曲美家居（QM） 真皮床 双人床 卧室软床奶油风仙女床卷装排骨架皮艺床1.8*2.0m', 0, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050646454273, 100091911390, '曲美家居（QM）餐桌椅 弯曲木餐桌长方形140cm 一桌四椅戈尔浅胡桃+深灰色', 0, '2024-09-03 20:43:58', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050675814401, 100091911388, '曲美家居（QM）餐桌椅 弯曲木餐桌长方形140cm 一桌四椅合观胡桃+深灰色', 0, '2024-09-03 20:44:01', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050705174529, 100091911386, '曲美家居（QM）餐桌椅 弯曲木餐桌长方形140cm 一桌四椅戈尔浅胡桃+奶油白', 0, '2024-09-03 20:43:56', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050738728961, 100091911366, '曲美家居（QM）餐桌椅 弯曲木餐桌长方形140cm 一桌四椅合观胡桃+奶油白', 0, '2024-09-03 20:43:59', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050763894786, 100091911338, '曲美家居（QM）弯曲木真皮床软床1.5*2.0m 砂砾白双人床', 0, '2024-09-01 19:40:18', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050793254914, 100086010289, '曲美家居（QM）沙发 真皮沙发客厅直排头层牛皮-三人位-2.2m 砂砾白', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050810032129, 100086010257, '曲美家居（QM）沙发 皮沙发头层牛皮客厅直排-三人位-2.2m 烟雨灰', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050831003650, 100085057005, '曲美家居（QM）弯曲木真皮床框架床1.5*2.0m 烟雨灰双人床', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050851975170, 100085056997, '曲美家居（QM）双人床 弯曲木皮床实木卧室婚床1.8*2.0m 砂砾白', 0, '2024-09-01 19:39:44', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050885529602, 100085056995, '曲美家居（QM）弯曲木真皮床实木床1.8*2.0m 烟雨灰双人床', 0, '2024-09-01 18:20:09', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050906501121, 100079454246, '曲美家居床 皮艺床实木框架双人床1.5*2.0m', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050927472642, 100079179884, '曲美家居床 真皮床 实木框架卧室皮艺大床1.5*2.0m双人床', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050948444162, 100079179882, '曲美家居床头柜 奶油白双大抽屉卧室储物柜', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050977804289, 100078688188, '曲美家居乳胶床垫 黄麻床垫 小口径独立袋弹簧26cm厚软硬双面床垫1.5*2.0m', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273050994581506, 100078688172, '曲美家居乳胶床垫 软硬双面黄麻床垫厚26cm 双人床垫 独立袋弹簧1.8*2.0m', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051015553025, 100078688166, '曲美家居床 皮床实木床意式极简卧室大床-优雅驼 1.5*2.0m单人床', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051032330241, 100078688148, '曲美家居双人床 皮床实木床意式极简风卧室大床-优雅驼 1.8*2.0m', 1, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051053301761, 100076758487, '曲美家居双人床 皮艺床实木框架床卧室婚床 1.8*2.0m', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051074273281, 100076574967, '曲美家居双人床 牛皮床实木框架卧室皮艺大床1.8*2.0m ', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051091050497, 100076574953, '曲美家居床头柜 轻奢黄双大抽屉卧室储物柜', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051116216322, 100066588665, '曲美家居（QM）床 双人床 现代简约家具婚床卧室架子床1.8*2米', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051132993537, 100064431086, '曲美家居凝胶记忆棉独立袋弹簧26cm厚垫子1.8*2米', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051153965057, 100064431074, '曲美家居（QM）凝胶记忆棉独立袋弹簧26cm厚垫子1.5*2米', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051170742274, 100064198182, '曲美家居（QM）床双人床 北欧风卧室大床结实耐用框架床1.5*2米', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051187519490, 100062711475, '曲美家居（QM）床 皮床现代主卧皮艺床1.5*2m单人床', 1, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051200102401, 100059710381, '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.5*2米', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051216879618, 100059710357, '曲美家居（QM）床头柜 现代简约床头柜卧室轻奢收纳储物床边柜清新绿', 0, '2024-09-01 18:18:55', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051233656834, 100059710355, '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.8*2.0m', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051254628353, 100058433110, '曲美家居（QM）乳胶床垫弹簧床垫1.8米*2米黄麻软硬双面席梦思床垫子', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051275599873, 100058433040, '曲美家居（QM）乳胶床垫弹簧床垫1.5x2米黄麻软硬双面单人床垫子', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051292377089, 100058374484, '曲美家居（QM）双人床 皮床现代主卧皮艺床1.8*2m', 1, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051309154306, 100052615522, '曲美家居（QM）床 牛皮床双人床 1.5*2米主卧大床婚床现代简约家具', 1, '2024-08-28 06:35:25', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051330125826, 100052615498, '曲美家居（QM）皮床 床双人床 1.8*2米主卧大床婚床现代简约家具', 1, '2024-09-01 22:18:59', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051346903041, 100081971405, '曲美家居全屋定制餐厅一桌四椅', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051363680258, 100087284376, '曲美家居全屋定制次卧（1.5m床*1+床垫*1+床头柜*1+三门衣柜*1）', 0, '2024-08-28 06:35:33', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051376263169, 100087284374, '曲美家居全屋定制主卧（双人床*1+床垫*1+床头柜*2+四门衣柜*1）', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051388846081, 100081971389, '曲美家居定制书房卧室（单人床*1+床垫*1+书柜*1+书桌椅*1）', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051401428994, 100081971391, '曲美家居全屋定制客厅（3人沙发*1+单人沙发*1+茶几*1+电视柜*1） ', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051422400513, 100053851400, '曲美家居（QM）床 双人床 现代简约家具婚床卧室架子床', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051443372033, 100053851370, '曲美家居（QM）床双人床 北欧风卧室大床结实耐用框架床', 0, '2024-08-28 06:35:25', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051460149250, 100079454244, '曲美家居沙发 耐猫抓沙发科技皮客厅意式极简懒人沙发-卡其色三人位2.2m ', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051476926466, 100079454232, '曲美家居餐桌椅 弯曲木餐桌长方形140cm 一桌四椅合观胡桃+奶油白', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051489509378, 100079454230, '曲美家居餐桌椅 弯曲木餐桌长方形140cm 一桌四椅戈尔浅胡桃+深灰色', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051506286593, 100079454228, '曲美家居懒人沙发 沙发 客厅意式沙发头层牛皮直排沙发-奶茶棕三人位2.2m', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051523063809, 100079454216, '曲美家居餐桌椅 弯曲木餐桌长方形140cm 一桌四椅戈尔浅胡桃+奶油白', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051531452418, 100079454214, '曲美家居（QM）沙发 懒人沙发 客厅意式极简沙发进口头层牛皮-奶茶棕多人位3.2m', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051552423937, 100079454212, '曲美家居懒人沙发 客厅意式沙发进口头层牛皮直排沙发-奶茶棕四人位2.85m', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051565006849, 100079454202, '曲美家居床 弯曲木真皮床软床1.5*2.0m 砂砾白双人床', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051573395458, 100079454200, '曲美家居沙发 耐猫抓沙发科技皮客厅意式极简懒人沙发-卡其色四人位2.85m', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051590172673, 100079454198, '曲美家居餐桌椅 弯曲木餐桌长方形140cm 一桌四椅合观胡桃+深灰色', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051619532801, 100079454186, '曲美家居弯曲木真皮床框架床1.5*2.0m 烟雨灰双人床', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051640504321, 100079454170, '曲美家居沙发 真皮沙发头层牛皮大小户型直排-四人位-2.7m 砂砾白', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051648892930, 100079179886, '曲美家居茶几 加厚钢化玻璃茶几弯曲木胡桃实木框架', 0, '2024-08-28 06:35:31', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051678253057, 100079179872, '曲美家居沙发 懒人沙发 客厅意式极简沙发进口头层牛皮-黑色多人位3.2m', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051690835970, 100078688146, '曲美家居曲美家居双人床 皮床实木床意式极简风卧室大床-大地棕 1.8*2.0m', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051707613185, 100076758481, '曲美家居沙发 耐猫抓沙发科技皮客厅意式极简懒人沙发-卡其色多人位3.2m', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051724390402, 100076758449, '曲美家居弯曲木真皮床实木床1.8*2.0m 烟雨灰双人床', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051736973314, 100076758447, '曲美家居沙发 真皮沙发客厅直排头层牛皮-三人位-2.2m 砂砾白', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051745361922, 100076758439, '曲美家居床 双人床 弯曲木皮床实木卧室婚床1.8*2.0m 砂砾白', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051770527745, 100076758437, '曲美家居沙发 皮沙发头层牛皮客厅直排-三人位-2.2m 烟雨灰', 0, '2024-08-28 06:35:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051778916353, 100076758435, '曲美家居沙发 皮沙发头层牛皮大直排-四人位-2.7m 烟雨灰', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051799887873, 100076574949, '曲美家居衣柜 四门大衣柜 对开门平开门卧室时尚储物柜 大衣柜', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051841830913, 100076574947, '曲美家居沙发 真皮沙发 客厅意式极简懒人沙发进口头层牛皮-黑色三人位', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051875385346, 100076574945, '曲美家居沙发 懒人沙发 客厅意式极简沙发进口头层牛皮-黑色四人位2.85m', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051892162561, 100076574941, '曲美家居（QM）衣柜 四门大衣柜 对开门平开门卧室时尚储物柜 大衣柜', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051908939777, 100076574937, '曲美家居（QM）衣柜 四门大衣柜 对开门平开门卧室时尚储物柜 大衣柜', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051921522689, 100076245907, '曲美家居曲美家居床 皮床实木床意式极简卧室大床-大地棕 1.5*2.0m单人床', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051938299905, 100067518449, '曲美家居（QM）圆餐桌 意式加厚岩板奶油风桌子餐厅家具', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051946688514, 100067452715, '曲美家居圆餐桌 意式加厚岩板奶油风一桌四椅餐厅家具', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051959271425, 100065589292, '曲美家居（QM）餐椅 软座凳子百搭餐厅家具 椅子*2', 0, '2024-08-28 06:35:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051980242946, 100064010050, '曲美家居电视柜落地奶油风客厅岩板柜子储物双抽屉', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273051997020162, 100064010040, '曲美家居（QM）茶几奶油风岩板客厅矮桌储物柜子', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052005408770, 100062711495, '曲美家居（QM）床头柜 卧室轻奢个性小型储物柜（右）', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052026380289, 100058889181, '曲美家居（QM）床 布艺双人床1.8m*2.0m简约主卧实木框架', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052038963202, 100058433832, '曲美家居（QM）床头柜 卧室轻奢储物柜（左）', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052059934722, 100058432952, '曲美家居（QM）床头柜 卧室轻奢储物柜（左）', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052076711938, 100058432940, '曲美家居（QM）床头柜 卧室轻奢储物柜（左）', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052097683458, 100058374502, '曲美家居（QM）皮床 卧室软床1.5*2.0米意式简约风单人床', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052122849281, 100058374492, '曲美家居（QM）床 双人床 悬浮床 真皮床1.8米*2米卧室极简风自动感应灯带', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052139626497, 100058374490, '曲美家居（QM）牛皮床 卧室双人软床1.8*2.0米意式简约现代风双色皮', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052156403714, 100058374488, '曲美家居（QM）悬浮床 牛皮床单人床 1.5*2m 卧室极简风', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052168986626, 100058374486, '曲美家居（QM）真皮床 卧室双人软床1.8*2.0米意式简约双色皮', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052189958146, 100058374470, '曲美家居（QM）皮床牛皮床 卧室软床1.5*2.0米意式简约单人床', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052206735361, 100058374436, '曲美家居（QM）床头柜 卧室轻奢个性小型储物柜（右）', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052219318274, 100058374434, '曲美家居（QM）床头柜 卧室轻奢个性小型储物柜（右）', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052244484098, 100052615496, '曲美家居（QM）布艺床 双人床 卧室软床1.5*2.0m', 0, '2024-08-28 06:35:25', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052252872705, 100058432984, '曲美家居（QM）沙发 懒人沙发客厅大转角大座深组合沙发3.7m（左转角）', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052278038529, 100055007336, '曲美家居（QM）沙发 客厅家具科技布沙发大小户型组合三人位2.42米雅灰色', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052294815745, 100066880299, '曲美家居（QM）真皮悬浮床QM23-B10配件床帮床架（单拍不发货）', 0, '2024-08-16 00:32:07', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052303204353, 100060482731, '曲美家居（QM）沙发 科技布艺沙发客厅组合沙发四人位3.16米', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052319981569, 100079454264, '曲美家居床 单人床 真皮床卧室软床烟灰色1.5*2.0m', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052328370177, 100079454248, '曲美家居双人床 床 真皮床卧室软床烟灰色1.8*2.0m ', 0, '2024-08-28 06:35:32', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:09', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052349341697, 100068114249, '曲美家居LAB墩墩沙发 模块沙发 方块豆腐块沙发自由组合客厅沙发家具', 0, '2024-07-09 09:34:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052366118914, 100066482792, '曲美家居（QM）LAB墩墩沙发 模块沙发 方块豆腐块沙发自由组合客厅沙发家具', 0, '2024-07-09 09:34:29', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052378701825, 100064635382, '曲美家居（QM）曲美家居凝胶记忆棉独立袋弹簧26cm厚垫子1.8*2米', 0, '2024-08-16 00:31:34', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052387090433, 100064431062, '曲美家居（QM）床 双人床1.8米*2米 悬浮床 真皮床卧室自动感应灯带', 0, '2024-08-16 00:31:45', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052403867649, 100064431018, '曲美家居（QM）QM23-B10-配件床帮床架', 0, '2024-07-09 09:34:30', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052420644865, 100062751039, '曲美家居（QM）真皮沙发 懒人沙发客厅小户型直排66cm座深意式沙发四人位2.7m', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052433227778, 100060237626, '曲美家居（QM）沙发 懒人沙发客厅大转角大座深组合沙发3.7m（右转角）', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052450004994, 100060237600, '曲美家居（QM）沙发 懒人沙发 科技布艺沙发家具三人位2.7m', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052462587905, 100060237598, '曲美家居（QM）沙发 懒人沙发客厅科技布大座深组合沙发3.7m（左转角）', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052475170817, 100060237574, '曲美家居（QM）沙发 懒人沙发客厅科技布沙发家具3m直排', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052491948034, 100059710379, '曲美家居（QM） 床 真皮床 复古欧包皮艺床主卧欧式实木框架家具1.5*2.0m', 0, '2024-08-28 06:35:28', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052508725250, 100058433102, '曲美家居（QM）真皮沙发客厅头层牛皮直排意式轻奢皮艺沙发三人位3.1m', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052525502466, 100058433078, '曲美家居（QM）真皮沙发 懒人沙发客厅小户型直排大座深意式沙发三人位2.1m', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052538085377, 100058433076, '曲美家居（QM）凝胶床垫独立袋弹簧冰丝面料1.8*2米床垫', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052554862594, 100058433066, '曲美家居（QM）凝胶床垫独立袋弹簧冰丝面料1.5*2米床垫', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052571639809, 100058433064, '曲美家居（QM）真皮沙发 懒人沙发客厅大户型66cm座深意式沙发直排3.3m', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052584222722, 100058433060, '曲美家居（QM）真皮沙发客厅头层牛皮直排意式轻奢皮艺沙发四人位3.95m', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052592611329, 100058433008, '曲美家居（QM）沙发 懒人沙发客厅大转角大座深组合沙发3.7m（右转角）', 0, '2024-08-28 06:35:27', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052613582849, 100053851392, '曲美家居（QM）沙发 懒人沙发 布艺沙发家具三人位2.7m', 0, '2024-08-28 06:35:26', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052621971457, 100053851390, '曲美家居（QM）沙发懒人沙发客厅科技布沙发家具', 0, '2024-08-28 06:35:25', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052651331585, 100053851358, '曲美家居（QM）床 真皮双人床卧室主卧法式复古软床实木框架家具1.8*2m', 0, '2024-08-28 06:35:25', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052684886018, 100052615524, '曲美家居（QM）床双人床真皮床奶油风公主床卧室软床1.5*2米', 0, '2024-08-28 06:35:25', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1794273052777160706, 100052615500, '曲美家居（QM）床双人床奶油风真皮床卧室大床婚床1.8*2米', 0, '2024-08-28 06:35:25', 1, 0, '2024-05-25 15:43:26', '2024-09-16 19:54:10', 0, 1784836484065443842, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1835648363102482434, 100133658606, '曲美家居（QM）lab多功能电动沙发成长型家具牛皮-两人位 2.22m 【单电动位】', 0, '2024-09-04 11:10:21', 1, 0, '2024-09-16 19:54:09', NULL, 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1835648363140231170, 100133658082, '曲美家居（QM）lab多功能电动沙发牛皮奶茶白大三人位 3.14m【双电动】', 0, '2024-09-04 11:10:21', 1, 0, '2024-09-16 19:54:09', NULL, 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1835648363140231171, 100133658026, '曲美家居（QM）lab多功能模块沙发牛皮-岩石灰 多人位 3.14m【无电动】', 0, '2024-09-04 11:10:21', 1, 0, '2024-09-16 19:54:09', NULL, 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1835648363207340034, 100112899277, '曲美家居lab多功能电动沙发成长型家具牛皮-奶茶白 两人位 2.22m', 0, '2024-09-04 11:10:21', 1, 0, '2024-09-16 19:54:09', NULL, 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1835648363207340035, 100112899275, '曲美家居（QM）lab多功能模块沙发牛皮-岩石灰 两人位2.22m 【无电动】', 0, '2024-09-04 11:10:21', 1, 0, '2024-09-16 19:54:09', NULL, 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1835648363270254593, 100112899245, '曲美家居lab多功能成长型模块沙发牛皮-岩石灰 单人沙发 1.3m 【无电动】', 0, '2024-09-04 11:10:21', 1, 0, '2024-09-16 19:54:09', NULL, 0, 0, 5); -INSERT INTO `oms_jd_vc_goods` VALUES (1835648363270254594, 100112898797, '曲美家居（QM）lab多功能电动沙发成长型家具牛皮-奶茶白大三人位 3.14m', 0, '2024-09-04 11:10:21', 1, 0, '2024-09-16 19:54:09', NULL, 0, 0, 5); - --- ---------------------------- --- Table structure for oms_jd_vc_order --- ---------------------------- -DROP TABLE IF EXISTS `oms_jd_vc_order`; -CREATE TABLE `oms_jd_vc_order` ( - `id` bigint NOT NULL, - `custom_order_id` bigint NULL DEFAULT NULL COMMENT '客单编号', - `pay` decimal(10, 2) NULL DEFAULT NULL COMMENT '支付金额', - `operator_state` int NULL DEFAULT NULL COMMENT '操作状态:5 新订单；10等待发货；16发货完成', - `order_state` int NULL DEFAULT NULL COMMENT '订单状态:7 新订单；10等待发货；16等待确认收货；19订单完成；22锁定，29删除', - `consignee_name` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收货人姓名', - `telephone` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '固定电话', - `phone` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码', - `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收货地址', - `order_remark` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单备注', - `order_create_date` datetime NULL DEFAULT NULL COMMENT '订购日期/订单生成时间', - `payment_category` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付分类: COD, NON_COD', - `payment_category_disp_name` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付分类名称: 货到付款, 在线支付', - `create_date` datetime NULL DEFAULT NULL COMMENT '创建日期', - `pin` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下单账号', - `refund_source_flag` int NULL DEFAULT NULL COMMENT '退款标识', - `province_id` int NULL DEFAULT NULL COMMENT '省份id', - `province_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省份名称', - `city_id` int NULL DEFAULT NULL COMMENT '市id', - `city_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市名称', - `county_id` int NULL DEFAULT NULL COMMENT '县id', - `county_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '县名称', - `town_id` int NULL DEFAULT NULL COMMENT '镇id', - `town_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '镇名称', - `memo_by_vendor` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '厂商备注', - `parent_order_id` bigint NULL DEFAULT NULL COMMENT '父单号', - `sku` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编号', - `commodity_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `commodity_num` int NULL DEFAULT NULL COMMENT '商品数量', - `jd_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '京东价', - `discount` decimal(10, 2) NULL DEFAULT NULL COMMENT '优惠价', - `reduce_count` decimal(10, 2) NULL DEFAULT NULL COMMENT '优惠金额', - `total_carriage` decimal(6, 2) NULL DEFAULT NULL COMMENT '总运费', - `cost` decimal(10, 2) NULL DEFAULT NULL COMMENT '采购价', - `branch_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌名称', - `update_date` bigint NULL DEFAULT NULL COMMENT '更新时间', - `shop_id` bigint NULL DEFAULT NULL COMMENT '店铺id', - `create_time` datetime NULL DEFAULT NULL COMMENT '系统创建时间', - `update_time` datetime NULL DEFAULT NULL COMMENT '系统更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `custom_order_id_index`(`custom_order_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of oms_jd_vc_order --- ---------------------------- -INSERT INTO `oms_jd_vc_order` VALUES (1794920326272380930, 293372970011, 59464.00, 5, 7, '邱海淘', '18430738635-5293', '18430738635-5293', '河北石家庄市正定县正定镇正定新区三里屯街道正定启化职业技术学校中建四局项目部 手机号后四位3042', NULL, '2024-05-09 11:45:00', 'NON_COD', '在线支付', '2024-05-26 11:44:51', 'wj191498659', 0, 5, '河北', 142, '石家庄市', 42542, '正定县', 42921, '正定镇', NULL, 292192197845, '100081971405', '曲美家居全屋定制餐厅一桌四椅', 8, 7433.00, NULL, 0.00, 0.00, 7059.00, '曲美家居（QM）', 1716695091643, 5, '2024-05-27 10:35:28', '2024-05-27 10:45:09'); -INSERT INTO `oms_jd_vc_order` VALUES (1794920326863777794, 293392591482, 91808.00, 5, 7, '邱海淘', '18430738500-6972', '18430738500-6972', '河北石家庄市正定县正定镇正定新区三里屯街道正定启化职业技术学校中建四局项目部 手机号后四位3042', NULL, '2024-05-09 11:45:00', 'NON_COD', '在线支付', '2024-05-26 11:44:51', 'wj191498659', 0, 5, '河北', 142, '石家庄市', 42542, '正定县', 42921, '正定镇', NULL, 292192197845, '100087284376', '曲美家居全屋定制次卧（1.5m床*1+床垫*1+床头柜*1+三门衣柜*1）', 8, 11476.00, NULL, 0.00, 0.00, 10900.00, '曲美家居（QM）', 1716695091661, 5, '2024-05-27 10:35:29', '2024-05-27 10:45:09'); -INSERT INTO `oms_jd_vc_order` VALUES (1794920326947663873, 293411721136, 122064.00, 5, 7, '邱海淘', '18430738446-2230', '18430738446-2230', '河北石家庄市正定县正定镇正定新区三里屯街道正定启化职业技术学校中建四局项目部 手机号后四位3042', NULL, '2024-05-09 11:45:00', 'NON_COD', '在线支付', '2024-05-26 11:44:51', 'wj191498659', 0, 5, '河北', 142, '石家庄市', 42542, '正定县', 42921, '正定镇', NULL, 292192197845, '100087284374', '曲美家居全屋定制主卧（双人床*1+床垫*1+床头柜*2+四门衣柜*1）', 8, 15258.00, NULL, 0.00, 0.00, 14493.00, '曲美家居（QM）', 1716695091714, 5, '2024-05-27 10:35:29', '2024-05-27 10:45:09'); -INSERT INTO `oms_jd_vc_order` VALUES (1794920327069298689, 293411721168, 116360.00, 5, 7, '邱海淘', '18430738020-8109', '18430738020-8109', '河北石家庄市正定县正定镇正定新区三里屯街道正定启化职业技术学校中建四局项目部 手机号后四位3042', NULL, '2024-05-09 11:45:00', 'NON_COD', '在线支付', '2024-05-26 11:44:51', 'wj191498659', 0, 5, '河北', 142, '石家庄市', 42542, '正定县', 42921, '正定镇', NULL, 292192197845, '100081971391', '曲美家居全屋定制客厅（3人沙发*1+单人沙发*1+茶几*1+电视柜*1）', 8, 14545.00, NULL, 0.00, 0.00, 13817.00, '曲美家居（QM）', 1716695091818, 5, '2024-05-27 10:35:29', '2024-05-27 10:45:09'); -INSERT INTO `oms_jd_vc_order` VALUES (1794920327144796162, 293411872209, 80608.00, 5, 7, '邱海淘', '18430737848-2752', '18430737848-2752', '河北石家庄市正定县正定镇正定新区三里屯街道正定启化职业技术学校中建四局项目部 手机号后四位3042', NULL, '2024-05-09 11:45:00', 'NON_COD', '在线支付', '2024-05-26 11:44:51', 'wj191498659', 0, 5, '河北', 142, '石家庄市', 42542, '正定县', 42921, '正定镇', NULL, 292192197845, '100081971389', '曲美家居定制书房卧室（单人床*1+床垫*1+书柜*1+书桌椅*1）', 8, 10076.00, NULL, 0.00, 0.00, 9569.00, '曲美家居（QM）', 1716695091967, 5, '2024-05-27 10:35:29', NULL); -INSERT INTO `oms_jd_vc_order` VALUES (1794920327375482882, 293297427417, 1999.00, 16, 19, '王利芹', '1******2533', '1******2533', '内蒙古兴安盟扎赉特旗音德尔镇赛罕名都5号楼1单元301', NULL, '2024-05-23 21:52:28', 'NON_COD', '在线支付', '2024-05-23 21:56:13', 'jd_5de5a3048dd90', 0, 11, '内蒙古', 895, '兴安盟', 899, '扎赉特旗', 16141, '音德尔镇', NULL, 293297427417, '100064431086', '曲美家居凝胶记忆棉独立袋弹簧26cm厚垫子1.8*2米', 1, 3999.00, NULL, 2000.00, 0.00, 1891.00, '曲美家居（QM）', 1717495886480, 5, '2024-05-27 10:35:29', '2024-09-21 09:17:13'); -INSERT INTO `oms_jd_vc_order` VALUES (1794920327484534786, 295205891630, 0.00, 5, 7, '刘念', '18400970065-7865', '18400970065-7865', '北京朝阳区奥运村街道北苑路拂林园小区16号楼904室 手机号后四位7100', NULL, '2024-05-24 14:05:09', 'NON_COD', '在线支付', '2024-05-24 14:05:10', '开卷大大有益', 0, 1, '北京', 72, '朝阳区', 55652, '奥运村街道', 0, NULL, NULL, 295205891630, '100058433040', '曲美家居（QM）乳胶床垫弹簧床垫1.5x2米黄麻软硬双面单人床垫子', 1, 3028.00, NULL, 3014.81, 0.00, 1399.00, '曲美家居（QM）', 1716530710162, 5, '2024-05-27 10:35:29', NULL); -INSERT INTO `oms_jd_vc_order` VALUES (1794920327568420866, 293378091641, 1378.81, 5, 7, '明攀虎', '18430738598-1164', '18430738598-1164', '四川南充市顺庆区中城街道文华巷124号院3幢 手机号后四位7127', NULL, '2024-05-26 09:28:53', 'NON_COD', '在线支付', '2024-05-26 09:30:46', '2775548-32589794', 0, 22, '四川', 2022, '南充市', 43226, '顺庆区', 57186, '中城街道', NULL, 293378091641, '100058433040', '曲美家居（QM）乳胶床垫弹簧床垫1.5x2米黄麻软硬双面单人床垫子', 1, 3028.00, NULL, 1636.00, 0.00, 1399.00, '曲美家居（QM）', 1716687046289, 5, '2024-05-27 10:35:29', '2024-05-27 10:45:09'); -INSERT INTO `oms_jd_vc_order` VALUES (1794922762335281154, 293210350417, 988.60, 5, 29, '顾军', '1******7736', '1******7736', '江苏无锡市新吴区梅村街道无锡新区泰伯二期331-302 手机号后四位7736', NULL, '2024-05-20 20:34:40', 'NON_COD', '在线支付', '2024-05-20 20:34:43', 'huaji111', 1, 12, '江苏', 984, '无锡市', 53561, '新吴区', 58023, '梅村街道', NULL, 293210350417, '100059710355', '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.8*2.0m', 1, 2271.00, NULL, 1272.01, 0.00, 999.00, '曲美家居（QM）', 1716770427514, 5, '2024-05-27 10:45:09', NULL); -INSERT INTO `oms_jd_vc_order` VALUES (1794922762700185601, 293431954129, 1045.19, 16, 19, '杨有燕', '1******2025', '1******2025', '北京朝阳区左家庄街道左家庄南里21楼润民柳芳居1单元1502', NULL, '2024-05-26 17:35:42', 'NON_COD', '在线支付', '2024-05-26 17:35:52', '森林湖280', 0, 1, '北京', 72, '朝阳区', 55692, '左家庄街道', 0, NULL, NULL, 293431954129, '100059710381', '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.5*2米', 1, 2271.00, NULL, 1225.81, 0.00, 999.00, '曲美家居（QM）', 1717326417772, 5, '2024-05-27 10:45:09', '2024-09-17 20:44:34'); -INSERT INTO `oms_jd_vc_order` VALUES (1836023437164929026, 296252726030, 2499.00, 5, 29, '黄蜂', '1******3311', '1******3311', '北京海淀区八里庄街道北洼西里51号院3号楼一单元1111', NULL, '2024-05-31 21:46:15', 'NON_COD', '在线支付', '2024-05-31 21:47:00', 'jd_xavtQlmctluo', 1, 1, '北京', 2800, '海淀区', 55811, '八里庄街道', 0, NULL, NULL, 296252726030, '100078688188', '曲美家居乳胶床垫 黄麻床垫 小口径独立袋弹簧26cm厚软硬双面床垫1.5*2.0m', 1, 3712.00, NULL, 1213.00, 0.00, 2469.00, '曲美家居（QM）', 1717304442269, 5, '2024-09-17 20:44:34', NULL); -INSERT INTO `oms_jd_vc_order` VALUES (1837294500213547010, 293664282873, 1083.70, 5, 29, '朱海霞', '1******7322', '1******7322', '山东泰安市岱岳区马庄镇泰安市马庄镇朱家寨村', NULL, '2024-06-01 18:18:26', 'NON_COD', '在线支付', '2024-06-01 18:18:40', '爱学习的朱乐', 1, 13, '山东', 1112, '泰安市', 46665, '岱岳区', 46712, '马庄镇', NULL, 293673328890, '100059710355', '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.8*2.0m', 1, 2271.00, NULL, 1176.91, 0.00, 999.00, '曲美家居（QM）', 1717374983120, 5, '2024-09-21 08:55:19', NULL); - --- ---------------------------- --- Table structure for oms_jd_vc_order_item --- ---------------------------- -DROP TABLE IF EXISTS `oms_jd_vc_order_item`; -CREATE TABLE `oms_jd_vc_order_item` ( - `id` bigint NOT NULL, - `jd_vc_order_id` bigint NOT NULL COMMENT '外键id', - `custom_order_id` bigint NULL DEFAULT NULL COMMENT '客单编号', - `sku` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '京东商品编码', - `ware_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `upc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品UPC编码', - `ware_num` int NULL DEFAULT NULL COMMENT '商品数量', - `jd_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '京东价', - `discount` decimal(10, 2) NULL DEFAULT NULL COMMENT '优惠价', - `cost` decimal(10, 2) NULL DEFAULT NULL COMMENT '采购价', - `po_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '采购单号', - `ro_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货单号', - `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 -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of oms_jd_vc_order_item --- ---------------------------- -INSERT INTO `oms_jd_vc_order_item` VALUES (1794920327144796163, 1794920327144796162, 293411872209, '100081971389', '曲美家居定制书房卧室（单人床*1+床垫*1+书柜*1+书桌椅*1）', NULL, 8, 10076.00, NULL, 9569.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1794920327509700610, 1794920327484534786, 295205891630, '100058433040', '曲美家居（QM）乳胶床垫弹簧床垫1.5x2米黄麻软硬双面单人床垫子', '100058433040', 1, 3028.00, NULL, 1399.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1794922761580306434, 1794920326272380930, 293372970011, '100081971405', '曲美家居全屋定制餐厅一桌四椅', NULL, 8, 7433.00, NULL, 7059.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1794922761899073538, 1794920326863777794, 293392591482, '100087284376', '曲美家居全屋定制次卧（1.5m床*1+床垫*1+床头柜*1+三门衣柜*1）', NULL, 8, 11476.00, NULL, 10900.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1794922762112983042, 1794920326947663873, 293411721136, '100087284374', '曲美家居全屋定制主卧（双人床*1+床垫*1+床头柜*2+四门衣柜*1）', NULL, 8, 15258.00, NULL, 14493.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1794922762222034945, 1794920327069298689, 293411721168, '100081971391', '曲美家居全屋定制客厅（3人沙发*1+单人沙发*1+茶几*1+电视柜*1）', NULL, 8, 14545.00, NULL, 13817.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1794922762511441922, 1794922762335281154, 293210350417, '100059710355', '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.8*2.0m', '100059710355', 1, 2271.00, NULL, 999.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1794922762620493826, 1794920327568420866, 293378091641, '100058433040', '曲美家居（QM）乳胶床垫弹簧床垫1.5x2米黄麻软硬双面单人床垫子', '100058433040', 1, 3028.00, NULL, 1399.00, NULL, NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_order_item` VALUES (1836023437102014465, 1794922762700185601, 293431954129, '100059710381', '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.5*2米', '100059710381', 1, 2271.00, NULL, 999.00, NULL, NULL, 0, 0); -INSERT INTO `oms_jd_vc_order_item` VALUES (1836023437164929027, 1836023437164929026, 296252726030, '100078688188', '曲美家居乳胶床垫 黄麻床垫 小口径独立袋弹簧26cm厚软硬双面床垫1.5*2.0m', NULL, 1, 3712.00, NULL, 2469.00, NULL, NULL, 0, 0); -INSERT INTO `oms_jd_vc_order_item` VALUES (1837294500263878658, 1837294500213547010, 293664282873, '100059710355', '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.8*2.0m', '100059710355', 1, 2271.00, NULL, 999.00, NULL, NULL, 0, 0); -INSERT INTO `oms_jd_vc_order_item` VALUES (1837300014108499969, 1794920327375482882, 293297427417, '100064431086', '曲美家居凝胶记忆棉独立袋弹簧26cm厚垫子1.8*2米', NULL, 1, 3999.00, NULL, 1891.00, NULL, NULL, 0, 0); - --- ---------------------------- --- Table structure for oms_jd_vc_refund --- ---------------------------- -DROP TABLE IF EXISTS `oms_jd_vc_refund`; -CREATE TABLE `oms_jd_vc_refund` ( - `id` bigint NOT NULL COMMENT '售前退款数据唯一标示', - `custom_order_id` bigint NULL DEFAULT NULL COMMENT '客户订单号', - `ro_apply_fee` double NULL DEFAULT NULL COMMENT '退款申请金额', - `ro_apply_date` datetime NULL DEFAULT NULL COMMENT '退款申请时间', - `order_create_date` datetime NULL DEFAULT NULL COMMENT '订单生成时间', - `modified_date` datetime NULL DEFAULT NULL COMMENT '退款状态更新时间', - `approval_state` int NULL DEFAULT NULL COMMENT '审核状态0未审核 1审核通过 2审核不通过', - `order_state` int NULL DEFAULT NULL COMMENT '订单状态orderState 7 新订单 10等待发货 16等待确认收货 19订单完成 22锁定 29删除', - `operator_state` int NULL DEFAULT NULL COMMENT ' 操作状态 operatorState 5 新订单 10等待发货 16发货完成', - `ro_pre_no` bigint NULL DEFAULT NULL COMMENT '申请单号', - `ro_account` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款申请账户', - `ro_reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款申请理由', - `approval_suggestion` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核意见', - `vendor_store_id` int NULL DEFAULT NULL COMMENT '仓id', - `vendor_store_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '仓名称', - `order_detail_list` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '返回商品结果集合JSON', - `sku_id` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `commodity_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `commodity_num` int NULL DEFAULT NULL COMMENT '退货数量', - `shop_id` bigint NULL DEFAULT NULL COMMENT '店铺id', - `create_time` datetime NULL DEFAULT NULL COMMENT '系统创建时间', - `update_time` datetime NULL DEFAULT NULL COMMENT '系统更新时间', - `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 -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '京东自营退款表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of oms_jd_vc_refund --- ---------------------------- -INSERT INTO `oms_jd_vc_refund` VALUES (24348160994, 293210350417, 988.6, '2024-05-26 09:35:03', '2024-05-20 20:34:40', '2024-05-27 08:40:29', 1, 29, 5, 24348160994, 'huaji111', '商品无货', '供应商审核通过', -1, NULL, '[{\"commodityName\":\"曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.8*2.0m\",\"commodityNum\":1,\"skuId\":\"100059710355\"}]', '100059710355', '曲美家居（QM）床垫 乳胶床垫 独立袋弹簧床垫1.8*2.0m', 1, 5, '2024-05-31 16:04:26', NULL, NULL, NULL); -INSERT INTO `oms_jd_vc_refund` VALUES (24510666793, 296252726030, 2499, '2024-06-01 12:57:53', '2024-05-31 21:46:15', '2024-06-02 13:00:43', 1, 29, 5, 24510666793, 'jd_xavtQlmctluo', '商品错选/多选', '审核超时，系统自动审核通过', -1, NULL, '[{\"commodityName\":\"曲美家居乳胶床垫 黄麻床垫 小口径独立袋弹簧26cm厚软硬双面床垫1.5*2.0m\",\"commodityNum\":1,\"skuId\":\"100078688188\"}]', '100078688188', '曲美家居乳胶床垫 黄麻床垫 小口径独立袋弹簧26cm厚软硬双面床垫1.5*2.0m', 1, 5, '2024-09-21 11:12:59', NULL, NULL, NULL); - -- ---------------------------- -- Table structure for oms_pdd_goods -- ---------------------------- @@ -13657,7 +13359,7 @@ CREATE TABLE `sys_user` ( -- ---------------------------- -- Records of sys_user -- ---------------------------- -INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐A', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-05-19 13:15:01', 'admin', '2023-08-07 19:31:37', '', '2025-05-19 13:15:01', '管理员'); +INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐A', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-05-19 18:28:49', 'admin', '2023-08-07 19:31:37', '', '2025-05-19 18:28:49', '管理员'); INSERT INTO `sys_user` VALUES (2, NULL, 'openapi', 'openApi接口专用', '00', '2806456181@qq.com', '15818590000', '0', '', '$2a$10$fHkhoqbMiyracAsTzl38H.55bu.M.of1FXk2EK7RQBjfic3tLU0Ue', '0', '0', '127.0.0.1', '2024-06-24 10:23:35', 'admin', '2024-03-17 14:55:22', 'admin', '2024-06-24 10:23:35', NULL); INSERT INTO `sys_user` VALUES (101, 101, '15818590119', 'aaa123', '00', '', '', '0', '', '$2a$10$pXcT6cHaObMeKuYd9vZb5uEb8PyUdF2AcqqRN1cBqiA9rV4qYQW7G', '0', '2', '', NULL, 'admin', '2024-08-15 13:45:25', '', NULL, NULL); INSERT INTO `sys_user` VALUES (102, 101, '15818590119', '老齐', '00', '', '', '0', '', '$2a$10$ysk.zgJ8wh25c7vOjKyZ8uarM2hkG0S51j8GYdJSo2kZmc3f8HdKe', '0', '0', '', NULL, 'admin', '2024-08-15 13:49:59', 'admin', '2025-02-10 16:26:20', NULL); diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java index b2526e1f..d6b9bb1e 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java @@ -2,9 +2,7 @@ package cn.qihangerp.api.jd.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.jd.domain.JdOrder; -import cn.qihangerp.module.open.jd.domain.JdVcOrder; import cn.qihangerp.module.open.jd.service.JdOrderService; -import cn.qihangerp.module.open.jd.service.JdVcOrderService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,19 +13,11 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/jd/order") public class JdOrderFeignController { private final JdOrderService jdOrderService; - private final JdVcOrderService jdVcOrderService; + @GetMapping(value = "/get_detail") - public AjaxResult getInfo(Long orderId,Integer vc) - { - if(vc!=null && vc==1){ - // jdvc - JdVcOrder jdVcOrder = jdVcOrderService.queryDetailByOrderId(orderId); - if(jdVcOrder!=null) return AjaxResult.success(jdVcOrder); - else return AjaxResult.error(500,"没有找到订单信息"); - }else { - JdOrder order = jdOrderService.queryDetailByOrderId(orderId); - if (order == null) return AjaxResult.error(404, "没有找到订单"); - else return AjaxResult.success(order); - } + public AjaxResult getInfo(Long orderId,Integer vc) { + JdOrder order = jdOrderService.queryDetailByOrderId(orderId); + if (order == null) return AjaxResult.error(404, "没有找到订单"); + else return AjaxResult.success(order); } } diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java index f62bd726..49f01b56 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java @@ -2,9 +2,7 @@ package cn.qihangerp.api.jd.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.jd.domain.JdRefund; -import cn.qihangerp.module.open.jd.domain.JdVcRefund; import cn.qihangerp.module.open.jd.service.JdRefundService; -import cn.qihangerp.module.open.jd.service.JdVcRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; @@ -17,22 +15,13 @@ import java.util.List; @RestController @RequestMapping("/jd/refund") public class JdRefundFeignController { - private final JdVcRefundService jdVcRefundService; private final JdRefundService jdRefundService; @GetMapping(value = "/get_detail") - public AjaxResult getInfo(Long refundId,Integer vc) - { - if(vc!=null && vc==1) { - // jdvc - JdVcRefund refund = jdVcRefundService.getById(refundId); - if (refund == null) return AjaxResult.error(404, "没有找到退款单"); - else return AjaxResult.success(refund); - }else { - //jd pop - List list = jdRefundService.list(new LambdaQueryWrapper().eq(JdRefund::getServiceId, refundId)); - if(list.isEmpty()) return AjaxResult.error(404,"没有找到售后单"); - else return AjaxResult.success(list.get(0)); - } + public AjaxResult getInfo(Long refundId,Integer vc) { + //jd pop + List list = jdRefundService.list(new LambdaQueryWrapper().eq(JdRefund::getServiceId, refundId)); + if (list.isEmpty()) return AjaxResult.error(404, "没有找到售后单"); + else return AjaxResult.success(list.get(0)); } } diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java deleted file mode 100644 index 26641ee1..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java +++ /dev/null @@ -1,881 +0,0 @@ -//package cn.qihangerp.jd.domain; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -//import java.util.Date; -// -///** -// * 京东售后 -// * @TableName jd_order_after -// */ -//public class JdOrderAfter implements Serializable { -// /** -// * -// */ -// private Long id; -// -// /** -// * 店铺id -// */ -// private Integer shopId; -// -// /** -// * 申请单号 -// */ -// private Long applyId; -// -// /** -// * 服务单号 -// */ -// private Long serviceId; -// -// /** -// * 申请时间 -// */ -// private Date applyTime; -// -// /** -// * 客户期望(10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款) -// */ -// private Integer customerExpect; -// -// /** -// * 客户期望名称 -// */ -// private String customerExpectName; -// -// /** -// * 服务单状态（10000-待审核领取 10001-待审核 10002-待客户反馈 10004-审核关闭 10005-待收货 10006-待处理领取 10007-待处理 10009-待用户确认 10010-完成 10011-取消 10012-客户已反馈 10013-待审核和待客户反馈 10041-提交退款申请 1100-待下发维修中心接单 12000-上门维修中 14000-上门检测中 13000-商家催收待处理 13000-未收货，待收款 13000-已收货，待收款） -// */ -// private Integer serviceStatus; -// -// /** -// * 服务单状态名称 -// */ -// private String serviceStatusName; -// -// /** -// * 客户账号 -// */ -// private String customerPin; -// -// /** -// * 客户姓名 -// */ -// private String customerName; -// -// /** -// * 用户电话 -// */ -// private String customerTel; -// -// /** -// * 取件地址 -// */ -// private String pickwareAddress; -// -// /** -// * 取件方式(4-上门取件 5-上门换新取件 7-客户送货 8-大家电上门取件 9-大家电换新取件 40-客户发货 70-送货至门店 71-快递至门店 72-门店上门取件 80-京东快运上门取件 85-德邦取件) -// */ -// private Integer pickwareType; -// -// /** -// * 订单号 -// */ -// private Long orderId; -// -// /** -// * 订单类型(0-一般订单 2-拍卖订单 11-售后调货 15-返修发货 16-直接赔偿 21-POPFBP 22-POPSOP 23-POPLBP 24-POPLBV 25-POPSOPL 18-厂商直送 19-客服补件 42-通用合约 61-EPT订单 69-京东服务产品订单 19-客服补件 75-LOC订单 77-LSP订单 42-虚拟订单 88-总代订单 96-sop虚拟订单 100-提货卡订单 33-电子礼品卡 49-礼品卡 108-京东维修服务产品订单 131-X无人超市订单 142-企业店铺IBS订单 151-品牌门店线下订单 112-自营采购，以销定结 159-领货码订单 89-移动仓库订单 170-实体领货码订单 140-商家采购订单 193-scf订单 54-线下礼品卡订单 202-月卡订单 4-虚拟商品) -// */ -// private Integer orderType; -// -// /** -// * 订单类型名称 -// */ -// private String orderTypeName; -// -// /** -// * 实付金额 -// */ -// private BigDecimal actualPayPrice; -// -// /** -// * 商品编号 -// */ -// private Long skuId; -// -// /** -// * 售后商品类型(10-申请主商品 20-申请的赠品 30-附件 40-发票 50-发票复印件 60-出检报告 70-包装 80-防损吊牌 90-贺卡 100-礼品购包装 110-loc订单验证码 120-服务产品标识) -// */ -// private Integer wareType; -// -// /** -// * 商品类型名称 -// */ -// private String wareTypeName; -// -// /** -// * 商品名称 -// */ -// private String wareName; -// -// /** -// * 商品类型(1-单品 2-赠品套装中的主商品 3-赠品套装中的赠品 4-套装中的单品 5-套装中的赠品 6-加价购赠品 7-延保通 8-延保通赠品) -// */ -// private Integer skuType; -// -// /** -// * skuType对应名称 -// */ -// private String skuTypeName; -// -// /** -// * 审核人账号 -// */ -// private String approvePin; -// -// /** -// * 审核人姓名 -// */ -// private String approveName; -// -// /** -// * 审核时间 -// */ -// private Date approveTime; -// -// /** -// * 审核结果(11-直赔积分 12-直赔余额 13-直赔优惠卷 14-直赔京豆 21-直赔商品 22-上门换新 31-自营取件 32-客户送货 33-客户发货 34-闪电退款 35-虚拟退款 36-上门检测 37-客户送货至门店 38-保外维修 39-快递至门店 40-门店上门取件 80-大家电检测 81-大家电安装 82-大家电移机 83-大家电维修 84-大家电其它 85-闪电催收 86-上门维修 87-补发商品 91-退款不退货 92-预授权冻结 93-ACS换新 95-(超级体验店)门店换新 96-(超级体验店)主站换新 97-厂商维修-寄修 98-厂商维修-上门维修 99-厂商维修-送修 101-厂商大家电检测鉴定 102-厂商大家电安装 103-厂商大家电移机拆机 104-厂商大家电维修(上门维修) 105-厂商大家电拆机鉴定 106-换货 100-客户退货至团长 107-3c上门维修 108-增值服务 109-退货(筋斗云使用) 110-直赔(筋斗云使用) 111-上门检测取件) -// */ -// private Integer approveResult; -// -// /** -// * 审核结果名称 -// */ -// private String approveResultName; -// -// /** -// * 处理人账号 -// */ -// private String processPin; -// -// /** -// * 处理人姓名 -// */ -// private String processName; -// -// /** -// * 处理时间 -// */ -// private Date processTime; -// -// /** -// * 处理结果(0-初始化 1-安装完成 2-维修完成 3-检测完成 4-拆机完成 5-咨询解释 6-取消 70-原返 80-换货 100-赔付) -// */ -// private Integer processResult; -// -// /** -// * 处理结果名称 -// */ -// private String processResultName; -// -// /** -// * 平台来源 -// */ -// private Integer platformSrc; -// -// /** -// * 平台来源名称 -// */ -// private String platformSrcName; -// -// /** -// * 服务单售后数量 -// */ -// private Integer serviceCount; -// -// /** -// * 用户电话 -// */ -// private String desenCustomerTel; -// -// private static final long serialVersionUID = 1L; -// -// /** -// * -// */ -// public Long getId() { -// return id; -// } -// -// /** -// * -// */ -// public void setId(Long id) { -// this.id = id; -// } -// -// /** -// * 店铺id -// */ -// public Integer getShopId() { -// return shopId; -// } -// -// /** -// * 店铺id -// */ -// public void setShopId(Integer shopId) { -// this.shopId = shopId; -// } -// -// /** -// * 申请单号 -// */ -// public Long getApplyId() { -// return applyId; -// } -// -// /** -// * 申请单号 -// */ -// public void setApplyId(Long applyId) { -// this.applyId = applyId; -// } -// -// /** -// * 服务单号 -// */ -// public Long getServiceId() { -// return serviceId; -// } -// -// /** -// * 服务单号 -// */ -// public void setServiceId(Long serviceId) { -// this.serviceId = serviceId; -// } -// -// /** -// * 申请时间 -// */ -// public Date getApplyTime() { -// return applyTime; -// } -// -// /** -// * 申请时间 -// */ -// public void setApplyTime(Date applyTime) { -// this.applyTime = applyTime; -// } -// -// /** -// * 客户期望(10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款) -// */ -// public Integer getCustomerExpect() { -// return customerExpect; -// } -// -// /** -// * 客户期望(10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款) -// */ -// public void setCustomerExpect(Integer customerExpect) { -// this.customerExpect = customerExpect; -// } -// -// /** -// * 客户期望名称 -// */ -// public String getCustomerExpectName() { -// return customerExpectName; -// } -// -// /** -// * 客户期望名称 -// */ -// public void setCustomerExpectName(String customerExpectName) { -// this.customerExpectName = customerExpectName; -// } -// -// /** -// * 服务单状态（10000-待审核领取 10001-待审核 10002-待客户反馈 10004-审核关闭 10005-待收货 10006-待处理领取 10007-待处理 10009-待用户确认 10010-完成 10011-取消 10012-客户已反馈 10013-待审核和待客户反馈 10041-提交退款申请 1100-待下发维修中心接单 12000-上门维修中 14000-上门检测中 13000-商家催收待处理 13000-未收货，待收款 13000-已收货，待收款） -// */ -// public Integer getServiceStatus() { -// return serviceStatus; -// } -// -// /** -// * 服务单状态（10000-待审核领取 10001-待审核 10002-待客户反馈 10004-审核关闭 10005-待收货 10006-待处理领取 10007-待处理 10009-待用户确认 10010-完成 10011-取消 10012-客户已反馈 10013-待审核和待客户反馈 10041-提交退款申请 1100-待下发维修中心接单 12000-上门维修中 14000-上门检测中 13000-商家催收待处理 13000-未收货，待收款 13000-已收货，待收款） -// */ -// public void setServiceStatus(Integer serviceStatus) { -// this.serviceStatus = serviceStatus; -// } -// -// /** -// * 服务单状态名称 -// */ -// public String getServiceStatusName() { -// return serviceStatusName; -// } -// -// /** -// * 服务单状态名称 -// */ -// public void setServiceStatusName(String serviceStatusName) { -// this.serviceStatusName = serviceStatusName; -// } -// -// /** -// * 客户账号 -// */ -// public String getCustomerPin() { -// return customerPin; -// } -// -// /** -// * 客户账号 -// */ -// public void setCustomerPin(String customerPin) { -// this.customerPin = customerPin; -// } -// -// /** -// * 客户姓名 -// */ -// public String getCustomerName() { -// return customerName; -// } -// -// /** -// * 客户姓名 -// */ -// public void setCustomerName(String customerName) { -// this.customerName = customerName; -// } -// -// /** -// * 用户电话 -// */ -// public String getCustomerTel() { -// return customerTel; -// } -// -// /** -// * 用户电话 -// */ -// public void setCustomerTel(String customerTel) { -// this.customerTel = customerTel; -// } -// -// /** -// * 取件地址 -// */ -// public String getPickwareAddress() { -// return pickwareAddress; -// } -// -// /** -// * 取件地址 -// */ -// public void setPickwareAddress(String pickwareAddress) { -// this.pickwareAddress = pickwareAddress; -// } -// -// /** -// * 取件方式(4-上门取件 5-上门换新取件 7-客户送货 8-大家电上门取件 9-大家电换新取件 40-客户发货 70-送货至门店 71-快递至门店 72-门店上门取件 80-京东快运上门取件 85-德邦取件) -// */ -// public Integer getPickwareType() { -// return pickwareType; -// } -// -// /** -// * 取件方式(4-上门取件 5-上门换新取件 7-客户送货 8-大家电上门取件 9-大家电换新取件 40-客户发货 70-送货至门店 71-快递至门店 72-门店上门取件 80-京东快运上门取件 85-德邦取件) -// */ -// public void setPickwareType(Integer pickwareType) { -// this.pickwareType = pickwareType; -// } -// -// /** -// * 订单号 -// */ -// public Long getOrderId() { -// return orderId; -// } -// -// /** -// * 订单号 -// */ -// public void setOrderId(Long orderId) { -// this.orderId = orderId; -// } -// -// /** -// * 订单类型(0-一般订单 2-拍卖订单 11-售后调货 15-返修发货 16-直接赔偿 21-POPFBP 22-POPSOP 23-POPLBP 24-POPLBV 25-POPSOPL 18-厂商直送 19-客服补件 42-通用合约 61-EPT订单 69-京东服务产品订单 19-客服补件 75-LOC订单 77-LSP订单 42-虚拟订单 88-总代订单 96-sop虚拟订单 100-提货卡订单 33-电子礼品卡 49-礼品卡 108-京东维修服务产品订单 131-X无人超市订单 142-企业店铺IBS订单 151-品牌门店线下订单 112-自营采购，以销定结 159-领货码订单 89-移动仓库订单 170-实体领货码订单 140-商家采购订单 193-scf订单 54-线下礼品卡订单 202-月卡订单 4-虚拟商品) -// */ -// public Integer getOrderType() { -// return orderType; -// } -// -// /** -// * 订单类型(0-一般订单 2-拍卖订单 11-售后调货 15-返修发货 16-直接赔偿 21-POPFBP 22-POPSOP 23-POPLBP 24-POPLBV 25-POPSOPL 18-厂商直送 19-客服补件 42-通用合约 61-EPT订单 69-京东服务产品订单 19-客服补件 75-LOC订单 77-LSP订单 42-虚拟订单 88-总代订单 96-sop虚拟订单 100-提货卡订单 33-电子礼品卡 49-礼品卡 108-京东维修服务产品订单 131-X无人超市订单 142-企业店铺IBS订单 151-品牌门店线下订单 112-自营采购，以销定结 159-领货码订单 89-移动仓库订单 170-实体领货码订单 140-商家采购订单 193-scf订单 54-线下礼品卡订单 202-月卡订单 4-虚拟商品) -// */ -// public void setOrderType(Integer orderType) { -// this.orderType = orderType; -// } -// -// /** -// * 订单类型名称 -// */ -// public String getOrderTypeName() { -// return orderTypeName; -// } -// -// /** -// * 订单类型名称 -// */ -// public void setOrderTypeName(String orderTypeName) { -// this.orderTypeName = orderTypeName; -// } -// -// /** -// * 实付金额 -// */ -// public BigDecimal getActualPayPrice() { -// return actualPayPrice; -// } -// -// /** -// * 实付金额 -// */ -// public void setActualPayPrice(BigDecimal actualPayPrice) { -// this.actualPayPrice = actualPayPrice; -// } -// -// /** -// * 商品编号 -// */ -// public Long getSkuId() { -// return skuId; -// } -// -// /** -// * 商品编号 -// */ -// public void setSkuId(Long skuId) { -// this.skuId = skuId; -// } -// -// /** -// * 售后商品类型(10-申请主商品 20-申请的赠品 30-附件 40-发票 50-发票复印件 60-出检报告 70-包装 80-防损吊牌 90-贺卡 100-礼品购包装 110-loc订单验证码 120-服务产品标识) -// */ -// public Integer getWareType() { -// return wareType; -// } -// -// /** -// * 售后商品类型(10-申请主商品 20-申请的赠品 30-附件 40-发票 50-发票复印件 60-出检报告 70-包装 80-防损吊牌 90-贺卡 100-礼品购包装 110-loc订单验证码 120-服务产品标识) -// */ -// public void setWareType(Integer wareType) { -// this.wareType = wareType; -// } -// -// /** -// * 商品类型名称 -// */ -// public String getWareTypeName() { -// return wareTypeName; -// } -// -// /** -// * 商品类型名称 -// */ -// public void setWareTypeName(String wareTypeName) { -// this.wareTypeName = wareTypeName; -// } -// -// /** -// * 商品名称 -// */ -// public String getWareName() { -// return wareName; -// } -// -// /** -// * 商品名称 -// */ -// public void setWareName(String wareName) { -// this.wareName = wareName; -// } -// -// /** -// * 商品类型(1-单品 2-赠品套装中的主商品 3-赠品套装中的赠品 4-套装中的单品 5-套装中的赠品 6-加价购赠品 7-延保通 8-延保通赠品) -// */ -// public Integer getSkuType() { -// return skuType; -// } -// -// /** -// * 商品类型(1-单品 2-赠品套装中的主商品 3-赠品套装中的赠品 4-套装中的单品 5-套装中的赠品 6-加价购赠品 7-延保通 8-延保通赠品) -// */ -// public void setSkuType(Integer skuType) { -// this.skuType = skuType; -// } -// -// /** -// * skuType对应名称 -// */ -// public String getSkuTypeName() { -// return skuTypeName; -// } -// -// /** -// * skuType对应名称 -// */ -// public void setSkuTypeName(String skuTypeName) { -// this.skuTypeName = skuTypeName; -// } -// -// /** -// * 审核人账号 -// */ -// public String getApprovePin() { -// return approvePin; -// } -// -// /** -// * 审核人账号 -// */ -// public void setApprovePin(String approvePin) { -// this.approvePin = approvePin; -// } -// -// /** -// * 审核人姓名 -// */ -// public String getApproveName() { -// return approveName; -// } -// -// /** -// * 审核人姓名 -// */ -// public void setApproveName(String approveName) { -// this.approveName = approveName; -// } -// -// /** -// * 审核时间 -// */ -// public Date getApproveTime() { -// return approveTime; -// } -// -// /** -// * 审核时间 -// */ -// public void setApproveTime(Date approveTime) { -// this.approveTime = approveTime; -// } -// -// /** -// * 审核结果(11-直赔积分 12-直赔余额 13-直赔优惠卷 14-直赔京豆 21-直赔商品 22-上门换新 31-自营取件 32-客户送货 33-客户发货 34-闪电退款 35-虚拟退款 36-上门检测 37-客户送货至门店 38-保外维修 39-快递至门店 40-门店上门取件 80-大家电检测 81-大家电安装 82-大家电移机 83-大家电维修 84-大家电其它 85-闪电催收 86-上门维修 87-补发商品 91-退款不退货 92-预授权冻结 93-ACS换新 95-(超级体验店)门店换新 96-(超级体验店)主站换新 97-厂商维修-寄修 98-厂商维修-上门维修 99-厂商维修-送修 101-厂商大家电检测鉴定 102-厂商大家电安装 103-厂商大家电移机拆机 104-厂商大家电维修(上门维修) 105-厂商大家电拆机鉴定 106-换货 100-客户退货至团长 107-3c上门维修 108-增值服务 109-退货(筋斗云使用) 110-直赔(筋斗云使用) 111-上门检测取件) -// */ -// public Integer getApproveResult() { -// return approveResult; -// } -// -// /** -// * 审核结果(11-直赔积分 12-直赔余额 13-直赔优惠卷 14-直赔京豆 21-直赔商品 22-上门换新 31-自营取件 32-客户送货 33-客户发货 34-闪电退款 35-虚拟退款 36-上门检测 37-客户送货至门店 38-保外维修 39-快递至门店 40-门店上门取件 80-大家电检测 81-大家电安装 82-大家电移机 83-大家电维修 84-大家电其它 85-闪电催收 86-上门维修 87-补发商品 91-退款不退货 92-预授权冻结 93-ACS换新 95-(超级体验店)门店换新 96-(超级体验店)主站换新 97-厂商维修-寄修 98-厂商维修-上门维修 99-厂商维修-送修 101-厂商大家电检测鉴定 102-厂商大家电安装 103-厂商大家电移机拆机 104-厂商大家电维修(上门维修) 105-厂商大家电拆机鉴定 106-换货 100-客户退货至团长 107-3c上门维修 108-增值服务 109-退货(筋斗云使用) 110-直赔(筋斗云使用) 111-上门检测取件) -// */ -// public void setApproveResult(Integer approveResult) { -// this.approveResult = approveResult; -// } -// -// /** -// * 审核结果名称 -// */ -// public String getApproveResultName() { -// return approveResultName; -// } -// -// /** -// * 审核结果名称 -// */ -// public void setApproveResultName(String approveResultName) { -// this.approveResultName = approveResultName; -// } -// -// /** -// * 处理人账号 -// */ -// public String getProcessPin() { -// return processPin; -// } -// -// /** -// * 处理人账号 -// */ -// public void setProcessPin(String processPin) { -// this.processPin = processPin; -// } -// -// /** -// * 处理人姓名 -// */ -// public String getProcessName() { -// return processName; -// } -// -// /** -// * 处理人姓名 -// */ -// public void setProcessName(String processName) { -// this.processName = processName; -// } -// -// /** -// * 处理时间 -// */ -// public Date getProcessTime() { -// return processTime; -// } -// -// /** -// * 处理时间 -// */ -// public void setProcessTime(Date processTime) { -// this.processTime = processTime; -// } -// -// /** -// * 处理结果(0-初始化 1-安装完成 2-维修完成 3-检测完成 4-拆机完成 5-咨询解释 6-取消 70-原返 80-换货 100-赔付) -// */ -// public Integer getProcessResult() { -// return processResult; -// } -// -// /** -// * 处理结果(0-初始化 1-安装完成 2-维修完成 3-检测完成 4-拆机完成 5-咨询解释 6-取消 70-原返 80-换货 100-赔付) -// */ -// public void setProcessResult(Integer processResult) { -// this.processResult = processResult; -// } -// -// /** -// * 处理结果名称 -// */ -// public String getProcessResultName() { -// return processResultName; -// } -// -// /** -// * 处理结果名称 -// */ -// public void setProcessResultName(String processResultName) { -// this.processResultName = processResultName; -// } -// -// /** -// * 平台来源 -// */ -// public Integer getPlatformSrc() { -// return platformSrc; -// } -// -// /** -// * 平台来源 -// */ -// public void setPlatformSrc(Integer platformSrc) { -// this.platformSrc = platformSrc; -// } -// -// /** -// * 平台来源名称 -// */ -// public String getPlatformSrcName() { -// return platformSrcName; -// } -// -// /** -// * 平台来源名称 -// */ -// public void setPlatformSrcName(String platformSrcName) { -// this.platformSrcName = platformSrcName; -// } -// -// /** -// * 服务单售后数量 -// */ -// public Integer getServiceCount() { -// return serviceCount; -// } -// -// /** -// * 服务单售后数量 -// */ -// public void setServiceCount(Integer serviceCount) { -// this.serviceCount = serviceCount; -// } -// -// /** -// * 用户电话 -// */ -// public String getDesenCustomerTel() { -// return desenCustomerTel; -// } -// -// /** -// * 用户电话 -// */ -// public void setDesenCustomerTel(String desenCustomerTel) { -// this.desenCustomerTel = desenCustomerTel; -// } -// -// @Override -// public boolean equals(Object that) { -// if (this == that) { -// return true; -// } -// if (that == null) { -// return false; -// } -// if (getClass() != that.getClass()) { -// return false; -// } -// JdOrderAfter other = (JdOrderAfter) that; -// return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) -// && (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId())) -// && (this.getApplyId() == null ? other.getApplyId() == null : this.getApplyId().equals(other.getApplyId())) -// && (this.getServiceId() == null ? other.getServiceId() == null : this.getServiceId().equals(other.getServiceId())) -// && (this.getApplyTime() == null ? other.getApplyTime() == null : this.getApplyTime().equals(other.getApplyTime())) -// && (this.getCustomerExpect() == null ? other.getCustomerExpect() == null : this.getCustomerExpect().equals(other.getCustomerExpect())) -// && (this.getCustomerExpectName() == null ? other.getCustomerExpectName() == null : this.getCustomerExpectName().equals(other.getCustomerExpectName())) -// && (this.getServiceStatus() == null ? other.getServiceStatus() == null : this.getServiceStatus().equals(other.getServiceStatus())) -// && (this.getServiceStatusName() == null ? other.getServiceStatusName() == null : this.getServiceStatusName().equals(other.getServiceStatusName())) -// && (this.getCustomerPin() == null ? other.getCustomerPin() == null : this.getCustomerPin().equals(other.getCustomerPin())) -// && (this.getCustomerName() == null ? other.getCustomerName() == null : this.getCustomerName().equals(other.getCustomerName())) -// && (this.getCustomerTel() == null ? other.getCustomerTel() == null : this.getCustomerTel().equals(other.getCustomerTel())) -// && (this.getPickwareAddress() == null ? other.getPickwareAddress() == null : this.getPickwareAddress().equals(other.getPickwareAddress())) -// && (this.getPickwareType() == null ? other.getPickwareType() == null : this.getPickwareType().equals(other.getPickwareType())) -// && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) -// && (this.getOrderType() == null ? other.getOrderType() == null : this.getOrderType().equals(other.getOrderType())) -// && (this.getOrderTypeName() == null ? other.getOrderTypeName() == null : this.getOrderTypeName().equals(other.getOrderTypeName())) -// && (this.getActualPayPrice() == null ? other.getActualPayPrice() == null : this.getActualPayPrice().equals(other.getActualPayPrice())) -// && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) -// && (this.getWareType() == null ? other.getWareType() == null : this.getWareType().equals(other.getWareType())) -// && (this.getWareTypeName() == null ? other.getWareTypeName() == null : this.getWareTypeName().equals(other.getWareTypeName())) -// && (this.getWareName() == null ? other.getWareName() == null : this.getWareName().equals(other.getWareName())) -// && (this.getSkuType() == null ? other.getSkuType() == null : this.getSkuType().equals(other.getSkuType())) -// && (this.getSkuTypeName() == null ? other.getSkuTypeName() == null : this.getSkuTypeName().equals(other.getSkuTypeName())) -// && (this.getApprovePin() == null ? other.getApprovePin() == null : this.getApprovePin().equals(other.getApprovePin())) -// && (this.getApproveName() == null ? other.getApproveName() == null : this.getApproveName().equals(other.getApproveName())) -// && (this.getApproveTime() == null ? other.getApproveTime() == null : this.getApproveTime().equals(other.getApproveTime())) -// && (this.getApproveResult() == null ? other.getApproveResult() == null : this.getApproveResult().equals(other.getApproveResult())) -// && (this.getApproveResultName() == null ? other.getApproveResultName() == null : this.getApproveResultName().equals(other.getApproveResultName())) -// && (this.getProcessPin() == null ? other.getProcessPin() == null : this.getProcessPin().equals(other.getProcessPin())) -// && (this.getProcessName() == null ? other.getProcessName() == null : this.getProcessName().equals(other.getProcessName())) -// && (this.getProcessTime() == null ? other.getProcessTime() == null : this.getProcessTime().equals(other.getProcessTime())) -// && (this.getProcessResult() == null ? other.getProcessResult() == null : this.getProcessResult().equals(other.getProcessResult())) -// && (this.getProcessResultName() == null ? other.getProcessResultName() == null : this.getProcessResultName().equals(other.getProcessResultName())) -// && (this.getPlatformSrc() == null ? other.getPlatformSrc() == null : this.getPlatformSrc().equals(other.getPlatformSrc())) -// && (this.getPlatformSrcName() == null ? other.getPlatformSrcName() == null : this.getPlatformSrcName().equals(other.getPlatformSrcName())) -// && (this.getServiceCount() == null ? other.getServiceCount() == null : this.getServiceCount().equals(other.getServiceCount())) -// && (this.getDesenCustomerTel() == null ? other.getDesenCustomerTel() == null : this.getDesenCustomerTel().equals(other.getDesenCustomerTel())); -// } -// -// @Override -// public int hashCode() { -// final int prime = 31; -// int result = 1; -// result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); -// result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode()); -// result = prime * result + ((getApplyId() == null) ? 0 : getApplyId().hashCode()); -// result = prime * result + ((getServiceId() == null) ? 0 : getServiceId().hashCode()); -// result = prime * result + ((getApplyTime() == null) ? 0 : getApplyTime().hashCode()); -// result = prime * result + ((getCustomerExpect() == null) ? 0 : getCustomerExpect().hashCode()); -// result = prime * result + ((getCustomerExpectName() == null) ? 0 : getCustomerExpectName().hashCode()); -// result = prime * result + ((getServiceStatus() == null) ? 0 : getServiceStatus().hashCode()); -// result = prime * result + ((getServiceStatusName() == null) ? 0 : getServiceStatusName().hashCode()); -// result = prime * result + ((getCustomerPin() == null) ? 0 : getCustomerPin().hashCode()); -// result = prime * result + ((getCustomerName() == null) ? 0 : getCustomerName().hashCode()); -// result = prime * result + ((getCustomerTel() == null) ? 0 : getCustomerTel().hashCode()); -// result = prime * result + ((getPickwareAddress() == null) ? 0 : getPickwareAddress().hashCode()); -// result = prime * result + ((getPickwareType() == null) ? 0 : getPickwareType().hashCode()); -// result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); -// result = prime * result + ((getOrderType() == null) ? 0 : getOrderType().hashCode()); -// result = prime * result + ((getOrderTypeName() == null) ? 0 : getOrderTypeName().hashCode()); -// result = prime * result + ((getActualPayPrice() == null) ? 0 : getActualPayPrice().hashCode()); -// result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); -// result = prime * result + ((getWareType() == null) ? 0 : getWareType().hashCode()); -// result = prime * result + ((getWareTypeName() == null) ? 0 : getWareTypeName().hashCode()); -// result = prime * result + ((getWareName() == null) ? 0 : getWareName().hashCode()); -// result = prime * result + ((getSkuType() == null) ? 0 : getSkuType().hashCode()); -// result = prime * result + ((getSkuTypeName() == null) ? 0 : getSkuTypeName().hashCode()); -// result = prime * result + ((getApprovePin() == null) ? 0 : getApprovePin().hashCode()); -// result = prime * result + ((getApproveName() == null) ? 0 : getApproveName().hashCode()); -// result = prime * result + ((getApproveTime() == null) ? 0 : getApproveTime().hashCode()); -// result = prime * result + ((getApproveResult() == null) ? 0 : getApproveResult().hashCode()); -// result = prime * result + ((getApproveResultName() == null) ? 0 : getApproveResultName().hashCode()); -// result = prime * result + ((getProcessPin() == null) ? 0 : getProcessPin().hashCode()); -// result = prime * result + ((getProcessName() == null) ? 0 : getProcessName().hashCode()); -// result = prime * result + ((getProcessTime() == null) ? 0 : getProcessTime().hashCode()); -// result = prime * result + ((getProcessResult() == null) ? 0 : getProcessResult().hashCode()); -// result = prime * result + ((getProcessResultName() == null) ? 0 : getProcessResultName().hashCode()); -// result = prime * result + ((getPlatformSrc() == null) ? 0 : getPlatformSrc().hashCode()); -// result = prime * result + ((getPlatformSrcName() == null) ? 0 : getPlatformSrcName().hashCode()); -// result = prime * result + ((getServiceCount() == null) ? 0 : getServiceCount().hashCode()); -// result = prime * result + ((getDesenCustomerTel() == null) ? 0 : getDesenCustomerTel().hashCode()); -// return result; -// } -// -// @Override -// public String toString() { -// StringBuilder sb = new StringBuilder(); -// sb.append(getClass().getSimpleName()); -// sb.append(" ["); -// sb.append("Hash = ").append(hashCode()); -// sb.append(", id=").append(id); -// sb.append(", shopId=").append(shopId); -// sb.append(", applyId=").append(applyId); -// sb.append(", serviceId=").append(serviceId); -// sb.append(", applyTime=").append(applyTime); -// sb.append(", customerExpect=").append(customerExpect); -// sb.append(", customerExpectName=").append(customerExpectName); -// sb.append(", serviceStatus=").append(serviceStatus); -// sb.append(", serviceStatusName=").append(serviceStatusName); -// sb.append(", customerPin=").append(customerPin); -// sb.append(", customerName=").append(customerName); -// sb.append(", customerTel=").append(customerTel); -// sb.append(", pickwareAddress=").append(pickwareAddress); -// sb.append(", pickwareType=").append(pickwareType); -// sb.append(", orderId=").append(orderId); -// sb.append(", orderType=").append(orderType); -// sb.append(", orderTypeName=").append(orderTypeName); -// sb.append(", actualPayPrice=").append(actualPayPrice); -// sb.append(", skuId=").append(skuId); -// sb.append(", wareType=").append(wareType); -// sb.append(", wareTypeName=").append(wareTypeName); -// sb.append(", wareName=").append(wareName); -// sb.append(", skuType=").append(skuType); -// sb.append(", skuTypeName=").append(skuTypeName); -// sb.append(", approvePin=").append(approvePin); -// sb.append(", approveName=").append(approveName); -// sb.append(", approveTime=").append(approveTime); -// sb.append(", approveResult=").append(approveResult); -// sb.append(", approveResultName=").append(approveResultName); -// sb.append(", processPin=").append(processPin); -// sb.append(", processName=").append(processName); -// sb.append(", processTime=").append(processTime); -// sb.append(", processResult=").append(processResult); -// sb.append(", processResultName=").append(processResultName); -// sb.append(", platformSrc=").append(platformSrc); -// sb.append(", platformSrcName=").append(platformSrcName); -// sb.append(", serviceCount=").append(serviceCount); -// sb.append(", desenCustomerTel=").append(desenCustomerTel); -// sb.append(", serialVersionUID=").append(serialVersionUID); -// sb.append("]"); -// return sb.toString(); -// } -//} \ No newline at end of file diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java deleted file mode 100644 index 584c8521..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.qihangerp.module.open.jd.domain; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * - * @TableName jd_vc_goods - */ -@TableName("oms_jd_vc_goods") -@Data -public class JdVcGoods implements Serializable { - /** - * - */ - private String id; - - /** - * 商品编号 - */ - private String wareId; - - /** - * 商品名称 - */ - private String wareName; - - /** - * 上下柜状态0，1，2 - */ - private Integer saleState; - - /** - * 修改时间 - */ - private Date modifyTime; - - /** - * 是否有主图 - */ - private Integer isPrimary; - - /** - * 是否盖亚 0:非盖亚 1：盖亚 - */ - private Integer isGaea; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 修改时间 - */ - private Date updateTime; - - /** - * 商品id(o_goods外键) - */ - private String oGoodsId; - - /** - * 商品skuid(o_goods_sku外键) - */ - private String oGoodsSkuId; - - /** - * 店铺id - */ - private Long shopId; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java deleted file mode 100644 index bc0a8847..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java +++ /dev/null @@ -1,217 +0,0 @@ -package cn.qihangerp.module.open.jd.domain; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * - * @TableName jd_vc_order - */ -@TableName("oms_jd_vc_order") -@Data -public class JdVcOrder implements Serializable { - /** - * - */ - private Long id; - - /** - * 客单编号 - */ - private Long customOrderId; - - /** - * 支付金额 - */ - private BigDecimal pay; - - /** - * 操作状态:5 新订单；10等待发货；16发货完成 - */ - private Integer operatorState; - - /** - * 订单状态:7 新订单；10等待发货；16等待确认收货；19订单完成；22锁定，29删除 - */ - private Integer orderState; - - /** - * 收货人姓名 - */ - private String consigneeName; - - /** - * 固定电话 - */ - private String telephone; - - /** - * 手机号码 - */ - private String phone; - - /** - * 收货地址 - */ - private String address; - - /** - * 订单备注 - */ - private String orderRemark; - - /** - * 订购日期/订单生成时间 - */ - private Date orderCreateDate; - - /** - * 支付分类: COD, NON_COD - */ - private String paymentCategory; - - /** - * 支付分类名称: 货到付款, 在线支付 - */ - private String paymentCategoryDispName; - - /** - * 创建日期 - */ - private Date createDate; - - /** - * 下单账号 - */ - private String pin; - - /** - * 退款标识 - */ - private Integer refundSourceFlag; - - /** - * 省份id - */ - private Integer provinceId; - - /** - * 省份名称 - */ - private String provinceName; - - /** - * 市id - */ - private Integer cityId; - - /** - * 市名称 - */ - private String cityName; - - /** - * 县id - */ - private Integer countyId; - - /** - * 县名称 - */ - private String countyName; - - /** - * 镇id - */ - private Integer townId; - - /** - * 镇名称 - */ - private String townName; - - /** - * 厂商备注 - */ - private String memoByVendor; - - /** - * 父单号 - */ - private Long parentOrderId; - - /** - * 商品编号 - */ - private String sku; - - /** - * 商品名称 - */ - private String commodityName; - - /** - * 商品数量 - */ - private Integer commodityNum; - - /** - * 京东价 - */ - private BigDecimal jdPrice; - - /** - * 优惠价 - */ - private BigDecimal discount; - - /** - * 优惠金额 - */ - private BigDecimal reduceCount; - - /** - * 总运费 - */ - private BigDecimal totalCarriage; - - /** - * 采购价 - */ - private BigDecimal cost; - - /** - * 品牌名称 - */ - private String branchName; - - /** - * 更新时间 - */ - private Long updateDate; - - /** - * 店铺id - */ - private Long shopId; - - /** - * 系统创建时间 - */ - private Date createTime; - - /** - * 系统更新时间 - */ - private Date updateTime; - - @TableField(exist = false) - private List items; - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java deleted file mode 100644 index a01c9117..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.qihangerp.module.open.jd.domain; - -import java.io.Serializable; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * - * @TableName jd_vc_order_item - */ -@TableName("oms_jd_vc_order_item") -@Data -public class JdVcOrderItem implements Serializable { - /** - * - */ - private Long id; - - /** - * 外键id - */ - private Long jdVcOrderId; - - /** - * 客单编号 - */ - private Long customOrderId; - - /** - * 京东商品编码 - */ - private String sku; - - /** - * 商品名称 - */ - private String wareName; - - /** - * 商品UPC编码 - */ - private String upc; - - /** - * 商品数量 - */ - private Integer wareNum; - - /** - * 京东价 - */ - private BigDecimal jdPrice; - - /** - * 优惠价 - */ - private BigDecimal discount; - - /** - * 采购价 - */ - private BigDecimal cost; - - /** - * 采购单号 - */ - private String poId; - - /** - * 退货单号 - */ - private String roId; - - /** - * erp商品id - */ - private String oGoodsId; - - /** - * erp商品sku id - */ - private String oGoodsSkuId; - - private static final long serialVersionUID = 1L; -} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java deleted file mode 100644 index 1c12a04c..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java +++ /dev/null @@ -1,220 +0,0 @@ -//package cn.qihangerp.jd.domain; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -//import java.util.Date; -//import java.util.List; -// -//import com.baomidou.mybatisplus.annotation.TableField; -//import lombok.Data; -// -///** -// * 京东自营采购订单表 -// * @TableName jd_vc_purchase_order -// */ -//@Data -//public class JdVcPurchaseOrder implements Serializable { -// /** -// * -// */ -// private Long id; -// -// /** -// * 采购单号 -// */ -// private Long orderId; -// -// /** -// * 顾客单号（只有EPT采购单才有） -// */ -// private Long customOrderId; -// -// /** -// * 订购时间 -// */ -// private Date createdDate; -// -// /** -// * 供应商简码 -// */ -// private String providerCode; -// -// /** -// * 供应商名称 -// */ -// private String providerName; -// -// /** -// * 采购总金额 -// */ -// private BigDecimal totalPrice; -// -// /** -// * 配送中心ID（订购城市ID） -// */ -// private Integer deliverCenterId; -// -// /** -// * 配送中心名称（订购城市名称） -// */ -// private String deliverCenterName; -// -// /** -// * 采购员姓名 -// */ -// private String purchaserName; -// -// /** -// * 采购员京东ERP账号 -// */ -// private String purchaserErpCode; -// -// /** -// * 删除状态ID:未删除 -// */ -// private Integer status; -// -// /** -// * 删除状态名称 -// */ -// private String statusName; -// -// /** -// * 是否EPT定制(true:是;false:不是) -// */ -// private String isEptCustomized; -// -// /** -// * 订单状态3：订单完成 -// */ -// private Integer state; -// -// /** -// * 订单状态名称 -// */ -// private String stateName; -// -// /** -// * 完成日期（订单完成后取updateDate，否则为空） -// */ -// private Date completeDate; -// -// /** -// * 更新时间 -// */ -// private Date updateDate; -// -// /** -// * 账期 -// */ -// private Integer accountPeriod; -// -// /** -// * 收货负责人 -// */ -// private String receiverName; -// -// /** -// * 收货电话 -// */ -// private String warehousePhone; -// -// /** -// * 详细地址 -// */ -// private String address; -// -// /** -// * 采购类型 -// */ -// private Integer orderType; -// -// /** -// * 采购类型名称 -// */ -// private String orderTypeName; -// -// /** -// * 订单属性 -// */ -// private Integer orderAttribute; -// -// /** -// * 订单属性名称 -// */ -// private String orderAttributeName; -// -// /** -// * 回告状态ID：回告成功 -// */ -// private Integer confirmState; -// -// /** -// * 回告状态名称 -// */ -// private String confirmStateName; -// -// /** -// * 品总数量（sku为维度） -// */ -// private Integer wareVariety; -// -// /** -// * 预计到货时间 -// */ -// private Date deliveryTime; -// -// /** -// * 是否可回告（true:可回告;false:不可回告） -// */ -// private Boolean isCanConfirm; -// -// /** -// * 是否有差异（0 表示存在差异 ） -// */ -// private Integer isExistActualNumDif; -// -// /** -// * 是否已结算（true:是;false:否） -// */ -// private Boolean balanceStatus; -// -// /** -// * 入库时间 -// */ -// private Date storageTime; -// -// /** -// * TC转运标识：0:否,1:是 -// */ -// private Integer tcFlag; -// -// /** -// * TC转运标识显示 -// */ -// private String tcFlagName; -// -// /** -// * 预约时间 -// */ -// private Date bookTime; -// -// /** -// * 店铺id -// */ -// private Long shopId; -// -// /** -// * 系统创建时间 -// */ -// private Date createTime; -// -// /** -// * 系统更新时间 -// */ -// private Date updateTime; -// -// @TableField(exist = false) -// private List items; -// private static final long serialVersionUID = 1L; -//} \ No newline at end of file diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java deleted file mode 100644 index c7442581..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java +++ /dev/null @@ -1,90 +0,0 @@ -//package cn.qihangerp.jd.domain; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -// -//import lombok.Data; -// -///** -// * 京东自营采购订单明细表 -// * @TableName jd_vc_purchase_order_item -// */ -//@Data -//public class JdVcPurchaseOrderItem implements Serializable { -// /** -// * -// */ -// private Long id; -// -// /** -// * 采购单号 -// */ -// private Long orderId; -// -// /** -// * 商品编号 -// */ -// private Long wareId; -// -// /** -// * 商品名称 -// */ -// private String wareName; -// -// /** -// * 采购价，单位元 -// */ -// private BigDecimal purchasePrice; -// -// /** -// * 原始采购数量 -// */ -// private Integer originalNum; -// -// /** -// * 回告数量或者采购数量 -// */ -// private Integer confirmNum; -// -// /** -// * 实收数量 -// */ -// private Integer actualNum; -// -// /** -// * 不满足原因（适用于非图书的） -// */ -// private String nonDeliveryReason; -// -// /** -// * 采购总金额，单位元 -// */ -// private BigDecimal totoalPrice; -// -// /** -// * 备注 -// */ -// private String remark; -// -// /** -// * 库房ID -// */ -// private Integer storeId; -// -// /** -// * 亚洲一号小件库 -// */ -// private String storeName; -// -// /** -// * 配送中心ID（配送机构） -// */ -// private Integer deliverCenterId; -// -// /** -// * 配送中心名称 -// */ -// private String deliverCenterName; -// -// private static final long serialVersionUID = 1L; -//} \ No newline at end of file diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java deleted file mode 100644 index e97f12ec..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java +++ /dev/null @@ -1,138 +0,0 @@ -package cn.qihangerp.module.open.jd.domain; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * 京东自营退款表 - * @TableName jd_vc_refund - */ -@TableName("oms_jd_vc_refund") -@Data -public class JdVcRefund implements Serializable { - /** - * 售前退款数据唯一标示 - */ - private Long id; - - /** - * 客户订单号 - */ - private Long customOrderId; - - /** - * 退款申请金额 - */ - private BigDecimal roApplyFee; - - /** - * 退款申请时间 - */ - private Date roApplyDate; - - /** - * 订单生成时间 - */ - private Date orderCreateDate; - - /** - * 退款状态更新时间 - */ - private Date modifiedDate; - - /** - * 审核状态0未审核 1审核通过 2审核不通过 - */ - private Integer approvalState; - - /** - * 订单状态orderState 7 新订单 10等待发货 16等待确认收货 19订单完成 22锁定 29删除 - */ - private Integer orderState; - - /** - * 操作状态 operatorState 5 新订单 10等待发货 16发货完成 - */ - private Integer operatorState; - - /** - * 申请单号 - */ - private Long roPreNo; - - /** - * 退款申请账户 - */ - private String roAccount; - - /** - * 退款申请理由 - */ - private String roReason; - - /** - * 审核意见 - */ - private String approvalSuggestion; - - /** - * 仓id - */ - private Integer vendorStoreId; - - /** - * 仓名称 - */ - private String vendorStoreName; - - /** - * 返回商品结果集合JSON - */ - private String orderDetailList; - - /** - * 商品编码 - */ - private String skuId; - - /** - * 商品名称 - */ - private String commodityName; - - /** - * 退货数量 - */ - private Integer commodityNum; - - /** - * 店铺id - */ - private Long shopId; - - /** - * 系统创建时间 - */ - private Date createTime; - - /** - * 系统更新时间 - */ - private Date updateTime; - - /** - * 商品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/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java deleted file mode 100644 index 901aae3d..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.qihangerp.module.open.jd.domain.bo; - -import lombok.Data; - -@Data -public class JdVcRefundBo { - private Integer shopId; - private String id; - private String customOrderId; - private Integer customerExpect;//11仅退款10退货退款 -} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java deleted file mode 100644 index 31fc21f8..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -//package cn.qihangerp.jd.mapper; -// -//import cn.qihangerp.jd.domain.JdOrderAfter; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -//* @author qilip -//* @description 针对表【jd_order_after(京东售后)】的数据库操作Mapper -//* @createDate 2024-03-10 18:37:36 -//* @Entity cn.qihangerp.jd.domain.JdOrderAfter -//*/ -//public interface JdOrderAfterMapper extends BaseMapper { -// -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java deleted file mode 100644 index 0124d776..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.qihangerp.module.open.jd.mapper; - - -import cn.qihangerp.module.open.jd.domain.JdVcGoods; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author TW -* @description 针对表【jd_vc_goods】的数据库操作Mapper -* @createDate 2024-05-25 15:31:46 -* @Entity cn.qihangerp.jd.domain.JdVcGoods -*/ -public interface JdVcGoodsMapper extends BaseMapper { - -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java deleted file mode 100644 index 472ec788..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.qihangerp.module.open.jd.mapper; - - -import cn.qihangerp.module.open.jd.domain.JdVcOrderItem; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author TW - * @description 针对表【jd_vc_order_item】的数据库操作Mapper - * @createDate 2024-05-25 17:18:39 - * @Entity cn.qihangerp.jd.domain.JdVcOrderItem - */ -public interface JdVcOrderItemMapper extends BaseMapper { - -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java deleted file mode 100644 index d8618cd6..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.qihangerp.module.open.jd.mapper; - - -import cn.qihangerp.module.open.jd.domain.JdVcOrder; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author TW - * @description 针对表【jd_vc_order】的数据库操作Mapper - * @createDate 2024-05-25 17:19:21 - * @Entity cn.qihangerp.jd.domain.JdVcOrder - */ -public interface JdVcOrderMapper extends BaseMapper { - -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java deleted file mode 100644 index a1f1091c..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -//package cn.qihangerp.jd.mapper; -// -//import cn.qihangerp.jd.domain.JdVcPurchaseOrderItem; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -//* @author TW -//* @description 针对表【jd_vc_purchase_order_item(京东自营采购订单明细表)】的数据库操作Mapper -//* @createDate 2024-05-29 15:43:05 -//* @Entity cn.qihangerp.jd.domain.JdVcPurchaseOrderItem -//*/ -//public interface JdVcPurchaseOrderItemMapper extends BaseMapper { -// -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java deleted file mode 100644 index 4311aab2..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -//package cn.qihangerp.jd.mapper; -// -//import cn.qihangerp.jd.domain.JdVcPurchaseOrder; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -//* @author TW -//* @description 针对表【jd_vc_purchase_order(京东自营采购订单表)】的数据库操作Mapper -//* @createDate 2024-05-29 15:43:05 -//* @Entity cn.qihangerp.jd.domain.JdVcPurchaseOrder -//*/ -//public interface JdVcPurchaseOrderMapper extends BaseMapper { -// -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java deleted file mode 100644 index 340ef2ed..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.qihangerp.module.open.jd.mapper; - - -import cn.qihangerp.module.open.jd.domain.JdVcRefund; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author TW -* @description 针对表【jd_vc_refund(京东自营退款表)】的数据库操作Mapper -* @createDate 2024-05-31 15:25:05 -* @Entity cn.qihangerp.jd.domain.JdVcRefund -*/ -public interface JdVcRefundMapper extends BaseMapper { - -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java deleted file mode 100644 index e09af94a..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -//package cn.qihangerp.jd.mapper; -// -//import cn.qihangerp.jd.domain.JdVcReturnItem; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -//* @author TW -//* @description 针对表【jd_vc_return_item】的数据库操作Mapper -//* @createDate 2024-05-29 15:43:05 -//* @Entity cn.qihangerp.jd.domain.JdVcReturnItem -//*/ -//public interface JdVcReturnItemMapper extends BaseMapper { -// -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java deleted file mode 100644 index ffbee930..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -//package cn.qihangerp.jd.mapper; -// -//import cn.qihangerp.jd.domain.JdVcReturn; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -//* @author TW -//* @description 针对表【jd_vc_return】的数据库操作Mapper -//* @createDate 2024-05-29 15:43:05 -//* @Entity cn.qihangerp.jd.domain.JdVcReturn -//*/ -//public interface JdVcReturnMapper extends BaseMapper { -// -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java deleted file mode 100644 index 17f5a2cb..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java +++ /dev/null @@ -1,19 +0,0 @@ -//package cn.qihangerp.open.jd.service; -// -//import cn.qihangerp.common.PageQuery; -//import cn.qihangerp.common.PageResult; -//import cn.qihangerp.common.ResultVo; -//import cn.qihangerp.open.jd.domain.JdOrderAfter; -//import com.baomidou.mybatisplus.extension.service.IService; -//import cn.qihangerp.open.jd.domain.bo.JdAfterBo; -// -///** -//* @author qilip -//* @description 针对表【jd_order_after(京东售后)】的数据库操作Service -//* @createDate 2024-03-10 18:37:36 -//*/ -//public interface JdOrderAfterService extends IService { -// PageResult queryPageList(JdAfterBo bo, PageQuery pageQuery); -// ResultVo saveAfter(Integer shopId,JdOrderAfter after); -// ResultVo updateAfterStatusByServiceId(JdOrderAfter after); -//} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java deleted file mode 100644 index d767aed6..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.qihangerp.module.open.jd.service; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.jd.domain.JdVcGoods; -import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【jd_vc_goods】的数据库操作Service -* @createDate 2024-05-25 15:31:46 -*/ -public interface JdVcGoodsService extends IService { - - PageResult queryPageList(JdGoodsBo bo, PageQuery pageQuery); - ResultVo saveGoods(Long shopId, JdVcGoods goods); -} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java deleted file mode 100644 index dd48985b..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.qihangerp.module.open.jd.service; - -import cn.qihangerp.module.open.jd.domain.JdVcOrderItem; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author TW - * @description 针对表【jd_vc_order_item】的数据库操作Service - * @createDate 2024-05-25 17:18:39 - */ -public interface JdVcOrderItemService extends IService { - -} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java deleted file mode 100644 index 6615e3b6..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.qihangerp.module.open.jd.service; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.jd.domain.JdVcOrder; -import cn.qihangerp.module.open.jd.domain.bo.JdOrderBo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author TW - * @description 针对表【jd_vc_order】的数据库操作Service - * @createDate 2024-05-25 17:19:21 - */ -public interface JdVcOrderService extends IService { - PageResult queryPageList(JdOrderBo bo, PageQuery pageQuery); - ResultVo saveOrder(Long shopId, JdVcOrder order); - JdVcOrder queryDetailByOrderId(Long customOrderId); -} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java deleted file mode 100644 index 17b1bd07..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java +++ /dev/null @@ -1,13 +0,0 @@ -//package cn.qihangerp.open.jd.service; -// -//import cn.qihangerp.open.jd.domain.JdVcPurchaseOrderItem; -//import com.baomidou.mybatisplus.extension.service.IService; -// -///** -//* @author TW -//* @description 针对表【jd_vc_purchase_order_item(京东自营采购订单明细表)】的数据库操作Service -//* @createDate 2024-05-29 15:43:05 -//*/ -//public interface JdVcPurchaseOrderItemService extends IService { -// -//} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java deleted file mode 100644 index eba9f3e9..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java +++ /dev/null @@ -1,18 +0,0 @@ -//package cn.qihangerp.open.jd.service; -// -//import cn.qihangerp.common.PageQuery; -//import cn.qihangerp.common.PageResult; -//import cn.qihangerp.common.ResultVo; -//import cn.qihangerp.open.jd.domain.JdVcPurchaseOrder; -//import com.baomidou.mybatisplus.extension.service.IService; -//import cn.qihangerp.open.jd.domain.bo.JdOrderBo; -// -///** -//* @author TW -//* @description 针对表【jd_vc_purchase_order(京东自营采购订单表)】的数据库操作Service -//* @createDate 2024-05-29 15:43:05 -//*/ -//public interface JdVcPurchaseOrderService extends IService { -// PageResult queryPageList(JdOrderBo bo, PageQuery pageQuery); -// ResultVo saveOrder(Long shopId, JdVcPurchaseOrder order); -//} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java deleted file mode 100644 index 0fd7cd7b..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.qihangerp.module.open.jd.service; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.jd.domain.JdVcRefund; -import cn.qihangerp.module.open.jd.domain.bo.JdVcRefundBo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【jd_vc_refund(京东自营退款表)】的数据库操作Service -* @createDate 2024-05-31 15:25:05 -*/ -public interface JdVcRefundService extends IService { - PageResult queryPageList(JdVcRefundBo bo, PageQuery pageQuery); - - ResultVo saveRefund(Long shopId, JdVcRefund jdVcRefund); -} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java deleted file mode 100644 index 84f7ae53..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java +++ /dev/null @@ -1,13 +0,0 @@ -//package cn.qihangerp.open.jd.service; -// -//import cn.qihangerp.open.jd.domain.JdVcReturnItem; -//import com.baomidou.mybatisplus.extension.service.IService; -// -///** -//* @author TW -//* @description 针对表【jd_vc_return_item】的数据库操作Service -//* @createDate 2024-05-29 15:43:05 -//*/ -//public interface JdVcReturnItemService extends IService { -// -//} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java deleted file mode 100644 index 5b2f8176..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java +++ /dev/null @@ -1,19 +0,0 @@ -//package cn.qihangerp.open.jd.service; -// -//import cn.qihangerp.common.PageQuery; -//import cn.qihangerp.common.PageResult; -//import cn.qihangerp.common.ResultVo; -//import cn.qihangerp.open.jd.domain.JdVcReturn; -//import com.baomidou.mybatisplus.extension.service.IService; -//import cn.qihangerp.open.jd.domain.bo.JdVcRefundBo; -// -///** -//* @author TW -//* @description 针对表【jd_vc_return】的数据库操作Service -//* @createDate 2024-05-29 15:43:05 -//*/ -//public interface JdVcReturnService extends IService { -// PageResult queryPageList(JdVcRefundBo bo, PageQuery pageQuery); -// -// ResultVo saveReturn(Integer shopId, JdVcReturn jdVcReturn); -//} diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java deleted file mode 100644 index bb47658d..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -//package cn.qihangerp.open.jd.service.impl; -// -//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.common.PageQuery; -//import cn.qihangerp.common.PageResult; -//import cn.qihangerp.common.ResultVo; -//import cn.qihangerp.common.ResultVoEnum; -//import cn.qihangerp.open.jd.domain.JdOrderAfter; -//import cn.qihangerp.open.jd.domain.bo.JdAfterBo; -//import cn.qihangerp.open.jd.service.JdOrderAfterService; -//import cn.qihangerp.open.jd.mapper.JdOrderAfterMapper; -//import lombok.AllArgsConstructor; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.interceptor.TransactionAspectSupport; -// -//import java.util.List; -// -///** -//* @author qilip -//* @description 针对表【jd_order_after(京东售后)】的数据库操作Service实现 -//* @createDate 2024-03-10 18:37:36 -//*/ -//@AllArgsConstructor -//@Service -//public class JdOrderAfterServiceImpl extends ServiceImpl -// implements JdOrderAfterService{ -// private final JdOrderAfterMapper mapper; -// -// @Override -// public PageResult queryPageList(JdAfterBo bo, PageQuery pageQuery) { -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() -// .eq(bo.getShopId()!=null,JdOrderAfter::getShopId,bo.getShopId()); -// -// Page page = mapper.selectPage(pageQuery.build(), queryWrapper); -// -// return PageResult.build(page); -// } -// -// @Override -// public ResultVo saveAfter(Integer shopId, JdOrderAfter after) { -// try { -// List jdOrderAfters = mapper.selectList(new LambdaQueryWrapper().eq(JdOrderAfter::getApplyId, after.getApplyId())); -// if (jdOrderAfters != null && jdOrderAfters.size() > 0) { -// // 存在，修改 -// JdOrderAfter update = new JdOrderAfter(); -// update.setId(jdOrderAfters.get(0).getId()); -// update.setServiceStatus(after.getServiceStatus()); -// update.setServiceStatusName(after.getServiceStatusName()); -// update.setApprovePin(after.getApprovePin()); -// update.setApproveName(after.getApproveName()); -// update.setApproveTime(after.getApproveTime()); -// update.setApproveResult(after.getApproveResult()); -// update.setApproveResultName(after.getApproveResultName()); -// update.setProcessPin(after.getProcessPin()); -// update.setProcessName(after.getProcessName()); -// update.setProcessTime(after.getProcessTime()); -// update.setProcessResult(after.getProcessResult()); -// update.setProcessResultName(after.getProcessResultName()); -// mapper.updateById(update); -// return ResultVo.error(ResultVoEnum.DataExist, "退款已经存在，更新成功"); -// } else { -// // 新增 -// after.setShopId(shopId); -// mapper.insert(after); -// return ResultVo.success(); -// } -// -// } catch (Exception e) { -// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); -// return ResultVo.error(ResultVoEnum.SystemException, "系统异常：" + e.getMessage()); -// } -// } -// -// @Override -// public ResultVo updateAfterStatusByServiceId(JdOrderAfter after) { -// List jdOrderAfters = mapper.selectList(new LambdaQueryWrapper().eq(JdOrderAfter::getServiceId, after.getServiceId())); -// if (jdOrderAfters != null && jdOrderAfters.size() > 0) { -// // 存在，修改 -// JdOrderAfter update = new JdOrderAfter(); -// update.setId(jdOrderAfters.get(0).getId()); -// update.setServiceStatus(after.getServiceStatus()); -// mapper.updateById(update); -// return ResultVo.success(update.getId()); -// } -// return ResultVo.error(ResultVoEnum.NotFound, "没有找到退款数据"); -// } -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java deleted file mode 100644 index 26a5cd68..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.qihangerp.module.open.jd.service.impl; - -import cn.qihangerp.module.open.jd.domain.JdVcGoods; -import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; -import cn.qihangerp.module.open.jd.mapper.JdVcGoodsMapper; -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.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.jd.service.JdVcGoodsService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** -* @author TW -* @description 针对表【jd_vc_goods】的数据库操作Service实现 -* @createDate 2024-05-25 15:31:46 -*/ -@AllArgsConstructor -@Service -public class JdVcGoodsServiceImpl extends ServiceImpl - implements JdVcGoodsService{ - private final JdVcGoodsMapper mapper; - - @Override - public PageResult queryPageList(JdGoodsBo bo, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(bo.getWareId() != null, JdVcGoods::getWareId, bo.getWareId()) - .eq(bo.getShopId() != null, JdVcGoods::getShopId, bo.getShopId()) - .eq(bo.getSaleState() != null, JdVcGoods::getSaleState, bo.getSaleState()) - .eq(bo.getHasLink() != null && bo.getHasLink() == 0, JdVcGoods::getOGoodsSkuId, 0) - .gt(bo.getHasLink() != null && bo.getHasLink() == 1, JdVcGoods::getOGoodsSkuId, 0); - - Page goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); - return PageResult.build(goodsPage); - } - - @Transactional - @Override - public ResultVo saveGoods(Long shopId, JdVcGoods goods) { - List jdVcGoods = mapper.selectList(new LambdaQueryWrapper().eq(JdVcGoods::getWareId, goods.getWareId())); - if(jdVcGoods== null || jdVcGoods.size()==0){ - // 新增 - goods.setShopId(shopId); - goods.setOGoodsId("0"); - goods.setOGoodsSkuId("0"); - goods.setCreateTime(new Date()); - mapper.insert(goods); - }else{ - // 修改 - goods.setId(jdVcGoods.get(0).getId()); - goods.setUpdateTime(new Date()); - mapper.updateById(goods); - } - return ResultVo.success(); - } -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java deleted file mode 100644 index 275b34a4..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.qihangerp.module.open.jd.service.impl; - -import cn.qihangerp.module.open.jd.mapper.JdVcOrderItemMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.open.jd.domain.JdVcOrderItem; -import cn.qihangerp.module.open.jd.service.JdVcOrderItemService; -import org.springframework.stereotype.Service; - -/** - * @author TW - * @description 针对表【jd_vc_order_item】的数据库操作Service实现 - * @createDate 2024-05-25 17:18:39 - */ -@Service -public class JdVcOrderItemServiceImpl extends ServiceImpl - implements JdVcOrderItemService{ - -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java deleted file mode 100644 index 79ca280e..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java +++ /dev/null @@ -1,170 +0,0 @@ -package cn.qihangerp.module.open.jd.service.impl; - -import cn.qihangerp.module.open.jd.domain.JdVcGoods; -import cn.qihangerp.module.open.jd.domain.JdVcOrder; -import cn.qihangerp.module.open.jd.domain.JdVcOrderItem; -import cn.qihangerp.module.open.jd.domain.bo.JdOrderBo; -import cn.qihangerp.module.open.jd.mapper.JdVcGoodsMapper; -import cn.qihangerp.module.open.jd.mapper.JdVcOrderItemMapper; -import cn.qihangerp.module.open.jd.mapper.JdVcOrderMapper; -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.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.module.open.jd.service.JdVcOrderService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.interceptor.TransactionAspectSupport; -import org.springframework.util.StringUtils; - -import java.util.Date; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * @author TW - * @description 针对表【jd_vc_order】的数据库操作Service实现 - * @createDate 2024-05-25 17:19:21 - */ -@AllArgsConstructor -@Service -public class JdVcOrderServiceImpl extends ServiceImpl - implements JdVcOrderService{ - private final JdVcOrderMapper mapper; - private final JdVcOrderItemMapper itemMapper; - private final JdVcGoodsMapper jdVcGoodsMapper; - - private final String DATE_PATTERN = - "^(?:(?:(?:\\d{4}-(?:0?[1-9]|1[0-2])-(?:0?[1-9]|1\\d|2[0-8]))|(?:(?:(?:\\d{2}(?:0[48]|[2468][048]|[13579][26])|(?:(?:0[48]|[2468][048]|[13579][26])00))-0?2-29))$)|(?:(?:(?:\\d{4}-(?:0?[13578]|1[02]))-(?:0?[1-9]|[12]\\d|30))$)|(?:(?:(?:\\d{4}-0?[13-9]|1[0-2])-(?:0?[1-9]|[1-2]\\d|30))$)|(?:(?:(?:\\d{2}(?:0[48]|[13579][26]|[2468][048])|(?:(?:0[48]|[13579][26]|[2468][048])00))-0?2-29))$)$"; - private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); - @Override - public PageResult queryPageList(JdOrderBo bo, PageQuery pageQuery) { - if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){ - Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime()); - boolean b = matcher.find(); - if(b){ - bo.setStartTime(bo.getStartTime()+" 00:00:00"); - } - } - if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){ - Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime()); - boolean b = matcher.find(); - if(b){ - bo.setEndTime(bo.getEndTime()+" 23:59:59"); - } - } - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(bo.getShopId()!=null,JdVcOrder::getShopId,bo.getShopId()) - .eq(StringUtils.hasText(bo.getOrderId()),JdVcOrder::getCustomOrderId,bo.getOrderId()) - .eq(StringUtils.hasText(bo.getOrderState()),JdVcOrder::getOrderState,bo.getOrderState()) - .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),JdVcOrder::getOrderCreateDate,bo.getStartTime()) - .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),JdVcOrder::getOrderCreateDate,bo.getEndTime()) - ; - - pageQuery.setOrderByColumn("order_create_date"); - pageQuery.setIsAsc("desc"); - Page taoGoodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); - if(taoGoodsPage.getRecords()!=null){ - for (var order:taoGoodsPage.getRecords()) { - order.setItems(itemMapper.selectList(new LambdaQueryWrapper().eq(JdVcOrderItem::getJdVcOrderId,order.getId()))); - } - } - return PageResult.build(taoGoodsPage); - } - - @Transactional - @Override - public ResultVo saveOrder(Long shopId, JdVcOrder order) { - try { - List jdOrders = mapper.selectList(new LambdaQueryWrapper().eq(JdVcOrder::getCustomOrderId, order.getCustomOrderId())); - if (jdOrders != null && jdOrders.size() > 0) { - // 存在，修改 - JdVcOrder update = new JdVcOrder(); - update.setId(jdOrders.get(0).getId()); - update.setOrderState(order.getOrderState()); - update.setPay(order.getPay()); - update.setOperatorState(order.getOperatorState()); - update.setOrderState(order.getOrderState()); - update.setConsigneeName(order.getConsigneeName()); - update.setTelephone(order.getTelephone()); - update.setPhone(order.getPhone()); - update.setAddress(order.getAddress()); - update.setOrderRemark(order.getOrderRemark()); - update.setPaymentCategory(order.getPaymentCategory()); - update.setPaymentCategoryDispName(order.getPaymentCategoryDispName()); - update.setRefundSourceFlag(order.getRefundSourceFlag()); - update.setProvinceId(order.getProvinceId()); - update.setProvinceName(order.getProvinceName()); - update.setCityId(order.getCityId()); - update.setCityName(order.getCityName()); - update.setCountyId(order.getCountyId()); - update.setCountyName(order.getCountyName()); - update.setTownId(order.getTownId()); - update.setTownName(order.getTownName()); - update.setMemoByVendor(order.getMemoByVendor()); - update.setUpdateDate(order.getUpdateDate()); - update.setUpdateTime(new Date()); - - mapper.updateById(update); - // 删除item - itemMapper.delete(new LambdaQueryWrapper().eq(JdVcOrderItem::getJdVcOrderId,jdOrders.get(0).getId())); - - // 添加item - for (var item : order.getItems()) { - List pddGoodsSku = jdVcGoodsMapper.selectList(new LambdaQueryWrapper().eq(JdVcGoods::getWareId, item.getSku())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - item.setOGoodsId(pddGoodsSku.get(0).getOGoodsId().toString()); - item.setOGoodsSkuId(pddGoodsSku.get(0).getOGoodsSkuId()); - } - item.setJdVcOrderId(jdOrders.get(0).getId()); - item.setCustomOrderId(jdOrders.get(0).getCustomOrderId()); - itemMapper.insert(item); - } - return ResultVo.error(ResultVoEnum.DataExist, "订单已经存在，更新成功"); - } else { - // 不存在，新增 - order.setShopId(shopId); - order.setCreateTime(new Date()); - mapper.insert(order); - // 添加item - for (var item : order.getItems()) { - List pddGoodsSku = jdVcGoodsMapper.selectList(new LambdaQueryWrapper().eq(JdVcGoods::getWareId, item.getSku())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - item.setOGoodsId(pddGoodsSku.get(0).getOGoodsId().toString()); - item.setOGoodsSkuId(pddGoodsSku.get(0).getOGoodsSkuId()); - } - item.setCustomOrderId(order.getCustomOrderId()); - item.setJdVcOrderId(order.getId()); - itemMapper.insert(item); - } - return ResultVo.success(); - } - } catch (Exception e) { - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - e.printStackTrace(); - return ResultVo.error(ResultVoEnum.SystemException, "系统异常：" + e.getMessage()); - } - } - - @Override - public JdVcOrder queryDetailByOrderId(Long customOrderId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().eq(JdVcOrder::getCustomOrderId,customOrderId); - List jdVcOrders = mapper.selectList(queryWrapper); - if(jdVcOrders.isEmpty()) return null; - else{ - jdVcOrders.get(0).setItems(itemMapper.selectList(new LambdaQueryWrapper().eq(JdVcOrderItem::getJdVcOrderId, jdVcOrders.get(0).getId()))); - return jdVcOrders.get(0); - } - } - -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java deleted file mode 100644 index cf28d474..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -//package cn.qihangerp.open.jd.service.impl; -// -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import cn.qihangerp.open.jd.domain.JdVcPurchaseOrderItem; -//import cn.qihangerp.open.jd.service.JdVcPurchaseOrderItemService; -//import cn.qihangerp.open.jd.mapper.JdVcPurchaseOrderItemMapper; -//import org.springframework.stereotype.Service; -// -///** -//* @author TW -//* @description 针对表【jd_vc_purchase_order_item(京东自营采购订单明细表)】的数据库操作Service实现 -//* @createDate 2024-05-29 15:43:05 -//*/ -//@Service -//public class JdVcPurchaseOrderItemServiceImpl extends ServiceImpl -// implements JdVcPurchaseOrderItemService{ -// -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java deleted file mode 100644 index 2f6248c8..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -//package cn.qihangerp.open.jd.service.impl; -// -//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.common.PageQuery; -//import cn.qihangerp.common.PageResult; -//import cn.qihangerp.common.ResultVo; -//import cn.qihangerp.common.ResultVoEnum; -//import cn.qihangerp.open.jd.domain.JdVcPurchaseOrder; -//import cn.qihangerp.open.jd.domain.JdVcPurchaseOrderItem; -//import cn.qihangerp.open.jd.domain.bo.JdOrderBo; -//import cn.qihangerp.open.jd.mapper.JdVcPurchaseOrderItemMapper; -//import cn.qihangerp.open.jd.service.JdVcPurchaseOrderService; -//import cn.qihangerp.open.jd.mapper.JdVcPurchaseOrderMapper; -//import lombok.AllArgsConstructor; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -//import org.springframework.transaction.interceptor.TransactionAspectSupport; -//import org.springframework.util.StringUtils; -// -//import java.util.Date; -//import java.util.List; -//import java.util.regex.Matcher; -//import java.util.regex.Pattern; -// -///** -//* @author TW -//* @description 针对表【jd_vc_purchase_order(京东自营采购订单表)】的数据库操作Service实现 -//* @createDate 2024-05-29 15:43:05 -//*/ -//@AllArgsConstructor -//@Service -//public class JdVcPurchaseOrderServiceImpl extends ServiceImpl -// implements JdVcPurchaseOrderService{ -// private final JdVcPurchaseOrderMapper mapper; -// private final JdVcPurchaseOrderItemMapper itemMapper; -// -// private final String DATE_PATTERN = -// "^(?:(?:(?:\\d{4}-(?:0?[1-9]|1[0-2])-(?:0?[1-9]|1\\d|2[0-8]))|(?:(?:(?:\\d{2}(?:0[48]|[2468][048]|[13579][26])|(?:(?:0[48]|[2468][048]|[13579][26])00))-0?2-29))$)|(?:(?:(?:\\d{4}-(?:0?[13578]|1[02]))-(?:0?[1-9]|[12]\\d|30))$)|(?:(?:(?:\\d{4}-0?[13-9]|1[0-2])-(?:0?[1-9]|[1-2]\\d|30))$)|(?:(?:(?:\\d{2}(?:0[48]|[13579][26]|[2468][048])|(?:(?:0[48]|[13579][26]|[2468][048])00))-0?2-29))$)$"; -// private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); -// @Override -// public PageResult queryPageList(JdOrderBo bo, PageQuery pageQuery) { -// if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){ -// Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime()); -// boolean b = matcher.find(); -// if(b){ -// bo.setStartTime(bo.getStartTime()+" 00:00:00"); -// } -// } -// if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){ -// Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime()); -// boolean b = matcher.find(); -// if(b){ -// bo.setEndTime(bo.getEndTime()+" 23:59:59"); -// } -// } -// -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() -// .eq(bo.getShopId()!=null,JdVcPurchaseOrder::getShopId,bo.getShopId()) -// .eq(StringUtils.hasText(bo.getOrderId()),JdVcPurchaseOrder::getOrderId,bo.getOrderId()) -// .eq(StringUtils.hasText(bo.getOrderState()),JdVcPurchaseOrder::getState,bo.getOrderState()) -// .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),JdVcPurchaseOrder::getCreatedDate,bo.getStartTime()) -// .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),JdVcPurchaseOrder::getCreatedDate,bo.getEndTime()) -// ; -// -// pageQuery.setOrderByColumn("created_date"); -// pageQuery.setIsAsc("desc"); -// Page taoGoodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); -// if(taoGoodsPage.getRecords()!=null){ -// for (var order:taoGoodsPage.getRecords()) { -// order.setItems(itemMapper.selectList(new LambdaQueryWrapper().eq(JdVcPurchaseOrderItem::getOrderId,order.getOrderId()))); -// } -// } -// return PageResult.build(taoGoodsPage); -// } -// -// @Transactional -// @Override -// public ResultVo saveOrder(Long shopId, JdVcPurchaseOrder order) { -// try { -// List jdOrders = mapper.selectList(new LambdaQueryWrapper().eq(JdVcPurchaseOrder::getOrderId, order.getOrderId())); -// if (jdOrders != null && jdOrders.size() > 0) { -// // 存在，修改 -// JdVcPurchaseOrder update = new JdVcPurchaseOrder(); -// update.setId(jdOrders.get(0).getId()); -// update.setStatus(order.getStatus()); -// update.setStatusName(order.getStatusName()); -// update.setState(order.getState()); -// update.setStateName(order.getStateName()); -// if(order.getCompleteDate()!=null) { -// update.setCompleteDate(order.getCompleteDate()); -// } -// update.setUpdateDate(order.getUpdateDate()); -// update.setUpdateTime(new Date()); -// -// mapper.updateById(update); -// // 删除item -// itemMapper.delete(new LambdaQueryWrapper().eq(JdVcPurchaseOrderItem::getOrderId,jdOrders.get(0).getOrderId())); -// -// // 添加item -// for (var item : order.getItems()) { -// item.setOrderId(jdOrders.get(0).getOrderId()); -// itemMapper.insert(item); -// } -// return ResultVo.error(ResultVoEnum.DataExist, "订单已经存在，更新成功"); -// } else { -// // 不存在，新增 -// order.setShopId(shopId); -// order.setCreateTime(new Date()); -// mapper.insert(order); -// // 添加item -// for (var item : order.getItems()) { -// item.setOrderId(order.getOrderId()); -// itemMapper.insert(item); -// } -// return ResultVo.success(); -// } -// } catch (Exception e) { -// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); -// e.printStackTrace(); -// return ResultVo.error(ResultVoEnum.SystemException, "系统异常：" + e.getMessage()); -// } -// } -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java deleted file mode 100644 index 1638ce3c..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.qihangerp.module.open.jd.service.impl; - -import cn.qihangerp.module.open.jd.domain.JdVcGoods; -import cn.qihangerp.module.open.jd.domain.JdVcRefund; -import cn.qihangerp.module.open.jd.domain.bo.JdVcRefundBo; -import cn.qihangerp.module.open.jd.mapper.JdVcGoodsMapper; -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.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.module.open.jd.service.JdVcRefundService; -import cn.qihangerp.module.open.jd.mapper.JdVcRefundMapper; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** -* @author TW -* @description 针对表【jd_vc_refund(京东自营退款表)】的数据库操作Service实现 -* @createDate 2024-05-31 15:25:05 -*/ -@AllArgsConstructor -@Service -public class JdVcRefundServiceImpl extends ServiceImpl - implements JdVcRefundService{ - private final JdVcRefundMapper mapper; - private final JdVcGoodsMapper goodsMapper; - @Override - public PageResult queryPageList(JdVcRefundBo bo, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(bo.getShopId()!=null,JdVcRefund::getShopId,bo.getShopId()) - .eq(bo.getId()!=null,JdVcRefund::getId,bo.getId()) - .eq(bo.getCustomOrderId()!=null,JdVcRefund::getCustomOrderId,bo.getCustomOrderId()) - ; - if(bo.getCustomerExpect()!=null){ - if(bo.getCustomerExpect()==11){ -// queryWrapper.and().eq(JdVcRefund::getOrderState,29).eq(JdVcRefund::getOperatorState,5) - queryWrapper.and(x->x.eq(JdVcRefund::getOrderState,29).and(y->y.eq(JdVcRefund::getOperatorState,5).or().eq(JdVcRefund::getOperatorState,10))); - } else if (bo.getCustomerExpect()==10) { - queryWrapper.and(x->x.eq(JdVcRefund::getOrderState,29).eq(JdVcRefund::getOperatorState,16)); - } - } - - Page page = mapper.selectPage(pageQuery.build(), queryWrapper); - - return PageResult.build(page); - } - - @Transactional - @Override - public ResultVo saveRefund(Long shopId, JdVcRefund jdVcRefund) { - List jdVcReturns = mapper.selectList(new LambdaQueryWrapper().eq(JdVcRefund::getId, jdVcRefund.getId())); - if(jdVcReturns== null||jdVcReturns.size()==0){ - // 不存在，新增 - List jdGoodsSkus = goodsMapper.selectList(new LambdaQueryWrapper().eq(JdVcGoods::getWareId, jdVcRefund.getSkuId())); - if(!jdGoodsSkus.isEmpty()){ - jdVcRefund.setOGoodsId(jdGoodsSkus.get(0).getOGoodsId()); - jdVcRefund.setOGoodsSkuId(jdGoodsSkus.get(0).getOGoodsSkuId()); - } - jdVcRefund.setShopId(shopId); - jdVcRefund.setCreateTime(new Date()); - mapper.insert(jdVcRefund); - return ResultVo.success(); - - }else { - // 存在，修改 - JdVcRefund update= new JdVcRefund(); - update.setId(jdVcReturns.get(0).getId()); - List jdGoodsSkus = goodsMapper.selectList(new LambdaQueryWrapper().eq(JdVcGoods::getWareId, jdVcRefund.getSkuId())); - if(!jdGoodsSkus.isEmpty()){ - update.setOGoodsId(jdGoodsSkus.get(0).getOGoodsId()); - update.setOGoodsSkuId(jdGoodsSkus.get(0).getOGoodsSkuId()); - } - update.setModifiedDate(jdVcRefund.getModifiedDate()); - update.setApprovalState(jdVcRefund.getApprovalState()); - update.setOrderState(jdVcRefund.getOrderState()); - update.setOperatorState(jdVcRefund.getOperatorState()); - update.setApprovalSuggestion(jdVcRefund.getApprovalSuggestion()); - update.setUpdateTime(new Date()); - mapper.updateById(update); - - return ResultVo.error(ResultVoEnum.DataExist, "已经存在，更新"); - } - - } -} - - - - diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java deleted file mode 100644 index a36f7bf9..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -//package cn.qihangerp.open.jd.service.impl; -// -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import cn.qihangerp.open.jd.domain.JdVcReturnItem; -//import cn.qihangerp.open.jd.service.JdVcReturnItemService; -//import cn.qihangerp.open.jd.mapper.JdVcReturnItemMapper; -//import org.springframework.stereotype.Service; -// -///** -//* @author TW -//* @description 针对表【jd_vc_return_item】的数据库操作Service实现 -//* @createDate 2024-05-29 15:43:05 -//*/ -//@Service -//public class JdVcReturnItemServiceImpl extends ServiceImpl -// implements JdVcReturnItemService{ -// -//} -// -// -// -// diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java deleted file mode 100644 index cf324a10..00000000 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -//package cn.qihangerp.open.jd.service.impl; -// -//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.common.PageQuery; -//import cn.qihangerp.common.PageResult; -//import cn.qihangerp.common.ResultVo; -//import cn.qihangerp.common.ResultVoEnum; -//import cn.qihangerp.open.jd.domain.JdVcReturn; -//import cn.qihangerp.open.jd.domain.JdVcReturnItem; -//import cn.qihangerp.open.jd.domain.bo.JdVcRefundBo; -//import cn.qihangerp.open.jd.mapper.JdVcReturnItemMapper; -//import cn.qihangerp.open.jd.service.JdVcReturnService; -//import cn.qihangerp.open.jd.mapper.JdVcReturnMapper; -//import lombok.AllArgsConstructor; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -// -//import java.util.Date; -//import java.util.List; -// -///** -//* @author TW -//* @description 针对表【jd_vc_return】的数据库操作Service实现 -//* @createDate 2024-05-29 15:43:05 -//*/ -//@AllArgsConstructor -//@Service -//public class JdVcReturnServiceImpl extends ServiceImpl -// implements JdVcReturnService{ -// private final JdVcReturnMapper mapper; -// private final JdVcReturnItemMapper itemMapper; -// -// @Override -// public PageResult queryPageList(JdVcRefundBo bo, PageQuery pageQuery) { -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() -// .eq(bo.getShopId()!=null,JdVcReturn::getShopId,bo.getShopId()) -// .eq(bo.getReturnId()!=null,JdVcReturn::getReturnId,bo.getReturnId()) -// ; -// -// Page page = mapper.selectPage(pageQuery.build(), queryWrapper); -// if(page.getRecords()!=null){ -// for (var re:page.getRecords()) { -// re.setItemList(itemMapper.selectList(new LambdaQueryWrapper().eq(JdVcReturnItem::getReturnId,re.getReturnId()))); -// } -// } -// -// return PageResult.build(page); -// } -// -// @Transactional -// @Override -// public ResultVo saveReturn(Integer shopId, JdVcReturn jdVcReturn) { -// List jdVcReturns = mapper.selectList(new LambdaQueryWrapper().eq(JdVcReturn::getReturnId, jdVcReturn.getReturnId())); -// if(jdVcReturns== null||jdVcReturns.size()==0){ -// // 不存在，新增 -// jdVcReturn.setShopId(shopId); -// jdVcReturn.setCreateTime(new Date()); -// mapper.insert(jdVcReturn); -// // 添加items -// for (var item:jdVcReturn.getItemList()) { -// item.setReturnId(jdVcReturn.getReturnId()); -// itemMapper.insert(item); -// } -// return ResultVo.success(); -// -// }else { -// // 存在，修改 -// JdVcReturn update= new JdVcReturn(); -// update.setId(jdVcReturns.get(0).getId()); -// update.setTotalNum(jdVcReturn.getTotalNum()); -// update.setTotalPrice(jdVcReturn.getTotalPrice()); -// update.setWareVariety(jdVcReturn.getWareVariety()); -// update.setBalanceStateName(jdVcReturn.getBalanceStateName()); -// update.setBalanceDate(jdVcReturn.getBalanceDate()); -// update.setUpdateTime(new Date()); -// mapper.updateById(update); -// -// // 删除item -// itemMapper.delete(new LambdaQueryWrapper().eq(JdVcReturnItem::getReturnId,jdVcReturn.getReturnId())); -// -// // 添加items -// for (var item:jdVcReturn.getItemList()) { -// item.setReturnId(jdVcReturn.getReturnId()); -// itemMapper.insert(item); -// } -// return ResultVo.error(ResultVoEnum.DataExist, "已经存在，更新"); -// } -// -// } -//} -// -// -// -// diff --git a/module/jd/src/main/resources/mapper/jd/JdVcGoodsMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcGoodsMapper.xml deleted file mode 100644 index ca6ebed9..00000000 --- a/module/jd/src/main/resources/mapper/jd/JdVcGoodsMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id,ware_id,ware_name, - sale_state,modify_time,is_primary, - is_gaea,create_time,update_time, - o_goods_id,o_goods_sku_id,shop_id - - diff --git a/module/jd/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml deleted file mode 100644 index e716bdcc..00000000 --- a/module/jd/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id,jd_vc_order_id,custom_order_id, - sku,ware_name,upc,o_goods_sku_id, - ware_num,jd_price,discount, - cost,po_id,ro_id,o_goods_id - - diff --git a/module/jd/src/main/resources/mapper/jd/JdVcOrderMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcOrderMapper.xml deleted file mode 100644 index d7bca58b..00000000 --- a/module/jd/src/main/resources/mapper/jd/JdVcOrderMapper.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,custom_order_id,pay, - operator_state,order_state,consignee_name, - telephone,phone,address, - order_remark,order_create_date,payment_category, - payment_category_disp_name,create_date,pin, - refund_source_flag,province_id,province_name, - city_id,city_name,county_id, - county_name,town_id,town_name, - memo_by_vendor,parent_order_id,sku, - commodity_name,commodity_num,jd_price, - discount,reduce_count,total_carriage, - cost,branch_name,update_date, - shop_id,create_time,update_time - - diff --git a/module/jd/src/main/resources/mapper/jd/JdVcRefundMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcRefundMapper.xml deleted file mode 100644 index 1770dee1..00000000 --- a/module/jd/src/main/resources/mapper/jd/JdVcRefundMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,custom_order_id,ro_apply_fee, - ro_apply_date,order_create_date,modified_date, - approval_state,order_state,operator_state, - ro_pre_no,ro_account,ro_reason, - approval_suggestion,vendor-store_id,vendor_store_name, - order_detail_list,sku_id,commodity_name, - commodity_num,shop_id,create_time, - update_time - - diff --git a/update_log.md b/update_log.md index 45b4ff2a..1b365399 100644 --- a/update_log.md +++ b/update_log.md @@ -3,4 +3,10 @@ + 店铺商品-tao：拆分商品和SKU列表; + 店铺商品-tao修改数据库字段； + 新增店铺商品-tao推送到商品库功能； -+ 新增店铺商品-tao一键关联商品库SKU功能； \ No newline at end of file ++ 新增店铺商品-tao一键关联商品库SKU功能； + +#### 2025-05-20 ++ 店铺商品-jd：拆分商品和SKU列表; ++ 店铺商品-jd修改数据库字段； ++ 新增店铺商品-jd推送到商品库功能； ++ 新增店铺商品-jd一键关联商品库SKU功能； \ No newline at end of file diff --git a/vue/src/views/shop/online_shop.vue b/vue/src/views/shop/online_shop.vue index e82464fa..8aaffa4d 100644 --- a/vue/src/views/shop/online_shop.vue +++ b/vue/src/views/shop/online_shop.vue @@ -52,6 +52,7 @@ plain icon="el-icon-delete" size="mini" + @click="handleDelete" :disabled="multiple" >删除