1、接入paypal
2、修改支付宝支付
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.ai.da.controller;
|
||||
|
||||
import com.ai.da.common.context.UserContext;
|
||||
import com.ai.da.common.enums.OrderStatusEnum;
|
||||
import com.ai.da.common.response.Response;
|
||||
import com.ai.da.mapper.primary.entity.OrderInfo;
|
||||
@@ -23,9 +24,9 @@ public class OrderInfoController {
|
||||
@ApiOperation("订单列表")
|
||||
@GetMapping("/list")
|
||||
public Response<List<OrderInfo>> list(){
|
||||
|
||||
List<OrderInfo> list = orderInfoService.listOrderByCreateTimeDesc();
|
||||
return Response.success(list);
|
||||
List<OrderInfo> orderByAccountId = orderInfoService.getOrderByAccountId(UserContext.getUserHolder().getId());
|
||||
// List<OrderInfo> list = orderInfoService.listOrderByCreateTimeDesc();
|
||||
return Response.success(orderByAccountId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -36,15 +37,11 @@ public class OrderInfoController {
|
||||
@ApiOperation("查询本地订单状态")
|
||||
@GetMapping("/query-order-status/{orderNo}")
|
||||
public Response<String> queryOrderStatus(@PathVariable String orderNo){
|
||||
|
||||
String orderStatus = orderInfoService.getOrderStatus(orderNo);
|
||||
if(OrderStatusEnum.SUCCESS.getType().equals(orderStatus)){
|
||||
return Response.success("支付成功"); //支付成功
|
||||
}
|
||||
|
||||
return Response.success(101,"支付中......");
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user