autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 订单日报保存订单编号

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-24 16:47:14 +08:00
parent a0fc6ccdf3
commit 011081e970
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -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<String> 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);