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

Commit 3085c20c authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/dev' into dev

parents aca658dd 0f8dadb8
...@@ -346,7 +346,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -346,7 +346,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
//生成订单 order_ticket //生成订单 order_ticket
KylinOrderTickets orderTickets = new KylinOrderTickets(); KylinOrderTickets orderTickets = new KylinOrderTickets();
String orderTicketId = IDGenerator.nextSnowId().toString(); String orderTicketId = IDGenerator.nextSnowId().toString();
log.debug("\n OTDER_TICKET_ID = "+ orderTicketId +" \n TIME = "+System.currentTimeMillis()); log.debug("\n ORDER_TICKET_ID = "+ orderTicketId +" \n TIME = "+System.currentTimeMillis());
orderTickets.setOrderTicketsId(orderTicketId); orderTickets.setOrderTicketsId(orderTicketId);
orderTickets.setUserId(uid); orderTickets.setUserId(uid);
Map token = CurrentUtil.getTokenClaims(); Map token = CurrentUtil.getTokenClaims();
......
...@@ -146,6 +146,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -146,6 +146,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId); KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
log.debug("PERFORMANCE_ID = "+performancesId);
List<KylinPerformanceVo> KylinPerformanceVoList = null; List<KylinPerformanceVo> KylinPerformanceVoList = null;
KylinPerformanceVoList.add(performancesInfo); KylinPerformanceVoList.add(performancesInfo);
KylinPerformanceVoList = checkAppStatus(KylinPerformanceVoList); KylinPerformanceVoList = checkAppStatus(KylinPerformanceVoList);
......
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