diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 860f775..82253a5 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -1,6 +1,7 @@ package com.bonus.material.order.controller; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.text.StrBuilder; import com.bonus.common.biz.enums.MaStatusEnum; import com.bonus.common.biz.enums.OrderStatusEnum; import com.bonus.common.core.web.controller.BaseController; @@ -202,15 +203,25 @@ public class OrderController extends BaseController { //订单金额 replacements.put("${cost}", orderInfoDto.getCost().toString()); //订单详情 - String orderDetail = ""; + StrBuilder orderDetail = new StrBuilder(); for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) { Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString()); String beginTime = outputFormat.format(rentBeginTime); Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); String endTime = outputFormat.format(rentEndTime); - orderDetail += "机具名称:" + orderDetailDto.getDeviceName() + "\\n租期:" + beginTime + "至" + endTime + "\\n天数:" + orderDetailDto.getDays() + "天 \\n租金:" + orderDetailDto.getDayLeasePrice() + "元/天\\n数量:" + orderDetailDto.getNum()+"\\n"; + // 添加每一行的内容 + orderDetail.append("机具名称:").append(orderDetailDto.getDeviceName()).append("\n") + .append(" 租期:").append(beginTime).append(" 至 ").append(endTime).append("\n") + .append(" 天数:").append(orderDetailDto.getDays()).append("天 ").append("\n") + .append("租金:").append(orderDetailDto.getDayLeasePrice()).append("元/天 ").append("\n") + .append("数量:").append(orderDetailDto.getNum()).append("个").append("\n"); + + // 在每条订单的末尾添加换行 +// orderDetail.append("\n"); } - replacements.put("${orderTable}", orderDetail); + + // 将拼接的字符串放入替换的map中 + replacements.put("${orderTable}", orderDetail.toString()); for (IBodyElement element : document.getBodyElements()) { if (element instanceof XWPFParagraph) {