From bd8b541ffe5d23d9388886596080c72952c1c9a6 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 27 Apr 2026 13:52:24 +0800 Subject: [PATCH] update --- .../com/jsowell/api/uniapp/customer/TempController.java | 2 +- .../java/com/jsowell/pile/dto/UpdateOrderReviewDTO.java | 5 +++++ .../com/jsowell/pile/service/OrderBasicInfoService.java | 2 +- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 8 +++++--- .../main/java/com/jsowell/quartz/task/JsowellTask.java | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) 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 18f6b8e97..d2eb68aca 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 @@ -1112,7 +1112,7 @@ public class TempController extends BaseController { // 将startTime、endTime转换成localDateTime LocalDateTime localStartTime = LocalDateTime.parse(date + "T00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));; LocalDateTime localEndTime = LocalDateTime.parse(date + "T23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));; - int i = orderBasicInfoService.updateOrderReviewFlagTemp(localStartTime, localEndTime, dto.getStationId()); + int i = orderBasicInfoService.updateOrderReviewFlagTemp(localStartTime, localEndTime, dto.getStationId(), dto.getRatio()); logger.info("批量更新订单评价, 批次:{}, 影响行数:{}", date, i); } response = new RestApiResponse<>(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateOrderReviewDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateOrderReviewDTO.java index 66042540f..588ed389c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateOrderReviewDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateOrderReviewDTO.java @@ -30,4 +30,9 @@ public class UpdateOrderReviewDTO { * 结束日期 */ private String endTime; + + /** + * 比率 + */ + private Double ratio; } 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 496903511..bbf855cbe 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 @@ -636,7 +636,7 @@ public interface OrderBasicInfoService{ void checkOrUpdateOrderSplitRecord(AfterSettleOrderDTO afterSettleOrderDTO); - int updateOrderReviewFlagTemp(LocalDateTime start, LocalDateTime end, String stationId); + int updateOrderReviewFlagTemp(LocalDateTime start, LocalDateTime end, String stationId, Double ratio); List queryOrderSplitConfigList(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 9297c8d82..52ab69f7e 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 @@ -6328,11 +6328,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } @Override - public int updateOrderReviewFlagTemp(LocalDateTime start, LocalDateTime end, String stationId) { - double ratio = 0.65; + public int updateOrderReviewFlagTemp(LocalDateTime start, LocalDateTime end, String stationId, Double ratio) { + if (ratio == null) { + ratio = 0.1; + logger.info("校验或更新订单分账信息-使用默认比例:{}", ratio); + } if (StringUtils.isBlank(stationId)) { stationId = "1003"; // 目前只有 大坡中学举视超充站 这一个站点使用 - ratio = 0.1; logger.info("校验或更新订单分账信息-使用默认站点id:{}", stationId); } List orderList = this.selectOrderListByDateTime(start, end, stationId); diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index e6a0798b5..2bc13e1ee 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -1152,7 +1152,7 @@ public class JsowellTask { LocalDateTime start = yesterday.atStartOfDay(); LocalDateTime end = yesterday.atTime(23, 59, 59); - orderBasicInfoService.updateOrderReviewFlagTemp(start, end, null); + orderBasicInfoService.updateOrderReviewFlagTemp(start, end, null, null); }