From 8672aa242db0297bf8ab44bbccafef6a3b8a4399 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 11 Mar 2024 13:45:13 +0800 Subject: [PATCH] update --- .../impl/OrderBasicInfoServiceImpl.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 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 799f1371c..e1c115306 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 @@ -2913,18 +2913,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { * @param settleAmount 需要拆分的结算金额 * @return */ - private SplitSettleAmountVO splitSettleAmount(BigDecimal settleAmount) { - SplitSettleAmountVO resultVO = new SplitSettleAmountVO(); - if (settleAmount == null) { - return resultVO; - } - // 计算手续费 = 结算金额 * 0.55% - BigDecimal fee = settleAmount.multiply(new BigDecimal(Constants.FEE_RATES)); - resultVO.setSettleAmount(settleAmount); - resultVO.setFeeAmount(fee); - resultVO.setTradeAmount(settleAmount.subtract(fee)); - return resultVO; - } + // private SplitSettleAmountVO splitSettleAmount(BigDecimal settleAmount) { + // SplitSettleAmountVO resultVO = new SplitSettleAmountVO(); + // if (settleAmount == null) { + // return resultVO; + // } + // // 计算手续费 = 结算金额 * 0.55% + // BigDecimal fee = settleAmount.multiply(new BigDecimal(Constants.FEE_RATES)); + // resultVO.setSettleAmount(settleAmount); + // resultVO.setFeeAmount(fee); + // resultVO.setTradeAmount(settleAmount.subtract(fee)); + // return resultVO; + // } /** * 获取运营商订单列表 @@ -3026,21 +3026,21 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { * * @param dto */ - private void whiteListPayOrder(PayOrderDTO dto) { - String orderCode = dto.getOrderCode(); - BigDecimal payAmount = dto.getPayAmount(); - String payMode = dto.getPayMode(); - - // 白名单直接算支付成功 - PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() - .orderCode(orderCode) - .payAmount(payAmount) - .payMode(payMode) - .startMode(dto.getStartMode()) - .acquirer(AcquirerEnum.LOCAL.getValue()) - .build(); - payOrderSuccessCallback(callbackDTO); // 白名单直接算支付成功 - } + // private void whiteListPayOrder(PayOrderDTO dto) { + // String orderCode = dto.getOrderCode(); + // BigDecimal payAmount = dto.getPayAmount(); + // String payMode = dto.getPayMode(); + // + // // 白名单直接算支付成功 + // PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() + // .orderCode(orderCode) + // .payAmount(payAmount) + // .payMode(payMode) + // .startMode(dto.getStartMode()) + // .acquirer(AcquirerEnum.LOCAL.getValue()) + // .build(); + // payOrderSuccessCallback(callbackDTO); // 白名单直接算支付成功 + // } /** * 订单支付成功 支付回调