记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 6d0a26a9 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents f2887e85 226781e4
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 22 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinRoadShowsAdminController.java
View file @ 6d0a26a9
...@@ -74,7 +74,7 @@ public class KylinRoadShowsAdminController { ...@@ -74,7 +74,7 @@ public class KylinRoadShowsAdminController {
@DeleteMapping(value = "") @DeleteMapping(value = "")
@ApiOperation(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) { public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
boolean result = roadShowsService.deleteRoadShow(roadShowId, status); boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
if (result) { if (result) {
...@@ -86,7 +86,7 @@ public class KylinRoadShowsAdminController { ...@@ -86,7 +86,7 @@ public class KylinRoadShowsAdminController {
@GetMapping(value = "details") @GetMapping(value = "details")
@ApiOperation(value = "详情") @ApiOperation(value = "详情")
@ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数") @ApiResponse(response = RoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) { public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
RoadShowAdminVo result = null; RoadShowAdminVo result = null;
result = roadShowsService.detailsRoadShow(roadShowId); 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
View file @ 6d0a26a9
...@@ -550,11 +550,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -550,11 +550,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
ticketVo.setTimeId(ticketRelationsItem.getTimesId()); ticketVo.setTimeId(ticketRelationsItem.getTimesId());
ticketVo.setTicket(tickets); ticketVo.setTicket(tickets);
ticketVo.setTicketStatus(ticketStatus); ticketVo.setTicketStatus(ticketStatus);
mongoTemplate.insert( boolean ticketExists =
ticketVo, TicketVo.class.getSimpleName() mongoTemplate.exists(Query.query(Criteria.where("ticketsId").is(ticketVo.getTicketsId())), TicketVo.class, TicketVo.class.getSimpleName());
); if (!ticketExists) {
//票种 库存redis TODO 库存可能会丢 mongoTemplate.insert(
ticketVo, TicketVo.class.getSimpleName()
);
}
//票种 库存redis TODO 库存可能会丢
TicketInventoryDto ticketInventoryDto = new TicketInventoryDto(); TicketInventoryDto ticketInventoryDto = new TicketInventoryDto();
if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) { if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange()); ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange());
...@@ -569,9 +573,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -569,9 +573,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange() - surplusGeneral); ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange() - surplusGeneral);
ticketInventoryDto.setSurplusGeneral(ticketStatus.getTotalGeneral() - surplusExchange); ticketInventoryDto.setSurplusGeneral(ticketStatus.getTotalGeneral() - surplusExchange);
ticketInventoryDto.setTicketsId(ticketVo.getTicketsId()); 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());
} }
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) { if (ticketVo.getIsMember() == 1) {
isMember = 1; isMember = 1;
...@@ -592,15 +596,24 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -592,15 +596,24 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
sellTime = tickets.getTimeStart().plusMinutes(-tickets.getAdvanceMinuteMember()); sellTime = tickets.getTimeStart().plusMinutes(-tickets.getAdvanceMinuteMember());
} }
} }
mongoTemplate.insert( boolean ticketTimesExists =
ticketTimesVo, TicketTimesVo.class.getSimpleName() 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.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime);
performanceVoData.setPerformanceRelations(performanceRelationsData); performanceVoData.setPerformanceRelations(performanceRelationsData);
mongoTemplate.insert( boolean performanceExists =
performanceVoData, PerformanceVo.class.getSimpleName() mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceVoData.getPerformancesId())), PerformanceVo.class, PerformanceVo.class.getSimpleName());
); if (!performanceExists) {
mongoTemplate.insert(
performanceVoData, PerformanceVo.class.getSimpleName()
);
}
//修改 提审vo //修改 提审vo
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("status", 3); map.put("status", 3);
...@@ -672,26 +685,26 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -672,26 +685,26 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
@Override @Override
public String copyPerformance(String performancesId) { 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.setPerformancesId(IDGenerator.nextSnowId().toString());
performancePartnerVo.setStatus(0); 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()); List<TicketTimesPartnerVo> ticketTimesPartnerVos = mongoTemplate.find(Query.query(Criteria.where("performances_id").is(performancesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
for (TicketTimesPartnerVo timeItem:ticketTimesPartnerVos){ for (TicketTimesPartnerVo timeItem : ticketTimesPartnerVos) {
//复制场次 //复制场次
timeItem.setTicketTimesId(IDGenerator.nextSnowId().toString()); timeItem.setTicketTimesId(IDGenerator.nextSnowId().toString());
timeItem.setPerformancesId(performancePartnerVo.getPerformancesId()); 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()); List<TicketPartnerVo> ticketPartnerVos = mongoTemplate.find(Query.query(Criteria.where("timesId").is(timeItem.getTicketTimesId())), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
for (TicketPartnerVo ticketItem:ticketPartnerVos){ for (TicketPartnerVo ticketItem : ticketPartnerVos) {
//复制票 //复制票
ticketItem.setStatus(0); ticketItem.setStatus(0);
ticketItem.setTimesId(ticketItem.getTimesId()); ticketItem.setTimesId(ticketItem.getTimesId());
ticketItem.setTicketsId(IDGenerator.nextSnowId().toString()); ticketItem.setTicketsId(IDGenerator.nextSnowId().toString());
mongoTemplate.insert(ticketItem,TicketPartnerVo.class.getSimpleName()); mongoTemplate.insert(ticketItem, TicketPartnerVo.class.getSimpleName());
} }
} }
return performancePartnerVo.getPerformancesId(); return performancePartnerVo.getPerformancesId();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment