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

打印日志

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-08 16:46:55 +08:00
parent 7eaf4afd42
commit 90b5762e85
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1012,7 +1012,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
*/ */
@Override @Override
public void tempOrderSplittingOperations(String merchantId, String tradeDate) { public void tempOrderSplittingOperations(String merchantId, String tradeDate) {
logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); logger.info("手动接口执行订单分账逻辑-运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate);
// AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); // AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
// adapayMemberAccount.setAdapayMemberId("0"); // adapayMemberAccount.setAdapayMemberId("0");
@@ -1020,7 +1020,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 查询运营商有没有开通结算账户 // 查询运营商有没有开通结算账户
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
if (adapayMemberAccount == null) { if (adapayMemberAccount == null) {
logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); logger.error("手动接口执行订单分账逻辑-订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId);
return; return;
} }
@@ -1029,12 +1029,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
for (SettleOrderReport orderReport : stationReportList) { for (SettleOrderReport orderReport : stationReportList) {
String orderCodes = orderReport.getOrderCodes(); String orderCodes = orderReport.getOrderCodes();
if (StringUtils.isBlank(orderCodes)) { if (StringUtils.isBlank(orderCodes)) {
logger.info("站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate); logger.info("手动接口执行订单分账逻辑-站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate);
continue; continue;
} }
List<String> orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ",")); List<String> orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ","));
List<OrderBasicInfo> orderBasicInfos = queryOrderList(orderCodeList); List<OrderBasicInfo> orderBasicInfos = queryOrderList(orderCodeList);
if (CollectionUtils.isEmpty(orderBasicInfos)) { if (CollectionUtils.isEmpty(orderBasicInfos)) {
logger.info("手动接口执行订单分账逻辑-站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate);
continue; continue;
} }
@@ -1045,7 +1046,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
if (PayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { if (PayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
// 余额支付的订单 只用余额支付转账 // 余额支付的订单 只用余额支付转账
orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount); orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount);
logger.info("手动接口执行订单分账逻辑order:{}, result:{}", JSON.toJSONString(orderBasicInfo), JSON.toJSONString(orderSettleResult)); logger.info("手动接口执行订单分账逻辑-order:{}, result:{}", JSON.toJSONString(orderBasicInfo), JSON.toJSONString(orderSettleResult));
} else { } else {
// 在线支付，进行支付确认分账 // 在线支付，进行支付确认分账
// orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount); // orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount);
@@ -1055,11 +1056,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// String orderCode = (String) jsonObject.get("orderCode"); // String orderCode = (String) jsonObject.get("orderCode");
// } // }
} catch (Exception e) { } catch (Exception e) {
logger.error("订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e); logger.error("手动接口执行订单分账逻辑-订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e);
} }
} }
} }
logger.info("运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate); logger.info("手动接口执行订单分账逻辑-运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate);
} }
/** /**