快递相关类提交

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressBatchesService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.kylin.entity.ExpressBatches;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface IExpressBatchesService extends IService<ExpressBatches> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressLogsService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.kylin.entity.ExpressLogs;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface IExpressLogsService extends IService<ExpressLogs> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressTimelinesService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.kylin.entity.ExpressTimelines;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 快递时间线表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface IExpressTimelinesService extends IService<ExpressTimelines> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressesService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.kylin.entity.Expresses;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 快递表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface IExpressesService extends IService<Expresses> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/MybatisPlusCodeGenerator.java

@@ -101,7 +101,8 @@ public class MybatisPlusCodeGenerator {
 //        String[] dbTableArray = new String[]{"kylin_road_shows"};
 //        String[] dbTableArray = new String[]{"kylin_buy_notice"};
 //        String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
-        String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
+//        String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
+        String[] dbTableArray = new String[]{"express_batches","express_logs","express_timelines","expresses"};
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressBatches.java

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ExpressBatches implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 管理员
+     */
+    private Integer adminId;
+
+    /**
+     * 订单Id，订阅前查询
+     */
+    private Integer orderId;
+
+    /**
+     * 订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单
+     */
+    private String orderType;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 快递公司名称
+     */
+    private String name;
+
+    /**
+     * 快递公司编号
+     */
+    private String company;
+
+    /**
+     * 快递单号
+     */
+    private String number;
+
+    /**
+     * 状态 0新导入 1订阅成功 2订阅失败
+     */
+    private Integer status;
+
+    /**
+     * 导入时间
+     */
+    private LocalDateTime importTime;
+
+    /**
+     * 导入批次
+     */
+    private Integer batch;
+
+    /**
+     * 失败原因
+     */
+    private String reason;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressLogs.java

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ExpressLogs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 订单id
+     */
+    private Integer orderId;
+
+    /**
+     * 订单类型 order_product 商品订单 , order_ticket 票务订单
+     */
+    private String orderType;
+
+    /**
+     * 修改人id
+     */
+    private Integer adminId;
+
+    /**
+     * 修改人名称
+     */
+    private String adminName;
+
+    /**
+     * 快递联系人
+     */
+    private String name;
+
+    /**
+     * 快递联系电话
+     */
+    private String mobile;
+
+    /**
+     * 快递收货地址
+     */
+    private String address;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressTimelines.java

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 快递时间线表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ExpressTimelines implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 快递
+     */
+    private Integer expressId;
+
+    /**
+     * 快递消息
+     */
+    private String context;
+
+    /**
+     * 时间，原始格式
+     */
+    private String time;
+
+    /**
+     * 格式化后时间
+     */
+    private LocalDateTime ftime;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/Expresses.java

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 快递表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Expresses implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 管理员
+     */
+    private Integer adminId;
+
+    /**
+     * 订单Id
+     */
+    private Integer orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单
+     */
+    private String orderType;
+
+    /**
+     * 状态 -1待揽收、0在途中、1已揽收、2疑难、3已签收
+     */
+    private Integer status;
+
+    /**
+     * 快递单号
+     */
+    private String number;
+
+    /**
+     * 快递公司名称
+     */
+    private String name;
+
+    /**
+     * 快递公司编号
+     */
+    private String company;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressBatchesMapper.java

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.ExpressBatches;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface ExpressBatchesMapper extends BaseMapper<ExpressBatches> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressLogsMapper.java

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.ExpressLogs;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface ExpressLogsMapper extends BaseMapper<ExpressLogs> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressTimelinesMapper.java

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.ExpressTimelines;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 快递时间线表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface ExpressTimelinesMapper extends BaseMapper<ExpressTimelines> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressesMapper.java

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.Expresses;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 快递表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+public interface ExpressesMapper extends BaseMapper<Expresses> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressBatchesMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressBatchesMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressLogsMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressLogsMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressTimelinesMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressTimelinesMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressesMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressesMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -588,6 +588,7 @@ CREATE TABLE `kylin_check_user_performances`
 
 
 -- 快递相关临时
+drop TABLE if exists `express_batches`;
 CREATE TABLE `express_batches` (
                                    `id` int unsigned NOT NULL AUTO_INCREMENT,
                                    `admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
@@ -610,6 +611,7 @@ CREATE TABLE `express_batches` (
                                    KEY `express_batches_order_code_index` (`order_code`),
                                    KEY `express_batches_order_type_index` (`order_type`)
 ) ENGINE=InnoDB AUTO_INCREMENT=34781 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+drop TABLE if exists `express_logs`;
 CREATE TABLE `express_logs` (
                                 `id` int unsigned NOT NULL AUTO_INCREMENT,
                                 `order_id` int NOT NULL COMMENT '订单id',
@@ -623,28 +625,18 @@ CREATE TABLE `express_logs` (
                                 `updated_at` timestamp NULL DEFAULT NULL,
                                 PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=487 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-CREATE TABLE `express_batches` (
+drop TABLE if exists `express_timelines`;
+CREATE TABLE `express_timelines` (
                                      `id` int unsigned NOT NULL AUTO_INCREMENT,
-                                   `admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
-                                   `order_id` int NOT NULL DEFAULT '0' COMMENT '订单Id，订阅前查询',
-                                   `order_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单',
-                                   `order_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
-                                   `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司名称',
-                                   `company` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司编号',
-                                   `number` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递单号',
-                                   `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态 0新导入 1订阅成功 2订阅失败',
-                                   `import_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '导入时间',
-                                   `batch` int NOT NULL DEFAULT '0' COMMENT '导入批次',
-                                   `reason` varchar(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '失败原因',
+                                     `express_id` int NOT NULL DEFAULT '0' COMMENT '快递',
+                                     `context` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '快递消息',
+                                     `time` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '时间，原始格式',
+                                     `ftime` datetime NOT NULL COMMENT '格式化后时间',
                                      `created_at` timestamp NULL DEFAULT NULL,
                                      `updated_at` timestamp NULL DEFAULT NULL,
-                                   PRIMARY KEY (`id`),
-                                   KEY `express_batches_batch_index` (`batch`),
-                                   KEY `express_batches_company_index` (`company`),
-                                   KEY `express_batches_number_index` (`number`),
-                                   KEY `express_batches_order_code_index` (`order_code`),
-                                   KEY `express_batches_order_type_index` (`order_type`)
-) ENGINE=InnoDB AUTO_INCREMENT=34781 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+                                     PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2039805 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='快递时间线表';
+drop TABLE if exists `expresses`;
 CREATE TABLE `expresses` (
                              `id` int unsigned NOT NULL AUTO_INCREMENT,
                              `admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/ExpressesController.java

+package com.liquidnet.service.kylin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 快递表 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@RestController
+@RequestMapping("/expresses")
+public class ExpressesController {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressBatchesServiceImpl.java

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.service.kylin.entity.ExpressBatches;
+import com.liquidnet.service.kylin.mapper.ExpressBatchesMapper;
+import com.liquidnet.service.kylin.service.IExpressBatchesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Service
+public class ExpressBatchesServiceImpl extends ServiceImpl<ExpressBatchesMapper, ExpressBatches> implements IExpressBatchesService {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressLogsServiceImpl.java

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.service.kylin.entity.ExpressLogs;
+import com.liquidnet.service.kylin.mapper.ExpressLogsMapper;
+import com.liquidnet.service.kylin.service.IExpressLogsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Service
+public class ExpressLogsServiceImpl extends ServiceImpl<ExpressLogsMapper, ExpressLogs> implements IExpressLogsService {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressTimelinesServiceImpl.java

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.service.kylin.entity.ExpressTimelines;
+import com.liquidnet.service.kylin.mapper.ExpressTimelinesMapper;
+import com.liquidnet.service.kylin.service.IExpressTimelinesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 快递时间线表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Service
+public class ExpressTimelinesServiceImpl extends ServiceImpl<ExpressTimelinesMapper, ExpressTimelines> implements IExpressTimelinesService {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressesServiceImpl.java

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.service.kylin.entity.Expresses;
+import com.liquidnet.service.kylin.mapper.ExpressesMapper;
+import com.liquidnet.service.kylin.service.IExpressesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 快递表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-26
+ */
+@Service
+public class ExpressesServiceImpl extends ServiceImpl<ExpressesMapper, Expresses> implements IExpressesService {
+
+}