租赁协议修改
This commit is contained in:
		
							parent
							
								
									763f79f860
								
							
						
					
					
						commit
						7fa6cc8a26
					
				| 
						 | 
				
			
			@ -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<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("${sellerCompanyPhone}", orderInfoDto.getPersonPhone());
 | 
			
		||||
            //承租方电话
 | 
			
		||||
            replacements.put("${buyerCompanyPhone}", SecurityUtils.getLoginUser().getSysUser().getPhonenumber());
 | 
			
		||||
            //订单详情
 | 
			
		||||
            StringBuilder orderDetail = new StringBuilder();
 | 
			
		||||
            List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue