物流查询多运单号适配

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1013,10 +1013,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     @Override
     public R getExpressMulti(FsStoreOrder order) {
         //顺丰轨迹查询处理
-        String lastFourNumber = "";
-        if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue())) {
-            lastFourNumber = PhoneUtils.getLastFourNum(order.getUserPhone());
-        }
+        String lastFourNumber = PhoneUtils.getLastFourNum(order.getUserPhone());
         // 获取该订单关联的物流信息
         List<FsStoreDelivers> fsStoreDelivers = fsStoreDeliversMapper.findByOrderId(order.getId());
         if(CollectionUtils.isEmpty(fsStoreDelivers)){

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -1324,51 +1324,7 @@ public class StoreOrderController extends  AppBaseController {
             throw new CustomException("未发货订单不能查询");
         }
 
-        JSONObject jsonObject = JSONObject.parseObject("{\n" +
-                "  \"LogisticCode\": \"YT1234567890\",  // 物流运单号, 示例：YT1234567890\n" +
-                "  \"ShipperCode\": \"YTO\",          // 快递公司编码, 示例：YTO (圆通)\n" +
-                "  \"Traces\": [                    // 物流轨迹, 数组形式，包含多个物流节点信息\n" +
-                "    {\n" +
-                "      \"Action\": \"已揽收\",       // 动作, 示例: 已揽收\n" +
-                "      \"Location\": \"上海市\",      //位置, 示例: 上海市\n" +
-                "      \"AcceptStation\": \"【上海市】已揽收, 揽收员：张三\",  // 物流节点描述, 示例：包裹已被揽收\n" +
-                "      \"AcceptTime\": \"2024-03-15 08:00:00\" // 物流节点时间, 示例：2024-03-15 08:00:00\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"运输中\",      // 动作, 示例: 运输中\n" +
-                "      \"Location\": \"上海市\",     // 位置, 示例：上海市\n" +
-                "      \"AcceptStation\": \"【上海市】已发出，下一站【上海市浦东新区】\",\n" +
-                "      \"AcceptTime\": \"2024-03-15 10:00:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"派送中\",      // 动作, 示例：派送中\n" +
-                "      \"Location\":\"上海市浦东新区\",       //位置, 示例：上海市浦东新区\n" +
-                "      \"AcceptStation\": \"【上海市浦东新区】派件中，派件员：张三，电话：13800000000\",\n" +
-                "      \"AcceptTime\": \"2024-03-16 09:00:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"已签收\",     // 动作, 示例：已签收\n" +
-                "      \"Location\": \"上海市浦东新区\",      //位置, 示例: 上海市浦东新区\n" +
-                "      \"AcceptStation\": \"【上海市浦东新区】已签收，签收人：本人\",\n" +
-                "      \"AcceptTime\": \"2024-03-16 12:00:00\"\n" +
-                "    }\n" +
-                "  ],\n" +
-                "  \"State\": \"3\",                // 物流状态：0-暂无轨迹信息 1-已揽收 2-在途中,3-签收,4-问题件, 示例：3 (已签收)\n" +
-                "  \"StateEx\": \"301\",              // 增值物流状态, 示例：301 (正常签收)\n" +
-                "  \"EBusinessID\": \"user123\",      // 用户ID, 示例：user123\n" +
-                "  \"Success\": true,             // 成功与否, 示例：true (成功)\n" +
-                "  \"Reason\": \"\",               // 失败原因, 示例：空字符串 (成功时为空)\n" +
-                "  \"ShipperName\": \"圆通快递\", // 快递公司名称, 示例：圆通快递\n" +
-                "  \"OrderCode\": \"order20240315\"  // 订单编号, 示例：order20240315\n" +
-                "}");
-
-        FsExpress fsExpress = new FsExpress();
-        fsExpress.setCode("YTO");
-        fsExpress.setName("圆通快递");
-
-        return R.ok().put("data", jsonObject)
-                .put("express",fsExpress).put("deliveryId",order.getDeliveryId());
-//        return orderService.getExpress(order);
+        return orderService.getExpress(order);
     }
 
 
@@ -1383,92 +1339,7 @@ public class StoreOrderController extends  AppBaseController {
         if (order.getStatus() <2) {
             throw new CustomException("未发货订单不能查询");
         }
-//        return orderService.getExpressMulti(order);
-
-        JSONObject jsonObject = JSONObject.parseObject("{\n" +
-                "  \"LogisticCode\": \"YT1234567890\",  // 物流运单号, 示例：YT1234567890\n" +
-                "  \"ShipperCode\": \"YTO\",          // 快递公司编码, 示例：YTO (圆通)\n" +
-                "  \"Traces\": [                    // 物流轨迹, 数组形式，包含多个物流节点信息\n" +
-                "    {\n" +
-                "      \"Action\": \"已揽收\",       // 动作, 示例: 已揽收\n" +
-                "      \"Location\": \"上海市\",      //位置, 示例: 上海市\n" +
-                "      \"AcceptStation\": \"【上海市】已揽收, 揽收员：张三\",  // 物流节点描述, 示例：包裹已被揽收\n" +
-                "      \"AcceptTime\": \"2024-03-15 08:00:00\" // 物流节点时间, 示例：2024-03-15 08:00:00\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"运输中\",      // 动作, 示例: 运输中\n" +
-                "      \"Location\": \"上海市\",     // 位置, 示例：上海市\n" +
-                "      \"AcceptStation\": \"【上海市】已发出，下一站【上海市浦东新区】\",\n" +
-                "      \"AcceptTime\": \"2024-03-15 10:00:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"派送中\",      // 动作, 示例：派送中\n" +
-                "      \"Location\":\"上海市浦东新区\",       //位置, 示例：上海市浦东新区\n" +
-                "      \"AcceptStation\": \"【上海市浦东新区】派件中，派件员：张三，电话：13800000000\",\n" +
-                "      \"AcceptTime\": \"2024-03-16 09:00:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"已签收\",     // 动作, 示例：已签收\n" +
-                "      \"Location\": \"上海市浦东新区\",      //位置, 示例: 上海市浦东新区\n" +
-                "      \"AcceptStation\": \"【上海市浦东新区】已签收，签收人：本人\",\n" +
-                "      \"AcceptTime\": \"2024-03-16 12:00:00\"\n" +
-                "    }\n" +
-                "  ],\n" +
-                "  \"State\": \"3\",                // 物流状态：0-暂无轨迹信息 1-已揽收 2-在途中,3-签收,4-问题件, 示例：3 (已签收)\n" +
-                "  \"StateEx\": \"301\",              // 增值物流状态, 示例：301 (正常签收)\n" +
-                "  \"EBusinessID\": \"user123\",      // 用户ID, 示例：user123\n" +
-                "  \"Success\": true,             // 成功与否, 示例：true (成功)\n" +
-                "  \"Reason\": \"\",               // 失败原因, 示例：空字符串 (成功时为空)\n" +
-                "  \"ShipperName\": \"圆通快递\", // 快递公司名称, 示例：圆通快递\n" +
-                "  \"OrderCode\": \"order20240315\"  // 订单编号, 示例：order20240315\n" +
-                "}");
-        JSONObject jsonObject2 = JSONObject.parseObject("{\n" +
-                "  \"LogisticCode\": \"SF9876543210\",\n" +
-                "  \"ShipperCode\": \"SF\",\n" +
-                "  \"Traces\": [\n" +
-                "    {\n" +
-                "      \"Action\": \"已揽收\",\n" +
-                "      \"Location\": \"上海市\",\n" +
-                "      \"AcceptStation\": \"【上海市】已揽收, 揽收员：张三\",\n" +
-                "      \"AcceptTime\": \"2024-03-15 08:00:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"运输中\",\n" +
-                "      \"Location\": \"上海市\",\n" +
-                "      \"AcceptStation\": \"【上海市】已发出，下一站【上海市浦东新区】\",\n" +
-                "      \"AcceptTime\": \"2024-03-15 10:00:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"派送中\",\n" +
-                "      \"Location\": \"上海市浦东新区\",\n" +
-                "      \"AcceptStation\": \"【上海市浦东新区】派件中，派件员：张三，电话：13800000000\",\n" +
-                "      \"AcceptTime\": \"2024-03-16 09:00:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"已签收\",\n" +
-                "      \"Location\": \"上海市浦东新区XX小区\",\n" +
-                "      \"AcceptStation\": \"【上海市浦东新区】已签收，签收人：门卫\",\n" +
-                "      \"AcceptTime\": \"2024-03-16 12:30:00\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"Action\": \"离开\",\n" +
-                "      \"Location\": \"上海市浦东新区XX小区\",\n" +
-                "      \"AcceptStation\": \"包裹已离开XX小区，开始新的旅程\",\n" +
-                "      \"AcceptTime\": \"2024-03-16 13:00:00\"\n" +
-                "    }\n" +
-                "  ],\n" +
-                "  \"State\": \"3\",\n" +
-                "  \"StateEx\": \"302\",\n" +
-                "  \"EBusinessID\": \"user456\",\n" +
-                "  \"Success\": true,\n" +
-                "  \"Reason\": \"\",\n" +
-                "  \"ShipperName\": \"顺丰速运\",\n" +
-                "  \"OrderCode\": \"order20240316\"\n" +
-                "}");
-        JSONArray objects = new JSONArray();
-        objects.add(jsonObject);
-        objects.add(jsonObject2);
-        return R.ok().put("data", objects);
+        return orderService.getExpressMulti(order);
     }