快递

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -77,6 +77,9 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
     @Autowired
     private KylinOrderExpressFeeInfoMapper kylinOrderExpressFeeInfoMapper;
 
+    @Autowired
+    private KylinOrderExpressRouteMapper kylinOrderExpressRouteMapper;
+
     public List<PerformanceExpressPerformanceListAdminDao> getPerformancesList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
         List<PerformanceExpressPerformanceListAdminDao> voList = new ArrayList();
         try {
@@ -281,6 +284,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                     HashMap resultResult = (HashMap) hashMap.get("result");
                     List<HashMap> feeList = (List) resultResult.get("feeList");
                     if (!CollectionUtil.isEmpty(feeList)) {
+                        kylinOrderExpressFeeInfoMapper.delete(new QueryWrapper<KylinOrderExpressFeeInfo>().eq("order_express_id", orderExpressInfo.getOrderExpressId()));
                         for (HashMap feeInfo : feeList) {
                             KylinOrderExpressFeeInfo kylinOrderExpressFeeInfo = new KylinOrderExpressFeeInfo();
                             String orderExpressFeeInfoId = IDGenerator.nextSnowId();
@@ -319,21 +323,24 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                     String msg = (String) hashMap.get("msg");
                     return ResponseDto.failure(msg);
                 } else {
-                    /*HashMap resultResult = (HashMap) hashMap.get("result");
-                    List<HashMap> feeList = (List) resultResult.get("feeList");
-                    if (!CollectionUtil.isEmpty(feeList)) {
-                        for (HashMap feeInfo : feeList) {
-                            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);
+                    List<HashMap> resultResult = (List) hashMap.get("result");
+                    if (!CollectionUtil.isEmpty(resultResult)) {
+                        kylinOrderExpressRouteMapper.delete(new QueryWrapper<KylinOrderExpressRoute>().eq("order_express_id", orderExpressInfo.getOrderExpressId()));
+                        for (HashMap routeInfo : resultResult) {
+                            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);
+                        }
                     }
-                    }*/
                 }
             }
         }

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

@@ -775,6 +775,24 @@ CREATE TABLE `kylin_order_express_fee_info`
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB COMMENT '订单快递费用信息表';
 
+drop TABLE if exists `kylin_order_express_route`;
+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_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 '路由节点操作码',
+    `created_at`             timestamp    NULL     DEFAULT NULL,
+    `updated_at`             timestamp    NULL     DEFAULT NULL,
+    KEY `order_express_route_id_index` (`order_express_route_id`),
+    PRIMARY KEY (`mid`)
+) ENGINE = InnoDB COMMENT '订单快递路由表';
+
 drop TABLE if exists `kylin_order_refund_pic`;
 CREATE TABLE `kylin_order_refund_pic`
 (