autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-16 20:18:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-06-13 13:25:35 +08:00
parent 6d2af9dbec
commit ac3e4b43eb
1 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -877,39 +877,42 @@ public class OrderService {
// 支付流水 // 支付流水
List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderCode); List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
if (CollectionUtils.isNotEmpty(orderPayRecordList)) { if (CollectionUtils.isNotEmpty(orderPayRecordList)) {
OrderPayRecord orderPayRecord = orderPayRecordList.get(0);
List<OrderDetailInfoVO.PayRecord> payRecordList = Lists.newArrayList(); List<OrderDetailInfoVO.PayRecord> payRecordList = Lists.newArrayList();
OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord(); for (OrderPayRecord orderPayRecord : orderPayRecordList) {
// 余额支付如果是由本金和赠送一起支付的，合并为一个 OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord();
BigDecimal bigDecimal = orderPayRecordList.stream() // 余额支付如果是由本金和赠送一起支付的，合并为一个
.map(OrderPayRecord::getPayAmount) BigDecimal bigDecimal = orderPayRecordList.stream()
.reduce(BigDecimal.ZERO, BigDecimal::add); .map(OrderPayRecord::getPayAmount)
payInfo.setPayAmount(bigDecimal.toString()); .reduce(BigDecimal.ZERO, BigDecimal::add);
payInfo.setPayStatus(orderBasicInfo.getPayStatus()); payInfo.setPayAmount(bigDecimal.toString());
payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime())); payInfo.setPayStatus(orderBasicInfo.getPayStatus());
payInfo.setRefundAmount(orderPayRecord.getRefundAmount().toString()); payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
String payMode = orderPayRecord.getPayMode(); if (orderPayRecord.getRefundAmount() != null) {
if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue()) payInfo.setRefundAmount(orderPayRecord.getRefundAmount().toString());
|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
// 使用余额支付
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue());
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel());
} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())){
// 使用微信支付
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue());
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel());
// 查微信支付回调记录
WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderCode);
if (wxpayCallbackRecord != null) {
payInfo.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
payInfo.setTransactionId(wxpayCallbackRecord.getTransactionId());
} }
} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WHITELIST_PAYMENT.getValue())){ String payMode = orderPayRecord.getPayMode();
// 使用白名单支付 if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue()); || StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getLabel()); // 使用余额支付
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue());
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel());
} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())){
// 使用微信支付
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue());
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel());
// 查微信支付回调记录
WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderCode);
if (wxpayCallbackRecord != null) {
payInfo.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
payInfo.setTransactionId(wxpayCallbackRecord.getTransactionId());
}
} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WHITELIST_PAYMENT.getValue())){
// 使用白名单支付
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue());
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getLabel());
}
payRecordList.add(payInfo);
} }
payRecordList.add(payInfo);
vo.setPayRecordList(payRecordList); vo.setPayRecordList(payRecordList);
} }