From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
index 98a4736..f65ae18 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
@@ -113,9 +113,10 @@
public R<String> excelExport(OrderQueryRequest orderQueryRequest, HttpServletResponse response) {
try {
response.setCharacterEncoding(Constants.UTF8);
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setContentType("application/vnd.ms-excel");
response.setHeader("Access-Control-Expose-Headers", "Content-disposition");
- response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(Constants.EXCEL_ORDER_FILE_NAME, CharEncoding.UTF_8) + ".xlsx");
+ response.setHeader("Content-Disposition", "attachment;filename=" +
+ URLEncoder.encode(Constants.EXCEL_ORDER_FILE_NAME, CharEncoding.UTF_8) + ".xlsx");
} catch (UnsupportedEncodingException e) {
return R.fail("excel导出失败！");
}
@@ -196,8 +197,11 @@
ServeRecord serveRecord = serveRecordService.lambdaQuery().eq(ServeRecord::getOrderId, order.getId())
.eq(ServeRecord::getIsDelete, 0).one();
// 师傅路线轨迹
- List<ServeCoordinate> serveCoordinateList = serveCoordinateService.lambdaQuery().eq(ServeCoordinate::getWorkerId, order.getServerId())
- .eq(ServeCoordinate::getIsDelete, 0).orderByDesc(ServeCoordinate::getCreateTime).list();
+ List<ServeCoordinate> serveCoordinateList = serveCoordinateService.lambdaQuery()
+ .eq(ServeCoordinate::getWorkerId, order.getServerId())
+ .eq(ServeCoordinate::getIsDelete, 0)
+ .eq(ServeCoordinate::getOrderId, order.getId())
+ .orderByDesc(ServeCoordinate::getCreateTime).list();
OrderByServeRecordVO orderByServeRecord = new OrderByServeRecordVO();
orderByServeRecord.setAcceptOrderTime(order.getAcceptTime());
orderByServeRecord.setReachTime(order.getTime());
@@ -232,6 +236,7 @@
}
OrderByServeVO orderByServe = new OrderByServeVO();
orderByServe.setServeName(recoveryServe.getServeName());
+ orderByServe.setCover(recoveryServe.getCover());
orderByServe.setSupClassify(recoveryClassify.getSupClassify());
orderByServe.setSubClassify(recoveryClassify.getSubClassify());
orderByServe.setPrice(order.getServePrice());
@@ -245,7 +250,7 @@
// 订单信息
OrderInfoVO orderInfo = new OrderInfoVO();
orderInfo.setOrderNumber(order.getOrderNumber());
- orderInfo.setPlaceOrderTime(order.getTime());
+ orderInfo.setPlaceOrderTime(order.getCreateTime());
orderInfo.setState(order.getState());
result.setOrderInfo(orderInfo);
}
@@ -271,8 +276,8 @@
}
@Override
- public OrderPageCountVO orderPageCount() {
- List<Order> orderList = baseMapper.orderPageCount();
+ public OrderPageCountVO orderPageCount(OrderQueryRequest orderQueryRequest) {
+ List<Order> orderList = baseMapper.orderPageCount(orderQueryRequest);
int total = 0;
int toBeDispatched = 0;
int stayDoorstep = 0;
--
Gitblit v1.7.1