update 查询站点报表详情

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<OrderSettleDetailVO> orderSettleDetailVOS = settleOrderReportService.selectSettleOrderReportDetail(dto);
+        return getDataTable(settleOrderReportService.selectSettleOrderReportDetail(dto));
-        return getDataTable(orderSettleDetailVOS);
     }
 }

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<ClearingBillVO> selectWithdrawInfoByOrderCodeList(@Param("orderCodeList") List<String> orderCodeList);
 }

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<ClearingBillVO> selectWithdrawInfoByOrderCodeList(List<String> orderCodeList);
 }

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<OrderSettleDetailVO> selectSettleOrderReportDetail(SettleOrderReportDTO dto);
+    PageResponse selectSettleOrderReportDetail(SettleOrderReportDTO dto);
 
     List<SettleOrderReport> selectByMerchantIdAndDate(String merchantId, String date);
 

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<ClearingBillVO> selectWithdrawInfoByOrderCodeList(List<String> orderCodeList) {
+        return clearingWithdrawInfoMapper.selectWithdrawInfoByOrderCodeList(orderCodeList);
+    }
+
 }

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<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);
+        List<ClearingBillVO> clearingBillVOList = clearingWithdrawInfoService.selectWithdrawInfoByOrderCodeList(orderCodeList);
-        PageInfo<AdapayCallbackRecord> pageInfo = new PageInfo<>(adapayCallbackRecords);
+        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(clearingBillVO.getOrderCode());
-            vo.setOrderCode(orderCode);
+            String paymentId = clearingBillVO.getPaymentId();
-            String paymentId = adapayCallbackRecord.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);
         }
-
+        PageResponse pageResponse = new PageResponse();
-        PageInfo<OrderSettleDetailVO> result = new PageInfo<>(resultList);
+        pageResponse.setPageSize(pageInfo.getPageSize());
-        return result.getList();
+        pageResponse.setPageNum(pageInfo.getPageNum());
+        pageResponse.setPages(pageInfo.getPages());
+        pageResponse.setTotal(pageInfo.getTotal());
+        pageResponse.setList(resultList);
+        return pageResponse;
     }
 
     @Override

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;
+
     /**
      * 清分单号
      */

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}
   </select>
+
+  <select id="selectWithdrawInfoByOrderCodeList" resultType="com.jsowell.pile.vo.web.ClearingBillVO">
+    select
+    t1.clearing_bill_code as clearingBillCode,
+    t2.order_code as orderCode,
+    t3.withdraw_code as withdrawCode,
+    t3.withdraw_status as withdrawStatus,
+    t4.payment_id as paymentId
+    from clearing_bill_info t1
+    left join clearing_bill_detail t2 on t2.clearing_bill_code = t1.clearing_bill_code and t2.del_flag = '0'
+    left join clearing_withdraw_info t3 on t3.withdraw_code = t1.withdraw_code and t3.del_flag = '0'
+    left join adapay_callback_record t4 on t4.order_code = t2.order_code and t4.del_flag = '0'
+    where t1.del_flag = '0'
+    and t2.order_code in
+    <foreach collection="orderCodeList" item="orderCode" open="(" separator="," close=")">
+      #{orderCode,jdbcType=VARCHAR}
+    </foreach>
+  </select>
 </mapper>