KylinDamaiServiceImpl.java 删除 010 020后缀

KylinOrderTicketsServiceImpl.java 订单支付回调增加 实时同步

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

@@ -237,12 +237,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     }
                     OrderPushDamaiDto item = data.get(i * forSize + y);
                     ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
-                    long orderTicketEntitiesKey;
-                    if (item.getIsMember() == 1) {
-                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
-                    } else {
-                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
-                    }
+                    long orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString());
 
                     long orderIdKey = IDGenerator.getDamaiCode(item.getOrderTicketsId());
                     if (item.getIsPayment() == 3 || item.getIsPayment() == 2) {

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

@@ -945,8 +945,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //                }catch (Exception e){
 //                    log.info("下单消息模版错误",e);
 //                }
-                // 大麦回调
-//                sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
+                //大麦回调
+                sycDamaiOrder(orderTickets.getOrderTicketsId());
             }
             log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
             return "success";
@@ -998,7 +998,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //        }
     }
 
-    private boolean sycDamaiOrder(String orderId, int isMember) {
+    private boolean sycDamaiOrder(String orderId) {
         try {
             KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId);
             KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
@@ -1030,38 +1030,30 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                     long ticketTimesKey;
                     if (item.getTicketId().length() > 13) {
-                        ticketTimesKey = Long.valueOf(item.getTicketId().substring(0, 5).concat(item.getTicketId().substring(7, 12)));
+                        ticketTimesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getTimeId()));
                     } else {
-                        ticketTimesKey = Long.parseLong(item.getTicketId());
+                        ticketTimesKey = Long.parseLong(item.getTimeId());
                     }
 
                     long ticketIdKey;
                     if (item.getTicketId().length() > 13) {
-                        ticketIdKey = Long.valueOf(item.getTicketId().substring(0, 5).concat(item.getTicketId().substring(7, 12)));
+                        ticketIdKey = Long.valueOf(IDGenerator.getDamaiCode(item.getTicketId()));
                     } else {
                         ticketIdKey = Long.valueOf(item.getTicketId());
                     }
 
                     long orderIdKey;
                     if (orderData.getOrderTicketsId().length() > 13) {
-                        orderIdKey = Long.valueOf(orderData.getOrderTicketsId().substring(0, 5).concat(orderData.getOrderTicketsId().substring(7, 12)));
+                        orderIdKey = Long.valueOf(IDGenerator.getDamaiCode(orderData.getOrderTicketsId()));
                     } else {
                         orderIdKey = Long.valueOf(orderData.getOrderTicketsId());
                     }
 
                     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");
+                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()));
                     } 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
-                        }
+                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId());//票单号 入场人id
                     }
 
                     obj3.setPerformId(ticketTimesKey);//场次id
@@ -1082,7 +1074,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     return true;
                 } else {
                     AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
-                    log.info("error data =" + rsp.getBody());
+                    log.info("success data =" + rsp.getBody());
                     return rsp.getResult().getSuccess();
                 }
             }