师傅账单明细接口//半成品

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")

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() {
     }
 

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

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