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

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java
#	liquidnet-bus-api/pom.xml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DMCheckOrderTimeImpl.java
#	liquidnet-bus-service/pom.xml

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinMyPerformancesController.java

+package com.liquidnet.service.kylin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: KylinMyPerformancesController
+ * @Package com.liquidnet.service.kylin.controller
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/9/12 13:34
+ */
+@Api(tags = "前端-演出")
+@RestController
+@RequestMapping("myPerformance")
+@Slf4j
+public class KylinMyPerformancesController {
+    @Autowired
+    private KylinPerformancesServiceImpl kylinPerformancesService;
+
+    @GetMapping("performancesList")
+    @ApiOperation("我的已购票演出列表")
+    public ResponseDto<List<KylinPerformanceVo>> performancesList() {
+        List<KylinPerformanceVo> result = kylinPerformancesService.myPerformancesList();
+        return ResponseDto.success(result);
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.impl;
 
 import com.liquidnet.commons.lang.CommonConst;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.DistanceUtil;
 import com.liquidnet.service.base.UserPathDto;
@@ -594,4 +595,13 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         }
         return isMemberStatus;
     }
+    /**
+     * 获取我的已购票演出列表
+     * @return
+     */
+    public List<KylinPerformanceVo> myPerformancesList() {
+        String userId = CurrentUtil.getCurrentUid();
+        List<KylinPerformanceVo> performanceVoList = dataUtils.myPerformancesList(userId);
+        return performanceVoList;
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -549,4 +549,30 @@ public class DataUtils {
         }
     }
 
+    /**
+     * 获取我的演出列表
+     */
+    public List<KylinPerformanceVo> myPerformancesList(String userId) {
+        Query queryNew = new Query();
+        queryNew.addCriteria(Criteria.where("userId").is(userId));
+        List<String> performanceIdList = mongoTemplate.findDistinct(queryNew, "performanceId",  "KylinOrderTicketVo",KylinOrderTicketVo.class, String.class);
+        log.info("myPerformancesList performanceIdList.size:{}",performanceIdList.size());
+
+        // 固定条件
+        Query query = getCommonWhere();
+        // 不要查询的字段
+        query.fields().exclude("details");
+        query.fields().exclude("noticeImage");
+        query.fields().exclude("ticketTimeList");
+        query.fields().exclude("describeElectronic");
+        //
+        query.addCriteria(Criteria.where("performancesId").in(performanceIdList));
+        query.with(Sort.by(
+                Sort.Order.desc("timeStart")
+        ));
+
+        List<KylinPerformanceVo> kylinPerformanceVoList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+        return kylinPerformanceVoList;
+    }
+
 }