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

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

@@ -9,11 +9,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -96,11 +92,9 @@ public class KylinPerformancesController {
         return ResponseDto.success(result);
     }
 
-    @GetMapping("detail")
+    @GetMapping("{performancesId}")
     @ApiOperation("演出详情")
-    public ResponseDto<HashMap<String, Object>> detail(
-            @RequestParam(value = "performancesId") String performancesId //演出id
-    ) {
+    public ResponseDto<HashMap<String, Object>> detail(@PathVariable("performancesId") String performancesId) {
         HashMap<String, Object> result = kylinPerformancesService.detail(performancesId);
         if (result.size() > 0) {
             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

 package com.liquidnet.service.kylin.service.impl;
 
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
@@ -175,7 +176,14 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                 PerformanceVo.class.getSimpleName()
         );
 
-        info.put("info", performancesInfo);
+        List<TicketTimesPartnerVo> ticketTimesPartnerVo = mongoTemplate.find(
+                Query.query(Criteria.where("performancesId").is(performancesId)),
+                TicketTimesPartnerVo.class,
+                TicketTimesPartnerVo.class.getSimpleName()
+        );
+
+        info.put("performancesInfo", performancesInfo);
+        info.put("ticketTimesPartnerVo", ticketTimesPartnerVo);
 
         return info;
     }