修改 同步大麦

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

@@ -208,6 +208,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
             for (int i = 0; i < data.size(); i++) {
                 OrderPushDamaiDto item = data.get(i);
+                log.info("FOREACH STEP 1 = "+ticketsId);
+                log.info("FOREACH STEP 2 = "+item.getStatus());
                 ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
                 long orderTicketEntitiesKey = 0l;
                 if (item.getIsMember() == 1) {
@@ -228,6 +230,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                 if (item.getStatus() == 4) {
                     taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
                 } else if(item.getStatus() == 0){
+                    log.info("FOREACH STEP 3 ");
                     list2.add(obj3);
                     obj3.setUserName(item.getEnterName());//用户名 入场人姓名
                     obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -850,7 +850,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
 
                 // 大麦回调
-                sycDamaiOrder(orderTickets.getOrderTicketsId());
+                sycDamaiOrder(orderTickets.getOrderTicketsId(),orderTicketData.getIsMember());
             }
             log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
             return "success";
@@ -892,7 +892,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
     }
 
-    private boolean sycDamaiOrder(String orderId) {
+    private boolean sycDamaiOrder(String orderId,int isMember) {
         try {
             KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId);
             KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
@@ -922,9 +922,39 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     obj3.setOrderUserMobile(item.getEnterMobile());//用户手机号 入场人手机号
                     obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type
                     obj3.setPayTime(DateUtil.parse(orderData.getTimePay(), "yyyy-MM-dd HH:mm:ss"));//支付时间
-                    obj3.setPerformId(Long.valueOf(item.getTimeId().substring(0,5).concat(item.getTimeId().substring(7,12))));//场次id
-                    obj3.setTicketItemId(Long.valueOf(item.getTicketId().substring(0,5).concat(item.getTicketId().substring(7,12))));
-                    obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0,5).concat(item.getOrderTicketEntitiesId().substring(7,12))));//票单号 入场人id
+
+                    long ticketTimesKey;
+                    if (item.getTicketId().length() > 13) {
+                        ticketTimesKey = Long.valueOf(item.getTicketId().substring(0, 5).concat(item.getTicketId().substring(7, 12)));
+                    } else {
+                        ticketTimesKey = Long.parseLong(item.getTicketId());
+                    }
+
+                    long ticketIdKey;
+                    if (item.getTicketId().length() > 13) {
+                        ticketIdKey = Long.valueOf(item.getTicketId().substring(0, 5).concat(item.getTicketId().substring(7, 12)));
+                    } else {
+                        ticketIdKey = Long.valueOf(item.getTicketId());
+                    }
+
+                    long orderTicketEntitiesKey;
+                    if (isMember == 1) {
+                        if (item.getOrderTicketEntitiesId().length() > 13) {
+                            orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12)) + "010");
+                        } else {
+                            orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId() + "010");//票单号 入场人id
+                        }
+                    } else {
+                        if (item.getOrderTicketEntitiesId().length() > 13) {
+                            orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12) + "020"));//票单号 入场人id
+                        } else {
+                            orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId() + "020");//票单号 入场人id
+                        }
+                    }
+
+                    obj3.setPerformId(ticketTimesKey);//场次id
+                    obj3.setTicketItemId(ticketIdKey);
+                    obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
 
                     obj3.setOrderId(Long.parseLong(orderData.getOrderTicketsId()));//订单id orderId
                     obj3.setMediumType(orderData.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子