feature: 基础平台

1.根据id查询房间时排除租户id

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfOrderServiceImpl.java

@@ -595,6 +595,7 @@ public class KfOrderServiceImpl implements IKfOrderService {
             guestTeamService.setGuestCheckInStatus(bo.getGuestId(), bo.getTeamId());
             // 设置房间状态
             roomService.updateGuestRoomStatus(bo.getRoomCode(), defaultConfig.getTenantId(), HotelRoomStatusEnum.YZ.code());
+
             KfOrderBo queryBo = new KfOrderBo();
             queryBo.setId(bo.getId());
             queryBo.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_RZ);

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/BaseBusiness.java

@@ -133,6 +133,7 @@ public class BaseBusiness {
         // 1.入消费明细表,根据消费金额与扣款方式及扣款钱包的余额，可能会从多个钱包扣钱，则对应的有多笔消费明细记录
         AtomicReference<Boolean> result = new AtomicReference<>();
         List<XfConsumeDetailVo> detailVos = new ArrayList<>();
+        log.info("扣费钱包个数:{}",bagVos.size());
         for (PtBagVo bagVo : bagVos) {
             XfConsumeDetailVo vo = createConsumeRecord(bo, userAccountVo, cardVo, bagVo, termVo, mealTypeVo, remark);
             // 多钱包扣费时，只要有一个钱包入消费明细表失败，则都失败
@@ -270,44 +271,48 @@ public class BaseBusiness {
                                                     bo.getTermRecordId().intValue(),
                                                     userAccountVo.getUserNo().intValue(),
                                                     Integer.parseInt(bagVo.getBagCode()));
+        try {
+            XfConsumeDetailBo consumeDetailBo = new XfConsumeDetailBo();
+            BeanUtil.copyProperties(bo, consumeDetailBo);
+            consumeDetailBo.setConsumeId(recordId);
+            // 设置消费账户信息
+            BeanUtil.copyProperties(userAccountVo, consumeDetailBo);
 
-        XfConsumeDetailBo consumeDetailBo = new XfConsumeDetailBo();
-        BeanUtil.copyProperties(bo, consumeDetailBo);
-        consumeDetailBo.setConsumeId(recordId);
-        // 设置消费账户信息
-        BeanUtil.copyProperties(userAccountVo, consumeDetailBo);
+            // 设置消费信息
+            consumeDetailBo.setConsumeDate(bo.getConsumeDate());
+            consumeDetailBo.setConsumeMoney(bo.getConsumeMoney());
+            consumeDetailBo.setConsumeBalance(bo.getBalance());
+            //consumeDetailBo.setCardValue(bagVo.getBalance());
+            // 设置卡片信息
+            consumeDetailBo.setCardNo(cardVo.getCardNo());
+            consumeDetailBo.setFactoryId(cardVo.getFactoryId());
+            consumeDetailBo.setCardValue(bo.getBalance());
+            // 设置设备信息
+            BeanUtil.copyProperties(termVo, consumeDetailBo);
+            // 设置操作员信息
+            consumeDetailBo.setOperatorId(bo.getOperatorId());
+            consumeDetailBo.setOperatorName(bo.getOperatorName());
+            // 设置餐类信息
+            consumeDetailBo.setMealType(Long.valueOf(mealTypeVo.getTypeId()));
+            consumeDetailBo.setMealName(mealTypeVo.getMealName());
+            // 设置钱包信息
+            consumeDetailBo.setBagType(bagVo.getBagCode());
+            consumeDetailBo.setStatusFlag(bo.getStatusFlag().longValue());
+            // 该字段为补款记录对应的消费明细Id,以便追查消费记录是否有补扣以及对应的补扣记录
+            consumeDetailBo.setDetailId(bo.getConsumeId());
+            consumeDetailBo.setRecordId(bo.getRecordId());
+            consumeDetailBo.setRemark(remark);
 
-        // 设置消费信息
-        consumeDetailBo.setConsumeDate(bo.getConsumeDate());
-        consumeDetailBo.setConsumeMoney(bo.getConsumeMoney());
-        consumeDetailBo.setConsumeBalance(bo.getBalance());
-        //consumeDetailBo.setCardValue(bagVo.getBalance());
-        // 设置卡片信息
-        consumeDetailBo.setCardNo(cardVo.getCardNo());
-        consumeDetailBo.setFactoryId(cardVo.getFactoryId());
-        consumeDetailBo.setCardValue(bo.getBalance());
-        // 设置设备信息
-        BeanUtil.copyProperties(termVo, consumeDetailBo);
-        // 设置操作员信息
-        consumeDetailBo.setOperatorId(bo.getOperatorId());
-        consumeDetailBo.setOperatorName(bo.getOperatorName());
-        // 设置餐类信息
-        consumeDetailBo.setMealType(Long.valueOf(mealTypeVo.getTypeId()));
-        consumeDetailBo.setMealName(mealTypeVo.getMealName());
-        // 设置钱包信息
-        consumeDetailBo.setBagType(bagVo.getBagCode());
-        consumeDetailBo.setStatusFlag(bo.getStatusFlag().longValue());
-        // 该字段为补款记录对应的消费明细Id,以便追查消费记录是否有补扣以及对应的补扣记录
-        consumeDetailBo.setDetailId(bo.getConsumeId());
-        consumeDetailBo.setRecordId(bo.getRecordId());
-        consumeDetailBo.setRemark(remark);
+            consumeDetailBo.setCreateTime(DateUtil.date());
+            consumeDetailBo.setUpdateTime(DateUtil.date());
 
-        consumeDetailBo.setCreateTime(DateUtil.date());
-        consumeDetailBo.setUpdateTime(DateUtil.date());
+            consumeDetailBo.setTenantId(bo.getTenantId());
 
-        consumeDetailBo.setTenantId(bo.getTenantId());
-
-        return consumeDetailService.createConsumeDetailRecord(consumeDetailBo);
+            return consumeDetailService.createConsumeDetailRecord(consumeDetailBo);
+        } catch (Exception ex){
+            log.error("消费明细入库错误",ex);
+            return null;
+        }
     }
 
     /**