Merge remote-tracking branch 'origin/dev' into dev

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

@@ -205,10 +205,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
             List<ThirdTicketPushOpenParam> list2 = new ArrayList<>();
             List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId);
-            log.info("FOREACH STEP 1 = "+ticketsId);
             for (int i = 0; i < data.size(); i++) {
                 OrderPushDamaiDto item = data.get(i);
-                log.info("FOREACH STEP 2 = "+item.getStatus());
                 ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
                 long orderTicketEntitiesKey = 0l;
                 if (item.getIsMember() == 1) {
@@ -235,8 +233,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
                 if (item.getIsPayment() == 3) {
                     taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
-                } else if(item.getIsPayment() == 1){
-                    log.info("FOREACH STEP 3 ");
+                } else {
                     list2.add(obj3);
                     obj3.setUserName(item.getEnterName());//用户名 入场人姓名
                     obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
@@ -256,12 +253,10 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                 }
             }
             req.setThirdTicketSetOpenParamList(list2);
-            log.info("STEP 1");
             if (list2.size() == 0) {
                 return true;
             } else {
                 AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
-                log.info("STEP 3 = "+rsp);
                 return rsp.getResult().getSuccess();
             }
 

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

@@ -972,6 +972,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
                 req.setThirdTicketSetOpenParamList(list2);
                 if (list2.size() == 0) {
+                    log.info("error data = success");
                     return true;
                 } else {
                     AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);