Merge remote-tracking branch 'origin/master'

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/domain/vo/RemoteCardDataVo.java

@@ -53,7 +53,8 @@ public class RemoteCardDataVo implements Serializable {
      * 持卡人
      */
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/TraineeBusiness.java

@@ -444,6 +444,7 @@ public class TraineeBusiness {
                 lockCardInfo.setCheckinDate(DateUtil.formatDateTime(userCardData.getStartTime()));
                 lockCardInfo.setCheckoutDate(DateUtil.formatDateTime(userCardData.getEndTime()));
                 lockCardInfo.setDataRemark(userCardData.getRemark());
+                lockCardInfo.setClassName(userCardData.getTeamName());
                 // lockCardInfo.setManageCard(userCardData);
             } else{
                 log.error("没有对应的住宿信息-[数据:{},卡号:{}]", cardData, cardId);

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/KfProvideCardHis.java

@@ -59,7 +59,8 @@ public class KfProvideCardHis extends TenantEntity {
      * 持卡人
      */
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/bo/KfProvideCardHisBo.java

@@ -59,7 +59,8 @@ public class KfProvideCardHisBo extends BaseEntity {
      * 持卡人
      */
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/vo/KfProvideCardHisVo.java

@@ -67,7 +67,8 @@ public class KfProvideCardHisVo implements Serializable {
      */
     @ExcelProperty(value = "持卡人")
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteCardDataServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.hotel.dubbo;
 
+import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -52,6 +53,8 @@ public class RemoteCardDataServiceImpl implements RemoteCardDataService {
     public RemoteCardDataVo getCardDataByBo(RemoteCardDataBo remoteBo) {
         KfProvideCardHisBo bo = MapstructUtils.convert(remoteBo, KfProvideCardHisBo.class);
         KfProvideCardHisVo vo = cardHisService.queryByBo(bo);
-        return MapstructUtils.convert(vo, RemoteCardDataVo.class);
+        RemoteCardDataVo remoteVo = new RemoteCardDataVo();
+        BeanUtil.copyProperties(vo, remoteVo);
+        return remoteVo;
     }
 }

ruoyi-modules/ruoyi-hotel/src/main/resources/mapper/hotel/basics/KfGuestMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join t_kf_guest g on tgr.guest_id = g.id
             left join t_kf_order o on g.id = o.guest_id
         <where>
-            tgr.del_flag = '0' and o.order_status not in ('1','3')
+            tgr.del_flag = '0' and (o.order_status not in ('1','3') or o.order_status is null)
             <if test="bo.teamId != null">
                 and tgr.team_id = #{bo.teamId}
             </if>