KylinDamaiServiceImpl.java 删除 010 020后缀

KylinOrderTicketsServiceImpl.java
订单支付回调增加 实时同步
订单支付回调增加 超时支付退款关闭订单
TaobaoTicketUtils.java 增加 大麦订单退款
KylinRefundsStatusServiceImpl.java 增加 财务通过 大麦同步
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,7 +237,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     }
                     OrderPushDamaiDto item = data.get(i * forSize + y);
                     ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
-                    long orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString());
+                    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("");
+                    }
 
                     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

@@ -319,11 +319,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
                 }
             }
-            if(e.getMessage()==null){
+            if (e.getMessage() == null) {
                 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
-            }else if (e.getMessage().equals("券不可用")) {
+            } else if (e.getMessage().equals("券不可用")) {
                 return ResponseDto.failure(ErrorMapping.get("20030"));//券不可用
-            }else{
+            } else {
                 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
             }
         }
@@ -948,7 +948,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //                    log.info("下单消息模版错误",e);
 //                }
                 //大麦回调
-                sycDamaiOrder(orderTickets.getOrderTicketsId());
+                sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
             }
             log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
             return "success";
@@ -1002,6 +1002,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
     /**
      * 同步 退款大麦订单
+     *
      * @param orderId
      * @return
      */
@@ -1042,18 +1043,19 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return true;
             }
             return true;
-        }catch (Exception e){
-            log.info("REFUND DAMAI ERROR = {}",e);
+        } catch (Exception e) {
+            log.info("REFUND DAMAI ERROR = {}", e);
             return false;
         }
     }
 
     /**
      * 同步大麦订单
+     *
      * @param orderId
      * @return
      */
-    private boolean sycDamaiOrder(String orderId) {
+    private boolean sycDamaiOrder(String orderId, Integer isMember) {
         try {
             KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId);
             KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
@@ -1105,11 +1107,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                     long orderTicketEntitiesKey;
                     if (item.getOrderTicketEntitiesId().length() > 13) {
-                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()));
+                        if(isMember==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("");
+                        }
                     } else {
                         orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId());//票单号 入场人id
                     }
-
                     obj3.setPerformId(ticketTimesKey);//场次id
                     obj3.setTicketItemId(ticketIdKey);
                     obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id