From 003f4c410eead1013e2d14c88fbf3058ee309969 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 22 Aug 2023 13:44:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/SettleOrderReportController.java | 4 +-- .../mapper/ClearingWithdrawInfoMapper.java | 2 ++ .../service/ClearingWithdrawInfoService.java | 2 ++ .../service/ISettleOrderReportService.java | 4 +-- .../impl/ClearingWithdrawInfoServiceImpl.java | 5 +++ .../impl/SettleOrderReportServiceImpl.java | 33 ++++++++++--------- .../jsowell/pile/vo/web/ClearingBillVO.java | 10 ++++++ .../pile/ClearingWithdrawInfoMapper.xml | 18 ++++++++++ 8 files changed, 57 insertions(+), 21 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java index b4db40be4..dff339fe9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java @@ -11,7 +11,6 @@ import com.jsowell.pile.domain.SettleOrderReport; import com.jsowell.pile.dto.MerchantOrderReportDTO; import com.jsowell.pile.dto.SettleOrderReportDTO; import com.jsowell.pile.service.ISettleOrderReportService; -import com.jsowell.pile.vo.web.OrderSettleDetailVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -112,7 +111,6 @@ public class SettleOrderReportController extends BaseController { @PostMapping("/getStationOrderReportDetail") public TableDataInfo getStationOrderReportDetail(@RequestBody SettleOrderReportDTO dto) { // startPage(); - List orderSettleDetailVOS = settleOrderReportService.selectSettleOrderReportDetail(dto); - return getDataTable(orderSettleDetailVOS); + return getDataTable(settleOrderReportService.selectSettleOrderReportDetail(dto)); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java index 0af42a885..f84659fc6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java @@ -66,4 +66,6 @@ public interface ClearingWithdrawInfoMapper { ClearingWithdrawInfo selectByWithdrawCode(String withdrawCode); ClearingBillVO selectWithdrawInfoByOrderCode(@Param("orderCode") String orderCode); + + List selectWithdrawInfoByOrderCodeList(@Param("orderCodeList") List orderCodeList); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingWithdrawInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingWithdrawInfoService.java index b8592b170..34d2723f3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingWithdrawInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingWithdrawInfoService.java @@ -30,4 +30,6 @@ public interface ClearingWithdrawInfoService{ ClearingWithdrawInfo selectByWithdrawCode(String withdrawCode); ClearingBillVO selectWithdrawInfoByOrderCode(String orderCode); + + List selectWithdrawInfoByOrderCodeList(List orderCodeList); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java index a2c272f17..c0436ace3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java @@ -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 selectSettleOrderReportDetail(SettleOrderReportDTO dto); + PageResponse selectSettleOrderReportDetail(SettleOrderReportDTO dto); List selectByMerchantIdAndDate(String merchantId, String date); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java index 2f838b5de..402a55d73 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java @@ -77,4 +77,9 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ return clearingWithdrawInfoMapper.selectWithdrawInfoByOrderCode(orderCode); } + @Override + public List selectWithdrawInfoByOrderCodeList(List orderCodeList) { + return clearingWithdrawInfoMapper.selectWithdrawInfoByOrderCodeList(orderCodeList); + } + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 2e2139b01..d4abf034f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -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 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 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 adapayCallbackRecords = adapayCallbackRecordMapper.queryRecordList(orderCodeList); - PageInfo pageInfo = new PageInfo<>(adapayCallbackRecords); + List clearingBillVOList = clearingWithdrawInfoService.selectWithdrawInfoByOrderCodeList(orderCodeList); + PageInfo pageInfo = new PageInfo<>(clearingBillVOList); + // 封装结果集 List 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 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 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java index 4fc13c707..086a2cf29 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java @@ -4,6 +4,16 @@ import lombok.Data; @Data public class ClearingBillVO { + /** + * 订单编号 + */ + private String orderCode; + + /** + * 支付id + */ + private String paymentId; + /** * 清分单号 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml index c7763eee6..9703ee2f7 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml @@ -448,4 +448,22 @@ where t1.del_flag = '0' and t2.order_code = #{orderCode,jdbcType=VARCHAR} + + \ No newline at end of file