定时任务

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/DMCheckGoblinOrderTimeImpl.java

@@ -65,8 +65,8 @@ public class DMCheckGoblinOrderTimeImpl extends ServiceImpl<GoblinStoreOrderMapp
             List<String> orderIds = goblinRedisUtils.getUnPayGoblinOrderList(i + "");
             for (String orderId : orderIds) {
                 GoblinStoreOrderVo orderVo = goblinRedisUtils.getGoblinOrder(orderId);
-                log.debug("orderVo = " + orderVo);
                 if (orderVo == null || orderVo.getCreatedAt() == null) {
+                    goblinRedisUtils.removeGoblinOrder(i + "", orderId);
                     continue;
                 }
                 LocalDateTime expireTime = LocalDateTime.parse(orderVo.getCreatedAt(), DTF_YMD_HMS).plusMinutes(orderVo.getPayCountdownMinute() + 1);
@@ -85,16 +85,16 @@ public class DMCheckGoblinOrderTimeImpl extends ServiceImpl<GoblinStoreOrderMapp
                         //库存&限购&&待支付订单
                         goblinRedisUtils.incrSkuStock("pre", skuVo.getSkuId(), skuVo.getNum());
                         goblinRedisUtils.decrSkuCountByUid(orderVo.getUserId(), skuVo.getSkuId(), skuVo.getNum());
-                        goblinRedisUtils.removeGoblinOrder(i + "", orderVo.getOrderId());
                         //mysql
                         sqlDataSku.add(new Object[]{
-                                orderVo.getStatus(), now, orderVo.getOrderId(), now, now
+                                skuVo.getStatus(), now, orderVo.getOrderId(), now, now
                         });
                     }
                     //订单
                     orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_5.getValue());
                     updateGoblinStoreOrderVo(orderVo.getOrderId(), orderVo);
                     goblinRedisUtils.setGoblinOrder(orderVo.getOrderId(), orderVo);
+                    goblinRedisUtils.removeGoblinOrder(i + "", orderVo.getOrderId());
                     //mysql
                     sqlDataOrder.add(new Object[]{
                             orderVo.getStatus(), now, now, "超时关闭", orderVo.getOrderId(), now, now
@@ -102,6 +102,8 @@ public class DMCheckGoblinOrderTimeImpl extends ServiceImpl<GoblinStoreOrderMapp
                     //执行sql
                     queueUtils.sendMsgByGoblinRedis(MQConst.KylinQueue.SQL_ORDER_CLOSE.getKey(),
                             SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
+                }else if(orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_5.getValue()||orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue()){
+                    goblinRedisUtils.removeGoblinOrder(i + "", orderVo.getOrderId());
                 }
             }
         }