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

租赁协议修改

This commit is contained in:
liang.chao 2024-12-19 15:29:40 +08:00
parent 763f79f860
commit 7fa6cc8a26
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,13 +218,17 @@ public class OrderController extends BaseController {
Date date = inputFormat.parse(dateStr); Date date = inputFormat.parse(dateStr);
String formattedDate = outputFormat.format(date); String formattedDate = outputFormat.format(date);
//订单日期 //订单日期
replacements.put("${orderTime}", formattedDate); replacements.put("${createTime}", formattedDate);
//装备所属公司 //装备所属公司
replacements.put("${czcompanyName}", orderInfoDto.getCzcompanyName()); replacements.put("${sellerCompanyName}", orderInfoDto.getCzcompanyName());
//承租方所属公司 //承租方所属公司
replacements.put("${companyName}", orderInfoDto.getCompanyName()); replacements.put("${buyerCompanyName}", orderInfoDto.getCompanyName());
//订单金额 //订单金额
replacements.put("${cost}", orderInfoDto.getCost().toString()); replacements.put("${cost}", orderInfoDto.getCost().toString());
//出租方电话
replacements.put("${sellerCompanyPhone}", orderInfoDto.getPersonPhone());
//承租方电话
replacements.put("${buyerCompanyPhone}", orderInfoDto.getPhoneNumber());
//订单详情 //订单详情
StringBuilder orderDetail = new StringBuilder(); StringBuilder orderDetail = new StringBuilder();
for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) { for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) {
@ -284,12 +288,18 @@ public class OrderController extends BaseController {
SimpleDateFormat inputFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH); SimpleDateFormat inputFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Map<String, String> replacements = new HashMap<>(); Map<String, String> replacements = new HashMap<>();
//订单日期
replacements.put("${createTime}", DateUtils.getDate());
//装备所属公司 //装备所属公司
replacements.put("${czcompanyName}", orderInfoDto.getCzcompanyName()); replacements.put("${sellerCompanyName}", orderInfoDto.getCzcompanyName());
//承租方所属公司 //承租方所属公司
replacements.put("${companyName}", orderInfoDto.getCompanyName()); replacements.put("${buyerCompanyName}", orderInfoDto.getCompanyName());
//订单金额 //订单金额
replacements.put("${cost}", orderInfoDto.getCost().toString()); replacements.put("${cost}", orderInfoDto.getCost().toString());
//出租方电话
replacements.put("${sellerCompanyPhone}", orderInfoDto.getPersonPhone());
//承租方电话
replacements.put("${buyerCompanyPhone}", SecurityUtils.getLoginUser().getSysUser().getPhonenumber());
//订单详情 //订单详情
StringBuilder orderDetail = new StringBuilder(); StringBuilder orderDetail = new StringBuilder();
List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList(); List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList();