记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 6e1c2f80 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

提交 订单列表 暂时 待修改

parent 2874f5b5
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 1118 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/BatchImportParam.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import lombok.Data;
import java.io.File;
@Data
public class BatchImportParam {
private String admin_id;
private String order_type;
private File excel;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/CourierListVo.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import com.liquidnet.service.kylin.entity.ExpressTimelines;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class CourierListVo implements Serializable {
private static final long serialVersionUID = 4283677861855377186L;
private String expressNumber;
private String expressCompany;
private List<ExpressTimelines> expressTimeLine;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/ExpressTimeLineVo.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import lombok.Data;
import java.io.Serializable;
@Data
public class ExpressTimeLineVo implements Serializable {
private static final long serialVersionUID = 7800739802323711435L;
private Integer id;
private Integer express_id;
private String context;
private String time;
private String ftime;
private String created_at;
private String updated_at;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/Kuaidi100Param.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import lombok.Data;
@Data
public class Kuaidi100Param {
private LastResultParam lastResultParam;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/KuaidiAdminParam.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import lombok.Data;
@Data
public class KuaidiAdminParam {
private int admin_id;
private int order_id;
private String order_code;
private String order_type;
private String number;
private String company;
// private String name;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/KuaidiDatasParam.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import lombok.Data;
@Data
public class KuaidiDatasParam {
private String context;
private String time;
private String ftime;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/KuaidiReturn.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import lombok.Data;
@Data
public class KuaidiReturn {
private boolean boolResult;
private Integer returnCode;
private String message;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/LastResultParam.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.dto.vo.tmp;
import lombok.Data;
import java.util.List;
@Data
public class LastResultParam {
private List<KuaidiDatasParam> data;
private String nu;
private String com;
private Integer state;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressBatchesService.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.entity.ExpressBatches;
/**
* <p>
* 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressBatchesService extends IService<ExpressBatches> {
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressLogsService.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.entity.ExpressLogs;
/**
* <p>
* 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressLogsService extends IService<ExpressLogs> {
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressTimelinesService.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.entity.ExpressTimelines;
/**
* <p>
* 快递时间线表 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressTimelinesService extends IService<ExpressTimelines> {
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressesService.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.tmp.CourierListVo;
import com.liquidnet.service.kylin.dto.vo.tmp.KuaidiAdminParam;
import com.liquidnet.service.kylin.dto.vo.tmp.KuaidiReturn;
import com.liquidnet.service.kylin.entity.ExpressBatches;
import com.liquidnet.service.kylin.entity.Expresses;
/**
* <p>
* 快递表 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressesService extends IService<Expresses> {
/**
* 根据订单ID查询快递信息
* order_id ：订单号
* type：订单类型 （订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单）
*/
ResponseDto<CourierListVo> courierList(String orderId, String type);
/**
* 快递100 订阅接«口
* company 快递公司
* number 快递单号
*/
KuaidiReturn observer(String company , String number);
void observerResult(String param);
String addExpress(KuaidiAdminParam param);
String editExpress(KuaidiAdminParam param);
String getExpressCompany(String name);
String getExpressCompanyEn(String name);
String innerAddExpress(KuaidiAdminParam param);
PageInfo<ExpressBatches> expressObserveUnSuccess(int page , int size);
// void expressBatchImport(); // 批量导入
// void expressImport(); // 单条导入
// void expressEdit(); // 编辑快递收货地址
// void expressEditLog(); //快递收货地址修改记录
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/other/DamaiService.java
View file @ 6e1c2f80
package com.liquidnet.service.kylin.service.other;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.tmp.CourierListVo;
import com.liquidnet.service.kylin.entity.KylinTicketTimes;
import com.liquidnet.service.kylin.entity.KylinTickets;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressBatches.java deleted 100644 → 0
View file @ 2874f5b5
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-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressLogs.java deleted 100644 → 0
View file @ 2874f5b5
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-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressTimelines.java deleted 100644 → 0
View file @ 2874f5b5
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-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/Expresses.java deleted 100644 → 0
View file @ 2874f5b5
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-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressBatchesMapper.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.ExpressBatches;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.entity.Expresses;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface ExpressBatchesMapper extends BaseMapper<ExpressBatches> {
List<ExpressBatches> selectStatusOrder();
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressLogsMapper.java deleted 100644 → 0
View file @ 2874f5b5
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-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressTimelinesMapper.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.ExpressTimelines;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 快递时间线表 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface ExpressTimelinesMapper extends BaseMapper<ExpressTimelines> {
List<ExpressTimelines> selectListOrder(Integer expressId);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressesMapper.java deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.Expresses;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 快递表 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface ExpressesMapper extends BaseMapper<Expresses> {
List<Expresses> selectListOrder(String orderId,String type);
Expresses selectListNumByCom(String com,String nu);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressBatchesMapper.xml deleted 100644 → 0
View file @ 2874f5b5
<?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">
<select id="selectStatusOrder" parameterType="java.lang.String"
resultType="com.liquidnet.service.kylin.entity.ExpressBatches">
SELECT *
FROM express_batches
where status = 0
or status = 2
ORDER BY batch, status DESC
</select>
</mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressLogsMapper.xml deleted 100644 → 0
View file @ 2874f5b5
<?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-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressTimelinesMapper.xml deleted 100644 → 0
View file @ 2874f5b5
<?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">
<select id="selectListOrder" parameterType="java.lang.Integer"
resultType="com.liquidnet.service.kylin.entity.ExpressTimelines">
SELECT ftime, context
FROM express_timelines
where express_id = #{expressId}
ORDER BY created_at DESC
</select>
</mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressesMapper.xml deleted 100644 → 0
View file @ 2874f5b5
<?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">
<select id="selectListOrder" parameterType="java.lang.String"
resultType="com.liquidnet.service.kylin.entity.Expresses">
SELECT *
FROM expresses
where order_type = #{type}
and order_id = #{orderId}
ORDER BY created_at DESC
</select>
<select id="selectListNumByCom" parameterType="java.lang.String"
resultType="com.liquidnet.service.kylin.entity.Expresses">
SELECT *
FROM expresses
where company = #{com}
and number = #{nu}
ORDER BY id DESC
limit 1
</select>
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ 6e1c2f80
......@@ -568,96 +568,6 @@ CREATE TABLE `kylin_check_user_performances`
DEFAULT CHARSET = utf8mb4 COMMENT '验票用户可看演出表';
-- 快递相关临时
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 '管理员',
`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 '失败原因',
`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;
drop TABLE if exists `express_logs`;
CREATE TABLE `express_logs`
(
`id` int unsigned NOT NULL AUTO_INCREMENT,
`order_id` int NOT NULL COMMENT '订单id',
`order_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单',
`admin_id` int NOT NULL DEFAULT '0' COMMENT '修改人id',
`admin_name` varchar(100) 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 '快递联系人',
`mobile` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递联系电话',
`address` varchar(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递收货地址',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE = InnoDB
AUTO_INCREMENT = 487
DEFAULT CHARSET = utf8
COLLATE = utf8_unicode_ci
ROW_FORMAT = DYNAMIC;
drop TABLE if exists `express_timelines`;
CREATE TABLE `express_timelines`
(
`id` int unsigned NOT NULL AUTO_INCREMENT,
`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`)
) 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 '管理员',
`order_id` int NOT NULL DEFAULT '0' COMMENT '订单Id',
`order_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
`order_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单',
`status` tinyint NOT NULL DEFAULT '-1' COMMENT '状态 -1待揽收、0在途中、1已揽收、2疑难、3已签收',
`number` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci 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 '快递公司编号',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `expresses_number_index` (`number`),
KEY `expresses_order_code_index` (`order_code`),
KEY `expresses_order_id_index` (`order_id`),
KEY `expresses_order_type_index` (`order_type`)
) ENGINE = InnoDB
AUTO_INCREMENT = 56762
DEFAULT CHARSET = utf8
COLLATE = utf8_unicode_ci
ROW_FORMAT = DYNAMIC COMMENT ='快递表';
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
values ('1', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png',
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/ExpressesController.java deleted 100644 → 0
View file @ 2874f5b5
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 deleted 100644 → 0
View file @ 2874f5b5
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 deleted 100644 → 0
View file @ 2874f5b5
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 deleted 100644 → 0
View file @ 2874f5b5
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 deleted 100644 → 0
View file @ 2874f5b5
package com.liquidnet.service.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dto.vo.tmp.*;
import com.liquidnet.service.kylin.entity.ExpressBatches;
import com.liquidnet.service.kylin.entity.ExpressTimelines;
import com.liquidnet.service.kylin.entity.Expresses;
import com.liquidnet.service.kylin.mapper.ExpressBatchesMapper;
import com.liquidnet.service.kylin.mapper.ExpressTimelinesMapper;
import com.liquidnet.service.kylin.mapper.ExpressesMapper;
import com.liquidnet.service.kylin.service.IExpressesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.http.client.utils.URLEncodedUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 快递表 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Service
public class ExpressesServiceImpl extends ServiceImpl<ExpressesMapper, Expresses> implements IExpressesService {
@Value("")
private String localUrl;
@Autowired
private ExpressesMapper expressesMapper;
@Autowired
private ExpressTimelinesMapper expressTimelinesMapper;
@Autowired
private ExpressBatchesMapper expressBatchesMapper;
@Override
public ResponseDto<CourierListVo> courierList(String orderId, String type) {
List<Expresses> list = expressesMapper.selectListOrder(orderId, type);
CourierListVo vo = new CourierListVo();
if (list.size() > 0) {
Expresses expresses = list.get(0);
Integer expressId = expresses.getId();
String expressNumber = expresses.getNumber();
String expressCompany = expresses.getName();
vo.setExpressNumber(expressNumber);
vo.setExpressCompany(expressCompany);
List<ExpressTimelines> expressTimelines = expressTimelinesMapper.selectListOrder(expressId);
vo.setExpressTimeLine(expressTimelines);
} else {
vo.setExpressNumber("");
vo.setExpressCompany("");
}
return ResponseDto.success(vo);
}
@Override
public KuaidiReturn observer(String company, String number) {
String param = "{\"company\":\"" + company + "\", \"number\":\"" + number + "\",\"from\":\"\", \"to\":\"\", \"key\":\"" + "DxjgEfKw8868" + "\", \"parameters\":{\"callbackurl\":\"http://" + localUrl + "/common/kuaidiCallBack\"}}";
LinkedMultiValueMap<String, String> postData = new LinkedMultiValueMap<>();
postData.add("schema", "json");
postData.add("param", param);
String url = "http://www.kuaidi100.com/poll";
// String o = "";
// for(Map.Entry<String, String> entry : postData.entrySet()){
// String mapKey = entry.getKey();
// String mapValue = entry.getValue();
// o += ""+mapKey+"=" + URLEncodedUtils.formatSegments(mapValue) + "&";
// }
// String postDataString = o.substring(0,o.length()-1);
String result = HttpUtil.post(url, postData);
System.out.println("\n\n" + result + "\n\n");
return JsonUtils.fromJson(result, KuaidiReturn.class);
}
@Override
public void observerResult(String param) {
Kuaidi100Param kuaidiParam = JsonUtils.fromJson(param, Kuaidi100Param.class);
try {
LastResultParam lastResultParam = kuaidiParam.getLastResultParam();
List<KuaidiDatasParam> datas = lastResultParam.getData();
String nu = lastResultParam.getNu();
String com = lastResultParam.getCom();
ExpressTimelines timeLineData = new ExpressTimelines();
Expresses expresses = expressesMapper.selectListNumByCom(com, nu);
Integer expressId = expresses.getId();
if (!expresses.getStatus().equals(lastResultParam.getState())) {
Integer statusInt = 0;
if (lastResultParam.getState() >= 4 && lastResultParam.getState() <= 7) {
statusInt = 0;
} else {
statusInt = lastResultParam.getState();
}
Expresses changeData = new Expresses();
changeData.setStatus(statusInt);
expressesMapper.update(changeData, new UpdateWrapper<Expresses>().eq("id", expresses.getId()));
timeLineData.setExpressId(expressId);
HashMap<String, Object> deleteMap = new HashMap<>();
deleteMap.put("express_id", expressId);
expressTimelinesMapper.deleteByMap(deleteMap);
for (KuaidiDatasParam item : datas) {
timeLineData.setContext(item.getContext());
timeLineData.setTime(item.getTime());
timeLineData.setFtime(LocalDateTime.parse(item.getFtime()));
expressTimelinesMapper.insert(timeLineData);
}
System.out.println("{\"result\":\"true\",\t\"returnCode\":\"200\",\"message\":\"成功\"}");
}
} catch (Exception e) {
System.out.println("{\"result\":\"false\",\t\"returnCode\":\"500\",\"message\":\"失败\"}");
}
}
@Override
public String addExpress(KuaidiAdminParam param) {
String message = "创建快递信息失败";
String name = getExpressCompany(param.getCompany());
try {
if (name.equals("order")) {
return "不支持填写的快递公司";
}
Expresses expresses = new Expresses();
BeanUtils.copyProperties(param, expresses);
expresses.setName(name);
int count = expressesMapper.insert(expresses);
if (count == 1) {
KuaidiReturn result100 = observer(expresses.getCompany(), expresses.getNumber());
if(result100.isBoolResult() && result100.getReturnCode()==200){
return "OK";
}else{
return message;
}
} else {
return message;
}
} catch (Exception e) {
return message;
}
}
@Override
public String editExpress(KuaidiAdminParam param) {
String message = "创建快递信息失败";
String name = getExpressCompany(param.getCompany());
try {
if (name.equals("order")) {
return "不支持填写的快递公司";
}
Expresses expresses = new Expresses();
BeanUtils.copyProperties(param, expresses);
expresses.setName(name);
int count = expressesMapper.update(expresses,new UpdateWrapper<Expresses>().eq("order_id",expresses.getOrderId()).eq("order_type",expresses.getOrderType()));
if (count == 1) {
KuaidiReturn result100 = observer(expresses.getCompany(), expresses.getNumber());
if(result100.isBoolResult() && result100.getReturnCode()==200){
return "OK";
}else{
return message;
}
} else {
return message;
}
} catch (Exception e) {
return message;
}
}
@Override
public String getExpressCompany(String name) {
String company;
switch (name) {
case "shunfeng": {
company = "顺丰";
break;
}
case "shentong": {
company = "申通";
break;
}
case "yuantong": {
company = "圆通";
break;
}
case "zhongtong": {
company = "中通";
break;
}
case "yunda": {
company = "韵达";
break;
}
case "huitongkuaidi": {
company = "汇通";
break;
}
case "debangwuliu": {
company = "德邦";
break;
}
case "tiantian": {
company = "天天";
break;
}
case "rufengda": {
company = "如风达";
break;
}
case "ems": {
company = "EMS";
break;
}
case "jd": {
company = "京东";
break;
}
default: {
company = "other";
break;
}
}
return company;
}
@Override
public String getExpressCompanyEn(String name) {
if (name.contains("顺丰")) {
return "shunfeng";
} else if (name.contains("申通")) {
return "shentong";
} else if (name.contains("圆通")) {
return "yuantong";
} else if (name.contains("中通")) {
return "zhongtong";
} else if (name.contains("韵达")) {
return "yunda";
} else if (name.contains("汇通")) {
return "huitongkuaidi";
} else if (name.contains("德邦")) {
return "debangwuliu";
} else if (name.contains("天天")) {
return "tiantian";
} else if (name.contains("如风达")) {
return "rufengda";
} else if (name.contains("EMS")) {
return "ems";
} else if (name.contains("京东")) {
return "jd";
} else if (name.contains("百世")) {
return "baishi";
} else {
return "";
}
}
@Override
public String innerAddExpress(KuaidiAdminParam param) {
String message = param.getNumber().toString();
String name = getExpressCompany(param.getCompany());
try {
if (name.equals("order")) {
return "不支持填写的快递公司";
}
Expresses expresses = new Expresses();
BeanUtils.copyProperties(param, expresses);
expresses.setName(name);
int count = expressesMapper.insert(expresses);
if (count == 1) {
KuaidiReturn result100 = observer(expresses.getCompany(), expresses.getNumber());
if(result100.isBoolResult() && result100.getReturnCode()==200){
return "OK";
}else{
return message;
}
} else {
return message;
}
} catch (Exception e) {
return message;
}
}
@Override
public PageInfo<ExpressBatches> expressObserveUnSuccess(int page, int size) {
PageInfo<ExpressBatches> pageInfoTmp = null;
try {
PageHelper.startPage(page, size);
List<ExpressBatches> voList = expressBatchesMapper.selectStatusOrder();
pageInfoTmp = new PageInfo(voList);
} catch (Exception e) {
return null;
}
return pageInfoTmp;
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 6e1c2f80
package com.liquidnet.service.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageInfo;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
......@@ -23,7 +22,6 @@ import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.ExpressesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -91,8 +89,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
@Autowired
private FeignAdamBaseClient feignAdamBaseClient;
@Autowired
private ExpressesMapper expressesMapper;
@Autowired
private TaobaoTicketUtils taobaoTicketUtils;
@Override
......@@ -113,7 +109,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
ticketTimesData = timeItem;
for (int y = 0; y < ticketTimesData.getTicketList().size(); y++) {
KylinTicketVo ticketItem = ticketTimesData.getTicketList().get(y);
if (ticketItem.getTimeId().equals(payOrderParam.getTicketId())) {
if (ticketItem.getTicketsId().equals(payOrderParam.getTicketId())) {
ticketData = ticketItem;
break;
}
......@@ -122,7 +118,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
}
}
Integer isStudent = ticketData.getIsStudent();
if (performanceData == null || ticketTimesData == null || ticketData == null) {
lock.unlock();
return ResponseDto.failure("参数错误");//参数错误
......@@ -137,6 +132,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
return ResponseDto.failure("无权购买");
}
Integer isStudent = ticketData.getIsStudent();
//会员时间获取
String memberTimeStart = ticketData.getMemberTimeStart(); // 会员开售时间
String timeStart = ticketData.getTimeStart(); // 普通开售时间
......@@ -740,27 +736,35 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
PageInfo<List<KylinOrderListVo>> mPageInfo = null;
String uid = CurrentUtil.getCurrentUid();
checkOrderTime(uid);
page -= 1;
try {
// 排序 分页
Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "orderTicketsId"));
// Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "orderTicketsId"));
//条件
Query query = new Query();
query.addCriteria(
Criteria.where("userId").is(uid).and("status").ne(-1)
Criteria.where("userId").is(uid)
// .and("status").ne(-1)
);
query.fields().include("orderTicketsId");
// 查询总数
long count = mongoTemplate.count(query, KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
query.with(pageable);
List<KylinOrderListVo> voList = mongoTemplate.find(query, KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
for (KylinOrderListVo item : voList) {
Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_code", item.getOrderCode()).eq("order_type", "order_ticket"));
// long count = mongoTemplate.count(query, KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
// query.with(pageable);
List<KylinOrderListVo> voIdList = mongoTemplate.find(query, KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
List<KylinOrderListVo> voList = new ArrayList<>();
for (int i = page * size; i < voIdList.size(); i++) {
String orderTicketsId = voIdList.get(i).getOrderTicketsId();
KylinOrderTicketVo data = dataUtils.getOrderTicketVo(orderTicketsId);
KylinOrderListVo item = new KylinOrderListVo();
BeanUtils.copyProperties(data, item);
//TODO 顺丰快递
Object expresses = null;
if (null != expresses) {
item.setExpress_number(expresses.getNumber());
item.setExpress_company(expresses.getName());
item.setKuaidi_status(expresses.getStatus());
item.setExpress_number("");//expresses.getNumber()
item.setExpress_company("");//expresses.getName()
item.setKuaidi_status(-2);//expresses.getStatus()
} else {
item.setExpress_number("");
item.setExpress_company("");
......@@ -775,10 +779,14 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
} else {
item.setRestTime(0L);
}
voList.add(item);
if(voList.size()>=20){
break;
}
}
mPageInfo = new PageInfo(voList);
mPageInfo.setTotal(count);
mPageInfo.setTotal(voIdList.size());
return mPageInfo;
} catch (Exception e) {
e.printStackTrace();
......@@ -794,7 +802,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
checkOrderTime(uid);
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
if (null != orderTicketVo) {
Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
//TODO 顺丰快递
Object expresses = null;
// Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
// 数据脱敏
......@@ -817,9 +827,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
}
//快递
if (null != expresses) {
vo.setExpress_number(expresses.getNumber());
vo.setExpress_company(expresses.getName());
vo.setKuaidi_status(expresses.getStatus());
vo.setExpress_number("");//expresses.getNumber()
vo.setExpress_company("");//expresses.getName()
vo.setKuaidi_status(-2);//expresses.getStatus()
} else {
vo.setExpress_number("");
vo.setExpress_company("");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment