快递

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -108,7 +108,26 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 结果主动查询
+     * 订单运费估算
+     */
+    @RequiresPermissions("kylin:performancesExpress:getFreight")
+    @PostMapping("/getFreight")
+    @ResponseBody
+    public AjaxResult getFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.getFreight(performanceExpressSearchAdminParam);
+        try {
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 下单结果主动查询
      */
     @RequiresPermissions("kylin:performancesExpress:getResult")
     @PostMapping("/getResult")
@@ -145,4 +164,50 @@ public class PerformancesExpressController extends BaseController {
         }
     }
 
+    /**
+     * 路由主动查询
+     */
+    @RequiresPermissions("kylin:performancesExpress:listOrderRoute")
+    @PostMapping("/listOrderRoute")
+    @ResponseBody
+    public AjaxResult listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.listOrderRoute(performanceExpressSearchAdminParam);
+        try {
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 订单状态推送
+     */
+
+    /**
+     * 路由推送
+     */
+
+    /**
+     * 清单运费推送
+     */
+
+    /**
+     * 预计派件时间
+     */
+
+    /**
+     * 通缉拦截
+     * 该接口只能在揽收后，派送成功前生效
+     * 同一订单在成功通缉拦截一次后，不可再次进行通缉拦截
+     * 1-转寄；2-退回；3-优派；4-再派；5-改自取（改派-其他自取点取件）；6-改派送（上门派送）；7-更改派送时间；8-修改收件人信息；9-更改付款方式；10-修改代收货款；12-作废；
+     */
+
+    /**
+     * 订单确认 快递员上门揽收前，如需修改部分下单内容（如收件人信息等
+     */
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html

@@ -72,6 +72,7 @@
     var cancelOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:cancelOrder')}]];
     var getResultFlag = [[${@permission.hasPermi('kylin:performancesExpress:getResult')}]];
     var getListFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getListFreight')}]];
+    var listOrderRouteFlag = [[${@permission.hasPermi('kylin:performancesExpress:listOrderRoute')}]];
 
     var prefix = ctx + "kylin/performancesExpress";
 
@@ -85,6 +86,7 @@
             cancelOrderUrl: prefix + "/cancelOrder",
             getResultUrl: prefix + "/getResult",
             getListFreightUrl: prefix + "/getListFreight",
+            listOrderRouteUrl: prefix + "/listOrderRoute",
             columns: [{
                 checkbox: true
             },
@@ -145,6 +147,7 @@
                         actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
                         actions.push('<a class="btn btn-default btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
                         actions.push('<a class="btn btn-default btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
+                        actions.push('<a class="btn btn-default btn-xs ' + listOrderRouteFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取路由信息吗？\', table.options.listOrderRouteUrl)"></i>路由主动查询</a> ');
                         return actions.join('');
                     }
                 }]

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

@@ -299,4 +299,95 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         return ResponseDto.success();
     }
 
+    public ResponseDto listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        List<String> ids = performanceExpressSearchAdminParam.getIds();
+        Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
+        for (String orderTicketsId : ids) {
+            KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
+                    new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
+                            .notIn("express_status", expressStatus)
+            );
+            if (null != orderExpressInfo) {
+                HashMap<String, Object> hBody = new HashMap<>();
+                hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
+
+                // 生成签名并请求
+                String result = shunfengSignUtils.generateSignatureAndRequest(hBody, "/public/order/v1/listOrderRoute");
+                HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
+                System.out.println(result);
+                if (hashMap.get("succ").equals("fail")) {
+                    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);
+                        }
+                    }*/
+                }
+            }
+        }
+        return ResponseDto.success();
+    }
+
+    public ResponseDto getFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        List<String> ids = performanceExpressSearchAdminParam.getIds();
+        Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
+        for (String orderTicketsId : ids) {
+            KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
+                    new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
+                            .notIn("express_status", expressStatus)
+            );
+            if (null != orderExpressInfo) {
+                HashMap<String, Object> hBody = new HashMap<>();
+                hBody.put("jProvince", "");
+                hBody.put("jCity", "");
+                hBody.put("jAddress", "");
+
+                hBody.put("dProvince", "");
+                hBody.put("dCity", "");
+                hBody.put("dAddress", "");
+                hBody.put("expressType", "");
+                hBody.put("parcelWeighs", 2.00);
+                hBody.put("volume", "10,10,20");
+
+                // 生成签名并请求
+                String result = shunfengSignUtils.generateSignatureAndRequest(hBody, "/public/order/v1/getFreight");
+                HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
+                System.out.println(result);
+                if (hashMap.get("succ").equals("fail")) {
+                    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);
+                        }
+                    }*/
+                }
+            }
+        }
+        return ResponseDto.success();
+    }
+
 }