chuangte/share-space-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-03-24 08:33:47 +08:00
parent 4388548345
commit d03013efe0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share-space-system/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
View File

@ -1033,8 +1033,10 @@ public class DeviceServiceImpl implements DeviceService
// 房间门单独打开
EquipmentVO roomDoor = equipmentService.selectDoorByRoomId(roomId, FACILITY_TYPE_ROOM_DOOR);
boolean b = controlDoor(roomDoor.getDeviceId(), roomDoor.getUnlockTime(), roomDoor.getUnlockMode(),true, reason,false);
log.info("【下单成功后房间全开】打开房间门{}", b ? "成功" : "失败");
if(roomDoor != null){
boolean b = controlDoor(roomDoor.getDeviceId(), roomDoor.getUnlockTime(), roomDoor.getUnlockMode(),true, reason,false);
log.info("【下单成功后房间全开】打开房间门{}", b ? "成功" : "失败");
}
return 1;
}

4
share-space-system/src/main/java/com/ruoyi/ss/order/service/impl/OrderServiceImpl.java
View File

@ -1504,7 +1504,9 @@ public class OrderServiceImpl implements IOrderService
adminIndexDataVO.setStoreCount(storeCount);
// 订单金额
BigDecimal orderAmount = orderMapper.getOrderFee(new OrderQuery());
OrderQuery orderQuery = new OrderQuery();
orderQuery.setPaid(ServiceConstants.ORDER_PAY_STATUS_PAID);
BigDecimal orderAmount = orderMapper.getOrderFee(orderQuery);
adminIndexDataVO.setOrderAmount(orderAmount);
// 订单数