From 38085f1cba05d480205f93fc695e37584c94dcd6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 06 二月 2025 15:07:11 +0800
Subject: [PATCH] 订单管理-订单列表接口新增下单时间搜索条件
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 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 d385ba9..d5751fa 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));
}
@@ -937,11 +941,12 @@
public void importExpress(String url) {
URL url1 = new URL(url);
try (InputStream fileInputStream = url1.openStream()) {
- Workbook workbook = new SXSSFWorkbook(new XSSFWorkbook(fileInputStream));
+ Workbook workbook = new XSSFWorkbook(fileInputStream);
Sheet sheet = workbook.getSheetAt(0); // 获取第一个Sheet
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(7).setCellType(CellType.STRING);
@@ -957,17 +962,26 @@
String cityCode = row.getCell(12).getStringCellValue();
Order order = this.getOne(new LambdaQueryWrapper<Order>()
.eq(Order::getOrderNumber, orderNum)
- .eq(Order::getOrderType, 2)
- .eq(Order::getDistributionMode,2)
- .eq(Order::getOrderStatus, 1)
);
if (order == null){
throw new ServiceException("订单不存在："+orderNum, 500);
}
- String companyNameByCode = ExpressCompanyMap.getCompanyNameByCode(expressName);
+ Integer orderType = order.getOrderType();
+ if (orderType != 2){
+ throw new ServiceException("该订单："+orderNum+"类型不为单品订单", 500);
+ }
+ if (order.getDistributionMode() != 2){
+ throw new ServiceException("该订单："+orderNum+"配送方式不为快递", 500);
+ }
+ Integer orderStatus = order.getOrderStatus();
+ if (orderStatus != 1){
+ throw new ServiceException("该订单："+orderNum+"状态不为待发货", 500);
+ }
+
+ String companyNameByCode = ExpressCompanyMap.getCodeByCompanyName(expressName);
if(StringUtils.isEmpty(companyNameByCode)){
- throw new ServiceException("快递公司编码错误："+expressName, 500);
+ throw new ServiceException("快递公司名称错误："+expressName, 500);
}
R<Region> regionBiCode = regionClient.getRegionBiCode(provinceCode);
@@ -979,13 +993,16 @@
throw new ServiceException("城市编码错误："+cityCode, 500);
}
JSONObject jsonObject = new JSONObject();
- jsonObject.put("com", expressName);
+ jsonObject.put("com", companyNameByCode);
jsonObject.put("num", expressNum);
- order.setExpressJson(jsonObject.toJSONString());
- order.setDeliverProvinceCode(provinceCode);
- order.setDeliverCityCode(cityCode);
- order.setOrderStatus(2);
- this.updateById(order);
+ ConfirmDelivery confirmDelivery =new ConfirmDelivery();
+ confirmDelivery.setOrderId(order.getId());
+ confirmDelivery.setCode(jsonObject.toJSONString());
+ confirmDelivery.setDeliverProvince(regionBiCode.getData().getName());
+ confirmDelivery.setDeliverProvinceCode(regionBiCode.getData().getCode());
+ confirmDelivery.setDeliverCity(regionBiCode1.getData().getName());
+ confirmDelivery.setDeliverCityCode(regionBiCode1.getData().getCode());
+ confirmDelivery(confirmDelivery);
}
} catch (IOException e) {
@@ -1024,7 +1041,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