diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 23c3e45f1..178fc615b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -421,6 +421,7 @@ public class OrderService { order.setOrderCode(orderBasicInfo.getOrderCode()); order.setTransactionCode(orderBasicInfo.getTransactionCode()); order.setOrderStatus(orderBasicInfo.getOrderStatus()); + order.setPayStatus(orderBasicInfo.getPayStatus()); order.setLogicCard(orderBasicInfo.getLogicCard()); if (orderBasicInfo.getVinCode() != null) { order.setVinCode(orderBasicInfo.getVinCode()); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 93d8329c3..90d334c32 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -178,6 +178,19 @@ public class OrderBasicInfoController extends BaseController { return toAjax(orderBasicInfoService.deleteOrderBasicInfoByIds(ids)); } + /** + * 取消订单/关闭待支付订单 + * 仅待支付状态的订单可取消,取消后订单状态变为 7-订单关闭 + * http://localhost:8080/order/closeOrderByOrderCode/{orderCode} + */ + @PreAuthorize("@ss.hasPermi('order:order:edit')") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/closeOrderByOrderCode/{orderCode}") + public AjaxResult closeOrderByOrderCode(@PathVariable("orderCode") String orderCode) { + orderBasicInfoService.closeOrderByOrderCode(orderCode); + return AjaxResult.success(); + } + /** * 人工结算订单/手动结算逻辑/手动结算按钮/手动结算订单 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java index 800904952..1c035289b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java @@ -57,6 +57,7 @@ public class OrderDetailInfoVO { private String orderCode; // 订单编号 private String transactionCode; // 交易流水号 private String orderStatus; // 订单状态 + private String payStatus; // 支付状态(0-待支付;1-支付完成;2-无需支付;3-待补缴) private String orderStatusDescribe; // 订单状态描述 private String logicCard; // 卡号 private String vinCode; // vin号