From a5cea4293fe9c47fa9dd750479d4e50eeecf08ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Tue, 9 Jul 2024 16:02:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=B0?=
 =?UTF-8?q?=E6=A1=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/order/TbOrderInfoServiceImpl.java    | 4 ++++
 .../src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java        | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index 33ecb66d..7143f08c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -126,6 +126,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
                     detail.setRefundNumber(detail.getNum());
                 });
             }
+            orderInfoVo.setTableName(tbOrderInfo.getTableName());
             orderInfoVo.setDetailList(details);
             BeanUtils.copyProperties(tbOrderInfo, orderInfoVo);
             orderInfoVo.setRefundAmount(refundAmount);
@@ -188,6 +189,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
                 criteria.setOrderType(null);
             }
         }
+
         List<TbOrderInfoDto> dto = tbOrderInfoMapper.toDto(tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder)));
         for (TbOrderInfoDto tbOrderInfo : dto) {
             List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId());
@@ -357,6 +359,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
     @Override
     public void download(List<TbOrderInfoDto> all, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
+
+        all=all.stream().sorted(Comparator.comparing(TbOrderInfoDto::getId).reversed()).collect(Collectors.toList());
         for (TbOrderInfoDto tbOrderInfo : all) {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("订单编号", tbOrderInfo.getOrderNo());
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java
index 139cb711..c95b542b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java
@@ -50,6 +50,8 @@ public class TbOrderInfoVo  {
 
     private String tableId;
 
+    private String tableName;
+
     private BigDecimal smallChange;
 
     private String sendType;