查询未分账订单

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<ClearingBillVO> clearingBillVOS = settleOrderReportService.queryUndividedOrder(dto);
-            response = new RestApiResponse<>(ImmutableMap.of("list", clearingBillVOS));
+            Map<String, Object> map = settleOrderReportService.queryUndividedOrder(dto);
+            response = new RestApiResponse<>(map);
         } catch (BusinessException e) {
             logger.error("查询未分账订单接口 error,", e);
             response = new RestApiResponse<>(e.getCode(), e.getMessage());

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<SettleOrderReport> queryOrderReport(List<String> stationIdList, String startTime, String endTime);
 
-    List<ClearingBillVO> queryUndividedOrder(SettleOrderReportDTO dto);
+    Map<String, Object> queryUndividedOrder(SettleOrderReportDTO dto);
 }

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) {
-
-    }
-
     /**
      * 使用汇付支付
      *

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<ClearingBillVO> queryUndividedOrder(SettleOrderReportDTO dto) {
-        List<ClearingBillVO> resultList = Lists.newArrayList();
+    public Map<String, Object> queryUndividedOrder(SettleOrderReportDTO dto) {
+        Map<String, Object> 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<ClearingBillVO> clearingList = Lists.newArrayList();
+        List<ClearingBillVO> 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<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> 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;
     }
 
     /**

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;
 }