From 011081e970263a9cf6c4fe9a4d82339975b5aec9 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 24 Jul 2023 16:47:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E6=97=A5=E6=8A=A5?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5786a628a..c91e7d561 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; import com.fasterxml.jackson.core.JsonProcessingException; +import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -2027,6 +2028,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal totalOrderAmount = BigDecimal.ZERO; BigDecimal totalVirtualAmount = BigDecimal.ZERO; BigDecimal totalSettleAmount = BigDecimal.ZERO; + List orderCodeList = Lists.newArrayList(); for (OrderListVO vo : orderListVOS) { // 统计orderAmount大于0的 String orderAmount = vo.getOrderAmount(); @@ -2046,7 +2048,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { useElectricity = useElectricity.add(chargingDegree); // 充电次数 chargeNum += 1; - + orderCodeList.add(vo.getOrderCode()); // 充电时间累计 if (StringUtils.isNotBlank(vo.getChargeStartTime()) && StringUtils.isNotBlank(vo.getChargeEndTime())) { long l = DateUtils.intervalTime(vo.getChargeStartTime(), vo.getChargeEndTime()); @@ -2085,6 +2087,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { settleOrderReport.setTotalAmount(totalOrderAmount); settleOrderReport.setVirtualAmount(totalVirtualAmount); settleOrderReport.setTradeDate(tradeDate); + settleOrderReport.setOrderCodes(Joiner.on(",").join(orderCodeList)); // 计算手续费 = 结算金额 * 0.55% BigDecimal tradeFee = totalSettleAmount.multiply(new BigDecimal("0.0055")); settleOrderReport.setTradeFee(tradeFee);