From d3c53bda86848d07f803348c14af4f296b0898d6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 06 二月 2025 15:14:39 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 3749999..af2f961 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -339,8 +339,8 @@
}
}
- PageInfo<OrderPageListVo> pageInfo = new PageInfo(orderPageList.getPageCurr(), orderPageList.getPageSize());
-
+ PageInfo<OrderPageListVo> pageInfo = new PageInfo<>(orderPageList.getPageCurr(), orderPageList.getPageSize());
+
List<OrderPageListVo> list = this.baseMapper.getOrderPageList(pageInfo, orderPageList);
for (OrderPageListVo orderPageListVo : list) {
Long appUserId = orderPageListVo.getAppUserId();
@@ -436,7 +436,7 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
Integer waitTime = jsonObject.getInteger("waitTime");
redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
-
+
JSONObject jsonObject1 = JSON.parseObject(confirmDelivery.getCode());
String com = jsonObject1.getString("com");
String num = jsonObject1.getString("num");
@@ -446,6 +446,10 @@
order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
this.updateById(order);
return R.ok();
+ }
+
+ public static void main(String[] args) {
+ System.out.println(LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
}
@@ -942,20 +946,21 @@
int lastRowNum = sheet.getLastRowNum();
for (int i = 2; i <= lastRowNum; i++) {
Row row = sheet.getRow(i);
- row.getCell(1).setCellType(CellType.STRING);
- String orderNum = row.getCell(1).getStringCellValue();
+ // 订单编号
+ row.getCell(0).setCellType(CellType.STRING);
+ String orderNum = row.getCell(0).getStringCellValue();
// 快递单号
- row.getCell(7).setCellType(CellType.STRING);
- String expressNum = row.getCell(7).getStringCellValue();
+ row.getCell(1).setCellType(CellType.STRING);
+ String expressNum = row.getCell(1).getStringCellValue();
// 快递公司名称
- row.getCell(8).setCellType(CellType.STRING);
- String expressName = row.getCell(8).getStringCellValue();
+ row.getCell(2).setCellType(CellType.STRING);
+ String expressName = row.getCell(2).getStringCellValue();
// 省区划代码
- row.getCell(10).setCellType(CellType.STRING);
- String provinceCode = row.getCell(10).getStringCellValue();
+ row.getCell(3).setCellType(CellType.STRING);
+ String provinceCode = row.getCell(3).getStringCellValue();
// 市区划代码
- row.getCell(12).setCellType(CellType.STRING);
- String cityCode = row.getCell(12).getStringCellValue();
+ row.getCell(4).setCellType(CellType.STRING);
+ String cityCode = row.getCell(4).getStringCellValue();
Order order = this.getOne(new LambdaQueryWrapper<Order>()
.eq(Order::getOrderNumber, orderNum)
);
@@ -989,7 +994,7 @@
throw new ServiceException("城市编码错误："+cityCode, 500);
}
JSONObject jsonObject = new JSONObject();
- jsonObject.put("com", expressName);
+ jsonObject.put("com", companyNameByCode);
jsonObject.put("num", expressNum);
ConfirmDelivery confirmDelivery =new ConfirmDelivery();
confirmDelivery.setOrderId(order.getId());
@@ -1037,7 +1042,4 @@
}
}
- public static void main(String[] args) throws MalformedURLException {
- importExpress2("http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/69c1fcbe5c114f2a9f38703e4f5e1af0.xlsx");
- }
}
--
Gitblit v1.7.1