From 7fa6cc8a2679d8accb1eec8eb4a6dfaf6af7faa1 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 19 Dec 2024 15:29:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderController.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) 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 b9b235b..a85cc75 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 @@ -218,13 +218,17 @@ public class OrderController extends BaseController { Date date = inputFormat.parse(dateStr); 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("${sellerCompanyPhone}", orderInfoDto.getPersonPhone()); + //承租方电话 + replacements.put("${buyerCompanyPhone}", orderInfoDto.getPhoneNumber()); //订单详情 StringBuilder orderDetail = new StringBuilder(); 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 outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map 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("${sellerCompanyPhone}", orderInfoDto.getPersonPhone()); + //承租方电话 + replacements.put("${buyerCompanyPhone}", SecurityUtils.getLoginUser().getSysUser().getPhonenumber()); //订单详情 StringBuilder orderDetail = new StringBuilder(); List detailsList = orderInfoDto.getDetailsList();