This commit is contained in:
2024-03-11 13:45:13 +08:00
parent 9e8a14d2dd
commit 8672aa242d

View File

@@ -2913,18 +2913,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
* @param settleAmount 需要拆分的结算金额 * @param settleAmount 需要拆分的结算金额
* @return * @return
*/ */
private SplitSettleAmountVO splitSettleAmount(BigDecimal settleAmount) { // private SplitSettleAmountVO splitSettleAmount(BigDecimal settleAmount) {
SplitSettleAmountVO resultVO = new SplitSettleAmountVO(); // SplitSettleAmountVO resultVO = new SplitSettleAmountVO();
if (settleAmount == null) { // if (settleAmount == null) {
return resultVO; // return resultVO;
} // }
// 计算手续费 = 结算金额 * 0.55% // // 计算手续费 = 结算金额 * 0.55%
BigDecimal fee = settleAmount.multiply(new BigDecimal(Constants.FEE_RATES)); // BigDecimal fee = settleAmount.multiply(new BigDecimal(Constants.FEE_RATES));
resultVO.setSettleAmount(settleAmount); // resultVO.setSettleAmount(settleAmount);
resultVO.setFeeAmount(fee); // resultVO.setFeeAmount(fee);
resultVO.setTradeAmount(settleAmount.subtract(fee)); // resultVO.setTradeAmount(settleAmount.subtract(fee));
return resultVO; // return resultVO;
} // }
/** /**
* 获取运营商订单列表 * 获取运营商订单列表
@@ -3026,21 +3026,21 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
* *
* @param dto * @param dto
*/ */
private void whiteListPayOrder(PayOrderDTO dto) { // private void whiteListPayOrder(PayOrderDTO dto) {
String orderCode = dto.getOrderCode(); // String orderCode = dto.getOrderCode();
BigDecimal payAmount = dto.getPayAmount(); // BigDecimal payAmount = dto.getPayAmount();
String payMode = dto.getPayMode(); // String payMode = dto.getPayMode();
//
// 白名单直接算支付成功 // // 白名单直接算支付成功
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() // PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
.orderCode(orderCode) // .orderCode(orderCode)
.payAmount(payAmount) // .payAmount(payAmount)
.payMode(payMode) // .payMode(payMode)
.startMode(dto.getStartMode()) // .startMode(dto.getStartMode())
.acquirer(AcquirerEnum.LOCAL.getValue()) // .acquirer(AcquirerEnum.LOCAL.getValue())
.build(); // .build();
payOrderSuccessCallback(callbackDTO); // 白名单直接算支付成功 // payOrderSuccessCallback(callbackDTO); // 白名单直接算支付成功
} // }
/** /**
* 订单支付成功 支付回调 * 订单支付成功 支付回调