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

update 汇付协议

Browse Source
This commit is contained in:
Guoqs
2024-08-06 15:46:43 +08:00
parent f5d5e3c6eb
commit c87e612ab5
13 changed files with 85 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,7 +482,7 @@ public class OrderService {
vo.setLastMonitorData(realTimeMonitorData);
}
// 支付流水
// 支付流水对应页面支付信息
List<OrderDetailInfoVO.PayRecord> payRecords = orderPayRecordService.selectOrderPayInfoList(orderCode);
vo.setPayRecordList(payRecords);
@@ -1121,9 +1121,6 @@ public class OrderService {
// 支付金额
BigDecimal amount = adapayCallbackRecord.getPayAmt();
// 支付渠道
adapayCallbackRecord.setPayChannel(jsonObject.getString("pay_channel"));
// 保存到数据库
adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord);

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

@@ -25,7 +25,7 @@ import com.jsowell.pile.mapper.OrderBasicInfoMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.web.ClearingBillVO;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.OrderPayDetailVO;
import com.jsowell.pile.vo.web.OrderPaymentDetailVO;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -471,10 +471,10 @@ public class TempService {
String endTime = dto.getEndTime();
// 查询时间段的订单
// List<AdapayCallbackRecord> list = adapayCallbackRecordService.selectByDateTime(startTime, endTime);
List<OrderPayDetailVO> orderPayDetailVOS = orderBasicInfoService.queryOrderPayDetail(startTime, endTime);
List<OrderPaymentDetailVO> orderPayDetailVOS = orderBasicInfoService.queryOrderPayDetail(startTime, endTime);
logger.info("校验未分账的支付单-在 {} - {} 期间，共查询到{}条支付记录", startTime, endTime, orderPayDetailVOS.size());
// 查询支付单 分账情况
for (OrderPayDetailVO record : orderPayDetailVOS) {
for (OrderPaymentDetailVO record : orderPayDetailVOS) {
String paymentId = record.getPaymentId();
BigDecimal confirmAmt = record.getSettleAmount();
String orderCode = record.getOrderCode();