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

update 查询站点报表详情

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-22 13:44:10 +08:00
parent e2f3fb7a8e
commit 003f4c410e
8 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java
View File

@@ -66,4 +66,6 @@ public interface ClearingWithdrawInfoMapper {
ClearingWithdrawInfo selectByWithdrawCode(String withdrawCode);
ClearingBillVO selectWithdrawInfoByOrderCode(@Param("orderCode") String orderCode);
List<ClearingBillVO> selectWithdrawInfoByOrderCodeList(@Param("orderCodeList") List<String> orderCodeList);
}

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

@@ -30,4 +30,6 @@ public interface ClearingWithdrawInfoService{
ClearingWithdrawInfo selectByWithdrawCode(String withdrawCode);
ClearingBillVO selectWithdrawInfoByOrderCode(String orderCode);
List<ClearingBillVO> selectWithdrawInfoByOrderCodeList(List<String> orderCodeList);
}

4
jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
View File

@@ -1,10 +1,10 @@
package com.jsowell.pile.service;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.vo.web.MerchantOrderReportVO;
import com.jsowell.pile.vo.web.OrderSettleDetailVO;
import java.util.List;
@@ -25,7 +25,7 @@ public interface ISettleOrderReportService {
SettleOrderReport selectByStationIdAndDate(String stationId, String date);
List<OrderSettleDetailVO> selectSettleOrderReportDetail(SettleOrderReportDTO dto);
PageResponse selectSettleOrderReportDetail(SettleOrderReportDTO dto);
List<SettleOrderReport> selectByMerchantIdAndDate(String merchantId, String date);

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java
View File

@@ -77,4 +77,9 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ
return clearingWithdrawInfoMapper.selectWithdrawInfoByOrderCode(orderCode);
}
@Override
public List<ClearingBillVO> selectWithdrawInfoByOrderCodeList(List<String> orderCodeList) {
return clearingWithdrawInfoMapper.selectWithdrawInfoByOrderCodeList(orderCodeList);
}
}

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

@@ -10,7 +10,6 @@ import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.AdapayCallbackRecord;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
@@ -78,33 +77,32 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
* @return
*/
@Override
public List<OrderSettleDetailVO> selectSettleOrderReportDetail(SettleOrderReportDTO dto) {
public PageResponse selectSettleOrderReportDetail(SettleOrderReportDTO dto) {
SettleOrderReport orderReport = selectByStationIdAndDate(dto.getStationId(), dto.getTradeDate());
if (orderReport == null) {
return Lists.newArrayList();
return new PageResponse();
}
String orderCodes = orderReport.getOrderCodes();
if (StringUtils.isBlank(orderCodes)) {
return Lists.newArrayList();
return new PageResponse();
}
String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderReport.getMerchantId());
List<String> orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ","));
// 查询订单支付信息 分页
int pageNum = dto.getPageNum() != null ? dto.getPageNum() : 1;
int pageSize = dto.getPageSize() != null ? dto.getPageSize() : 10;
PageHelper.startPage(pageNum, pageSize);
List<AdapayCallbackRecord> adapayCallbackRecords = adapayCallbackRecordMapper.queryRecordList(orderCodeList);
PageInfo<AdapayCallbackRecord> pageInfo = new PageInfo<>(adapayCallbackRecords);
List<ClearingBillVO> clearingBillVOList = clearingWithdrawInfoService.selectWithdrawInfoByOrderCodeList(orderCodeList);
PageInfo<ClearingBillVO> pageInfo = new PageInfo<>(clearingBillVOList);
// 封装结果集
List<OrderSettleDetailVO> resultList = Lists.newArrayList();
OrderSettleDetailVO vo = null;
for (AdapayCallbackRecord adapayCallbackRecord : pageInfo.getList()) {
String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderReport.getMerchantId());
for (ClearingBillVO clearingBillVO : pageInfo.getList()) {
vo = new OrderSettleDetailVO();
String orderCode = adapayCallbackRecord.getOrderCode();
vo.setOrderCode(orderCode);
String paymentId = adapayCallbackRecord.getPaymentId();
vo.setOrderCode(clearingBillVO.getOrderCode());
String paymentId = clearingBillVO.getPaymentId();
QueryPaymentConfirmDTO build = QueryPaymentConfirmDTO.builder()
.wechatAppId(wechatAppId)
.paymentId(paymentId)
@@ -120,7 +118,6 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
}
vo.setClearingStatus(clearingStatus);
if ("已清分".equals(vo.getClearingStatus())) {
ClearingBillVO clearingBillVO = clearingWithdrawInfoService.selectWithdrawInfoByOrderCode(orderCode);
vo.setClearingBillCode(clearingBillVO.getClearingBillCode());
vo.setWithdrawCode(clearingBillVO.getWithdrawCode());
String withdrawStatus = null;
@@ -133,9 +130,13 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
}
resultList.add(vo);
}
PageInfo<OrderSettleDetailVO> result = new PageInfo<>(resultList);
return result.getList();
PageResponse pageResponse = new PageResponse();
pageResponse.setPageSize(pageInfo.getPageSize());
pageResponse.setPageNum(pageInfo.getPageNum());
pageResponse.setPages(pageInfo.getPages());
pageResponse.setTotal(pageInfo.getTotal());
pageResponse.setList(resultList);
return pageResponse;
}
@Override

10
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java
View File

@@ -4,6 +4,16 @@ import lombok.Data;
@Data
public class ClearingBillVO {
/**
* 订单编号
*/
private String orderCode;
/**
* 支付id
*/
private String paymentId;
/**
* 清分单号
*/