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

Commit 85d38644 authored by 胡佳晨's avatar 胡佳晨

下单 写死参数

parent 2c61def7
...@@ -35,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> { ...@@ -35,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
// 同步大麦数据接口 // 同步大麦数据接口
//订单列表(状态 待支付 已支付 倒计时 已失效) //订单列表(状态 待支付 已支付 倒计时 已失效)
PageInfo<List<KylinOrderListVo>> orderList(int page, int size); PageInfo<List<KylinOrderListVo>> orderList();
//订单详情 //订单详情
OrderDetailsVo orderDetails(String orderId); OrderDetailsVo orderDetails(String orderId);
......
...@@ -71,9 +71,8 @@ public class KylinOrderTicketsController { ...@@ -71,9 +71,8 @@ public class KylinOrderTicketsController {
@GetMapping("list") @GetMapping("list")
@ApiOperation("订单列表") @ApiOperation("订单列表")
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList(@RequestParam("page") int page, public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList() {
@RequestParam("size") int size) { return ResponseDto.success(orderTicketsService.orderList());
return ResponseDto.success(orderTicketsService.orderList(page,size));
} }
@GetMapping("details") @GetMapping("details")
......
...@@ -118,9 +118,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -118,9 +118,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setDefault(); kylinTicketPartnerVo.setDefault();
if(ticketCreateParam.getIsExpress()==1){ if(ticketCreateParam.getIsExpress()==1){
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
}else{
kylinTicketPartnerVo.setDescribesExpress("");
} }
if(ticketCreateParam.getIsElectronic()==1){ if(ticketCreateParam.getIsElectronic()==1){
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
}else{
kylinTicketPartnerVo.setDescribeElectronic("");
} }
if (ticketCreateParam.getIsExpress() == 1) { if (ticketCreateParam.getIsExpress() == 1) {
...@@ -164,10 +168,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -164,10 +168,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType()); kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
if(ticketCreateParam.getIsExpress()==1){ if(ticketCreateParam.getIsExpress()==1){
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
}else{
kylinTicketPartnerVo.setDescribesExpress("");
} }
if(ticketCreateParam.getIsElectronic()==1){ if(ticketCreateParam.getIsElectronic()==1){
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
}else{
kylinTicketPartnerVo.setDescribeElectronic("");
} }
kylinTicketPartnerVo.setStatus(-2); kylinTicketPartnerVo.setStatus(-2);
kylinTicketPartnerVo.setDefault(); kylinTicketPartnerVo.setDefault();
...@@ -296,7 +305,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -296,7 +305,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if(performancePartnerVo.getAuditStatus()==0){ if(performancePartnerVo.getAuditStatus()==0 || performancePartnerVo.getAuditStatus()==1){
return ResponseDto.failure(ErrorMapping.get(20107)); return ResponseDto.failure(ErrorMapping.get(20107));
} }
......
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