From c84d57bf0917c8cc616ae340bfcd6737c0b225b5 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 22 Apr 2026 11:38:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderBasicInfoServiceImpl.java | 6 +++--- .../java/com/jsowell/pile/util/MerchantUtils.java | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) 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 24d86ed61..9297c8d82 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 @@ -6329,18 +6329,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { @Override public int updateOrderReviewFlagTemp(LocalDateTime start, LocalDateTime end, String stationId) { + double ratio = 0.65; if (StringUtils.isBlank(stationId)) { stationId = "1003"; // 目前只有 大坡中学举视超充站 这一个站点使用 + ratio = 0.1; logger.info("校验或更新订单分账信息-使用默认站点id:{}", stationId); } List orderList = this.selectOrderListByDateTime(start, end, stationId); if (CollectionUtils.isEmpty(orderList)) { return 0; } - List orderCodeList = orderList.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList()); UpdateOrderReviewDTO dto = new UpdateOrderReviewDTO(); - // dto.setOrderCodeList(MerchantUtils.getRandomNinetyPercent(orderCodeList)); - dto.setOrderCodeList(MerchantUtils.getRandomOrderCodes(orderList)); + dto.setOrderCodeList(MerchantUtils.getRandomOrderCodes(orderList, ratio)); dto.setStationId(stationId); return batchUpdateOrderReview(dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java index 741214aaa..c86fc8636 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java @@ -75,21 +75,18 @@ public class MerchantUtils { return new ArrayList<>(shuffled.subList(0, keepCount)); } - public static List getRandomOrderCodes(List list) { + public static List getRandomOrderCodes(List list, double ratio) { if (list == null || list.isEmpty()) { return new ArrayList<>(); } - // 检查订单信息中的昵称,剔除不是以会员开头的订单 - // list = list.stream().filter(order -> order.getNickName().startsWith("会员")).collect(Collectors.toList()); int total = list.size(); - int removeCount = (int) Math.ceil(total * 0.65); + int removeCount = (int) Math.ceil(total * ratio); int keepCount = Math.max(1, total - removeCount); List shuffled = new ArrayList<>(list); Collections.shuffle(shuffled); - List orderListVOS = new ArrayList<>(shuffled.subList(0, keepCount)); - // 提取orderCode - List codeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList()); - return codeList; + return shuffled.subList(0, keepCount).stream() + .map(OrderListVO::getOrderCode) + .collect(Collectors.toList()); } }