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

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

增加 但支付订单数量 接口

parent 73e123b2
......@@ -46,6 +46,9 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
//TASK 订单状态
ResponseDto<Integer> checkOrderResult(String orderId);
//TASK 订单状态
ResponseDto<Integer> orderUnPayCount();
// 下单接口(无订单->待支付->可支付)
// 删除订单
......
......@@ -54,9 +54,9 @@ public class KylinOrderTicketsController {
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
if(null==vo){
if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20003"));
}else{
} else {
return ResponseDto.success(vo);
}
}
......@@ -78,11 +78,11 @@ public class KylinOrderTicketsController {
@GetMapping("details")
@ApiOperation("订单详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId",required = false) @NotNull(message = "订单id不能为空") String orderId) {
public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
if(null==vo){
if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20003"));
}else {
} else {
return ResponseDto.success(vo);
}
}
......@@ -92,15 +92,24 @@ public class KylinOrderTicketsController {
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
Integer status = orderTicketsService.checkOrderResult(orderId).getData();
if(null==status){
if (null == status) {
return ResponseDto.failure(ErrorMapping.get("20003"));
}else {
HashMap<String,Integer> map = new HashMap<>();
map.put("status",status);
} else {
HashMap<String, Integer> map = new HashMap<>();
map.put("status", status);
return ResponseDto.success(map);
}
}
@GetMapping("orderUnPayCount")
@ApiOperation("待支付演出订单数量")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap> orderUnPayCount() {
Integer unPayCount = orderTicketsService.orderUnPayCount().getData();
HashMap<String, Integer> map = new HashMap<>();
map.put("unPayCount", unPayCount);
return ResponseDto.success(map);
}
@PostMapping("checkOrderTime")
......
......@@ -1127,6 +1127,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
}
}
@Override
public ResponseDto<Integer> orderUnPayCount() {
String uid = CurrentUtil.getCurrentUid();
List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
Integer unPayCount = 0;
for (KylinOrderListVo item : voList ){
if(item.getStatus()==0){
unPayCount+=1;
}
}
return ResponseDto.success(unPayCount);
}
public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
boolean isAgent = ticketData.getIsAgent() == 1;
if (isAgent) {
......
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