From 43f26cd860165eee4193824d8e908cfdcd485a44 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 22 Aug 2023 15:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AA=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/TempController.java | 9 ++++----- .../service/ISettleOrderReportService.java | 4 ++-- .../impl/OrderBasicInfoServiceImpl.java | 5 ----- .../impl/SettleOrderReportServiceImpl.java | 20 ++++++++++++++----- .../jsowell/pile/vo/web/ClearingBillVO.java | 3 +++ 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index fdca410e9..68c976d13 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -2,7 +2,6 @@ package com.jsowell.api.uniapp; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.google.common.collect.ImmutableMap; import com.jsowell.adapay.dto.BalancePaymentRequestDTO; import com.jsowell.adapay.service.AdapayService; import com.jsowell.common.annotation.Anonymous; @@ -20,7 +19,6 @@ import com.jsowell.pile.dto.QueryOrderDTO; import com.jsowell.pile.dto.SettleOrderReportDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.uniapp.MemberBalanceVO; -import com.jsowell.pile.vo.web.ClearingBillVO; import com.jsowell.service.OrderService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.List; +import java.util.Map; /** * 用于临时接口 @@ -319,12 +318,12 @@ public class TempController extends BaseController { * http://localhost:8080/temp/queryUndividedOrder */ @PostMapping("/queryUndividedOrder") - public RestApiResponse queryUndividedOrder(SettleOrderReportDTO dto) { + public RestApiResponse queryUndividedOrder(@RequestBody SettleOrderReportDTO dto) { logger.info("查询未分账订单param:{}", JSON.toJSONString(dto)); RestApiResponse response; try { - List clearingBillVOS = settleOrderReportService.queryUndividedOrder(dto); - response = new RestApiResponse<>(ImmutableMap.of("list", clearingBillVOS)); + Map map = settleOrderReportService.queryUndividedOrder(dto); + response = new RestApiResponse<>(map); } catch (BusinessException e) { logger.error("查询未分账订单接口 error,", e); response = new RestApiResponse<>(e.getCode(), e.getMessage()); 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 cfc79c277..b8b62920d 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 @@ -4,10 +4,10 @@ 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.ClearingBillVO; import com.jsowell.pile.vo.web.MerchantOrderReportVO; import java.util.List; +import java.util.Map; /** * 结算订单报Service接口 @@ -101,5 +101,5 @@ public interface ISettleOrderReportService { List queryOrderReport(List stationIdList, String startTime, String endTime); - List queryUndividedOrder(SettleOrderReportDTO dto); + Map queryUndividedOrder(SettleOrderReportDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index a01f9c481..f572b59bd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2811,11 +2811,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } } - @Override - public void queryUndividedOrder(SettleOrderReportDTO dto) { - - } - /** * 使用汇付支付 * 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 8de330d1b..2fa04afbe 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 @@ -3,6 +3,7 @@ package com.jsowell.pile.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; import com.jsowell.adapay.service.AdapayService; @@ -30,6 +31,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; /** * 结算订单报Service业务层处理 @@ -72,8 +74,8 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { @Override - public List queryUndividedOrder(SettleOrderReportDTO dto) { - List resultList = Lists.newArrayList(); + public Map queryUndividedOrder(SettleOrderReportDTO dto) { + Map resultMap = Maps.newHashMap(); SettleOrderReport orderReport = selectByStationIdAndDate(dto.getStationId(), dto.getTradeDate()); if (orderReport == null) { @@ -86,6 +88,9 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { throw new BusinessException("00300005", "查询清分信息为空"); } String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderReport.getMerchantId()); + // clearing + List clearingList = Lists.newArrayList(); + List unClearingList = Lists.newArrayList(); for (ClearingBillVO clearingBillVO : clearingBillVOList) { String paymentId = clearingBillVO.getPaymentId(); QueryPaymentConfirmDTO build = QueryPaymentConfirmDTO.builder() @@ -94,11 +99,16 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { .build(); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); List paymentConfirms = response.getPaymentConfirms(); - if (paymentConfirms == null) { - resultList.add(clearingBillVO); + if (!CollectionUtils.isEmpty(paymentConfirms)) { + clearingBillVO.setConfirmInfo(paymentConfirms.get(0)); + clearingList.add(clearingBillVO); + } else { + unClearingList.add(clearingBillVO); } } - return resultList; + resultMap.put("clearingList", clearingList); + resultMap.put("unClearingList", unClearingList); + return resultMap; } /** 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 086a2cf29..51bb68311 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 @@ -1,5 +1,6 @@ package com.jsowell.pile.vo.web; +import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; import lombok.Data; @Data @@ -28,4 +29,6 @@ public class ClearingBillVO { * 提现状态 */ private String withdrawStatus; + + private QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirmInfo; }