Pu Zhibing
7 天以前 b4c371a3049be8a53a5cad6b6ba499ebaf438232
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -528,7 +528,7 @@
            }
            orderList = orderPrivateCarService.queryOrderInfo2(orderId, 6, null, null);
            if (orderInfoWarpper.getState() > 1 && orderInfoWarpper.getDriverId() != 0) {
               String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
               String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
               if (value == null || value.equals("")) {
                  if (orderList.isEmpty()) {
                     orderList = orderPrivateCarService.queryOrderInfo2(orderId, 5, "0", "0");
@@ -2391,8 +2391,8 @@
            List<TripOrderVo> tripOrderVos = processTripOrderVos(orderList);
            String filePath = tripSheetGenerator.generatePdf(tripOrderVos);
            File attachment = new File(filePath);
            String displayFileName = "贵人家园行程单.pdf";
            emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "行程单", "请查收您的行程单", attachment,displayFileName);
            String displayFileName = "贵人家园出行-行程单.pdf";
            emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "贵人家园出行-行程单", "贵人家园出行-行程单", attachment,displayFileName);
            attachment.delete(); // 发送成功后删除临时文件
            Map<String, Object> result = new HashMap<>();
            result.put("orderNum", orderList.size());