快递

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressPushRouteParam.java

@@ -12,7 +12,5 @@ public class PerformanceExpressPushRouteParam {
     private String acceptAddress;        // 路由节点发生的城市
     private String remark;        // 路由节点具体描述
     private String opCode;        // 路由节点操作码
-    private String companyId;        // 客户appid
-    private String routeAddress;        // 客户推送接收地址
 
 }

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

@@ -853,6 +853,26 @@ CREATE TABLE `kylin_order_express_route`
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB COMMENT '订单快递路由表';
 
+drop TABLE if exists `kylin_order_express_status`;
+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)',
+    `created_at`              timestamp    NULL     DEFAULT NULL,
+    `updated_at`              timestamp    NULL     DEFAULT NULL,
+    KEY `order_express_status_id_index` (`order_express_status_id`),
+    PRIMARY KEY (`mid`)
+) ENGINE = InnoDB COMMENT '订单快递状态表';
+
 drop TABLE if exists `kylin_order_refund_pic`;
 CREATE TABLE `kylin_order_refund_pic`
 (

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java

 package com.liquidnet.service.platform.service.express.shunfeng;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.*;
@@ -71,39 +72,46 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
     @Autowired
     private KylinOrderExpressRouteMapper kylinOrderExpressRouteMapper;
 
+    @Autowired
+    private KylinOrderExpressStatusMapper kylinOrderExpressStatusMapper;
+
     @Autowired
     HttpServletRequest httpServletRequest;
 
     @Autowired
     private RedisUtil redisUtil;
 
-    public boolean orderStatus(String performanceExpressPushStatusParam) {
-
-        boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushStatusParam, httpServletRequest);
-        System.out.println(performanceExpressPushStatusParam);
-        System.out.println(res);
-
-        Enumeration headerNames = httpServletRequest.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            String key = (String) headerNames.nextElement();
-            String value = httpServletRequest.getHeader(key);
-            System.out.println(key + "=" + value);
+    public boolean orderStatus(String params) {
+        boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
+        if (res) {
+            PerformanceExpressPushStatusParam performanceExpressPushStatusParam = JsonUtils.fromJson(params, PerformanceExpressPushStatusParam.class);
+            KylinOrderExpressStatus kylinOrderExpressStatus = new KylinOrderExpressStatus();
+            String orderExpressStatusId = IDGenerator.nextSnowId();
+
+            KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(new QueryWrapper<KylinOrderExpress>().eq("mailno", performanceExpressPushStatusParam.getWaybillNo()));
+            kylinOrderExpressStatus.setOrderExpressStatusId(orderExpressStatusId);
+            kylinOrderExpressStatus.setOrderExpressId(orderExpressInfo.getOrderExpressId());
+            kylinOrderExpressStatus.setOrderStateCode(performanceExpressPushStatusParam.getOrderStateCode());
+            kylinOrderExpressStatus.setOrderStateDesc(performanceExpressPushStatusParam.getOrderStateDesc());
+            kylinOrderExpressStatus.setEmpCode(performanceExpressPushStatusParam.getEmpCode());
+            kylinOrderExpressStatus.setEmpPhone(performanceExpressPushStatusParam.getEmpPhone());
+            kylinOrderExpressStatus.setNetCode(performanceExpressPushStatusParam.getNetCode());
+            kylinOrderExpressStatus.setLastTime(performanceExpressPushStatusParam.getLastTime());
+            kylinOrderExpressStatus.setBookTime(performanceExpressPushStatusParam.getBookTime());
+            kylinOrderExpressStatus.setCarrierCode(performanceExpressPushStatusParam.getCarrierCode());
+            kylinOrderExpressStatus.setCreatedAt(DateUtil.getNowTime());
+            kylinOrderExpressStatusMapper.insert(kylinOrderExpressStatus);
+            return true;
         }
 
         return false;
     }
 
     public boolean orderFreightList(String performanceExpressPushFreightParam) {
-
         boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushFreightParam, httpServletRequest);
-        System.out.println(performanceExpressPushFreightParam);
-        System.out.println(res);
-
-        Enumeration headerNames = httpServletRequest.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            String key = (String) headerNames.nextElement();
-            String value = httpServletRequest.getHeader(key);
-            System.out.println(key + "=" + value);
+        if (res) {
+            JsonUtils.fromJson(performanceExpressPushFreightParam, KylinOrderExpressFeeInfo.class);
+            return true;
         }
         /*KylinOrderExpressFeeInfo kylinOrderExpressFeeInfo = new KylinOrderExpressFeeInfo();
         String orderExpressFeeInfoId = IDGenerator.nextSnowId();
@@ -118,30 +126,24 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
         return false;
     }
 
-    public boolean orderRoute(String performanceExpressPushRouteParam) {
-
-        boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushRouteParam, httpServletRequest);
-        System.out.println(performanceExpressPushRouteParam);
-        System.out.println(res);
-
-        Enumeration headerNames = httpServletRequest.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            String key = (String) headerNames.nextElement();
-            String value = httpServletRequest.getHeader(key);
-            System.out.println(key + "=" + value);
+    public boolean orderRoute(String params) {
+        boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
+        if (res) {
+            PerformanceExpressPushRouteParam performanceExpressPushRouteParam = JsonUtils.fromJson(params, PerformanceExpressPushRouteParam.class);
+            KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
+            String orderExpressRouteId = IDGenerator.nextSnowId();
+
+            KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(new QueryWrapper<KylinOrderExpress>().eq("mailno", performanceExpressPushRouteParam.getMailno()));
+            kylinOrderExpressRoute.setOrderExpressRouteId(orderExpressRouteId);
+            kylinOrderExpressRoute.setOrderExpressId(orderExpressInfo.getOrderExpressId());
+            kylinOrderExpressRoute.setAcceptAddress(performanceExpressPushRouteParam.getAcceptAddress());
+            kylinOrderExpressRoute.setAcceptTotaltime(performanceExpressPushRouteParam.getAcceptTime());
+            kylinOrderExpressRoute.setRemark(performanceExpressPushRouteParam.getRemark());
+            kylinOrderExpressRoute.setOpcode(performanceExpressPushRouteParam.getOpCode());
+            kylinOrderExpressRoute.setCreatedAt(DateUtil.getNowTime());
+            kylinOrderExpressRouteMapper.insert(kylinOrderExpressRoute);
+            return true;
         }
-        /*KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
-        String orderExpressRouteId = IDGenerator.nextSnowId();
-        kylinOrderExpressRoute.setOrderExpressRouteId(orderExpressRouteId);
-        kylinOrderExpressRoute.setOrderExpressId(orderExpressInfo.getOrderExpressId());
-        kylinOrderExpressRoute.setAcceptAddress((String) routeInfo.get("accept_address"));
-        kylinOrderExpressRoute.setAcceptDate((String) routeInfo.get("accept_date"));
-        kylinOrderExpressRoute.setAcceptTime((String) routeInfo.get("accept_time"));
-        kylinOrderExpressRoute.setAcceptTotaltime((String) routeInfo.get("accept_totaltime"));
-        kylinOrderExpressRoute.setRemark((String) routeInfo.get("remark"));
-        kylinOrderExpressRoute.setOpcode((String) routeInfo.get("opcode"));
-        kylinOrderExpressRoute.setCreatedAt(DateUtil.getNowTime());
-        kylinOrderExpressRouteMapper.insert(kylinOrderExpressRoute);*/
 
         return false;
     }