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

Commit b6d5058d authored by 胡佳晨's avatar 胡佳晨

KylinDamaiServiceImpl 大麦同步修改

KylinPerformancesMapper.xml admin 演出详情 增加根据票种名称排序
KylinTicketsPartnerServiceImpl 票种增加价格排序
KylinTicketTimesPartnerServiceImpl 场次根据 创建时间排序
orderList.html 增加短订单查询
KylinPerformancesServiceImpl 增加 根据券规则获取演出id
parent 4f15cb37
package com.liquidnet.service.kylin.service; package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao; import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
import com.liquidnet.service.kylin.entity.KylinPerformances; import com.liquidnet.service.kylin.entity.KylinPerformances;
...@@ -15,4 +16,12 @@ import java.util.List; ...@@ -15,4 +16,12 @@ import java.util.List;
* @since 2021-05-05 * @since 2021-05-05
*/ */
public interface IKylinPerformancesService { public interface IKylinPerformancesService {
/**
* 根据 券适用范围查询演出id
* @param useScope
* @param busiId
* @return
*/
ResponseDto<String> getPerformanceIdByInfo(Integer useScope,String busiId);
} }
...@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto; ...@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo; import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
import com.liquidnet.service.kylin.service.IKylinLackRegistersService; import com.liquidnet.service.kylin.service.IKylinLackRegistersService;
import com.liquidnet.service.kylin.service.IKylinPerformancesService;
import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl; import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -40,6 +41,8 @@ public class KylinPerformancesController { ...@@ -40,6 +41,8 @@ public class KylinPerformancesController {
private KylinPerformancesServiceImpl kylinPerformancesService; private KylinPerformancesServiceImpl kylinPerformancesService;
@Autowired @Autowired
private IKylinLackRegistersService kylinLackRegistersService; private IKylinLackRegistersService kylinLackRegistersService;
@Autowired
private IKylinPerformancesService iKylinPerformancesService;
@GetMapping("localList") @GetMapping("localList")
@ApiOperation("本地演出列表") @ApiOperation("本地演出列表")
...@@ -233,7 +236,17 @@ public class KylinPerformancesController { ...@@ -233,7 +236,17 @@ public class KylinPerformancesController {
@ApiImplicitParam(type = "query", dataType = "String", name = "performancesId", value = "演出id", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "performancesId", value = "演出id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "ticketsId", value = "票种id", required = true) @ApiImplicitParam(type = "query", dataType = "String", name = "ticketsId", value = "票种id", required = true)
}) })
public ResponseDto<String> addLackRegister(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId){ public ResponseDto<String> addLackRegister(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId) {
return kylinLackRegistersService.addLackRegister(performancesId,ticketsId); return kylinLackRegistersService.addLackRegister(performancesId, ticketsId);
}
@PostMapping("couponPerformanceId")
@ApiOperation("根据券信息获取演出id")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "Integer", name = "useScope", value = "适用范围[91-场次|92-票]", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "busiId", value = "使用Id", required = true)
})
public ResponseDto<String> addLackRegister(@RequestParam("useScope") Integer useScope, @RequestParam("busiId") String busiId) {
return iKylinPerformancesService.getPerformanceIdByInfo(useScope, busiId);
} }
} }
...@@ -5,11 +5,17 @@ import com.liquidnet.commons.lang.util.CollectionUtil; ...@@ -5,11 +5,17 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.DistanceUtil; import com.liquidnet.commons.lang.util.DistanceUtil;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.UserPathDto; import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum; import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo; import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
import com.liquidnet.service.kylin.service.IKylinPerformancesService; import com.liquidnet.service.kylin.service.IKylinPerformancesService;
import com.liquidnet.service.kylin.utils.DataUtils; import com.liquidnet.service.kylin.utils.DataUtils;
...@@ -421,6 +427,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -421,6 +427,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
} }
return newList; return newList;
} }
public List<KylinPerformanceVo> checkAppStatusRoad(List<KylinPerformanceVo> list) { public List<KylinPerformanceVo> checkAppStatusRoad(List<KylinPerformanceVo> list) {
List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList(); List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
...@@ -595,8 +602,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -595,8 +602,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
} }
return isMemberStatus; return isMemberStatus;
} }
/** /**
* 获取我的已购票演出列表 * 获取我的已购票演出列表
*
* @return * @return
*/ */
public List<KylinPerformanceVo> myPerformancesList() { public List<KylinPerformanceVo> myPerformancesList() {
...@@ -604,4 +613,33 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -604,4 +613,33 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
List<KylinPerformanceVo> performanceVoList = dataUtils.myPerformancesList(userId); List<KylinPerformanceVo> performanceVoList = dataUtils.myPerformancesList(userId);
return performanceVoList; return performanceVoList;
} }
@Override
public ResponseDto<String> getPerformanceIdByInfo(Integer useScope, String busiId) {
if (useScope.equals(91)) {//场次
List<KylinTicketTimesPartnerVo> voTimes = mongoTemplate.find(Query.query(Criteria.where("ticketTimesId").is(busiId)),
KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
if(voTimes.size()>0){
return ResponseDto.failure();
}else{
return ResponseDto.success(voTimes.get(0).getPerformancesId());
}
} else if (useScope.equals(92)) {//票
List<KylinTicketPartnerVo> voTickets = mongoTemplate.find(Query.query(Criteria.where("ticketsId").is(busiId)),
KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
if(voTickets.size()>0) {
return ResponseDto.failure();
}else{
List<KylinTicketTimesPartnerVo> voTimes = mongoTemplate.find(Query.query(Criteria.where("ticketTimesId").is(voTickets.get(0).getTimesId())),
KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
if(voTimes.size()>0){
return ResponseDto.failure();
}else{
return ResponseDto.success(voTimes.get(0).getPerformancesId());
}
}
} else {
return ResponseDto.failure();
}
}
} }
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