~API:迁移调整验票代码（kylin to merchant, 去除登录登出，新增权限逻辑）;

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantStationController.java

@@ -186,12 +186,23 @@ public class MerchantStationController {
         String currentUid = CurrentUtil.getCurrentUid();
         log.info("验票:下载验票数据[UID:{},performanceId:{}]", currentUid, performanceId);
 
-        ResponseDto<MerchantStationCheckRefreshVo> responseDto = this.downloadRefreshTicketDataValid(currentUid, performanceId);
-        if (!responseDto.isSuccess()) {
-            return responseDto;
+        // 查取当前用户下关联演出ID列表
+        List<MerchantAuthorizationPerformanceVo> authorizationPerformanceVoList = merchantStationService.getCheckUserRelationVo(currentUid);
+        if (CollectionUtils.isEmpty(authorizationPerformanceVoList)) {
+            return ResponseDto.failure(ErrorMapping.get("130901"));
         }
+        List<MerchantAuthorizationPerformanceVo> targetAuthPerformanceVoList =
+                authorizationPerformanceVoList.stream().filter(r -> r.getPerformanceId().equals(performanceId)).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(targetAuthPerformanceVoList)) {
+            return ResponseDto.failure(ErrorMapping.get("130902"));
+        }
+        MerchantAuthorizationPerformanceVo authorizationPerformanceVo = targetAuthPerformanceVoList.get(0);
+//        LocalDateTime canDownDt = DateUtil.Formatter.yyyyMMddHHmmss.parse(relationParam.getCanDownTime());
+//        if (canDownDt.isAfter(LocalDateTime.now())) {
+//            return ResponseDto.failure(ErrorMapping.get("130903"));
+//        }
 
-        return ResponseDto.success(merchantStationService.downloadRefreshTicketData(performanceId, null));
+        return ResponseDto.success(merchantStationService.downloadRefreshTicketData(authorizationPerformanceVo, performanceId, null));
     }
 
     @ApiOperationSupport(order = 3)
@@ -208,12 +219,23 @@ public class MerchantStationController {
         String currentUid = CurrentUtil.getCurrentUid();
         log.info("验票:刷新验票数据[UID:{},performanceId:{},latestUpdateAt:{}]", currentUid, performanceId, latestUpdateAt);
 
-        ResponseDto<MerchantStationCheckRefreshVo> responseDto = this.downloadRefreshTicketDataValid(currentUid, performanceId);
-        if (!responseDto.isSuccess()) {
-            return responseDto;
+        // 查取当前用户下关联演出ID列表
+        List<MerchantAuthorizationPerformanceVo> authorizationPerformanceVoList = merchantStationService.getCheckUserRelationVo(currentUid);
+        if (CollectionUtils.isEmpty(authorizationPerformanceVoList)) {
+            return ResponseDto.failure(ErrorMapping.get("130901"));
+        }
+        List<MerchantAuthorizationPerformanceVo> targetAuthPerformanceVoList =
+                authorizationPerformanceVoList.stream().filter(r -> r.getPerformanceId().equals(performanceId)).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(targetAuthPerformanceVoList)) {
+            return ResponseDto.failure(ErrorMapping.get("130902"));
         }
+        MerchantAuthorizationPerformanceVo authorizationPerformanceVo = targetAuthPerformanceVoList.get(0);
+//        LocalDateTime canDownDt = DateUtil.Formatter.yyyyMMddHHmmss.parse(relationParam.getCanDownTime());
+//        if (canDownDt.isAfter(LocalDateTime.now())) {
+//            return ResponseDto.failure(ErrorMapping.get("130903"));
+//        }
 
-        return ResponseDto.success(merchantStationService.downloadRefreshTicketData(performanceId, latestUpdateAt));
+        return ResponseDto.success(merchantStationService.downloadRefreshTicketData(authorizationPerformanceVo, performanceId, latestUpdateAt));
     }
 
     @ApiOperationSupport(order = 4)
@@ -251,30 +273,4 @@ public class MerchantStationController {
 //    }
 
     /* ------------------------------------------------------------------ */
-
-    /**
-     * 下载、更新验票数据逻辑校验
-     *
-     * @param currentUid    UID
-     * @param performanceId 演出ID
-     * @return ResponseDto<MerchantStationCheckRefreshVo>
-     */
-    public ResponseDto<MerchantStationCheckRefreshVo> downloadRefreshTicketDataValid(String currentUid, String performanceId) {
-        // 查取当前用户下关联演出ID列表
-        List<MerchantAuthorizationPerformanceVo> authorizationPerformanceVoList = merchantStationService.getCheckUserRelationVo(currentUid);
-        if (CollectionUtils.isEmpty(authorizationPerformanceVoList)) {
-            return ResponseDto.failure(ErrorMapping.get("130901"));
-        }
-        List<MerchantAuthorizationPerformanceVo> targetAuthPerformanceVoList =
-                authorizationPerformanceVoList.stream().filter(r -> r.getPerformanceId().equals(performanceId)).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(targetAuthPerformanceVoList)) {
-            return ResponseDto.failure(ErrorMapping.get("130902"));
-        }
-//        MerchantAuthorizationPerformanceVo authorizationPerformanceVo = targetAuthPerformanceVoList.get(0);
-//        LocalDateTime canDownDt = DateUtil.Formatter.yyyyMMddHHmmss.parse(relationParam.getCanDownTime());
-//        if (canDownDt.isAfter(LocalDateTime.now())) {
-//            return ResponseDto.failure(ErrorMapping.get("130903"));
-//        }
-        return ResponseDto.success();
-    }
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantStationService.java

@@ -174,11 +174,12 @@ public class MerchantStationService {
     /**
      * 下载、更新验票数据
      *
-     * @param performanceId  演出ID
-     * @param latestUpdateAt 最近更新时间（仅当更新时必传，下载时传null）
+     * @param authorizationPerformanceVo 用户演出权限
+     * @param performanceId              演出ID
+     * @param latestUpdateAt             最近更新时间（仅当更新时必传，下载时传null）
      * @return MerchantStationCheckRefreshVo
      */
-    public MerchantStationCheckRefreshVo downloadRefreshTicketData(String performanceId, String latestUpdateAt) {
+    public MerchantStationCheckRefreshVo downloadRefreshTicketData(MerchantAuthorizationPerformanceVo authorizationPerformanceVo, String performanceId, String latestUpdateAt) {
         Criteria criteria = Criteria.where("performanceId").is(performanceId).and("isPayment").is(1);
         if (StringUtils.isNotEmpty(latestUpdateAt)) {
             criteria.and("updatedAt").gte(latestUpdateAt);
@@ -200,8 +201,6 @@ public class MerchantStationService {
             }
         }
 
-        MerchantStationCheckRefreshVo stationCheckRefreshVo = MerchantStationCheckRefreshVo.getNew();
-        stationCheckRefreshVo.setCheckOrderVos(checkOrderVos);
         // 查取演出信息
         MerchantStationPerformanceVo performanceVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
                 MerchantStationPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
@@ -220,8 +219,12 @@ public class MerchantStationService {
 
             ticketVoList.add(stationTicketVo);
         }
+        performanceVo.setPermissionIds(StringUtils.join(authorizationPerformanceVo.getPermissionIds().toArray(), "."));
         performanceVo.setTicketTimeList(null);
         performanceVo.setTicketVoList(ticketVoList);
+
+        MerchantStationCheckRefreshVo stationCheckRefreshVo = MerchantStationCheckRefreshVo.getNew();
+        stationCheckRefreshVo.setCheckOrderVos(checkOrderVos);
         stationCheckRefreshVo.setPerformanceVo(performanceVo);
         return stationCheckRefreshVo;
     }