Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamSwitchAdminController.java

@@ -45,7 +45,7 @@ public class AdamSwitchAdminController {
             @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "会员用户最大ID_NO", example = "15000"),
     })
     @PostMapping("set/memberno")
-    public ResponseDto<Object> purchaseStartMemberNo(@Max(1) @Min(0) @RequestParam int opt) {
+    public ResponseDto<Object> purchaseStartMemberNo(@Min(11417) @RequestParam int opt) {
         redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, opt);
         return ResponseDto.success(redisUtil.get(AdamRedisConst.INCR_MEMBER_NO));
     }

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

@@ -916,7 +916,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 for (int i = 0; i < listData.size(); i++) {
                     KylinOrderTicketEntitiesVo item = listData.get(i);
                     AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam obj3 = new AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam();
-                    list2.add(obj3);
                     obj3.setUserName(item.getEnterName());//用户名 入场人姓名
                     obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
                     obj3.setOrderUserMobile(item.getEnterMobile());//用户手机号 入场人手机号
@@ -969,12 +968,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     obj3.setSystemId(taobaoTicketUtils.getSystemId());
                     obj3.setSeatType(1L);
                     obj3.setTicketType(1L);//票类型
+                    list2.add(obj3);
                 }
                 req.setThirdTicketSetOpenParamList(list2);
                 if (list2.size() == 0) {
                     return true;
                 } else {
                     AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
+                    log.info("error data =", req);
                     return rsp.getResult().getSuccess();
                 }
             }