bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:3f2cbc78d1d3253cfa0b7a067a02673cc9531b3d
Branches Tags
bonus:master
bonus:ah-simple
bonus:gz-simple
bonus:sx-simple
bonus:ah-simple-old
bonus:matype1211
bonus:maprop1210
..
compare: bonus:e5d3d0985a6d11ae4790ea5b6158a6feb67194fd
Branches Tags
bonus:ah-simple
bonus:gz-simple
bonus:sx-simple
bonus:ah-simple-old
bonus:master
bonus:matype1211
bonus:maprop1210

No commits in common. "3f2cbc78d1d3253cfa0b7a067a02673cc9531b3d" and "e5d3d0985a6d11ae4790ea5b6158a6feb67194fd" have entirely different histories.
3f2cbc78d1 ... e5d3d0985a

1 changed files with 3 additions and 14 deletions
Show Stats Expand all files Collapse all files

17
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -1,7 +1,6 @@
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;
@ -203,25 +202,15 @@ public class OrderController extends BaseController {
//订单金额
replacements.put("${cost}", orderInfoDto.getCost().toString());
//订单详情
StrBuilder orderDetail = new StrBuilder();
String orderDetail = "";
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.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");
orderDetail += "机具名称：" + orderDetailDto.getDeviceName() + "\\n租期：" + beginTime + "至" + endTime + "\\n天数：" + orderDetailDto.getDays() + "天 \\n租金：" + orderDetailDto.getDayLeasePrice() + "元/天\\n数量：" + orderDetailDto.getNum()+"\\n";
}
// 将拼接的字符串放入替换的map中
replacements.put("${orderTable}", orderDetail.toString());
replacements.put("${orderTable}", orderDetail);
for (IBodyElement element : document.getBodyElements()) {
if (element instanceof XWPFParagraph) {