KylinDamaiServiceImpl.java 删除 010 020后缀

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

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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/other/DamaiService.java

@@ -14,5 +14,5 @@ public interface DamaiService {
     Boolean sycTicket(long timeId, KylinTickets ticketsData);
 
     //订单
-    Boolean sycOrder(long timeId, String ticketsId, long ticketsmId);
+    Boolean sycOrder(long timeId, String ticketsId, long ticketsmId,long ticketIdMemberKey);
 }

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

@@ -204,13 +204,28 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setPerformId(timemId);
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
-//            obj1.setRemark("0");
             req.setPushItemParam(obj1);
             log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + " 大麦票种id =" + ticketIdKey + " 票种价格 = " + ticketsData.getPrice());
             AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
             if (rsp.getResult().getSuccess()) {
-                return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
-//                return true;
+                TaobaoClient client2 = taobaoTicketUtils.initTaobaoClient();
+                AlibabaDamaiMevOpenPushitemRequest req2 = new AlibabaDamaiMevOpenPushitemRequest();
+                PushTicketItemPushOpenParam obj12 = new PushTicketItemPushOpenParam();
+                long ticketIdKey2 = Long.valueOf(ticketIdKey + "".concat("010"));
+                obj12.setItemId(ticketIdKey2);
+                obj12.setItemName(ticketsData.getTitle() + "-登登登VIP");
+                obj12.setItemPrice(ticketsData.getPrice().longValue() * 100);
+                obj12.setPerformId(timemId);
+                obj12.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
+                obj12.setSystemId(taobaoTicketUtils.getSystemId());
+                req.setPushItemParam(obj12);
+                log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + "-登登登VIP 大麦票种id =" + ticketIdKey + " 票种价格 = " + ticketsData.getPrice());
+                AlibabaDamaiMevOpenPushitemResponse rsp2 = client2.execute(req2);
+                if (rsp2.getResult().getSuccess()) {
+                    return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey,ticketIdKey2);
+                } else {
+                    return false;
+                }
             } else {
                 return false;
             }
@@ -221,7 +236,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
     }
 
     @Override
-    public Boolean sycOrder(long timemId, String ticketsId, long ticketsmId) {
+    public Boolean sycOrder(long timemId, String ticketsId, long ticketsmId,long ticketIdMemberKey) {
         try {
             TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
             AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
@@ -240,7 +255,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     long orderTicketEntitiesKey;
                     if (item.getIsMember() == 1) {
                         orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
-                        obj3.setExt("登登登VIP");
+
                     } else {
                         orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
                         obj3.setExt("");
@@ -262,7 +277,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                         obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type
                         obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间
                         obj3.setPerformId(timemId);//场次id
-                        obj3.setTicketItemId(ticketsmId);
+                        if(item.getIsMember()==1){
+                            obj3.setExt("登登登VIP");
+                            obj3.setTicketItemId(ticketIdMemberKey);
+                        }else{
+                            obj3.setExt("登登登VIP");
+                            obj3.setTicketItemId(ticketsmId);
+                        }
                         obj3.setQrCode(IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId()));
                         obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
                         obj3.setOrderId(orderIdKey);//订单id orderId

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

@@ -1110,15 +1110,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                         if(isMember==1){
                             orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
                             obj3.setExt("登登登VIP");
+                            obj3.setTicketItemId(Long.valueOf(ticketIdKey+"".concat("010")));
                         }else{
                             orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
                             obj3.setExt("");
+                            obj3.setTicketItemId(ticketIdKey);
                         }
                     } else {
                         orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId());//票单号 入场人id
                     }
                     obj3.setPerformId(ticketTimesKey);//场次id
-                    obj3.setTicketItemId(ticketIdKey);
                     obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
                     obj3.setQrCode(IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId()));
                     obj3.setOrderId(orderIdKey);//订单id orderId