From ff572036cdbb8c2512b561be7327a43a189aadbe Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 8 Dec 2023 10:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E6=94=B6=E4=BB=A3?= =?UTF-8?q?=E4=BB=98=E6=96=B0=E5=A2=9E=E5=88=9D=E5=A7=8B=E5=8C=96=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E8=B4=A6=E6=88=B7=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finmanufacturerbank/BankVoForPayment.java | 19 +++++++ .../FinManufacturerBankFeign.java | 8 ++- .../FinManufacturerBankFeignFallback.java | 5 ++ .../FinManufacturerBankMapper.java | 11 ++--- .../FinManufacturerBankMapper.xml | 6 +++ .../FinManufacturerBankRest.java | 5 ++ .../FinManufacturerBankService.java | 49 +++++++++++-------- .../LoanTransferPaymentApplyService.java | 3 ++ 8 files changed, 78 insertions(+), 28 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/BankVoForPayment.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/BankVoForPayment.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/BankVoForPayment.java new file mode 100644 index 0000000000..9eef677aa0 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/BankVoForPayment.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.fin.api.finmanufacturerbank; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/12/8 9:50 + */ +@Data +public class BankVoForPayment { + @ApiModelProperty("开户银行") + private String depositBank; + @ApiModelProperty("转付账户") + private String account; + @ApiModelProperty("转付账户账号") + private String accountNumber; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java index 43e03f7288..1cd2519ec8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java @@ -85,7 +85,7 @@ public interface FinManufacturerBankFeign { @ApiOperation("获取该分公司下的开户账号:切换机构") @GetMapping("/selectAccountByUseOrgSid") @ResponseBody - public ResultBean> selectAccountByUseOrgSid(@RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath); + public ResultBean> selectAccountByUseOrgSid(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); @ApiOperation("获取该本分公司下的开户账号") @GetMapping("/selAccountByOrgSid") @@ -96,4 +96,10 @@ public interface FinManufacturerBankFeign { @PostMapping("/selAppAccountByOrgSid") @ResponseBody public ResultBean> selAppAccountByOrgSid(@RequestBody PagerQuery query); + + @ApiOperation("代收代付选择银行账户") + @GetMapping("/listByPayment") + @ResponseBody + public ResultBean listByPayment(@RequestParam("orgPath") String orgPath, @RequestParam("key") String key); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java index 892e377f46..b5ce5cbb12 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java @@ -89,4 +89,9 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig public ResultBean> selAppAccountByOrgSid(PagerQuery query) { return null; } + + @Override + public ResultBean listByPayment(String orgPath, String key) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java index 8551767bfe..29a55b3922 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java @@ -31,10 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery; -import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank; -import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDetailsVo; -import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo; -import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo; +import com.yxt.anrui.fin.api.finmanufacturerbank.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,7 +63,9 @@ public interface FinManufacturerBankMapper extends BaseMapper selectAccountByUseOrgSid(String useOrgSid); - List selAccountByOrgSid(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param(Constants.WRAPPER) QueryWrapper qw); + List selAccountByOrgSid(@Param("useOrgSid") String useOrgSid, @Param("name") String name, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selAppAccountByOrgSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw,@Param("name") String name); + IPage selAppAccountByOrgSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + + List listByPayment(@Param("useOrgSid") String useOrgSid, @Param("key") String key); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml index 7ba6ab9206..5599f7927a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml @@ -87,4 +87,10 @@ + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java index f7a53811d6..5e2dbe14ed 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java @@ -105,4 +105,9 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign { IPage voIPage = finManufacturerBankService.selAppAccountByOrgSid(query); return rb.success().setData(voIPage); } + + @Override + public ResultBean listByPayment(String orgPath, String key) { + return finManufacturerBankService.listByPayment(orgPath,key); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java index 248cf994db..0aefac0f50 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java @@ -80,10 +80,10 @@ public class FinManufacturerBankService extends MybatisBaseService qw = new QueryWrapper<>(); FinManufacturerBankQuery params = pq.getParams(); if (params != null) { - if(StringUtils.isNotBlank(params.getOrgPath())){ + if (StringUtils.isNotBlank(params.getOrgPath())) { String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); qw.eq("useOrgSid", orgSid); - }else{ + } else { String userSid = params.getUserSid(); if (StringUtils.isNotBlank(userSid)) { ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); @@ -126,7 +126,7 @@ public class FinManufacturerBankService extends MybatisBaseService data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData(); - if (data != null){ + if (data != null) { for (BasePurchaseSystemDetailsVo datum : data) { CNBankacnt cnBankacnt = new CNBankacnt(); cnBankacnt.setFCreateOrgId(datum.getOrgCode()); @@ -136,7 +136,7 @@ public class FinManufacturerBankService extends MybatisBaseService data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData(); - if (data != null){ + if (data != null) { for (BasePurchaseSystemDetailsVo datum : data) { CNBankacnt cnBankacnt = new CNBankacnt(); cnBankacnt.setFCreateOrgId(datum.getOrgCode()); @@ -171,7 +171,7 @@ public class FinManufacturerBankService extends MybatisBaseService> selectAccountByUseOrgSid(String userSid,String orgPath) { + public ResultBean> selectAccountByUseOrgSid(String userSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); String useOrgSid = ""; - if(StringUtils.isNotBlank(orgPath)){ + if (StringUtils.isNotBlank(orgPath)) { useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - }else{ + } else { useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } List list = baseMapper.selectAccountByUseOrgSid(useOrgSid); @@ -220,20 +220,20 @@ public class FinManufacturerBankService extends MybatisBaseService list = baseMapper.selAccountByOrgSid(useOrgSid,query.getName(),qw); + List list = baseMapper.selAccountByOrgSid(useOrgSid, query.getName(), qw); list.removeAll(Collections.singleton(null)); return rb.success().setData(list); } @@ -250,19 +250,26 @@ public class FinManufacturerBankService extends MybatisBaseService iPage = baseMapper.selAppAccountByOrgSid(page, qw, name); return iPage; } + + public ResultBean listByPayment(String orgPath, String key) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List list = baseMapper.listByPayment(useOrgSid, key); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index ca1e3099d1..1bbb895036 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -94,6 +94,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService