KylinDamaiServiceImpl.java 删除 010 020后缀

KylinOrderTicketsServiceImpl.java
订单支付回调增加 实时同步
订单支付回调增加 超时支付退款关闭订单
TaobaoTicketUtils.java 增加 大麦订单退款
KylinRefundsStatusServiceImpl.java 增加 财务通过 大麦同步
KylinOrderTicketsServiceImpl.java 增加新接口 放开订单列表

同步大麦增加 票种同步双份(登登登VIP/非登登登VIP)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/TaobaoTicketUtils.java

@@ -92,11 +92,17 @@ public class TaobaoTicketUtils {
                     }
 
                     long orderTicketEntitiesKey;
-                    if (item.getOrderTicketEntitiesId().length() > 13) {
-                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()));
+//                    if (item.getOrderTicketEntitiesId().length() > 13) {
+//                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()));
+//                    } else {
+//                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId());//票单号 入场人id
+//                    }
+                    if (orderData.getIsMember() == 1) {
+                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
                     } else {
-                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId());//票单号 入场人id
+                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
                     }
+
                     withdrawDamaiOrder(ticketTimesKey, orderTicketEntitiesKey);
                 }
                 return true;

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

@@ -1033,10 +1033,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
 
                     long orderTicketEntitiesKey;
-                    if (item.getOrderTicketEntitiesId().length() > 13) {
-                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()));
+                    if (orderData.getIsMember() == 1) {
+                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
                     } else {
-                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId());//票单号 入场人id
+                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
                     }
                     taobaoTicketUtils.withdrawDamaiOrder(ticketTimesKey, orderTicketEntitiesKey);
                 }