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

Merge remote-tracking branch 'origin/dev' into dev-zzx

Browse Source
This commit is contained in:
YAS\29473
2025-08-05 10:31:19 +08:00
parent 2ce4235f58 e642a7f5fe
commit 68ebfa6bb1
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java
View File

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

5
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java
View File

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

14
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -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<String, List<OrderSplitRecord>> otherSplitDetailMap = Maps.newHashMap(); // 当天其他人分账的记录
for (Map.Entry<String, List<OrderSplitRecord>> listEntry : adapayMemberIdRecordMap.entrySet()) {
List<OrderSplitRecord> recordList = listEntry.getValue();