From a6a6c38d4a5548cff73f96355a6ee50d09eb71a5 Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Wed, 24 Aug 2022 13:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E8=B4=A6=E5=8D=95=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=8E=A5=E5=8F=A3//=E5=8D=8A=E6=88=90=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/FinancialMasterController.java    |  8 ++++++++
 .../ghy/payment/domain/FinancialMaster.java   |  8 ++++++++
 .../service/FinancialMasterService.java       |  5 +++++
 .../impl/FinancialMasterServiceImpl.java      | 19 +++++++++++++++++++
 4 files changed, 40 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialMasterController.java
index 3c58469f..d8f24bde 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialMasterController.java
@@ -46,6 +46,14 @@ public class FinancialMasterController extends BaseController {
         return getDataTable(list);
     }
 
+    @PostMapping("/app/list")
+    @ResponseBody
+    public TableDataInfo appList(FinancialMaster request) {
+        startPage();
+        List<FinancialMaster> list = financialMasterService.selectAppList(request);
+        return getDataTable(list);
+    }
+
     @Log(title = "主财务单管理", businessType = BusinessType.EXPORT)
     @RequiresPermissions("financial:master:export")
     @PostMapping("/export")
diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java
index a02d622a..cc33000a 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java
@@ -57,6 +57,14 @@ public class FinancialMaster extends BaseEntity {
 
     private List<Long> ids;
 
+    private Integer type;
+
+    private Long userId;
+
+    private String orderCode;
+
+    private List<FinancialDetail> details;
+
     public FinancialMaster() {
     }
 
diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java
index 976a1b1d..86119cbe 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java
@@ -30,6 +30,11 @@ public interface FinancialMasterService {
      */
     List<FinancialMaster> selectFinancialMasterList(FinancialMaster financialMaster);
 
+    /**
+     * @param request 主财务单入参
+     * @return 主财务单集合
+     * */
+    List<FinancialMaster> selectAppList(FinancialMaster request);
 
     /**
      * @param financialMasterId 主财务单id
diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java
index 34498b7b..0d720ba7 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java
@@ -4,9 +4,11 @@ import com.ghy.common.adapay.model.PaymentDTO;
 import com.ghy.common.core.text.Convert;
 import com.ghy.common.enums.PayStatus;
 import com.ghy.common.enums.PayTypeEnum;
+import com.ghy.payment.domain.FinancialDetail;
 import com.ghy.payment.domain.FinancialMaster;
 import com.ghy.payment.mapper.FinancialMasterMapper;
 import com.ghy.payment.mapper.PaymentMapper;
+import com.ghy.payment.service.FinancialDetailService;
 import com.ghy.payment.service.FinancialMasterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,6 +44,8 @@ public class FinancialMasterServiceImpl implements FinancialMasterService {
     private PaymentMapper paymentMapper;
     @Resource
     private FinancialMasterMapper financialMasterMapper;
+    @Resource
+    private FinancialDetailService financialDetailService;
 
     @Override
     public int insertFinancialMaster(FinancialMaster financialMaster) {
@@ -58,6 +62,21 @@ public class FinancialMasterServiceImpl implements FinancialMasterService {
         return financialMasterMapper.selectFinancialMasterList(financialMaster);
     }
 
+    @Override
+    public List<FinancialMaster> selectAppList(FinancialMaster request) {
+        List<FinancialMaster> masterList =this.selectFinancialMasterList(request);
+        masterList.forEach(master->{
+            FinancialDetail param = new FinancialDetail();
+            param.setFinancialMasterId(master.getId());
+            param.setPayeeId(request.getUserId());
+            List<FinancialDetail> details = financialDetailService.selectFinancialDetailList(param);
+            details.forEach(detail->{
+
+            });
+        });
+        return null;
+    }
+
     @Override
     public FinancialMaster selectById(Long financialMasterId) {
         return financialMasterMapper.selectById(financialMasterId);