From 59c5077596a479bdb6f9db00205cce854d5017f1 Mon Sep 17 00:00:00 2001
From: limqhz <540344226@qq.com>
Date: Wed, 22 May 2024 22:00:56 +0800
Subject: [PATCH] =?UTF-8?q?202404=20=E8=B6=B3=E7=90=83=E5=85=A5=E5=9C=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sv/dto/api/MemberTicketEnterDTO.java     | 11 ++++++-----
 .../com/sv/service/api/MemberTicketEnterService.java  |  6 +++++-
 .../mybatis/mapper/sv/MemberLessonTicketMapper.xml    |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java b/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java
index 53275a1..768e0ff 100644
--- a/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java
+++ b/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java
@@ -44,19 +44,20 @@ public class MemberTicketEnterDTO extends MemberLessonTicket {
      * 场馆纬度
      */
     private String latitude;
-    private String mobile;
+    // 是否是预定人
+    private boolean order = false;
     private String errCode;
     private String msg;
     private boolean openFlag = false;
 
     private List<MemberTicketInviteDTO> memberTicketInviteList;
 
-    public String getMobile() {
-        return mobile;
+    public boolean isOrder() {
+        return order;
     }
 
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
+    public void setOrder(boolean order) {
+        this.order = order;
     }
 
     public Date getDate() {
diff --git a/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java b/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java
index 021d5e7..6f9948a 100644
--- a/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java
+++ b/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java
@@ -83,12 +83,16 @@ public class MemberTicketEnterService extends BaseServiceImpl {
         for (MemberTicketInvite ticketInvite : inviteList) {
             MemberTicketInviteDTO memberTicketInviteDTO = new MemberTicketInviteDTO();
             memberTicketInviteDTO.setMine(false);
-            if (memberId == ticketInvite.getMemberId()){
+            if (memberId.equals(ticketInvite.getMemberId())){
                 memberTicketInviteDTO.setMine(true);
             }
             BeanUtils.copyProperties(ticketInvite,memberTicketInviteDTO);
             memberTicketInviteList.add(memberTicketInviteDTO);
         }
+        if(memberId.equals(memberLessonTicket.getMemberId())) {
+            //当前用户就是预定人
+            res.setOrder(true);
+        }
         res.setMemberTicketInviteList(memberTicketInviteList);
         return res;
     }
diff --git a/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml b/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml
index 68b0697..ced661f 100644
--- a/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml
@@ -436,6 +436,7 @@
 			sv.name,
 			svl.name AS lessonname,
 			sm.nickname,
+			sm.mobile,
 			svl.price,
 			smc.card_type,
 			so.pay_time,