Merge remote-tracking branch 'origin/main'

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -185,6 +185,22 @@ public class RedisTask {
         if (ObjectUtils.isEmpty(device1)) {
             throw new BaseException("设备不存在！");
         }
+        SOrder order = new SOrder();
+        order.setStoreId(sOrder.getStoreId());
+        order.setRoomId(sOrder.getRoomId());
+        order.setConsumerId(sOrder.getConsumerId());
+        order.setOrderType(OrderTypeEnum.RENEW.getCode());
+        order.setStatus(OrderStatusEnum.UNUSED.getCode());
+        //查询当前订单下是否存在未使用的续费订单
+        List<SOrder> sOrders = isOrderService.selectSOrderList(order);
+        if (!CollectionUtils.isEmpty(sOrders)) {
+            //删除当前的订单
+            redisUtil.delete(o);
+            //更改订单状态
+            sOrder.setStatus(OrderStatusEnum.USED.getCode());
+            isOrderService.updateById(sOrder);
+            return;
+        }
         mqttxService.actionExecute(device.getDevId(), sOrder.getConsumerPhone(), value,
                 DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN),
                 DateUtil.format(DateUtil.offsetMinute(new Date(), 1), DatePattern.NORM_DATETIME_PATTERN), "1");