autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-08-12 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加后管取消订单接口

Browse Source
This commit is contained in:
jsowell
2026-08-05 13:27:58 +08:00
parent b770b08b4e
commit 45f9eb3061
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -421,6 +421,7 @@ public class OrderService {
order.setOrderCode(orderBasicInfo.getOrderCode()); order.setOrderCode(orderBasicInfo.getOrderCode());
order.setTransactionCode(orderBasicInfo.getTransactionCode()); order.setTransactionCode(orderBasicInfo.getTransactionCode());
order.setOrderStatus(orderBasicInfo.getOrderStatus()); order.setOrderStatus(orderBasicInfo.getOrderStatus());
order.setPayStatus(orderBasicInfo.getPayStatus());
order.setLogicCard(orderBasicInfo.getLogicCard()); order.setLogicCard(orderBasicInfo.getLogicCard());
if (orderBasicInfo.getVinCode() != null) { if (orderBasicInfo.getVinCode() != null) {
order.setVinCode(orderBasicInfo.getVinCode()); order.setVinCode(orderBasicInfo.getVinCode());

13
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -178,6 +178,19 @@ public class OrderBasicInfoController extends BaseController {
return toAjax(orderBasicInfoService.deleteOrderBasicInfoByIds(ids)); 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();
}
/** /**
* 人工结算订单/手动结算逻辑/手动结算按钮/手动结算订单 * 人工结算订单/手动结算逻辑/手动结算按钮/手动结算订单

1
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
View File

@@ -57,6 +57,7 @@ public class OrderDetailInfoVO {
private String orderCode; // 订单编号 private String orderCode; // 订单编号
private String transactionCode; // 交易流水号 private String transactionCode; // 交易流水号
private String orderStatus; // 订单状态 private String orderStatus; // 订单状态
private String payStatus; // 支付状态（0-待支付；1-支付完成；2-无需支付；3-待补缴）
private String orderStatusDescribe; // 订单状态描述 private String orderStatusDescribe; // 订单状态描述
private String logicCard; // 卡号 private String logicCard; // 卡号
private String vinCode; // vin号 private String vinCode; // vin号