coder-xiaomo/epp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

取消订单完成，小程序订单详情页完善

Browse Source
This commit is contained in:
小墨
2023-03-21 19:18:06 +08:00
parent b71d4381d7
commit 23dfc8288c
8 changed files with 208 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
backend/microservice-provider-shop-8003/src/main/java/com/cxyxiaomo/epp/shop/controller/OrderController.java
View File

@@ -166,8 +166,6 @@ public class OrderController {
//判断是否可以支付
OrderStatus orderStatus = OrderStatus.get(order.getOrderStatus());
if (orderStatus != OrderStatus.PENDING) {
}
switch (orderStatus) {
case PENDING:
// 可以支付
@@ -175,7 +173,7 @@ public class OrderController {
case PROCESSING:
return Res.error("订单已支付，无需重复支付");
case CANCELLED:
return Res.error("订单已取消，无需重复支付");
return Res.error("订单已取消，无法支付");
default:
return Res.error("当前订单状态无法支付");
}
@@ -185,4 +183,44 @@ public class OrderController {
return Res.success(success ? "支付成功" : "支付失败");
}
@PostMapping("/miniprogram/cancelOrder")
@ResponseBody
public Res cancelOrder(@RequestBody JSONObject params) {
Long orderId = params.getLong("orderId");
if (orderId == null) {
return Res.error("参数错误");
}
// 查询订单详情
Order order = orderService.getOrderById(orderId);
if (order == null) {
return Res.error("订单不存在");
}
//判断是否可以取消
OrderStatus orderStatus = OrderStatus.get(order.getOrderStatus());
switch (orderStatus) {
case PENDING:
// 可以取消
break;
case PROCESSING:
// 可以取消
// return Res.error("订单已支付，不可取消");
break;
case SHIPPED:
return Res.error("订单已发货，不可取消");
case DELIVERED:
return Res.error("订单已送达，不可取消");
case CANCELLED:
return Res.error("订单已取消");
default:
return Res.error("当前订单状态无法取消");
}
// 更新支付信息
Boolean success = orderService.updateOrderStatus(orderId, OrderStatus.CANCELLED);
return Res.success(success ? "取消成功" : "取消失败");
}
}