autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 19:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-09-19 16:39:13 +08:00
parent 6e4426ba5c 79e0dcb259
commit 42ad306647
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -417,15 +417,16 @@ public class TempService {
.build(); .build();
QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build);
List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms(); List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms();
if (!org.springframework.util.CollectionUtils.isEmpty(paymentConfirms)) { if (CollectionUtils.isEmpty(paymentConfirms)) {
unClearingList.add(clearingBillVO);
} else {
clearingBillVO.setConfirmInfo(paymentConfirms.get(0)); clearingBillVO.setConfirmInfo(paymentConfirms.get(0));
clearingList.add(clearingBillVO); clearingList.add(clearingBillVO);
} else {
unClearingList.add(clearingBillVO);
} }
} }
resultMap.put("clearingList", clearingList); resultMap.put("clearingList", clearingList);
resultMap.put("unClearingList", unClearingList); resultMap.put("unClearingList", unClearingList);
resultMap.put("orderSize", clearingBillVOList.size());
return resultMap; return resultMap;
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1365,8 +1365,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId);
} }
// orderSettleResult = delayMerchantOrderProcessingLogic(orderBasicInfo, adapayMemberAccount, appId);
if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) {
// 应收金额 = 订单结算金额汇总 // 应收金额 = 订单结算金额汇总
receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount()); receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount());