From 3bc97951e5ad3a9788c68cdca0cb11e23204606f Mon Sep 17 00:00:00 2001
From: sonjinyon <2476687577@qq.com>
Date: Fri, 18 Oct 2024 09:30:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E7=BA=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/LitemallReservationRespVO.java         | 20 +++++++++++++------
 .../LitemallReservationServiceImpl.java       |  4 +++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java
index 5d00260..df02dcb 100644
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java
@@ -53,18 +53,26 @@ public class LitemallReservationRespVO {
     @DictFormat("status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
     private Integer status;
 
-    @Schema(description = "备注", example = "随便")
-    @ExcelProperty("备注")
-    private String remark;
+    private String technicianName;
+
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ExcelProperty("用户名称")
-    private String nickname;
-
     @ExcelProperty("门店")
     private String brandName;
 
+    @ExcelProperty("用户名称")
+    private String nickname;
+
+    //电话
+    private String memberphone;
+
+    //门店地址
+    private String brandaddress;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String remark;
 }
\ No newline at end of file
diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java
index 6c13674..00921a3 100644
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java
@@ -111,12 +111,14 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic
 
             LitemallBrandDO litemallBrandDO = litemallBrandMapper.selectOne("id", litemallReservationDO.getBrandId());
             litemallReservationDO.setBrandName(litemallBrandDO.getName());
+            litemallReservationDO.setBrandaddress(litemallBrandDO.getAddress());
 
             LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getTechnicianId());
             litemallReservationDO.setTechnicianName(litemallTechnicianDO.getTechnicianName());
 
             MemberUserDO memberUserDO = memberUserMapper.selectOne("id", litemallReservationDO.getUserId());
-            litemallReservationDO.setNickname(memberUserDO.getName());
+            litemallReservationDO.setNickname(memberUserDO.getNickname());
+            litemallReservationDO.setMemberphone(memberUserDO.getMobile());
         }
 
         return litemallReservationDOPageResult;