From 82ed8539e56cecc733ec92c368ceb89566085810 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Fri, 14 Nov 2025 14:15:17 +0800 Subject: [PATCH] =?UTF-8?q?add=E6=B7=BB=E5=8A=A0=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=BC=82=E5=B8=B8=E8=AE=A2=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uniapp/customer/TempController.java | 17 ++++++++++ .../java/com/jsowell/service/TempService.java | 33 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index 09827f18a..221a4df61 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -1035,4 +1035,21 @@ public class TempController extends BaseController { util.exportExcel(response, list, "某运营商财务报表"); } + /** + * 批量结算白名单异常订单 + * @param dto + * @return + */ + public RestApiResponse whiteListSettlement(@RequestBody QueryOrderDTO dto) { + RestApiResponse response = null; + try { + tempService.whiteListSettlement(dto); + response = new RestApiResponse<>(); + } catch (Exception e){ + logger.error("白名单异常订单结算 error", e); + response = new RestApiResponse<>("00300002", "白名单异常订单结算异常"); + } + return response; + } + } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 0df76f220..b3107fc10 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -139,6 +139,9 @@ public class TempService { @Autowired private MemberWalletInfoService memberWalletInfoService; + @Autowired + private OrderService orderService; + /** * 计算订单耗电量 * 内蒙古站点 @@ -1495,5 +1498,35 @@ public class TempService { return list; } + public void whiteListSettlement(QueryOrderDTO dto) { + if (dto == null || dto.getOrderCodeList() == null || dto.getOrderCodeList().isEmpty()) { + throw new RuntimeException("请添加要结算的白名单订单"); + } + + for (String orderCode : dto.getOrderCodeList()) { + + OrderBasicInfo orderBasicInfo = orderBasicInfoMapper.getOrderInfoByOrderCode(orderCode); + if (orderBasicInfo == null) { + throw new RuntimeException("订单号不存在:" + orderCode); + } + + if (!Objects.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ABNORMAL.getValue())) { + throw new RuntimeException("订单不是异常订单:" + orderCode); + } + + if (!Objects.equals(orderBasicInfo.getPayMode(), PayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { + throw new RuntimeException("订单不是白名单支付方式:" + orderCode); + } + + ManualSettlementDTO build = ManualSettlementDTO.builder() + .chargingDegree("0") + .chargingAmount("0") + .orderCode(orderCode) + .build(); + + orderService.manualSettlementOrder(build); + } + } + }