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/admin/KylinRoadShowsAdminController.java

@@ -74,7 +74,7 @@ public class KylinRoadShowsAdminController {
 
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除")
-    @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
+    @ApiResponse( code = 200, message = "接口返回对象参数")
     public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
         boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
         if (result) {
@@ -86,7 +86,7 @@ public class KylinRoadShowsAdminController {
 
     @GetMapping(value = "details")
     @ApiOperation(value = "详情")
-    @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
+    @ApiResponse(response = RoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
     public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
         RoadShowAdminVo result = null;
         result = roadShowsService.detailsRoadShow(roadShowId);

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

@@ -550,11 +550,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     ticketVo.setTimeId(ticketRelationsItem.getTimesId());
                     ticketVo.setTicket(tickets);
                     ticketVo.setTicketStatus(ticketStatus);
+                    boolean ticketExists =
+                            mongoTemplate.exists(Query.query(Criteria.where("ticketsId").is(ticketVo.getTicketsId())), TicketVo.class, TicketVo.class.getSimpleName());
+                    if (!ticketExists) {
                         mongoTemplate.insert(
                                 ticketVo, TicketVo.class.getSimpleName()
                         );
-                    //票种 库存redis TODO 库存可能会丢
+                    }
 
+                    //票种 库存redis TODO 库存可能会丢
                     TicketInventoryDto ticketInventoryDto = new TicketInventoryDto();
                     if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
                         ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange());
@@ -569,9 +573,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange() - surplusGeneral);
                         ticketInventoryDto.setSurplusGeneral(ticketStatus.getTotalGeneral() - surplusExchange);
                         ticketInventoryDto.setTicketsId(ticketVo.getTicketsId());
-                    }
                         redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL, ticketInventoryDto.getSurplusGeneral());
                         redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_EXCHANGE, ticketInventoryDto.getSurplusExchange());
+                    }
 
                     if (ticketVo.getIsMember() == 1) {
                         isMember = 1;
@@ -592,15 +596,24 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         sellTime = tickets.getTimeStart().plusMinutes(-tickets.getAdvanceMinuteMember());
                     }
                 }
+                boolean ticketTimesExists =
+                        mongoTemplate.exists(Query.query(Criteria.where("ticketTimesId").is(ticketTimesVo.getTicketTimesId())), TicketTimesVo.class, TicketTimesVo.class.getSimpleName());
+                if (!ticketTimesExists) {
                     mongoTemplate.insert(
                             ticketTimesVo, TicketTimesVo.class.getSimpleName()
                     );
                 }
+
+            }
             performanceVoData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime);
             performanceVoData.setPerformanceRelations(performanceRelationsData);
+            boolean performanceExists =
+                    mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceVoData.getPerformancesId())), PerformanceVo.class, PerformanceVo.class.getSimpleName());
+            if (!performanceExists) {
                 mongoTemplate.insert(
                         performanceVoData, PerformanceVo.class.getSimpleName()
                 );
+            }
             //修改 提审vo
             Map<String, Object> map = new HashMap<>();
             map.put("status", 3);
@@ -672,26 +685,26 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     @Override
     public String copyPerformance(String performancesId) {
 
-        PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performances_id").is(performancesId)),PerformancePartnerVo.class,PerformancePartnerVo.class.getSimpleName());
+        PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performances_id").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
         //复制演出
         performancePartnerVo.setPerformancesId(IDGenerator.nextSnowId().toString());
         performancePartnerVo.setStatus(0);
-        mongoTemplate.insert(performancePartnerVo,PerformancePartnerVo.class.getSimpleName());
+        mongoTemplate.insert(performancePartnerVo, PerformancePartnerVo.class.getSimpleName());
 
-        List<TicketTimesPartnerVo> ticketTimesPartnerVos = mongoTemplate.find(Query.query(Criteria.where("performances_id").is(performancesId)),TicketTimesPartnerVo.class,TicketTimesPartnerVo.class.getSimpleName());
-        for (TicketTimesPartnerVo timeItem:ticketTimesPartnerVos){
+        List<TicketTimesPartnerVo> ticketTimesPartnerVos = mongoTemplate.find(Query.query(Criteria.where("performances_id").is(performancesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
+        for (TicketTimesPartnerVo timeItem : ticketTimesPartnerVos) {
             //复制场次
             timeItem.setTicketTimesId(IDGenerator.nextSnowId().toString());
             timeItem.setPerformancesId(performancePartnerVo.getPerformancesId());
-            mongoTemplate.insert(timeItem,TicketTimesPartnerVo.class.getSimpleName());
+            mongoTemplate.insert(timeItem, TicketTimesPartnerVo.class.getSimpleName());
 
-            List<TicketPartnerVo> ticketPartnerVos = mongoTemplate.find(Query.query(Criteria.where("timesId").is(timeItem.getTicketTimesId())),TicketPartnerVo.class,TicketPartnerVo.class.getSimpleName());
-            for (TicketPartnerVo ticketItem:ticketPartnerVos){
+            List<TicketPartnerVo> ticketPartnerVos = mongoTemplate.find(Query.query(Criteria.where("timesId").is(timeItem.getTicketTimesId())), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
+            for (TicketPartnerVo ticketItem : ticketPartnerVos) {
                 //复制票
                 ticketItem.setStatus(0);
                 ticketItem.setTimesId(ticketItem.getTimesId());
                 ticketItem.setTicketsId(IDGenerator.nextSnowId().toString());
-                mongoTemplate.insert(ticketItem,TicketPartnerVo.class.getSimpleName());
+                mongoTemplate.insert(ticketItem, TicketPartnerVo.class.getSimpleName());
             }
         }
         return performancePartnerVo.getPerformancesId();