diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index f4a64f4d6..4b29e90b6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -361,10 +361,10 @@ public class PayController extends BaseController { } response = new RestApiResponse<>(map); } catch (BusinessException e) { - logger.warn("wechatpay支付订单 warn param:{}", dto.toString(), e); + logger.warn("支付占桩订单 warn param:{}", dto.toString(), e); response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e) { - logger.error("wechatpay支付订单 error param:{}", dto.toString(), e); + logger.error("支付占桩订单 error param:{}", dto.toString(), e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_ORDER_PAY_ERROR); } finally { // 支付订单解锁 @@ -372,7 +372,7 @@ public class PayController extends BaseController { redisCache.unLock(lockKey); } } - logger.info("wechatpay支付订单 result:{}", JSONObject.toJSONString(response)); + logger.info("支付占桩订单 result:{}", JSONObject.toJSONString(response)); return response; } 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 92526d326..740e5776d 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 @@ -705,7 +705,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { OrderSettleResult orderSettleResult = orderPaymentSettlementAndRefund(orderBasicInfo); // 记账 - doUpdateClearingBill(orderSettleResult); + // doUpdateClearingBill(orderSettleResult); // 将卡/vin状态解锁 if (!StringUtils.equals("0000000000000000", data.getLogicCard())) { @@ -749,8 +749,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { logger.info("订单分账逻辑-订单:{}, 查不到一级运营商信息", orderCode); return null; } - String appId = merchantInfo.getAppId(); - String delayMode = merchantInfo.getDelayMode(); // 获取结算账户信息 AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); @@ -765,6 +763,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { 未使用延时分账的一级运营商 */ + String delayMode = merchantInfo.getDelayMode(); if (StringUtils.equals(delayMode, Constants.ADAPAY_PAY_MODE_DELAY)) { // 记账 冻结金额 freezeAmount(orderBasicInfo); @@ -786,7 +785,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { onlinePaymentOrderRefund(orderBasicInfo); } else { // 白名单支付 - logger.info("订单:{}使用白名单支付,不进行退款处理", orderBasicInfo.getOrderCode()); + logger.info("订单:{}使用白名单支付,不进行退款处理", orderBasicInfo.getOrderCode()); } } catch (Exception e) { logger.error("订单退款逻辑异常orderCode:{}", orderBasicInfo.getOrderCode(), e);