不是快递 不是电子

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderOutLineVo.java

@@ -15,9 +15,9 @@ public class OrderOutLineVo {
     private Integer number;
     @Excel(name = "票种名称",cellType = Excel.ColumnType.STRING)
     private String ticketTitle;
-    @Excel(name = "票种适用开始时间",cellType = Excel.ColumnType.STRING,dateFormat = "yyyy-MM-dd")
+    @Excel(name = "票种适用开始时间",cellType = Excel.ColumnType.STRING,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private String useStart;
-    @Excel(name = "票种适用结束时间",cellType = Excel.ColumnType.STRING,dateFormat = "yyyy-MM-dd")
+    @Excel(name = "票种适用结束时间",cellType = Excel.ColumnType.STRING,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private String useEnd;
     @Excel(name = "票种类型(电子票,快递票)",cellType = Excel.ColumnType.STRING)
     private String ticketType;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/ImportServiceImpl.java

@@ -154,7 +154,7 @@ public class ImportServiceImpl implements IImportService {
                 }
             }
             try {
-                order(number, ticketType.equals("express") ? 1 : 0, uid, isMember, performanceData, ticketTimesData, ticketData, enterMobile, enterName, enterIdCode, address);
+                order(number, ticketType.equals("express") ? 1 : 0, adamUserInfoVo, isMember, performanceData, ticketTimesData, ticketData, enterMobile, enterName, enterIdCode, address);
                 successNum++;
             } catch (Exception e) {
                 e.printStackTrace();
@@ -171,7 +171,7 @@ public class ImportServiceImpl implements IImportService {
     }
 
 
-    private void order(Integer number, Integer IsExpress, String uid, boolean isMember,
+    private void order(Integer number, Integer IsExpress, AdamUserInfoVo adamUserInfoVo, boolean isMember,
                        KylinPerformanceVo performanceData, KylinTicketTimesVo ticketTimesVo, KylinTicketVo ticketData,
                        String enterMobile, String enterName, String enterIdCode, String address) throws Exception {
         String source = "OUTLINE";
@@ -181,10 +181,9 @@ public class ImportServiceImpl implements IImportService {
         KylinOrderTickets orderTickets = KylinOrderTickets.getNew();
         String orderTicketId = IDGenerator.nextSnowId();
         orderTickets.setOrderTicketsId(orderTicketId);
-        orderTickets.setUserId(uid);
-        Map token = CurrentUtil.getTokenClaims();
-        orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
-        orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
+        orderTickets.setUserId(adamUserInfoVo.getUid());
+        orderTickets.setUserName(adamUserInfoVo.getNickname());
+        orderTickets.setUserMobile(adamUserInfoVo.getMobile());
         orderTickets.setPerformanceTitle(performanceData.getTitle());
         orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
         orderTickets.setPayCode("OUTLINE");
@@ -266,7 +265,7 @@ public class ImportServiceImpl implements IImportService {
             String orderTicketEntitiesId = IDGenerator.nextSnowId();
             orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
             orderTicketEntities.setOrderId(orderTicketId);
-            orderTicketEntities.setUserId(uid);
+            orderTicketEntities.setUserId(adamUserInfoVo.getUid());
             orderTicketEntities.setTicketId(ticketData.getTicketsId());
             orderTicketEntities.setPerformanceId(performanceData.getPerformancesId());
             orderTicketEntities.setTimeId(ticketTimesVo.getTimeId());
@@ -298,7 +297,7 @@ public class ImportServiceImpl implements IImportService {
             String orderTicketEntitiesId = IDGenerator.nextSnowId();
             orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
             orderTicketEntities.setOrderId(orderTicketId);
-            orderTicketEntities.setUserId(uid);
+            orderTicketEntities.setUserId(adamUserInfoVo.getUid());
             orderTicketEntities.setTicketId(ticketData.getTicketsId());
             orderTicketEntities.setPerformanceId(performanceData.getPerformancesId());
             orderTicketEntities.setTimeId(ticketTimesVo.getTimeId());
@@ -341,7 +340,7 @@ public class ImportServiceImpl implements IImportService {
         orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
         mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
 
-        orderUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId(), orderTicketVo);
+        orderUtils.resetOrderListVo(adamUserInfoVo.getUid(), 1, orderTicketVo.getOrderTicketsId(), orderTicketVo);
     }
 
 }