|
|
@@ -69,7 +69,7 @@ public class EquipmentChargeStatusJob {
|
|
|
.eq(ChargeOrder::getStartChargeSeq, chargeOrder.getStartChargeSeq())
|
|
|
.select(ChargeOrder::getChargeStatus, ChargeOrder::getOrderStatus)
|
|
|
.one();
|
|
|
- if (dbOrder != null && dbOrder.getChargeStatus().equals(ChargeOrder.CHARGE_STATUS_已结束)) {
|
|
|
+ if (dbOrder != null && (dbOrder.getChargeStatus().equals(ChargeOrder.CHARGE_STATUS_已结束) || dbOrder.getOrderStatus().equals(ChargeOrder.ORDER_STATUS_成功))) {
|
|
|
log.info("订单{}已在DB中结束,跳过Redis数据覆盖,清理Redis缓存", chargeOrder.getStartChargeSeq());
|
|
|
redisTemplate.opsForHash().delete(RedisKeys.CHARGE_ORDER_EQUIP_CHARGE_STATUS, chargeOrder.getStartChargeSeq());
|
|
|
return;
|
|
|
@@ -81,7 +81,9 @@ public class EquipmentChargeStatusJob {
|
|
|
});
|
|
|
if (!orderList.isEmpty()) {
|
|
|
chargeOrderService.updateBatchByQueryWrapper(orderList, order ->
|
|
|
- new QueryWrapper<ChargeOrder>().eq("start_charge_seq", order.getStartChargeSeq()));
|
|
|
+ new QueryWrapper<ChargeOrder>().eq("start_charge_seq", order.getStartChargeSeq())
|
|
|
+ .ne("charge_status", ChargeOrder.CHARGE_STATUS_已结束)
|
|
|
+ .ne("order_status", ChargeOrder.ORDER_STATUS_成功));
|
|
|
}
|
|
|
}
|
|
|
log.info("设备充电状态信息(订单信息)更新定时任务结束,本次更新{}条订单...", orders.size());
|