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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-26 15:56:36 +08:00
parent 530e1d11d7
commit 94436f5484
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,6 +474,7 @@ public class TempService {
String orderCode = orderBasicInfo.getOrderCode(); String orderCode = orderBasicInfo.getOrderCode();
// 查询订单支付记录 // 查询订单支付记录
List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderCode); List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
logger.info("doBalancePaymentTemp-查询订单:{}支付记录:{}", orderCode, JSON.toJSONString(orderPayRecordList));
if (CollectionUtils.isEmpty(orderPayRecordList)) { if (CollectionUtils.isEmpty(orderPayRecordList)) {
return; return;
} }

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -408,9 +408,8 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
.merchantId(dto.getMerchantId()) .merchantId(dto.getMerchantId())
.startTime(dto.getStartTime()) .startTime(dto.getStartTime())
.endTime(dto.getEndTime()) .endTime(dto.getEndTime())
// .pageNum(dto.getPageNum())
// .pageSize(dto.getPageSize())
.build(); .build();
PageHelper.clearPage();
List<MerchantClearingBillVO> merchantClearingBillList = clearingBillInfoService.getMerchantClearingBillList(clearingBillDTO); List<MerchantClearingBillVO> merchantClearingBillList = clearingBillInfoService.getMerchantClearingBillList(clearingBillDTO);
BigDecimal tradeAmount = BigDecimal.ZERO; BigDecimal tradeAmount = BigDecimal.ZERO;
BigDecimal tradeFee = BigDecimal.ZERO; BigDecimal tradeFee = BigDecimal.ZERO;