From 268cb88c47c75f1e7633c3e115f79bed4c967365 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 31 Jul 2025 09:28:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunkuaichong/BMSAbortDuringChargingPhaseHandler.java | 3 ++- .../yunkuaichong/BMSDemandAndChargerOutputHandler.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java index cba855097..a4d71159c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java @@ -1,5 +1,6 @@ package com.jsowell.netty.handler.yunkuaichong; +import com.alibaba.fastjson2.JSON; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +29,7 @@ public class BMSAbortDuringChargingPhaseHandler extends AbstractYkcHandler { @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { - // log.info("[===充电阶段 BMS 中止===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); + log.info("[===充电阶段BMS中止===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.channel().id().asShortText()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java index ad6971624..80ec3bd1e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java @@ -1,12 +1,13 @@ package com.jsowell.netty.handler.yunkuaichong; +import com.alibaba.fastjson2.JSON; +import com.jsowell.common.core.domain.ykc.BMSDemandAndChargerOutputData; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.common.core.domain.ykc.BMSDemandAndChargerOutputData; import com.jsowell.pile.service.PileBasicInfoService; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; @@ -127,7 +128,7 @@ public class BMSDemandAndChargerOutputHandler extends AbstractYkcHandler { @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { - // log.info("[===充电过程 BMS 需求与充电机输出===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); + log.info("[===充电过程BMS需求与充电机输出===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.channel().id().asShortText()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); From e642a7f5fec88f136a6a6130ba34c6e879526cba Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 4 Aug 2025 15:08:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8DNPM=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderSplitRecordServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 26a9b2ba6..7bb022b04 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -210,6 +210,20 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { BigDecimal totalMerchantServiceAmount = BigDecimal.ZERO; // 当天运营商分账金额汇总 BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总 BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额 + + // 如果没有查询到订单分账记录, 进入下一个循环 + if (CollectionUtils.isNotEmpty(orderCodeSet)) { + summaryData.setOtherSplitDetailList(Lists.newArrayList()); + summaryData.setTotalSettleAmount(totalSettleAmount); + summaryData.setMerchantSplitAmount(totalMerchantSplitAmount); + summaryData.setMerchantFeeAmount(totalFeeAmount); + summaryData.setMerchantElecAmount(totalMerchantElecAmount); + summaryData.setMerchantServiceAmount(totalMerchantServiceAmount); + summaryData.setOtherSplitAmount(totalOtherSplitAmount); + resultList.add(summaryData); + continue; + } + Map> otherSplitDetailMap = Maps.newHashMap(); // 当天其他人分账的记录 for (Map.Entry> listEntry : adapayMemberIdRecordMap.entrySet()) { List recordList = listEntry.getValue();