bug修改

src/main/java/com/chuanghai/ihotel/controller/HotelUserController.java

@@ -52,7 +52,7 @@ public class HotelUserController {
         LoginUserVO loginUserVO = hotelUserService.weixiaoAuth(wxcode, state);
 
         if (loginUserVO != null) {
-            return "redirect:" + fontEndUrl + "/#/pages/blankIndex/blankIndex/?token=" + loginUserVO.getToken() + "&tokenTtl=" + loginUserVO.getTokenTtl();
+            return "redirect:" + fontEndUrl + "/?token=" + loginUserVO.getToken() + "&tokenTtl=" + loginUserVO.getTokenTtl();
         } else {
             return "redirect:" + fontEndUrl + "/#/error/?errorMsg=" + URLEncoder.encode("获取用户信息失败", "utf-8");
         }

src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java

@@ -343,19 +343,26 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         hotelOrder.setRoomTypeName(roomType.getTypeName());
         hotelOrder.setRoomTypeMasterImg(roomType.getTypeImage().split(",")[0]);
         hotelOrder.setCreateTime(LocalDateTime.now());
-        hotelOrder.setOrderStatu(OrderStatuEnum.WAIT_PAY.getCode());
-        hotelOrder.setBizStatu(OrderBillStatuEnum.WAIT_HANDLE.getCode());
+        if (totalAmount.doubleValue() == 0) {
+            hotelOrder.setOrderStatu(OrderStatuEnum.FINISH_PAY.getCode());
+            hotelOrder.setBizStatu(OrderBillStatuEnum.FINISH.getCode());
+        } else {
+            hotelOrder.setOrderStatu(OrderStatuEnum.WAIT_PAY.getCode());
+            hotelOrder.setBizStatu(OrderBillStatuEnum.WAIT_HANDLE.getCode());
+        }
         hotelOrder.setDeleteFlag("1"); // 0删除、1正常
         this.save(hotelOrder);
 
-        // 发送延迟消息
-        EventMessageDTO eventMessage = EventMessageDTO.builder()
-                .eventMessageType(EventMessageTypeEnum.PRODUCT_ORDER_NEW.name())
-                .accountNo(loginUserVO.getCardNumber())
-                .bizId(orderId)
-                .build();
+        if (totalAmount.doubleValue() != 0) {
+            // 发送延迟消息
+            EventMessageDTO eventMessage = EventMessageDTO.builder()
+                    .eventMessageType(EventMessageTypeEnum.PRODUCT_ORDER_NEW.name())
+                    .accountNo(loginUserVO.getCardNumber())
+                    .bizId(orderId)
+                    .build();
 
-        rabbitTemplate.convertAndSend(rabbitMQConfig.getOrderEventExchange(), rabbitMQConfig.getOrderCloseDelayRoutingKey(), eventMessage);
+            rabbitTemplate.convertAndSend(rabbitMQConfig.getOrderEventExchange(), rabbitMQConfig.getOrderCloseDelayRoutingKey(), eventMessage);
+        }
 
         // 返回支付参数
         String payUrl = null;

src/main/java/com/chuanghai/ihotel/service/impl/HotelStaffServiceImpl.java

@@ -48,11 +48,12 @@ public class HotelStaffServiceImpl extends ServiceImpl<HotelStaffDao, HotelStaff
             throw new RRException(BizCodeEnume.ADMIN_LOGIN_FAIL);
         }
         BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        String password = null;
+        String password;
         try {
             password = RSAUtils.decrypt(request.getPassword(), RSAUtils.getPrivateKey(privateKey));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("密码解密失败，错误信息【{}】", e.getCause());
+            throw new RRException(BizCodeEnume.ADMIN_LOGIN_FAIL, "密码解密失败");
         }
         if (!encoder.matches(password, staff.getPassword())) {
             throw new RRException(BizCodeEnume.ADMIN_LOGIN_FAIL);