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

Skip to content

L
liquidnet-bus-v1
Commit 775befdd authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

快递

parent b8f3cd6c
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 28 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ 775befdd
......@@ -803,10 +803,10 @@ CREATE TABLE `kylin_order_express`
`order_tickets_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
`order_express_code` varchar(255) NOT NULL DEFAULT '' COMMENT '订单快递编号',
`mailno` varchar(255) NOT NULL DEFAULT '' COMMENT '顺丰运单号',
`express_type` tinyint NOT NULL DEFAULT '0' COMMENT '快件产品类型 1顺丰特快...',
`express_type` tinyint NOT NULL DEFAULT 0 COMMENT '快件产品类型 1顺丰特快...',
`filter_result` varchar(2) NOT NULL DEFAULT '0' COMMENT '1-人工确认；2-可收派；3-不可以收派',
`remark` varchar(255) NOT NULL DEFAULT '' COMMENT 'filter_result=3时返回不可以收派的原因代码',
`express_status` tinyint NOT NULL DEFAULT '0' COMMENT '快递状态',
`express_status` tinyint NOT NULL DEFAULT 0 COMMENT '快递状态',
`origincode` varchar(255) NOT NULL DEFAULT '' COMMENT '原寄地区域代码 可用于顺丰电子面单标签打印',
`destcode` varchar(255) NOT NULL DEFAULT '' COMMENT '目的地区域代码 可用于顺丰电子面单标签打印',
`print_icon` varchar(255) NOT NULL DEFAULT '' COMMENT '打印图标',
......@@ -841,12 +841,12 @@ CREATE TABLE `kylin_order_express_route`
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`order_express_route_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_route_id',
`order_express_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_id',
`accept_address` varchar(200) NOT NULL DEFAULT '0' COMMENT '路由节点发生的城市',
`accept_address` varchar(200) NOT NULL DEFAULT '' COMMENT '路由节点发生的城市',
`accept_date` varchar(200) NOT NULL DEFAULT '' COMMENT 'YYYY-MM-DD',
`accept_time` varchar(200) NOT NULL DEFAULT '0.00' COMMENT 'HH24:MM:SS',
`accept_totaltime` varchar(200) NOT NULL DEFAULT '0.00' COMMENT 'YYYY-MM-DD HH24:MM:SS',
`remark` varchar(255) NOT NULL DEFAULT '0.00' COMMENT '路由节点具体描述',
`opcode` varchar(200) NOT NULL DEFAULT '0.00' COMMENT '路由节点操作码',
`accept_time` varchar(200) NOT NULL DEFAULT '' COMMENT 'HH24:MM:SS',
`accept_totaltime` varchar(200) NOT NULL DEFAULT '' COMMENT 'YYYY-MM-DD HH24:MM:SS',
`remark` varchar(255) NOT NULL DEFAULT '' COMMENT '路由节点具体描述',
`opcode` varchar(200) NOT NULL DEFAULT '' COMMENT '路由节点操作码',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
KEY `order_express_route_id_index` (`order_express_route_id`),
......@@ -859,14 +859,14 @@ CREATE TABLE `kylin_order_express_status`
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`order_express_status_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_status_id',
`order_express_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_id',
`orderStateCode` varchar(200) NOT NULL DEFAULT '0' COMMENT '订单状态',
`orderStateDesc` varchar(200) NOT NULL DEFAULT '0' COMMENT '订单状态描述',
`empCode` varchar(200) NOT NULL DEFAULT '' COMMENT '收件员工工号',
`empPhone` varchar(200) NOT NULL DEFAULT '0.00' COMMENT '收件员手机号',
`netCode` varchar(200) NOT NULL DEFAULT '0.00' COMMENT '网点',
`lastTime` varchar(255) NOT NULL DEFAULT '0.00' COMMENT '最晚上门时间',
`bookTime` varchar(200) NOT NULL DEFAULT '0.00' COMMENT '客户预约时间',
`carrierCode` varchar(200) NOT NULL DEFAULT '0.00' COMMENT '承运商代码(SF)',
`order_state_code` varchar(200) NOT NULL DEFAULT '' COMMENT '订单状态',
`order_state_desc` varchar(200) NOT NULL DEFAULT '' COMMENT '订单状态描述',
`emp_code` varchar(200) NOT NULL DEFAULT '' COMMENT '收件员工工号',
`emp_phone` varchar(200) NOT NULL DEFAULT '' COMMENT '收件员手机号',
`net_code` varchar(200) NOT NULL DEFAULT '' COMMENT '网点',
`last_time` varchar(255) NOT NULL DEFAULT '' COMMENT '最晚上门时间',
`book_time` varchar(200) NOT NULL DEFAULT '' COMMENT '客户预约时间',
`carrier_code` varchar(200) NOT NULL DEFAULT '' COMMENT '承运商代码(SF)',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
KEY `order_express_status_id_index` (`order_express_status_id`),
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java
View file @ 775befdd
......@@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
/**
......@@ -104,21 +106,29 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
return false;
}
public boolean orderFreightList(@RequestBody String performanceExpressPushFreightParam) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushFreightParam, httpServletRequest);
if (res) {
JsonUtils.fromJson(performanceExpressPushFreightParam, KylinOrderExpressFeeInfo.class);
public boolean orderFreightList(@RequestBody String params) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
if (true) {
PerformanceExpressPushFreightParam performanceExpressPushFreightParam = JsonUtils.fromJson(params, PerformanceExpressPushFreightParam.class);
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(new QueryWrapper<KylinOrderExpress>().eq("mailno", performanceExpressPushFreightParam.getWaybillNo()));
String orderExpressId = orderExpressInfo.getOrderExpressId();
kylinOrderExpressFeeInfoMapper.delete(new QueryWrapper<KylinOrderExpressFeeInfo>().eq("order_express_id", orderExpressId));
List<PerformanceExpressPushFreightInfoParam> feeList = performanceExpressPushFreightParam.getFeeList();
for (PerformanceExpressPushFreightInfoParam feeInfo : feeList) {
KylinOrderExpressFeeInfo kylinOrderExpressFeeInfo = new KylinOrderExpressFeeInfo();
String orderExpressFeeInfoId = IDGenerator.nextSnowId();
kylinOrderExpressFeeInfo.setOrderExpressFeeInfoId(orderExpressFeeInfoId);
kylinOrderExpressFeeInfo.setOrderExpressId(orderExpressId);
kylinOrderExpressFeeInfo.setType(feeInfo.getFeeIndType().toString());
kylinOrderExpressFeeInfo.setName(feeInfo.getFeeTypeCode());
kylinOrderExpressFeeInfo.setValue(BigDecimal.valueOf(feeInfo.getFeeAmt()));
kylinOrderExpressFeeInfo.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressFeeInfoMapper.insert(kylinOrderExpressFeeInfo);
}
return true;
}
/*KylinOrderExpressFeeInfo kylinOrderExpressFeeInfo = new KylinOrderExpressFeeInfo();
String orderExpressFeeInfoId = IDGenerator.nextSnowId();
kylinOrderExpressFeeInfo.setOrderExpressFeeInfoId(orderExpressFeeInfoId);
kylinOrderExpressFeeInfo.setOrderExpressId(orderExpressInfo.getOrderExpressId());
kylinOrderExpressFeeInfo.setType((String) feeInfo.get("type"));
kylinOrderExpressFeeInfo.setName((String) feeInfo.get("name"));
kylinOrderExpressFeeInfo.setValue(new BigDecimal(feeInfo.get("value").toString()));
kylinOrderExpressFeeInfo.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressFeeInfoMapper.insert(kylinOrderExpressFeeInfo);*/
return false;
}
......
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