Pārlūkot izejas kodu

feature: 消费服务
1.修复消费机校时报错问题

luoyb 1 gadu atpakaļ
vecāks
revīzija
bab8d173ce

+ 5 - 0
ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/domain/bo/RemoteOrderBo.java

@@ -87,6 +87,11 @@ public class RemoteOrderBo implements Serializable {
      * 团客指定房间时是预定状态
      */
     private String orderStatus;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
     //endregion
 
         /**

+ 3 - 3
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -73,16 +73,16 @@ public interface CacheNames {
     /**
      * 客户公钥
      */
-    String CUSTOM_PUB_KEY = "customer_pub_key#30d";
+    String CUSTOM_PUB_KEY = "customer_pub_key";
     /**
      * 客户私钥
      */
-    String CUSTOM_PRI_KEY = "customer_pri_key#30d";
+    String CUSTOM_PRI_KEY = "customer_pri_key";
 
     /**
      * 用户卡余加解密密钥
      */
-    String USER_SECRET_KEY = "user_secret_key#30d";
+    String USER_SECRET_KEY = "user_secret_key";
 
     /**
      * 系统参数

+ 2 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/dubbo/RemotePtRoomServiceImpl.java

@@ -12,6 +12,7 @@ import org.dromara.backstage.basics.domain.bo.PtRoomBo;
 import org.dromara.backstage.basics.domain.vo.PtRoomVo;
 import org.dromara.backstage.basics.service.IPtRoomService;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -61,6 +62,6 @@ public class RemotePtRoomServiceImpl implements RemotePtRoomService {
      */
     @Override
     public Boolean updateGuestRoomStatus(String roomCode, String tenantId, String roomStatus) {
-        return roomService.updateGuestRoomStatus(roomCode, tenantId, roomStatus);
+        return TenantHelper.ignore(() -> roomService.updateGuestRoomStatus(roomCode, tenantId, roomStatus));
     }
 }

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

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