mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-07-09 00:18:07 +08:00
update 余额订单分账
This commit is contained in:
@@ -478,6 +478,7 @@ public class TempService {
|
|||||||
if (CollectionUtils.isEmpty(orderPayRecordList)) {
|
if (CollectionUtils.isEmpty(orderPayRecordList)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
BigDecimal settleAmount = orderBasicInfo.getSettleAmount();
|
||||||
OrderPayRecord record = orderPayRecordList.get(0);
|
OrderPayRecord record = orderPayRecordList.get(0);
|
||||||
String deductionRecord = record.getDeductionRecord();
|
String deductionRecord = record.getDeductionRecord();
|
||||||
AbstractOrderLogic orderLogic = new DelayMerchantOrderLogic();
|
AbstractOrderLogic orderLogic = new DelayMerchantOrderLogic();
|
||||||
@@ -495,6 +496,7 @@ public class TempService {
|
|||||||
}
|
}
|
||||||
List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> confirms = response.getPaymentConfirms();
|
List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> confirms = response.getPaymentConfirms();
|
||||||
if (CollectionUtils.isNotEmpty(confirms)) {
|
if (CollectionUtils.isNotEmpty(confirms)) {
|
||||||
|
// 已经分过账
|
||||||
for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) {
|
for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) {
|
||||||
JSONObject jsonObject = JSON.parseObject(confirm.getDescription());
|
JSONObject jsonObject = JSON.parseObject(confirm.getDescription());
|
||||||
|
|
||||||
@@ -512,6 +514,9 @@ public class TempService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// 未分账情况
|
||||||
|
adapayService.createPaymentConfirmRequest(paymentId, adapayMemberAccount, settleAmount, orderCode, wechatAppId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user