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 需要拆分的结算金额
* @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); // 白名单直接算支付成功
// }
/**
* 订单支付成功 支付回调