From 11fa2378d3558204022f0b7a530b901db0df4db5 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Thu, 28 Apr 2022 19:40:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppFinCollectionConfirmationFeign.java | 15 +++++++- ...inCollectionConfirmationFeignFallback.java | 17 ++++++++- .../AppFinCollectionConfirmationRest.java | 17 ++++++++- .../AppFinCollectionConfirmationService.java | 35 +++++++++++++++++-- 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java index b9afb794cc..11221b0614 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java @@ -26,7 +26,7 @@ package com.yxt.anrui.terminal.api.finance; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -79,4 +79,17 @@ public interface AppFinCollectionConfirmationFeign { @ApiOperation("手机端—查询可使用款项明细列表") @PostMapping("/getPaymentDetailsList") public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("app获取客户账单列表") + @PostMapping("/getCustomerBillList") + public ResultBean> getCustomerBillList(@RequestBody PagerQuery pq); + + @ApiOperation("app获取客户合同账单列表") + @PostMapping("/getCustomerBill2List") + public ResultBean> getCustomerBill2List(@RequestBody PagerQuery pq); + + @ApiOperation("app获取账单详情") + @PostMapping("/getCustomerBillDetail/{paymentSid}") + public ResultBean> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java index 2c5d7025bc..6f40bd1595 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java @@ -26,7 +26,7 @@ package com.yxt.anrui.terminal.api.finance; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -78,4 +78,19 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean> getCustomerBillList(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> getCustomerBill2List(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> getCustomerBillDetail(String paymentSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java index 8f175e9549..7c132a2142 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java @@ -26,7 +26,7 @@ package com.yxt.anrui.terminal.biz.finance; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; import com.yxt.anrui.terminal.api.finance.AppFinCollectionConfirmationFeign; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -123,4 +123,19 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return appfinCollectionConfirmationService.getPaymentDetailsList(pagerQuery); } + + @Override + public ResultBean> getCustomerBillList(PagerQuery pq) { + return appfinCollectionConfirmationService.getCustomerBillList(pq); + } + + @Override + public ResultBean> getCustomerBill2List(PagerQuery pq) { + return appfinCollectionConfirmationService.getCustomerBill2List(pq); + } + + @Override + public ResultBean> getCustomerBillDetail(String paymentSid) { + return appfinCollectionConfirmationService.getCustomerBillDetail(paymentSid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java index 8203bdac5c..9a795cb706 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java @@ -27,7 +27,7 @@ package com.yxt.anrui.terminal.biz.finance; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -52,6 +52,8 @@ import org.springframework.stereotype.Service; public class AppFinCollectionConfirmationService { @Autowired FinCollectionConfirmationFeign finCollectionConfirmationFeign; + @Autowired + FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; /** @@ -98,7 +100,6 @@ public class AppFinCollectionConfirmationService { /** * 手机端—删除收款确认单 * - * * @param collectionBillSid * @return */ @@ -115,4 +116,34 @@ public class AppFinCollectionConfirmationService { public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return finCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery); } + + /** + * app获取客户账单列表 + * + * @param pq + * @return + */ + public ResultBean> getCustomerBillList(PagerQuery pq) { + return finUncollectedReceivablesDetailedFeign.getCustomerBillList(pq); + } + + /** + * app获取客户合同账单列表 + * + * @param pq + * @return + */ + public ResultBean> getCustomerBill2List(PagerQuery pq) { + return finUncollectedReceivablesDetailedFeign.getCustomerBill2List(pq); + } + + /** + * app获取账单详情 + * + * @param paymentSid + * @return + */ + public ResultBean> getCustomerBillDetail(String paymentSid) { + return finUncollectedReceivablesDetailedFeign.getCustomerBillDetail(paymentSid); + } } \ No newline at end of file