mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-07-14 11:08:15 +08:00
更新订单实收金额
This commit is contained in:
@@ -2076,9 +2076,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
.wechatAppId(appId)
|
.wechatAppId(appId)
|
||||||
.build();
|
.build();
|
||||||
PaymentConfirmResponse paymentConfirmRequest = adapayService.createPaymentConfirmRequest(param);
|
PaymentConfirmResponse paymentConfirmRequest = adapayService.createPaymentConfirmRequest(param);
|
||||||
|
|
||||||
// 保存订单分账记录
|
// 保存订单分账记录
|
||||||
OrderInfoDetailVO orderInfoDetailVO = getOrderInfoDetailVO(orderCode);
|
OrderInfoDetailVO orderInfoDetailVO = getOrderInfoDetailVO(orderCode);
|
||||||
orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmRequest, splitDataList, orderInfoDetailVO);
|
orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmRequest, splitDataList, orderInfoDetailVO);
|
||||||
|
|
||||||
|
// 更新订单实收金额
|
||||||
|
updateOrderReceivedAmount(orderCode, splitDataList);
|
||||||
return paymentConfirmRequest;
|
return paymentConfirmRequest;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2117,6 +2121,27 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新订单实收金额
|
||||||
|
*/
|
||||||
|
private void updateOrderReceivedAmount(String orderCode, List<SplitData> splitDataList) {
|
||||||
|
BigDecimal actualReceivedAmount = BigDecimal.ZERO;
|
||||||
|
for (SplitData splitData : splitDataList) {
|
||||||
|
// 如果是手续费承担方, 计算实收金额
|
||||||
|
if (StringUtils.equals(splitData.getFeeFlag(), Constants.Y)) {
|
||||||
|
actualReceivedAmount = splitData.getElecAmount().add(splitData.getServiceAmount());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 先查再更新
|
||||||
|
OrderBasicInfo orderInfo = getOrderInfoByOrderCode(orderCode);
|
||||||
|
if (orderInfo != null && actualReceivedAmount.compareTo(BigDecimal.ZERO) > 0) {
|
||||||
|
orderInfo.setActualReceivedAmount(actualReceivedAmount);
|
||||||
|
orderInfo.setUpdateBy(Constants.SYSTEM);
|
||||||
|
orderInfo.setUpdateTime(DateUtils.getNowDate());
|
||||||
|
this.updateOrderBasicInfo(orderInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 计算每个账户需要分账的金额
|
* 计算每个账户需要分账的金额
|
||||||
* @param stationSplitConfigList 参与分账的账户信息
|
* @param stationSplitConfigList 参与分账的账户信息
|
||||||
|
|||||||
Reference in New Issue
Block a user