From cf21a9a237a550d5ca0d2ec558b0a15de499e6a7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 26 Aug 2023 10:30:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E8=B4=A6=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderBasicInfoServiceImpl.java | 13 ++++++++++--- .../main/java/com/jsowell/pile/util/SnUtils.java | 1 - 2 files changed, 10 insertions(+), 4 deletions(-) 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 0ef017b25..a0c9dc756 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 @@ -735,8 +735,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * 清分账单生成逻辑改为当天第一笔结算后就新建，后面的产生的订单，追加更新 */ private OrderSettleResult orderPaymentSettlement(OrderBasicInfo orderBasicInfo) { - String appId = ""; - AdapayMemberAccount adapayMemberAccount = null; + // 获取一级运营商appId + String appId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId()); + if (StringUtils.isBlank(appId)) { + return null; + } + // 获取结算账户信息 + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(orderBasicInfo.getMerchantId()); + if (adapayMemberAccount == null) { + return null; + } OrderSettleResult orderSettleResult = null; try { if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { @@ -1195,7 +1203,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 余额支付订单，使用余额分账 - * * @param orderBasicInfo * @param adapayMemberAccount * @return diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java index 54f67961d..f1d3eb788 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java @@ -50,7 +50,6 @@ public class SnUtils { long pileSnNum = Long.parseLong(StringUtils.substring(pileSn, 4, pileSn.length())); // 再将该值存入数据库 redisCache.setCacheObject(key, pileSnNum); - } Long increNum = redisCache.increment(key, 1); // 年份