记得上下班打卡 | git大法好,push需谨慎

Commit 88aec3f4 authored by 胡佳晨's avatar 胡佳晨

增加日志

parent 42b69440
......@@ -198,7 +198,7 @@
FROM kylin_order_tickets AS ot
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -pay_countdown_minute MINUTE)
WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -(pay_countdown_minute+1) MINUTE)
<if test="userId!=''">
AND user_id = #{userId}
</if>
......
......@@ -921,6 +921,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
));
if(item.getRestTime()<=0L){
item.setRestTime(0L);
}
} catch (Exception e) {
e.printStackTrace();
}
......@@ -1010,6 +1013,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
DateUtil.parse(orderTicketVo.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
));
if(vo.getRestTime()<=0L){
vo.setRestTime(0L);
}
} else {
vo.setRestTime(0L);
}
......@@ -1029,6 +1035,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
log.info(UserPathDto.setData("订单列表", orderId, vo));
return vo;
} catch (Exception e) {
e.printStackTrace();
return vo;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment