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

Skip to content

L
liquidnet-bus-v1
Commit b645ded0 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

取消 kylin order相关接口

parent 52740aa2
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 139 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @ b645ded0
......@@ -31,122 +31,122 @@ import java.util.List;
* @author liquidnet
* @since 2021-05-20
*/
@Api(tags = "前端-订单相关")
@RestController
@RequestMapping("order")
@Validated
//@Api(tags = "前端-订单相关")
//@RestController
//@RequestMapping("order")
//@Validated
public class KylinOrderTicketsController {
@Autowired
IKylinOrderTicketsService orderTicketsService;
@PostMapping("pre")
@ApiOperation("下单")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
return orderTicketsService.checkCanOrder(payOrderParam);
}
@PostMapping("payAgain")
@ApiOperation("再次支付")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20024"));
} else {
return ResponseDto.success(vo);
}
}
@PostMapping("syncOrder")
@ApiOperation("支付回调")
@ApiResponse(code = 200, message = "接口返回对象参数")
public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
return orderTicketsService.syncOrder(syncOrderParam);
}
@GetMapping("list")
@ApiOperation("订单列表")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList() {
return ResponseDto.success(orderTicketsService.orderList());
}
@GetMapping("details")
@ApiOperation("订单详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20003"));
} else {
return ResponseDto.success(vo);
}
}
@GetMapping("toOrderRefundDetails")
@ApiOperation("想要退款订单详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
KylinOrderTicketPreVo vo = orderTicketsService.toOrderRefundDetails(orderId);
if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20003"));
} else {
return ResponseDto.success(vo);
}
}
@PostMapping("sendOrderRefunds")
@ApiOperation("发起退款申请")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap<String,String>> sendOrderRefund(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
@RequestParam(value = "orderTicketEntitiesId", required = true) @NotNull(message = "票单id不能为空") String orderTicketEntitiesId,
@RequestParam(value = "reason", required = true) @NotNull(message = "退款原因不能为空") String reason,
@RequestParam(value = "picList", required = false) String picList) {
String orderRefundId = orderTicketsService.sendOrderRefund(orderId, orderTicketEntitiesId, reason, picList).getData();
HashMap<String,String> map = new HashMap<String,String>();
map.put("orderRefundsId",orderRefundId);
return ResponseDto.success(map);
}
@GetMapping("orderRefundDetails")
@ApiOperation("退款申请详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<OrderRefundVo> orderRefundDetails(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
return ResponseDto.success(orderTicketsService.orderRefundDetails(orderId, orderRefundId));
}
@PostMapping("orderRefundWithdraw")
@ApiOperation("发起退款撤回")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Boolean> orderRefundWithdraw(@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
return orderTicketsService.orderRefundWithdraw(orderRefundId);
}
@GetMapping("checkPayment")
@ApiOperation("订单状态")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
Integer status = orderTicketsService.checkOrderResult(orderId).getData();
if (null == status) {
return ResponseDto.failure(ErrorMapping.get("20003"));
} 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);
}
// @Autowired
// IKylinOrderTicketsService orderTicketsService;
//
// @PostMapping("pre")
// @ApiOperation("下单")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
// return orderTicketsService.checkCanOrder(payOrderParam);
// }
//
// @PostMapping("payAgain")
// @ApiOperation("再次支付")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
// PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
// if (null == vo) {
// return ResponseDto.failure(ErrorMapping.get("20024"));
// } else {
// return ResponseDto.success(vo);
// }
// }
//
// @PostMapping("syncOrder")
// @ApiOperation("支付回调")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
// return orderTicketsService.syncOrder(syncOrderParam);
// }
//
// @GetMapping("list")
// @ApiOperation("订单列表")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList() {
// return ResponseDto.success(orderTicketsService.orderList());
// }
//
// @GetMapping("details")
// @ApiOperation("订单详情")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
// OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
// if (null == vo) {
// return ResponseDto.failure(ErrorMapping.get("20003"));
// } else {
// return ResponseDto.success(vo);
// }
// }
//
// @GetMapping("toOrderRefundDetails")
// @ApiOperation("想要退款订单详情")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
// KylinOrderTicketPreVo vo = orderTicketsService.toOrderRefundDetails(orderId);
// if (null == vo) {
// return ResponseDto.failure(ErrorMapping.get("20003"));
// } else {
// return ResponseDto.success(vo);
// }
// }
//
// @PostMapping("sendOrderRefunds")
// @ApiOperation("发起退款申请")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<HashMap<String,String>> sendOrderRefund(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
// @RequestParam(value = "orderTicketEntitiesId", required = true) @NotNull(message = "票单id不能为空") String orderTicketEntitiesId,
// @RequestParam(value = "reason", required = true) @NotNull(message = "退款原因不能为空") String reason,
// @RequestParam(value = "picList", required = false) String picList) {
// String orderRefundId = orderTicketsService.sendOrderRefund(orderId, orderTicketEntitiesId, reason, picList).getData();
// HashMap<String,String> map = new HashMap<String,String>();
// map.put("orderRefundsId",orderRefundId);
// return ResponseDto.success(map);
// }
//
// @GetMapping("orderRefundDetails")
// @ApiOperation("退款申请详情")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<OrderRefundVo> orderRefundDetails(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
// @RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
// return ResponseDto.success(orderTicketsService.orderRefundDetails(orderId, orderRefundId));
// }
//
// @PostMapping("orderRefundWithdraw")
// @ApiOperation("发起退款撤回")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<Boolean> orderRefundWithdraw(@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
// return orderTicketsService.orderRefundWithdraw(orderRefundId);
// }
//
//
// @GetMapping("checkPayment")
// @ApiOperation("订单状态")
// @ApiResponse(code = 200, message = "接口返回对象参数")
// public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
// Integer status = orderTicketsService.checkOrderResult(orderId).getData();
// if (null == status) {
// return ResponseDto.failure(ErrorMapping.get("20003"));
// } 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);
// }
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/OrderRefundOvertimeController.java
View file @ b645ded0
......@@ -19,30 +19,30 @@ import org.springframework.web.bind.annotation.RestController;
* @author jiangxiulong
* @since 2021-06-11 6:10 下午
*/
@Api(tags = "前端-退款回调")
@RestController
@RequestMapping("refund")
//@Api(tags = "前端-退款回调")
//@RestController
//@RequestMapping("refund")
public class OrderRefundOvertimeController {
@Autowired
private OrderRefundOvertimeServiceImpl orderRefundOvertimeServiceImpl;
@PostMapping("apply")
@ApiOperation("超时退款")
@ApiImplicitParams({
@ApiImplicitParam(type = "body", dataType = "String", name = "orderTicketsId", value = "订单ID", required = true),
})
public Boolean refundApply(@RequestParam() String orderTicketsId) {
try {
Boolean res = orderRefundOvertimeServiceImpl.refundApply(orderTicketsId);
if (res) {
return true;
} else {
return false;
}
} catch (Exception e) {
return false;
}
}
// @Autowired
// private OrderRefundOvertimeServiceImpl orderRefundOvertimeServiceImpl;
//
// @PostMapping("apply")
// @ApiOperation("超时退款")
// @ApiImplicitParams({
// @ApiImplicitParam(type = "body", dataType = "String", name = "orderTicketsId", value = "订单ID", required = true),
// })
// public Boolean refundApply(@RequestParam() String orderTicketsId) {
// try {
// Boolean res = orderRefundOvertimeServiceImpl.refundApply(orderTicketsId);
// if (res) {
// return true;
// } else {
// return false;
// }
// } catch (Exception e) {
// return false;
// }
// }
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketEntitiesController.java 0 → 100644
View file @ b645ded0
package com.liquidnet.service.order.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 订单详情 前端控制器
* </p>
*
* @author liquidnet
* @since 2021-05-20
*/
@RestController
@RequestMapping("orderEnter")
public class KylinOrderTicketEntitiesController {
}
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