From 6ca99d25f33a52da4f465141729ee18996fde709 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 15 六月 2023 10:57:52 +0800
Subject: [PATCH] 订单修改

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 9828cbe..aa9408c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -103,12 +103,12 @@
         model.addAttribute("discountAmount",tOrder.getDiscountAmount());//折扣金额
         model.addAttribute("userId",tOrder.getUserId());//用户id
         model.addAttribute("routeRecord",tOrder.getRouteRecord());//行程录音
+        model.addAttribute("userPhone",tOrder.getUserPhone());//用户手机号
+        model.addAttribute("userName",tOrder.getUserName());//用户名称
 
         // 查询用户
         TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
         if(Objects.nonNull(tAppUser)){
-            model.addAttribute("userName",tAppUser.getNickname());
-            model.addAttribute("userPhone",tAppUser.getPhone());
             model.addAttribute("havDiscount",tAppUser.getHavDiscount());
             if(1 == tAppUser.getHavDiscount()){
                 // 计算9折优惠金额
@@ -118,9 +118,7 @@
                 model.addAttribute("multiply",0);
             }
         }else {
-            model.addAttribute("userName","");
-            model.addAttribute("userPhone","");
-            model.addAttribute("havDiscount","");
+            model.addAttribute("havDiscount",0);
             model.addAttribute("multiply",0);
         }
 

--
Gitblit v1.7.1