修改 同步大麦

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

@@ -206,11 +206,26 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
             for (int i = 0; i < data.size(); i++) {
                 OrderPushDamaiDto item = data.get(i);
+                ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
+                long orderTicketEntitiesKey = 0l;
+                if (item.getIsMember() == 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
+                    }
+                }
+
 
                 if (item.getStatus() == 4) {
-                    taobaoTicketUtils.withdrawDamaiOrder(timemId + "", item.getOrderTicketEntitiesId());
+                    taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
                 } else {
-                    ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
                     list2.add(obj3);
                     obj3.setUserName(item.getEnterName());//用户名 入场人姓名
                     obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
@@ -219,22 +234,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间
                     obj3.setPerformId(timemId);//场次id
                     obj3.setTicketItemId(ticketsmId);
-
+                    obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
                     obj3.setOrderId(Long.parseLong(item.getOrderTicketsId()));//订单id orderId
-                    if (item.getIsMember() == 1) {
-                        if (item.getOrderTicketEntitiesId().length() > 13) {
-                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12))+"010"));//票单号 入场人id
-                        } else {
-                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId()+"010"));//票单号 入场人id
-                        }
-                    } else {
-                        if (item.getOrderTicketEntitiesId().length() > 13) {
-                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12)+"020")));//票单号 入场人id
-                        } else {
-                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId()+"020"));//票单号 入场人id
-                        }
-                    }
-
 
                     obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
                     obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());

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

@@ -39,13 +39,13 @@ public class TaobaoTicketUtils {
      * @param orderEntitiesId 入场人的id
      * @return
      */
-    public boolean withdrawDamaiOrder(String timesId, String orderEntitiesId) {
+    public boolean withdrawDamaiOrder(long timesId, long orderEntitiesId) {
         try {
             TaobaoClient client = initTaobaoClient();
             AlibabaDamaiMevOpenWithdrawticketRequest req = new AlibabaDamaiMevOpenWithdrawticketRequest();
             AlibabaDamaiMevOpenWithdrawticketRequest.TicketIdOpenParam obj1 = new AlibabaDamaiMevOpenWithdrawticketRequest.TicketIdOpenParam();
-            obj1.setPerformId(Long.valueOf(timesId.substring(0, 5).concat(timesId.substring(7, 12))));//场次id
-            obj1.setVoucherId(Long.valueOf(orderEntitiesId.substring(0, 5).concat(orderEntitiesId.substring(7, 12))));//票单号 入场人id
+            obj1.setPerformId(timesId);//场次id
+            obj1.setVoucherId(orderEntitiesId);//票单号 入场人id
             obj1.setSupplierSecret(SUPPLIER_SECRET);
             obj1.setSystemId(SYSTEM_ID);
             req.setTicketIdOpenParam(obj1);