Merge remote-tracking branch 'origin/master'

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

@@ -29,6 +29,7 @@ import org.dromara.backstage.payment.domain.bo.PtUserAccountBo;
 import org.dromara.backstage.payment.domain.vo.PtBagVo;
 import org.dromara.backstage.payment.service.IPtBagService;
 import org.dromara.backstage.payment.service.IPtUserAccountService;
+import org.dromara.common.core.config.DefaultConfig;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.constant.HotelBusinessConstants;
@@ -91,6 +92,8 @@ public class TraineeBusiness {
     private final PushKafkaData kafkaProducer;
     private final SelfBusiness selfBusiness;
 
+    private final DefaultConfig defaultConfig;
+
     /**
      * 获取报到学员信息
      *
@@ -362,6 +365,12 @@ public class TraineeBusiness {
         remoteBo.setEndTime(DateUtil.parseDateTime(temp));
         remoteBo.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_RZ);
         remoteBo.setUpdatedBy(Long.valueOf(bo.getUserId()));
+        //todo 自助报到，修改房态时没有租户id，所以暂时写一个默认的租户
+        if(StringUtils.isNotEmpty(bo.getTenantId())){
+            remoteBo.setTenantId(bo.getTenantId());
+        }else{
+            remoteBo.setTenantId(defaultConfig.getTenantId());
+        }
 
         return kfOrderService.checkInTeamByBo(remoteBo);
     }

ruoyi-modules/ruoyi-hotel/src/main/resources/mapper/hotel/business/KfOrderMapper.xml

@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select o.*, g.name as name, g.phone,g.id_card as idCard, g.sex,o.start_time as checkinDate, o.end_time as checkoutDate,o.id from t_kf_order o
         left join t_kf_guest g on o.guest_id = g.id
         <where>
-            g.del_flag = '0' and o.del_flag = '0'
+            g.del_flag = '0' and o.del_flag = '0' and o.order_status in ('1','2','3')
             <if test="roomCodes != null and roomCodes.size() > 0">
                 and o.room_code in
                 <foreach collection="roomCodes" item="code" open="(" separator="," close=")">

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/convert/strategy/impl/YcRecordConvertStrategyImpl.java

@@ -93,6 +93,7 @@ public class YcRecordConvertStrategyImpl implements IRecordConvertStrategy {
             yc.setPosRecordState(bo.getRecordStatus());
             yc.setOperatorID(bo.getOperatorId());
             yc.setConsumeDetailId(bo.getTermRecordId());
+            yc.setStatusFlag(bo.getStatusFlag());
 
             return yc;
         }

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/domain/YcConsumeInfo.java

@@ -92,4 +92,6 @@ public class YcConsumeInfo implements Serializable
      * 消费详情Id
      */
     private Long consumeDetailId;
+
+    private Integer statusFlag;
 }