From d4e7a665a913d7b1b0b0099fcbff23b0588697d8 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 25 Sep 2025 10:06:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=85=B3=E9=97=AD=E5=BE=85=E6=94=AF=E4=BB=98=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uniapp/customer/OrderController.java | 23 +++++++++++++++++++ .../src/test/java/PaymentTestController.java | 6 ++--- .../common/enums/ykc/OrderStatusEnum.java | 2 +- .../pile/service/OrderBasicInfoService.java | 6 +++++ .../impl/OrderBasicInfoServiceImpl.java | 18 +++++++++++++++ 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java index 94dccfec6..79fa65126 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java @@ -14,6 +14,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.CarCouponRecordService; import com.jsowell.pile.service.ChargeAlgorithmRecordService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.uniapp.customer.ChargeAlgorithmRecordVO; import com.jsowell.pile.vo.uniapp.customer.OrderVO; @@ -50,6 +51,9 @@ public class OrderController extends BaseController { @Autowired private CarCouponRecordService carCouponRecordService; + @Autowired + private OrderBasicInfoService orderBasicInfoService; + /** * 生成订单/创建订单 * http://localhost:8080/uniapp/order/generateOrder @@ -436,4 +440,23 @@ public class OrderController extends BaseController { logger.info("查询停车优免订单 memberId:{}, result:{}", memberId, response); return response; } + + /** + * 关闭待支付的订单 + * @param orderCode + * @return + */ + @GetMapping("/closeUnPayOder/{orderCode}") + public RestApiResponse closeUnPayOder(@PathVariable("orderCode") String orderCode) { + RestApiResponse response = null; + try { + orderBasicInfoService.closeUnPayOder(orderCode); + response = new RestApiResponse<>(); + } catch (Exception e) { + logger.error("关闭订单号：{} 的订单失败, error:", orderCode, e); + response = new RestApiResponse<>(e); + } + logger.info("关闭订单：{}", orderCode); + return response; + } } diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index b4f8f4aed..48e35133d 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -539,10 +539,10 @@ public class PaymentTestController { */ @Test public void createPaymentReverseRequestTest() { - String paymentId = "002212025091910192610814936868000780288"; - BigDecimal refundAmount = new BigDecimal("0.02"); + String paymentId = "002212025092509265410817097978174926848"; + BigDecimal refundAmount = new BigDecimal("0.5"); String memberId = "65622699"; - String orderCode = "C48996543963"; + String orderCode = "C23464104497"; // 延迟分账未确认调撤销调撤销接口退款 PaymentReverseOperation operation = new PaymentReverseOperation(); diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderStatusEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderStatusEnum.java index 9db9041ef..475a6f4af 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderStatusEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderStatusEnum.java @@ -14,7 +14,7 @@ public enum OrderStatusEnum { ABNORMAL("4", "异常"), SUSPICIOUS("5", "可疑"), ORDER_COMPLETE("6", "订单完成"), - ORDER_CLOSE_TIMEOUT("7", "超时关闭"), + ORDER_CLOSE_TIMEOUT("7", "订单关闭"), ; private String value; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index 0b9f9a93b..9a4fffa6c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -598,4 +598,10 @@ public interface OrderBasicInfoService{ * @param connectorMark 主辅枪标记 */ void chargingPileStartedSuccessfully(String transactionCode, String pileConnectorCode, String connectorMark); + + /** + * 关闭某笔待支付订单 + * @param orderCode + */ + void closeUnPayOder(String orderCode); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 48ba6f032..388fb1ba9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -5543,5 +5543,23 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { public List queryOrderListByStationIdAndTime(String stationId , String startTime , String endTime) { return orderBasicInfoMapper.queryOrderListByStationIdAndTime(stationId, startTime, endTime); } + + /** + * 关闭某笔待支付订单 + * @param orderCode + */ + @Override + public void closeUnPayOder(String orderCode) { + // 查询订单信息 + OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(orderCode); + String payStatus = orderBasicInfo.getPayStatus(); + if (!StringUtils.equals(OrderPayStatusEnum.unpaid.getValue(), payStatus)) { + // 不是待支付状态 + throw new BusinessException(ReturnCodeEnum.CODE_ORDER_INFO_ERROR); + } + // 订单状态改为 7-订单关闭 + orderBasicInfo.setOrderStatus(OrderStatusEnum.ORDER_CLOSE_TIMEOUT.getValue()); + updateOrderBasicInfo(orderBasicInfo); + } }