diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql index 61ac447d..26fe3edd 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -741,54 +741,42 @@ INSERT INTO `o_logistics_company` VALUES (284, 100, NULL, 105031, 'BESTQJT', ' -- ---------------------------- DROP TABLE IF EXISTS `o_order`; CREATE TABLE `o_order` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单id，自增', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单编号（第三方平台订单号）', - `shop_type` int NOT NULL COMMENT '店铺类型', - `shop_id` int NOT NULL COMMENT '店铺ID', - `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单备注', - `buyer_memo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家留言信息', - `seller_memo` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '卖家留言信息', - `tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签', - `refund_status` int NOT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', - `order_status` int NOT NULL COMMENT '订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除，101部分发货', - `goods_amount` double NULL DEFAULT NULL COMMENT '订单商品金额', - `post_fee` double NULL DEFAULT NULL COMMENT '订单运费', - `amount` double NOT NULL COMMENT '订单实际金额', - `payment` double NULL DEFAULT NULL COMMENT '实付金额', - `receiver_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', - `receiver_mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', - `address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人地址', - `province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', - `city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', - `town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', - `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间', - `ship_type` int NOT NULL COMMENT '发货类型（0仓库发货；1供应商代发）', - `shipping_time` datetime NULL DEFAULT NULL COMMENT '发货时间', - `shipping_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '快递单号', - `shipping_company` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', - `shipping_man` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货人', - `shipping_cost` decimal(10, 2) NULL DEFAULT NULL COMMENT '发货费用', - `erp_push_status` int NULL DEFAULT 0 COMMENT 'ERP推送状态(200订单推送成功，100订单取消推送成功，其他失败）', - `erp_push_result` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ERP推送状态结果', - `erp_push_time` datetime NULL DEFAULT NULL COMMENT 'ERP最近推送时间', - `length` float NULL DEFAULT 0 COMMENT '长', - `width` float NULL DEFAULT 0 COMMENT '宽', - `height` float NULL DEFAULT 0 COMMENT '高', - `weight` float NULL DEFAULT NULL COMMENT '重量', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `platform_discount` double NULL DEFAULT 0 COMMENT '平台优惠金额，单位：元', - `seller_discount` double NULL DEFAULT 0 COMMENT '商家优惠金额，单位：元', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `order_sn_index`(`order_num`) USING BTREE, - INDEX `shopid_index`(`shop_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 38 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS订单表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of o_order --- ---------------------------- + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单id，自增', + `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单编号（第三方平台订单号）', + `shop_type` int NOT NULL COMMENT '店铺类型', + `shop_id` bigint NOT NULL COMMENT '店铺ID', + `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单备注', + `buyer_memo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家留言信息', + `seller_memo` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '卖家留言信息', + `tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签', + `refund_status` int NOT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', + `order_status` int NOT NULL COMMENT '订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除，101部分发货', + `goods_amount` double NULL DEFAULT NULL COMMENT '订单商品金额', + `post_fee` double NULL DEFAULT NULL COMMENT '订单运费', + `seller_discount` double NULL DEFAULT 0 COMMENT '商家优惠金额，单位：元', + `platform_discount` double NULL DEFAULT 0 COMMENT '平台优惠金额，单位：元', + `amount` double NOT NULL COMMENT '订单实际金额', + `payment` double NULL DEFAULT NULL COMMENT '实付金额', + `receiver_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', + `receiver_mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', + `address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人地址', + `province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', + `city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', + `town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', + `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间', + `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货类型（0仓库发货；1供应商代发；2联合发货）', + `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货 1 部分发货 2全部发货', + `erp_push_status` int NULL DEFAULT 0 COMMENT 'ERP推送状态(200订单推送成功，100订单取消推送成功，其他失败）', + `erp_push_result` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ERP推送状态结果', + `erp_push_time` datetime NULL DEFAULT NULL COMMENT 'ERP最近推送时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `order_sn_index`(`order_num`) USING BTREE, + INDEX `shopid_index`(`shop_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 40 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS订单表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for o_order_item @@ -796,6 +784,8 @@ CREATE TABLE `o_order` ( DROP TABLE IF EXISTS `o_order_item`; CREATE TABLE `o_order_item` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id，自增', + `shop_id` bigint NOT NULL COMMENT '店铺ID', + `shop_type` int NOT NULL COMMENT '店铺类型', `order_id` bigint NOT NULL COMMENT '订单ID（o_order外键）', `order_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单号（第三方平台）', `sub_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子订单号（第三方平台）', @@ -816,18 +806,18 @@ CREATE TABLE `o_order_item` ( `refund_count` int NULL DEFAULT 0 COMMENT '已退货数量', `refund_status` int NULL DEFAULT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', `order_status` int NULL DEFAULT NULL COMMENT '订单状态1：待发货，2：已发货，3：已完成，11已取消；21待付款', + `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货类型（0仓库发货；1供应商代发；2联合发货-实际上不存在这种情况）', + `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货 1 已发货', `has_push_erp` int NULL DEFAULT 0 COMMENT '是否推送到ERP', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `shop_type` int NOT NULL COMMENT '店铺类型', - `shop_id` bigint NOT NULL COMMENT '店铺ID', PRIMARY KEY (`id`) USING BTREE, INDEX `goodId_index`(`goods_id`) USING BTREE, INDEX `order_id`(`order_id`) USING BTREE, INDEX `order_num_index`(`order_num`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 43 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS订单明细表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 45 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS订单明细表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of o_order_item @@ -878,62 +868,65 @@ CREATE TABLE `o_refund` ( -- Records of o_refund -- ---------------------------- + + -- ---------------------------- --- Table structure for o_ship_stock_up +-- Table structure for o_order_ship_list -- ---------------------------- -DROP TABLE IF EXISTS `o_ship_stock_up`; -CREATE TABLE `o_ship_stock_up` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `shop_id` bigint NOT NULL COMMENT '店铺id', - `shop_type` int NOT NULL COMMENT '店铺类型', - `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方 0 仓库发货 1 供应商发货', - `ship_supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '发货供应商ID（0自己发货）', - `ship_supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货供应商', - `sale_order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', - `sale_order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', - `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `ship_logistics_company` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', - `ship_logistics_company_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司code', - `ship_logistics_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', - `ship_status` int NOT NULL COMMENT '发货状态1：待发货，2：已发货，3已推送', - PRIMARY KEY (`id`) USING BTREE +DROP TABLE IF EXISTS `o_order_ship_list`; +CREATE TABLE `o_order_ship_list` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `shop_id` bigint NOT NULL COMMENT '店铺id', + `shop_type` int NOT NULL COMMENT '店铺类型', + `shipper` int NOT NULL COMMENT '发货方 0 仓库发货 1 供应商发货', + `ship_supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '发货供应商ID（0自己发货）', + `ship_supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货供应商', + `order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', + `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', + `ship_logistics_company` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', + `ship_logistics_company_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司code', + `ship_logistics_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', + `ship_status` int NOT NULL COMMENT '发货状态1：待发货，2：已发货，3已推送', + `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）' ROW_FORMAT = DYNAMIC; + -- ---------------------------- --- Table structure for o_ship_stock_up_item +-- Table structure for o_order_ship_list_item -- ---------------------------- -DROP TABLE IF EXISTS `o_ship_stock_up_item`; -CREATE TABLE `o_ship_stock_up_item` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `shop_id` bigint NULL DEFAULT NULL COMMENT '店铺id', - `shop_type` int NOT NULL COMMENT '店铺类型', - `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方 0 仓库发货 1 供应商发货', - `ship_supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '发货供应商ID（0自己发货）', - `ship_supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货供应商', - `sale_order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', - `sale_order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', - `original_sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原始订单skuid', - `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id', - `sku_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品规格id', - `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `sku_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', - `sku_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', - `quantity` int NOT NULL COMMENT '商品数量', - `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - PRIMARY KEY (`id`) USING BTREE +DROP TABLE IF EXISTS `o_order_ship_list_item`; +CREATE TABLE `o_order_ship_list_item` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `shop_id` bigint NOT NULL COMMENT '店铺id', + `list_id` bigint NOT NULL COMMENT '外键id', + `shop_type` int NOT NULL COMMENT '店铺类型', + `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方 0 仓库发货 1 供应商发货', + `ship_supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '发货供应商ID（0自己发货）', + `ship_supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货供应商', + `order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', + `order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', + `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', + `original_sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原始订单skuid', + `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id', + `sku_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品规格id', + `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `sku_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `sku_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `quantity` int NOT NULL COMMENT '商品数量', + `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表（打单加入备货清单）' ROW_FORMAT = DYNAMIC; @@ -967,60 +960,60 @@ CREATE TABLE `o_ship_waybill` ( -- ---------------------------- DROP TABLE IF EXISTS `o_shipment`; CREATE TABLE `o_shipment` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `shop_id` int NULL DEFAULT NULL COMMENT '店铺id', - `shipping_type` int NULL DEFAULT NULL COMMENT '发货类型（1订单发货2商品补发3商品换货）', - `order_nums` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货的所有订单号，以逗号隔开', - `sub_order_nums` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货的所有子订单号，以逗号隔开', - `receiver_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', - `receiver_mobile` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', - `province` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', - `city` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', - `town` varchar(55) 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 '详细地址', - `logistics_company` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', - `logistics_company_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司编码', - `waybill_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', - `shipping_fee` decimal(6, 0) NULL DEFAULT NULL COMMENT '物流费用', - `shipping_time` datetime NULL DEFAULT NULL COMMENT '发货时间', - `shipping_operator` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货操作人', - `shipping_status` int NULL DEFAULT NULL COMMENT '物流状态（1运输中2已完成）', - `package_weight` float NULL DEFAULT NULL COMMENT '包裹重量', - `package_length` float NULL DEFAULT NULL COMMENT '包裹长度', - `package_width` float NULL DEFAULT NULL COMMENT '包裹宽度', - `package_height` float NULL DEFAULT NULL COMMENT '包裹高度', - `package_operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '打包操作人', - `package_time` datetime NULL DEFAULT NULL COMMENT '打包时间', - `packages` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '包裹内容JSON', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_time` datetime NULL DEFAULT NULL, - `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `update_time` datetime NULL DEFAULT NULL, - `update_by` datetime NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE + `id` bigint NOT NULL AUTO_INCREMENT, + `shop_id` bigint NOT NULL COMMENT '店铺id', + `shipment_type` int NOT NULL COMMENT '发货类型（1订单发货2商品补发3商品换货）', + `order_nums` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货的所有订单号，以逗号隔开', + `receiver_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', + `receiver_mobile` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', + `province` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', + `city` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', + `town` varchar(55) 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 '详细地址', + `logistics_company` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', + `logistics_company_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司编码', + `logistics_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', + `shipment_fee` decimal(6, 2) NULL DEFAULT NULL COMMENT '物流费用', + `shipment_time` datetime NULL DEFAULT NULL COMMENT '发货时间', + `shipment_operator` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货操作人', + `shipment_status` int NULL DEFAULT NULL COMMENT '物流状态（1运输中2已完成）', + `package_weight` float NULL DEFAULT NULL COMMENT '包裹重量', + `package_length` float NULL DEFAULT NULL COMMENT '包裹长度', + `package_width` float NULL DEFAULT NULL COMMENT '包裹宽度', + `package_height` float NULL DEFAULT NULL COMMENT '包裹高度', + `package_operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '打包操作人', + `package_time` datetime NULL DEFAULT NULL COMMENT '打包时间', + `packages` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '包裹内容JSON', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `create_time` datetime NULL DEFAULT NULL, + `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `update_time` datetime NULL DEFAULT NULL, + `update_by` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-发货记录表' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of o_shipment --- ---------------------------- - -- ---------------------------- -- Table structure for o_shipment_item -- ---------------------------- DROP TABLE IF EXISTS `o_shipment_item`; CREATE TABLE `o_shipment_item` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `shipping_id` bigint NULL DEFAULT NULL COMMENT '发货表id', - `order_id` bigint NULL DEFAULT NULL COMMENT 'o_order表id', - `order_item_id` bigint NULL DEFAULT NULL COMMENT 'o_order_item表id', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号（第三方平台）', - `sub_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子订单号（第三方平台）', - PRIMARY KEY (`id`) USING BTREE + `id` bigint NOT NULL AUTO_INCREMENT, + `shipment_id` bigint NOT NULL COMMENT '发货表id', + `order_id` bigint NULL DEFAULT NULL COMMENT 'o_order表id', + `order_item_id` bigint NULL DEFAULT NULL COMMENT 'o_order_item表id', + `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号（第三方平台）', + `sub_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子订单号（第三方平台）', + `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id', + `sku_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品规格id', + `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `sku_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `sku_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `quantity` int NOT NULL COMMENT '商品数量', + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-发货记录明细表' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of o_shipment_item --- ---------------------------- -- ---------------------------- -- Table structure for o_shop diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java index cf74be8c..acef8134 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java @@ -117,10 +117,10 @@ public class OrderController extends BaseController @PostMapping("/manualShipment") public AjaxResult manualShipment(@RequestBody ShopOrderShipBo shipBo) { -// var result = orderService.manualShipmentOrder(shipBo,getUsername()); -// if(result.getCode() == 0) return AjaxResult.success(); -// else return AjaxResult.error(result.getMsg()); - return AjaxResult.error("未实现AAA"); + var result = orderService.manualShipmentOrder(shipBo,getUsername()); + if(result.getCode() == 0) return AjaxResult.success(); + else return AjaxResult.error(result.getMsg()); +// return AjaxResult.error("未实现AAA"); } /** diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java index 51a4ed73..a43be303 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java @@ -1,14 +1,11 @@ package cn.qihangerp.api.order.controller; -import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -import cn.qihangerp.module.order.service.OShipStockUpItemService; -import cn.qihangerp.module.order.service.OShipStockUpService; -import cn.qihangerp.module.order.service.OShipWaybillService; +import cn.qihangerp.module.order.service.OOrderShipListItemService; +import cn.qihangerp.module.order.service.OOrderShipListService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -17,8 +14,8 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/ship") public class ShipStockupController extends BaseController { - private final OShipStockUpService shipStockUpService; - private final OShipStockUpItemService shipStockUpItemService; + private final OOrderShipListService shipStockUpService; + private final OOrderShipListItemService shipStockUpItemService; /** * 备货列表(仓库发货) diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java index 4993d9ea..ec03446b 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java @@ -38,30 +38,30 @@ public class ShipmentController extends BaseController { return getDataTable(orderService.searchOrderItemByReceiverMobile(receiverMobile)); } - /** - * 订单发货 - * @param shipping - * @return - */ - @PostMapping("/handShip") - public AjaxResult orderHandShip(@RequestHeader("Authorization") String authorization,@RequestBody OrderShipBo shipping) - { - - var result = shippingService.handOrderShip(shipping); -// if(result.getCode() == ResultVoEnum.SUCCESS.getIndex()) { -// // 发货 -// TaoOrderShipBo bo = new TaoOrderShipBo(); -// bo.setShopId(shipping.getShopId()); -//// bo.setTid(shipping.getOrderId()); -// bo.setWaybillCode(shipping.getShipCode()); -// bo.setWaybillCompany(shipping.getShipCompany()); +// /** +// * 订单发货 +// * @param shipping +// * @return +// */ +// @PostMapping("/handShip") +// public AjaxResult orderHandShip(@RequestHeader("Authorization") String authorization,@RequestBody OrderShipBo shipping) +// { // -// JSONObject jsonObject = taoApiService.orderShip(authorization, bo); -// return AjaxResult.success(); -// }else{ -// return AjaxResult.error(result.getCode(),result.getMsg()); -// } - - return AjaxResult.success(); - } +// var result = shippingService.handOrderShip(shipping); +//// if(result.getCode() == ResultVoEnum.SUCCESS.getIndex()) { +//// // 发货 +//// TaoOrderShipBo bo = new TaoOrderShipBo(); +//// bo.setShopId(shipping.getShopId()); +////// bo.setTid(shipping.getOrderId()); +//// bo.setWaybillCode(shipping.getShipCode()); +//// bo.setWaybillCompany(shipping.getShipCompany()); +//// +//// JSONObject jsonObject = taoApiService.orderShip(authorization, bo); +//// return AjaxResult.success(); +//// }else{ +//// return AjaxResult.error(result.getCode(),result.getMsg()); +//// } +// +// return AjaxResult.success(); +// } } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java index 057f65d7..9e8b3cda 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java @@ -122,57 +122,19 @@ public class OOrder implements Serializable { private Date orderTime; /** - * 发货类型（0仓库发货；1供应商代发） + * 发货类型（0仓库发货；1供应商代发；2联合发货） */ private Integer shipType; - /** - * 发货时间 + * 发货状态 0 待发货 1 部分发货 2全部发货 */ - private Date shippingTime; + private Integer shipStatus; - /** - * 快递单号 - */ - private String shippingNumber; - - /** - * 物流公司 - */ - private String shippingCompany; - - /** - * 发货人 - */ - private String shippingMan; - - /** - * 发货费用 - */ - private BigDecimal shippingCost; private Integer erpPushStatus; private String erpPushResult; private Date erpPushTime; - /** - * 长 - */ - private Double length; - /** - * 宽 - */ - private Double width; - - /** - * 高 - */ - private Double height; - - /** - * 重量 - */ - private Double weight; /** * 创建时间 diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java index 7befbcb9..a8bd2379 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java @@ -114,7 +114,14 @@ public class OOrderItem implements Serializable { private Integer refundStatus; private Integer orderStatus; private Integer hasPushErp;//是否推送到ERP - + /** + * 发货类型（0仓库发货；1供应商代发；2联合发货） + */ + private Integer shipType; + /** + * 发货状态 0 待发货 1 部分发货 2全部发货 + */ + private Integer shipStatus; /** * 创建时间 diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java similarity index 87% rename from module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java rename to module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java index b6e36049..7a289dd1 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java @@ -6,15 +6,17 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import java.util.List; + import lombok.Data; /** * 发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单） - * @TableName o_ship_stock_up + * @TableName o_order_ship_list */ -@TableName(value ="o_ship_stock_up") +@TableName(value ="o_order_ship_list") @Data -public class OShipStockUp implements Serializable { +public class OOrderShipList implements Serializable { /** * */ @@ -49,18 +51,33 @@ public class OShipStockUp implements Serializable { /** * erp订单id */ - private Long saleOrderId; - - /** - * erp订单itemid - */ - private Long saleOrderItemId; + private Long orderId; /** * 订单编号 */ private String orderNum; + /** + * 物流公司 + */ + private String shipLogisticsCompany; + + /** + * 物流公司code + */ + private String shipLogisticsCompanyCode; + + /** + * 物流单号 + */ + private String shipLogisticsCode; + + /** + * 发货状态1：待发货，2：已发货，3已推送 + */ + private Integer shipStatus; + /** * 状态0待备货1备货中2备货完成3已发货 */ @@ -86,25 +103,8 @@ public class OShipStockUp implements Serializable { */ private String updateBy; - /** - * 物流公司 - */ - private String shipLogisticsCompany; - - /** - * 物流公司code - */ - private String shipLogisticsCompanyCode; - - /** - * 物流单号 - */ - private String shipLogisticsCode; - - /** - * 发货状态1：待发货，2：已发货，3已推送 - */ - private Integer shipStatus; + @TableField(exist = false) + private List items; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipListItem.java similarity index 89% rename from module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java rename to module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipListItem.java index b0cb03c1..1a1e18b4 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipListItem.java @@ -10,11 +10,11 @@ import lombok.Data; /** * 发货-备货表（打单加入备货清单） - * @TableName o_ship_stock_up_item + * @TableName o_order_ship_list_item */ -@TableName(value ="o_ship_stock_up_item") +@TableName(value ="o_order_ship_list_item") @Data -public class OShipStockUpItem implements Serializable { +public class OOrderShipListItem implements Serializable { /** * */ @@ -26,6 +26,11 @@ public class OShipStockUpItem implements Serializable { */ private Long shopId; + /** + * 外键id + */ + private Long listId; + /** * 店铺类型 */ @@ -49,12 +54,12 @@ public class OShipStockUpItem implements Serializable { /** * erp订单id */ - private Long saleOrderId; + private Long orderId; /** * erp订单itemid */ - private Long saleOrderItemId; + private Long orderItemId; /** * 订单编号 diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java index 135e2758..590af6df 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java @@ -1,70 +1,106 @@ package cn.qihangerp.module.order.domain; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; import lombok.Data; /** - * 发货记录表 - * @TableName o_order_shipping + * 发货-发货记录表 + * @TableName o_shipment */ +@TableName(value ="o_shipment") @Data public class OShipment implements Serializable { /** * */ @TableId(type = IdType.AUTO) - private String id; + private Long id; /** * 店铺id */ private Long shopId; + /** + * 发货类型（1订单发货2商品补发3商品换货） + */ + private Integer shipmentType; - private Integer shippingType;//发货类型（1订单发货2商品补发3商品换货） - private String orderNums;//发货的所有订单号，以逗号隔开 - private String subOrderNums;//发货的所有子订单号，以逗号隔开 + /** + * 发货的所有订单号，以逗号隔开 + */ + private String orderNums; + + /** + * 收件人姓名 + */ private String receiverName; + + /** + * 收件人手机号 + */ private String receiverMobile; + + /** + * 省 + */ private String province; + + /** + * 市 + */ private String city; + + /** + * 区 + */ private String town; + + /** + * 详细地址 + */ private String address; /** * 物流公司 */ private String logisticsCompany; + + /** + * 物流公司编码 + */ private String logisticsCompanyCode; /** * 物流单号 */ - private String waybillCode; + private String logisticsCode; /** * 物流费用 */ - private Integer shippingFee; + private BigDecimal shipmentFee; /** * 发货时间 */ - private Date shippingTime; + private Date shipmentTime; /** * 发货操作人 */ - private String shippingOperator; + private String shipmentOperator; /** * 物流状态（1运输中2已完成） */ - private Integer shippingStatus; + private Integer shipmentStatus; /** * 包裹重量 @@ -100,6 +136,10 @@ public class OShipment implements Serializable { * 包裹内容JSON */ private String packages; + + /** + * 备注 + */ private String remark; /** @@ -122,5 +162,6 @@ public class OShipment implements Serializable { */ private Date updateBy; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java index 5197f3ef..03319e17 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java @@ -1,15 +1,17 @@ package cn.qihangerp.module.order.domain; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; import lombok.Data; /** - * OMS发货明细表 - * @TableName o_order_shipping_item + * 发货-发货记录明细表 + * @TableName o_shipment_item */ +@TableName(value ="o_shipment_item") @Data public class OShipmentItem implements Serializable { /** @@ -21,17 +23,17 @@ public class OShipmentItem implements Serializable { /** * 发货表id */ - private String shippingId; + private Long shipmentId; /** * o_order表id */ - private String orderId; + private Long orderId; /** * o_order_item表id */ - private String orderItemId; + private Long orderItemId; /** * 订单编号（第三方平台） @@ -43,5 +45,46 @@ public class OShipmentItem implements Serializable { */ private String subOrderNum; + /** + * erp系统商品id + */ + private Long goodsId; + + /** + * erp系统商品规格id + */ + private Long skuId; + + /** + * 商品标题 + */ + private String goodsTitle; + + /** + * 商品图片 + */ + private String goodsImg; + + /** + * 商品编码 + */ + private String goodsNum; + + /** + * 商品规格 + */ + private String skuName; + + /** + * 商品规格编码 + */ + private String skuNum; + + /** + * 商品数量 + */ + private Integer quantity; + + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java new file mode 100644 index 00000000..fc9156b2 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.order.mapper; + +import cn.qihangerp.module.order.domain.OOrderShipListItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_order_ship_list_item(发货-备货表（打单加入备货清单）)】的数据库操作Mapper +* @createDate 2025-05-24 16:03:35 +* @Entity cn.qihangerp.module.order.domain.OOrderShipListItem +*/ +public interface OOrderShipListItemMapper extends BaseMapper { + +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java new file mode 100644 index 00000000..d69be9be --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.order.mapper; + +import cn.qihangerp.module.order.domain.OOrderShipList; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_order_ship_list(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Mapper +* @createDate 2025-05-24 16:03:35 +* @Entity cn.qihangerp.module.order.domain.OOrderShipList +*/ +public interface OOrderShipListMapper extends BaseMapper { + +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java deleted file mode 100644 index 9f87e14f..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.qihangerp.module.order.mapper; - -import cn.qihangerp.module.order.domain.OShipStockUpItem; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author qilip -* @description 针对表【o_ship_stock_up_item(发货-备货表（打单加入备货清单）)】的数据库操作Mapper -* @createDate 2025-05-23 21:43:16 -* @Entity cn.qihangerp.module.order.domain.OShipStockUpItem -*/ -public interface OShipStockUpItemMapper extends BaseMapper { - -} - - - - diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java deleted file mode 100644 index 64e93d62..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.qihangerp.module.order.mapper; - -import cn.qihangerp.module.order.domain.OShipStockUp; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author qilip -* @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Mapper -* @createDate 2025-05-23 21:43:16 -* @Entity cn.qihangerp.module.order.domain.OShipStockUp -*/ -public interface OShipStockUpMapper extends BaseMapper { - -} - - - - diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java index 936c3c27..bd31a2d3 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java @@ -1,14 +1,13 @@ package cn.qihangerp.module.order.mapper; - import cn.qihangerp.module.order.domain.OShipmentItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** -* @author TW -* @description 针对表【o_order_shipping_item(OMS发货明细表)】的数据库操作Mapper -* @createDate 2024-05-23 14:01:14 -* @Entity cn.qihangerp.oms.domain.OOrderShippingItem +* @author qilip +* @description 针对表【o_shipment_item(发货-发货记录明细表)】的数据库操作Mapper +* @createDate 2025-05-24 16:21:35 +* @Entity cn.qihangerp.module.order.domain.OShipmentItem */ public interface OShipmentItemMapper extends BaseMapper { diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java index 6dc2b447..d126cdc1 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java @@ -1,14 +1,13 @@ package cn.qihangerp.module.order.mapper; - import cn.qihangerp.module.order.domain.OShipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip -* @description 针对表【o_order_shipping(发货记录表)】的数据库操作Mapper -* @createDate 2024-03-31 11:16:00 -* @Entity cn.qihangerp.oms.domain.OOrderShipping +* @description 针对表【o_shipment(发货-发货记录表)】的数据库操作Mapper +* @createDate 2025-05-24 16:26:06 +* @Entity cn.qihangerp.module.order.domain.OShipment */ public interface OShipmentMapper extends BaseMapper { diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java index 962c3f83..7e90325f 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java @@ -1,6 +1,7 @@ package cn.qihangerp.module.order.service; +import cn.qihangerp.common.bo.ShopOrderShipBo; import cn.qihangerp.module.order.domain.OOrder; import cn.qihangerp.module.order.domain.OOrderItem; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; @@ -47,4 +48,11 @@ public interface OOrderService extends IService { List salesDaily(); SalesDailyVo getTodaySalesDaily(); Integer getWaitShipOrderAllCount(); + + /** + * 手动发货 + * @param shipBo + * @return + */ + ResultVo manualShipmentOrder(ShopOrderShipBo shipBo, String createBy); } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java new file mode 100644 index 00000000..c5f43bc5 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java @@ -0,0 +1,17 @@ +package cn.qihangerp.module.order.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.OOrderShipListItem; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_order_ship_list_item(发货-备货表（打单加入备货清单）)】的数据库操作Service +* @createDate 2025-05-24 16:03:35 +*/ +public interface OOrderShipListItemService extends IService { + PageResult queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery); + PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery); +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java new file mode 100644 index 00000000..7f944e6c --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java @@ -0,0 +1,16 @@ +package cn.qihangerp.module.order.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.OOrderShipList; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_order_ship_list(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service +* @createDate 2025-05-24 16:03:35 +*/ +public interface OOrderShipListService extends IService { + PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery); +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java deleted file mode 100644 index 9e56755d..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.qihangerp.module.order.service; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.order.domain.OShipStockUpItem; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author qilip -* @description 针对表【o_ship_stock_up_item(发货-备货表（打单加入备货清单）)】的数据库操作Service -* @createDate 2025-05-23 21:43:16 -*/ -public interface OShipStockUpItemService extends IService { - PageResult queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery); - PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery); -} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java deleted file mode 100644 index cbe9deb3..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.qihangerp.module.order.service; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.order.domain.OShipStockUp; -import cn.qihangerp.module.order.domain.OShipStockUpItem; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author qilip -* @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service -* @createDate 2025-05-23 21:43:16 -*/ -public interface OShipStockUpService extends IService { - PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery); -} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentItemService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentItemService.java index 4614b667..c1d06e49 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentItemService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentItemService.java @@ -1,13 +1,12 @@ package cn.qihangerp.module.order.service; - import cn.qihangerp.module.order.domain.OShipmentItem; import com.baomidou.mybatisplus.extension.service.IService; /** -* @author TW -* @description 针对表【o_order_shipping_item(OMS发货明细表)】的数据库操作Service -* @createDate 2024-05-23 14:01:14 +* @author qilip +* @description 针对表【o_shipment_item(发货-发货记录明细表)】的数据库操作Service +* @createDate 2025-05-24 16:21:35 */ public interface OShipmentItemService extends IService { diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java index e2d6af35..61d927fc 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java @@ -2,43 +2,14 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.common.enums.EnumShopType; - import cn.qihangerp.module.order.domain.OShipment; -import cn.qihangerp.module.order.domain.bo.OrderShipBo; import com.baomidou.mybatisplus.extension.service.IService; - /** * @author qilip -* @description 针对表【o_order_shipping(发货记录表)】的数据库操作Service -* @createDate 2024-03-31 11:16:00 +* @description 针对表【o_shipment(发货-发货记录表)】的数据库操作Service +* @createDate 2025-05-24 16:26:06 */ public interface OShipmentService extends IService { - /** - * 发货记录 - * @param shipping - * @param pageQuery - * @return - */ PageResult queryPageList(OShipment shipping, PageQuery pageQuery); - - /** - * 手动订单发货 - * @param shipping - * @return - */ - ResultVo handOrderShip(OrderShipBo shipping); - - - /** - * 发货消息 - * @param orderNum - * @param shopType - * @param logisticsCompany - * @param logisticsCode - * @return - */ -// ResultVo shipSendMessage(String orderNum, EnumShopType shopType,String logisticsCompany,String logisticsCode); } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index b3f58d32..9ab27882 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -1,18 +1,15 @@ package cn.qihangerp.module.order.service.impl; +import cn.qihangerp.common.bo.ShopOrderShipBo; +import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; -import cn.qihangerp.module.order.domain.OOrder; -import cn.qihangerp.module.order.domain.OOrderItem; -import cn.qihangerp.module.order.domain.OfflineOrder; -import cn.qihangerp.module.order.domain.OfflineOrderItem; +import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; +import cn.qihangerp.module.order.domain.*; import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; -import cn.qihangerp.module.order.mapper.OOrderItemMapper; -import cn.qihangerp.module.order.mapper.OOrderMapper; -import cn.qihangerp.module.order.mapper.OfflineOrderItemMapper; -import cn.qihangerp.module.order.mapper.OfflineOrderMapper; +import cn.qihangerp.module.order.mapper.*; import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.request.OrderSearchRequest; import com.alibaba.fastjson2.JSONArray; @@ -31,7 +28,6 @@ import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.StringUtils; import lombok.AllArgsConstructor; -import lombok.extern.java.Log; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -56,9 +52,15 @@ public class OOrderServiceImpl extends ServiceImpl private final OOrderMapper orderMapper; private final OOrderItemMapper orderItemMapper; - + private final OLogisticsCompanyMapper logisticsCompanyMapper; private final OGoodsSkuMapper oGoodsSkuMapper; + private final OOrderShipListMapper orderShipListMapper; + private final OOrderShipListItemMapper orderShipListItemMapper; + + private final OShipmentMapper shipmentMapper; + private final OShipmentItemMapper shipmentItemMapper; + private final OfflineOrderMapper offlineOrderMapper; private final OfflineOrderItemMapper offlineOrderItemMapper; @@ -1451,6 +1453,154 @@ public class OOrderServiceImpl extends ServiceImpl return orderMapper.getWaitShipOrderAllCount(); } + /** + * 手动发货-仓库发货 + * @param shipBo + * @param createBy + * @return + */ + @Transactional + @Override + public ResultVo manualShipmentOrder(ShopOrderShipBo shipBo, String createBy) { + if (org.springframework.util.StringUtils.isEmpty(shipBo.getId()) || shipBo.getId().equals("0")) + return ResultVo.error(ResultVoEnum.ParamsError, "缺少参数：id"); + + if(org.springframework.util.StringUtils.isEmpty(shipBo.getShippingNumber())) return ResultVo.error("快递单号不能为空"); + + OOrder erpOrder = orderMapper.selectById(shipBo.getId()); + if (erpOrder == null) { + return ResultVo.error("找不到订单数据"); + } else if (erpOrder.getOrderStatus().intValue() != 1 && erpOrder.getRefundStatus().intValue() != 1) { + return ResultVo.error("订单状态不对，不允许发货"); + } + OLogisticsCompany erpLogisticsCompany = logisticsCompanyMapper.selectById(shipBo.getShippingCompany()); + if(erpLogisticsCompany==null) return ResultVo.error("快递公司选择错误"); + + // 自己发货的list + List oOrderItems = orderItemMapper.selectList( + new LambdaQueryWrapper() + .eq(OOrderItem::getOrderId, erpOrder.getId()) + .eq(OOrderItem::getShipStatus,0) + .eq(OOrderItem::getShipType,0) + ); + if(oOrderItems==null) return ResultVo.error("订单 item 数据错误，无法发货！"); + // 添加到备货单 + OOrderShipList shipList = new OOrderShipList(); + shipList.setShopId(erpOrder.getShopId()); + shipList.setShopType(erpOrder.getShopType()); + shipList.setShipper(0); + shipList.setShipSupplierId(0L); + shipList.setShipSupplier("自由仓库发货"); + shipList.setOrderId(Long.parseLong(erpOrder.getId())); + shipList.setOrderNum(erpOrder.getOrderNum()); + shipList.setStatus(0); + shipList.setShipLogisticsCompany(erpLogisticsCompany.getName()); + shipList.setShipLogisticsCompanyCode(erpLogisticsCompany.getCode()); + shipList.setShipLogisticsCode(shipBo.getShippingNumber()); + shipList.setShipStatus(2); + shipList.setCreateTime(new Date()); + shipList.setCreateBy("手动发货"); + orderShipListMapper.insert(shipList); + + + // 添加发货记录 + OShipment erpShipment = new OShipment(); + erpShipment.setShopId(erpOrder.getShopId()); + erpShipment.setShipmentType(1); + erpShipment.setOrderNums(erpOrder.getOrderNum()); + erpShipment.setReceiverName(erpOrder.getReceiverName()); + erpShipment.setReceiverMobile(erpOrder.getReceiverMobile()); + erpShipment.setProvince(erpOrder.getProvince()); + erpShipment.setCity(erpOrder.getCity()); + erpShipment.setTown(erpOrder.getTown()); + erpShipment.setAddress(erpOrder.getAddress()); + erpShipment.setLogisticsCompany(erpLogisticsCompany.getName()); + erpShipment.setLogisticsCompanyCode(erpLogisticsCompany.getCode()); + erpShipment.setLogisticsCode(shipBo.getShippingNumber()); + erpShipment.setShipmentFee(shipBo.getShippingCost()); + erpShipment.setShipmentTime(new Date()); + erpShipment.setShipmentOperator(shipBo.getShippingMan()); + erpShipment.setShipmentStatus(1);//物流状态（1运输中2已完成） + + erpShipment.setPackageHeight(shipBo.getHeight()); + erpShipment.setPackageWeight(shipBo.getWeight()); + erpShipment.setPackageLength(shipBo.getLength()); + erpShipment.setPackageWidth(shipBo.getWidth()); + erpShipment.setPackageOperator(shipBo.getShippingMan()); + erpShipment.setPackageTime(new Date()); +// erpShipment.setPackages(JSONObject.toJSONString(oOrderItems)); + erpShipment.setRemark(shipBo.getRemark()); + erpShipment.setCreateBy("手动发货"); + erpShipment.setCreateTime(new Date()); + shipmentMapper.insert(erpShipment); + + for(OOrderItem orderItem:oOrderItems){ + // 添加备货清单item + OOrderShipListItem listItem=new OOrderShipListItem(); + listItem.setShopId(erpOrder.getShopId()); + listItem.setShopType(erpOrder.getShopType()); + listItem.setListId(shipList.getId()); + listItem.setShipper(shipList.getShipper()); + listItem.setShipSupplier(shipList.getShipSupplier()); + listItem.setShipSupplierId(shipList.getShipSupplierId()); + listItem.setOrderId(Long.parseLong(orderItem.getOrderId())); + listItem.setOrderItemId(Long.parseLong(orderItem.getId())); + listItem.setOrderNum(orderItem.getOrderNum()); + listItem.setOriginalSkuId(orderItem.getSkuId()); + listItem.setGoodsId(orderItem.getGoodsId()); + listItem.setSkuId(orderItem.getGoodsSkuId()); + listItem.setGoodsTitle(orderItem.getGoodsTitle()); + listItem.setGoodsImg(orderItem.getGoodsImg()); + listItem.setGoodsNum(orderItem.getGoodsNum()); + listItem.setSkuName(orderItem.getGoodsSpec()); + listItem.setSkuNum(orderItem.getSkuNum()); + listItem.setQuantity(orderItem.getQuantity()); + listItem.setStatus(0);//状态0待备货1备货中2备货完成3已发货 + listItem.setCreateBy("手动发货"); + listItem.setCreateTime(new Date()); + orderShipListItemMapper.insert(listItem); + + // 添加发货清单 + OShipmentItem erpShipmentItem = new OShipmentItem(); + erpShipmentItem.setShipmentId(erpShipment.getId()); + erpShipmentItem.setOrderId(Long.parseLong(orderItem.getOrderId())); + erpShipmentItem.setOrderNum(orderItem.getOrderNum()); + erpShipmentItem.setOrderItemId(Long.parseLong(orderItem.getId())); + erpShipmentItem.setSubOrderNum(orderItem.getSubOrderNum()); + erpShipmentItem.setGoodsId(orderItem.getGoodsId()); + erpShipmentItem.setSkuId(orderItem.getGoodsSkuId()); + erpShipmentItem.setGoodsTitle(orderItem.getGoodsTitle()); + erpShipmentItem.setGoodsNum(orderItem.getGoodsNum()); + erpShipmentItem.setGoodsImg(orderItem.getGoodsImg()); + erpShipmentItem.setSkuName(orderItem.getGoodsSpec()); + erpShipmentItem.setSkuNum(orderItem.getSkuNum()); + erpShipmentItem.setQuantity(orderItem.getQuantity()); + shipmentItemMapper.insert(erpShipmentItem); + + // 更新订单item发货状态 + OOrderItem orderItemUpdate = new OOrderItem(); + orderItemUpdate.setId( orderItem.getId()); + orderItemUpdate.setUpdateBy("手动发货"); + orderItemUpdate.setUpdateTime(new Date()); + orderItemUpdate.setShipType(0); + orderItemUpdate.setShipStatus(1);//发货状态 0 待发货 1 已发货 + orderItemMapper.updateById(orderItemUpdate); + } + + + // 更新状态、发货方式 + OOrder update = new OOrder(); + update.setId(erpOrder.getId()); + update.setShipType(0); + update.setShipStatus(2); + update.setOrderStatus(2); + update.setUpdateTime(new Date()); + update.setUpdateBy("手动发货"); + orderMapper.updateById(update); + + return ResultVo.success(); + } + } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java new file mode 100644 index 00000000..5679e460 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java @@ -0,0 +1,53 @@ +package cn.qihangerp.module.order.service.impl; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +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.module.order.domain.OOrderShipListItem; +import cn.qihangerp.module.order.service.OOrderShipListItemService; +import cn.qihangerp.module.order.mapper.OOrderShipListItemMapper; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** +* @author qilip +* @description 针对表【o_order_ship_list_item(发货-备货表（打单加入备货清单）)】的数据库操作Service实现 +* @createDate 2025-05-24 16:03:35 +*/ +@Service +public class OOrderShipListItemServiceImpl extends ServiceImpl + implements OOrderShipListItemService{ + + @Override + public PageResult queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(OOrderShipListItem::getShipper,0) + .eq(bo.getShopId()!=null,OOrderShipListItem::getShopId,bo.getShopId()) + .eq(bo.getStatus()!=null,OOrderShipListItem::getStatus,bo.getStatus()) + .eq(StringUtils.hasText(bo.getOrderNum()),OOrderShipListItem::getOrderNum,bo.getOrderNum()) + ; + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } + + @Override + public PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(OOrderShipListItem::getShipper,1) + .eq(bo.getShopId()!=null,OOrderShipListItem::getShopId,bo.getShopId()) + .eq(bo.getStatus()!=null,OOrderShipListItem::getStatus,bo.getStatus()) + .eq(StringUtils.hasText(bo.getOrderNum()),OOrderShipListItem::getOrderNum,bo.getOrderNum()) + ; + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java new file mode 100644 index 00000000..e935a07e --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java @@ -0,0 +1,39 @@ +package cn.qihangerp.module.order.service.impl; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +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.module.order.domain.OOrderShipList; +import cn.qihangerp.module.order.service.OOrderShipListService; +import cn.qihangerp.module.order.mapper.OOrderShipListMapper; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** +* @author qilip +* @description 针对表【o_order_ship_list(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service实现 +* @createDate 2025-05-24 16:03:35 +*/ +@Service +public class OOrderShipListServiceImpl extends ServiceImpl + implements OOrderShipListService{ + @Override + public PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(OOrderShipList::getShipper,1) + .eq(bo.getShopId()!=null,OOrderShipList::getShopId,bo.getShopId()) + .eq(bo.getStatus()!=null,OOrderShipList::getStatus,bo.getStatus()) + .eq(StringUtils.hasText(bo.getOrderNum()),OOrderShipList::getOrderNum,bo.getOrderNum()) + ; + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java deleted file mode 100644 index ed08ee82..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.qihangerp.module.order.service.impl; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -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.module.order.domain.OShipStockUpItem; -import cn.qihangerp.module.order.service.OShipStockUpItemService; -import cn.qihangerp.module.order.mapper.OShipStockUpItemMapper; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** -* @author qilip -* @description 针对表【o_ship_stock_up_item(发货-备货表（打单加入备货清单）)】的数据库操作Service实现 -* @createDate 2025-05-23 21:43:16 -*/ -@Service -public class OShipStockUpItemServiceImpl extends ServiceImpl - implements OShipStockUpItemService{ - - @Override - public PageResult queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(OShipStockUpItem::getShipper,0) - .eq(bo.getShopId()!=null,OShipStockUpItem::getShopId,bo.getShopId()) - .eq(bo.getStatus()!=null,OShipStockUpItem::getStatus,bo.getStatus()) - .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUpItem::getOrderNum,bo.getOrderNum()) - ; - Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); - - return PageResult.build(pages); - } - @Override - public PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(OShipStockUpItem::getShipper,1) - .eq(bo.getShopId()!=null,OShipStockUpItem::getShopId,bo.getShopId()) - .eq(bo.getStatus()!=null,OShipStockUpItem::getStatus,bo.getStatus()) - .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUpItem::getOrderNum,bo.getOrderNum()) - ; - Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); - - return PageResult.build(pages); - } -} - - - - diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java deleted file mode 100644 index ddca885e..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.qihangerp.module.order.service.impl; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.order.domain.OShipStockUpItem; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -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.module.order.domain.OShipStockUp; -import cn.qihangerp.module.order.service.OShipStockUpService; -import cn.qihangerp.module.order.mapper.OShipStockUpMapper; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** -* @author qilip -* @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service实现 -* @createDate 2025-05-23 21:43:16 -*/ -@Service -public class OShipStockUpServiceImpl extends ServiceImpl - implements OShipStockUpService{ - - @Override - public PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(OShipStockUp::getShipper,1) - .eq(bo.getShopId()!=null,OShipStockUp::getShopId,bo.getShopId()) - .eq(bo.getStatus()!=null,OShipStockUp::getStatus,bo.getStatus()) - .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUp::getOrderNum,bo.getOrderNum()) - ; - Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); - - return PageResult.build(pages); - } -} - - - - diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentItemServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentItemServiceImpl.java index 08a97d0c..1225a17a 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentItemServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentItemServiceImpl.java @@ -1,20 +1,19 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.module.order.domain.OShipmentItem; -import cn.qihangerp.module.order.mapper.OShipmentItemMapper; -import cn.qihangerp.module.order.service.OShipmentItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - +import cn.qihangerp.module.order.domain.OShipmentItem; +import cn.qihangerp.module.order.service.OShipmentItemService; +import cn.qihangerp.module.order.mapper.OShipmentItemMapper; import org.springframework.stereotype.Service; /** -* @author TW -* @description 针对表【o_order_shipping_item(OMS发货明细表)】的数据库操作Service实现 -* @createDate 2024-05-23 14:01:14 +* @author qilip +* @description 针对表【o_shipment_item(发货-发货记录明细表)】的数据库操作Service实现 +* @createDate 2025-05-24 16:21:35 */ @Service public class OShipmentItemServiceImpl extends ServiceImpl - implements OShipmentItemService { + implements OShipmentItemService{ } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java index 373c167d..920cc4ce 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java @@ -1,42 +1,24 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.module.order.domain.*; -import cn.qihangerp.module.order.domain.bo.OrderShipBo; -import cn.qihangerp.module.order.mapper.*; -import cn.qihangerp.module.order.service.OShipmentService; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; 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.common.enums.EnumShopType; -import lombok.AllArgsConstructor; -import lombok.extern.java.Log; +import cn.qihangerp.module.order.domain.OShipment; +import cn.qihangerp.module.order.service.OShipmentService; +import cn.qihangerp.module.order.mapper.OShipmentMapper; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; /** * @author qilip -* @description 针对表【o_order_shipping(发货记录表)】的数据库操作Service实现 -* @createDate 2024-03-31 11:16:00 +* @description 针对表【o_shipment(发货-发货记录表)】的数据库操作Service实现 +* @createDate 2025-05-24 16:26:06 */ -@Log -@AllArgsConstructor @Service public class OShipmentServiceImpl extends ServiceImpl - implements OShipmentService { - private final OShipmentMapper mapper; - private final OShipmentItemMapper shippingItemMapper; - private final OOrderMapper orderMapper; - private final OOrderItemMapper itemMapper; - + implements OShipmentService{ /** * 查询发货记录 * @param shipping @@ -47,182 +29,12 @@ public class OShipmentServiceImpl extends ServiceImpl queryPageList(OShipment shipping, PageQuery pageQuery) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .likeRight(StringUtils.hasText(shipping.getOrderNums()), OShipment::getOrderNums, shipping.getOrderNums()) - .eq(StringUtils.hasText(shipping.getWaybillCode()), OShipment::getWaybillCode, shipping.getWaybillCode()) + .eq(StringUtils.hasText(shipping.getLogisticsCode()), OShipment::getLogisticsCode, shipping.getLogisticsCode()) .eq(shipping.getShopId() != null, OShipment::getShopId, shipping.getShopId()); - Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); return PageResult.build(pages); } - - /** - * 手动订单发货 - * @param shipBo - * @return - */ - @Transactional - @Override - public ResultVo handOrderShip(OrderShipBo shipBo) { - if(shipBo.getItemIds()==null || shipBo.getItemIds().length ==0) return ResultVo.error(ResultVoEnum.ParamsError,"参数错误：缺失OrderItemId"); - List shippingItemList = new ArrayList<>(); - List orderNums = new ArrayList<>(); - List subOrderNums = new ArrayList<>(); - for (var orderItemId:shipBo.getItemIds()) { - // 查询子订单是否存在 - OOrderItem oOrderItem = itemMapper.selectById(orderItemId); - if(oOrderItem==null ) return ResultVo.error(ResultVoEnum.NotFound, orderItemId + "子订单未找到"); - else if (oOrderItem.getRefundStatus()!=1) { - return ResultVo.error(ResultVoEnum.StatusError, orderItemId + "子订单退款状态不允许发货"); - } - - // 查询子订单对应的主订单是否存在 - OOrder oOrder = orderMapper.selectById(oOrderItem.getOrderId()); - if (oOrder == null) { - // 没有找到订单 - return ResultVo.error(ResultVoEnum.NotFound, orderItemId + "子订单对应的主订单未找到"); - }else if(oOrder.getOrderStatus() != 1){ - return ResultVo.error(ResultVoEnum.StatusError, orderItemId + "子订单对应的主订单状态不允许发货"); - } - - orderNums.add(oOrderItem.getOrderNum()); - subOrderNums.add(oOrderItem.getSubOrderNum()); - - // 添加shipping_item - OShipmentItem shippingItem = new OShipmentItem(); - shippingItem.setOrderId(oOrderItem.getOrderId()); - shippingItem.setOrderItemId(oOrderItem.getId()); - shippingItem.setOrderNum(oOrderItem.getOrderNum()); - shippingItem.setSubOrderNum(oOrderItem.getSubOrderNum()); - shippingItemList.add(shippingItem); - } - - // 订单发货主表 - OShipment shipping = new OShipment(); - shipping.setShippingType(1);//订单发货 - shipping.setShopId(shipBo.getShopId()); - shipping.setOrderNums(String.join(", ", orderNums)); - shipping.setSubOrderNums(String.join(", ", subOrderNums)); - shipping.setReceiverName(shipBo.getReceiverName()); - shipping.setReceiverMobile(shipBo.getReceiverMobile()); - shipping.setProvince(shipBo.getProvince()); - shipping.setCity(shipBo.getCity()); - shipping.setTown(shipBo.getTown()); - shipping.setAddress(shipBo.getAddress()); - shipping.setLogisticsCompany(shipBo.getShipCompany()); - shipping.setLogisticsCompanyCode(shipBo.getShipCompany()); - shipping.setWaybillCode(shipBo.getShipCode()); - shipping.setShippingTime(new Date()); -// shipping.setRemark("手动发货"); - shipping.setCreateTime(new Date()); - mapper.insert(shipping); - - // 添加发货子表 - for (var item:shippingItemList) { - item.setShippingId(shipping.getId()); - shippingItemMapper.insert(item); - } -// // 回写主订单状态 -// OOrder update = new OOrder(); -// update.setId(oOrders.get(0).getId()); -// update.setOrderStatus(2);//2已发货 -// update.setShippingTime(new Date()); -// update.setShippingCompany(shipping.getLogisticsCompanyCode()); -// update.setShippingNumber(shipping.getWaybillCode()); -// update.setShippingMan(shipping.getShippingOperator()); -// update.setUpdateTime(new Date()); -// update.setUpdateBy(shipping.getCreateBy()); -// orderMapper.updateById(update); - - return ResultVo.success(); - } - - - -// @Transactional -// @Override -// public ResultVo shipSendMessage(String orderNum, EnumShopType shopType,String logisticsCompany,String logisticsCode) { -// -// List oOrders = orderMapper.selectList(new LambdaQueryWrapper().eq(OOrder::getOrderNum, orderNum).eq(OOrder::getShopType, shopType.getIndex())); -// if(oOrders == null || oOrders.size()==0){ -// log.info("===========订单发货错误：OOrder表中没有找到订单数据====="+orderNum); -// }else { -// log.info("===========订单发货开始处理业务====="+orderNum); -// // 更新erp sale order 订单表发货状态 -// if(oOrders.get(0).getOrderStatus()!=3){ -// //2是已发货 -// OOrder update = new OOrder(); -// update.setId(oOrders.get(0).getId()); -// update.setOrderStatus(2); -// update.setShippingCompany(logisticsCompany); -// update.setShippingNumber(logisticsCode); -// update.setShippingCost(BigDecimal.ZERO); -// update.setShippingMan("消息通知发货完成"); -// update.setShippingTime(new Date()); -//// update.setShipStatus(3); -// -// update.setUpdateTime(new Date()); -// update.setUpdateBy("消息通知发货完成"); -// orderMapper.updateById(update); -// } -// // 更新备货表相关订单状态0_ship_stock_up -// OShipStockUp shipStockUp = new OShipStockUp(); -// shipStockUp.setUpdateBy("消息通知发货完成"); -// shipStockUp.setUpdateTime(new Date()); -// shipStockUp.setStatus(3);//状态0待备货1备货中2已出库3已发货 -// shipStockUpMapper.update(shipStockUp,new LambdaQueryWrapper().eq(OShipStockUp::getSaleOrderId,oOrders.get(0).getId())); -// -// //插入发货表数据o_shipment & o_shipment_item -// List oOrderItems = itemMapper.selectList(new LambdaQueryWrapper().eq(OOrderItem::getOrderId, oOrders.get(0).getId())); -// List orderNums = new ArrayList<>(); -// List subOrderNums = new ArrayList<>(); -// List shippingItemList = new ArrayList<>(); -// for (var oOrderItem:oOrderItems) { -//// if (oOrderItem.getRefundStatus()!=1) { -//// return ResultVo.error(ResultVoEnum.StatusError, orderItemId + "子订单退款状态不允许发货"); -//// } -// -// orderNums.add(oOrderItem.getOrderNum()); -// subOrderNums.add(oOrderItem.getSubOrderNum()); -// -// // 添加shipping_item -// OShipmentItem shippingItem = new OShipmentItem(); -// shippingItem.setOrderId(oOrderItem.getOrderId()); -// shippingItem.setOrderItemId(oOrderItem.getId()); -// shippingItem.setOrderNum(oOrderItem.getOrderNum()); -// shippingItem.setSubOrderNum(oOrderItem.getSubOrderNum()); -// shippingItemList.add(shippingItem); -// } -// -// // 订单发货主表 -// OShipment shipping = new OShipment(); -// shipping.setShippingType(1);//订单发货 -// shipping.setShopId(oOrders.get(0).getShopId()); -// shipping.setOrderNums(String.join(", ", orderNums)); -// shipping.setSubOrderNums(String.join(", ", subOrderNums)); -// shipping.setReceiverName(oOrders.get(0).getReceiverName()); -// shipping.setReceiverMobile(oOrders.get(0).getReceiverMobile()); -// shipping.setProvince(oOrders.get(0).getProvince()); -// shipping.setCity(oOrders.get(0).getCity()); -// shipping.setTown(oOrders.get(0).getTown()); -// shipping.setAddress(oOrders.get(0).getAddress()); -// shipping.setLogisticsCompany(logisticsCompany); -// shipping.setLogisticsCompanyCode(logisticsCompany); -// shipping.setWaybillCode(logisticsCode); -// shipping.setShippingTime(new Date()); -//// shipping.setRemark("手动发货"); -// shipping.setCreateTime(new Date()); -// mapper.insert(shipping); -// -// // 添加发货子表 -// for (var item:shippingItemList) { -// item.setShippingId(shipping.getId()); -// shippingItemMapper.insert(item); -// } -// -// -// } -// -// return ResultVo.success(); -// } } diff --git a/module/order/src/main/resources/mapper/OOrderItemMapper.xml b/module/order/src/main/resources/mapper/OOrderItemMapper.xml index dcfeb9f0..796abe21 100644 --- a/module/order/src/main/resources/mapper/OOrderItemMapper.xml +++ b/module/order/src/main/resources/mapper/OOrderItemMapper.xml @@ -7,6 +7,8 @@ + + @@ -25,6 +27,8 @@ + + @@ -33,7 +37,7 @@ - id,order_id,sub_order_num, + id,order_id,sub_order_num,shop_id,shop_type,ship_type,ship_status, sku_id,goods_id,goods_sku_id, goods_title,goods_img,goods_num, goods_spec,sku_num,goods_price,discount_amount, diff --git a/module/order/src/main/resources/mapper/OOrderMapper.xml b/module/order/src/main/resources/mapper/OOrderMapper.xml index 59a87127..046da5f2 100644 --- a/module/order/src/main/resources/mapper/OOrderMapper.xml +++ b/module/order/src/main/resources/mapper/OOrderMapper.xml @@ -8,7 +8,7 @@ - + @@ -29,15 +29,7 @@ - - - - - - - - - + @@ -56,10 +48,7 @@ order_status,goods_amount,amount,platform_discount,seller_discount,payment,post_fee, receiver_name,receiver_mobile,address, province,city,town, - order_time,ship_type,shipping_time, - shipping_number,shipping_company,shipping_man, - shipping_cost,length,width, - height,weight,create_time, + order_time,ship_type,ship_status,create_time, create_by,update_time,update_by