From 193f2a408c4d77b59782ad0c7b3b3aa9655e7786 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 31 Jul 2023 13:46:58 +0800 Subject: [PATCH] update --- .../netty/handler/HeartbeatRequestHandler.java | 3 +-- .../service/impl/OrderBasicInfoServiceImpl.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java index 1d6490abe..ba6ebae9f 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; @@ -41,7 +40,7 @@ public class HeartbeatRequestHandler extends AbstractHandler { @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电桩心跳包===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩心跳包===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); 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 1576916c0..f4dfd8e25 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 @@ -875,13 +875,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { @Override public void orderSplittingOperations(String merchantId, String tradeDate) { logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); + + AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); + adapayMemberAccount.setAdapayMemberId("0"); + // 查询运营商有没有开通结算账户 - AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId("1"); - if (adapayMemberAccount == null) { - logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); - // throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_MEMBER_IS_NULL_ERROR); - return; - } + // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + // if (adapayMemberAccount == null) { + // logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); + // // throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_MEMBER_IS_NULL_ERROR); + // return; + // } // 根据交易日期查询运营商下面所有站点的交易日报 List stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate);