From 4b91d89fa488e6c4e0db538b3d3f9e71190a2e7c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 18 Nov 2024 17:46:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E8=AE=A4=E6=AC=BE=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationFeign.java | 20 +- ...inCollectionConfirmationFeignFallback.java | 21 +- .../AsFinCollectionConfirmationDetailsVo.java | 131 +++++++++ .../as/AsFinCollectionConfirmationDto.java | 87 ++++++ .../as/AsFinCollectionConfirmationQuery.java | 93 ++++++ .../as/AsFinCollectionConfirmationVo.java | 105 +++++++ .../AsFinSelectedReceivablesDetailedDto.java | 54 ++++ .../AsFinSelectedReceivablesDetailedVo.java | 93 ++++++ ...inUncollectedReceivablesDetailedFeign.java | 7 + ...ectedReceivablesDetailedFeignFallback.java | 7 + ...ilsOfReceivablesAndUncollectedItemsVo.java | 48 ++++ ...inUncollectedReceivablesDetailedQuery.java | 34 +++ .../FinCollectionConfirmationMapper.java | 5 +- .../FinCollectionConfirmationMapper.xml | 11 +- .../FinCollectionConfirmationRest.java | 22 ++ .../FinCollectionConfirmationService.java | 271 +++++++++++++++++- ...nUncollectedReceivablesDetailedMapper.java | 3 + ...inUncollectedReceivablesDetailedMapper.xml | 37 +++ ...FinUncollectedReceivablesDetailedRest.java | 9 + ...UncollectedReceivablesDetailedService.java | 49 ++++ .../asbusrepairbill/AsBusrepairBillFeign.java | 25 ++ .../asbusrepairbill/FinBusrepairBillVo.java | 15 + .../asbusrepairbill/FinBusrepairBillVo.java | 15 + .../asbusrepairbill/AsBusrepairBillRest.java | 8 + .../AsBusrepairBillService.java | 65 +++++ .../AsBusrepairBillInvoiceService.java | 2 +- 26 files changed, 1230 insertions(+), 7 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDetailsVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationQuery.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsDetailsOfReceivablesAndUncollectedItemsVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsFinUncollectedReceivablesDetailedQuery.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/AsBusrepairBillFeign.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/FinBusrepairBillVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/FinBusrepairBillVo.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 7d40ef936e..073c888eea 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -27,6 +27,10 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationQuery; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.core.query.PagerQuery; @@ -114,6 +118,20 @@ public interface FinCollectionConfirmationFeign { @PostMapping("/selectSids") ResultBean> selectSids(@RequestParam("busVehSid") String busVehSid); + /*-------------------------------------------------------------------------*/ + + @ApiOperation("售后提交新增保存") + @PostMapping("/asSave") + public ResultBean asSave(@RequestBody AsFinCollectionConfirmationDto dto); + + @ApiOperation("售后编辑回显或详情") + @GetMapping("/asFetchBySid/{sid}") + public ResultBean asFetchBySid(@PathVariable("sid") String sid); + + @ApiOperation("售后查看收款申请以及代办理列表") + @PostMapping("/asListPagess") + public ResultBean> asListPagess(@RequestBody PagerQuery pq); + /*----------------------金融认款申请---------------------------*/ @@ -235,4 +253,4 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("手机端—初始化收款确认申请") @GetMapping("/getRskCollectionConfirmDetail") ResultBean getRskCollectionConfirmDetail(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery); -} \ No newline at end of file +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index a365921bde..f70e4b8ea3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -27,6 +27,10 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationQuery; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.core.query.PagerQuery; @@ -114,6 +118,21 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf return null; } + @Override + public ResultBean asSave(AsFinCollectionConfirmationDto dto) { + return null; + } + + @Override + public ResultBean asFetchBySid(String sid) { + return null; + } + + @Override + public ResultBean> asListPagess(PagerQuery pq) { + return null; + } + @Override public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) { return null; @@ -253,4 +272,4 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf public ResultBean getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery) { return null; } -} \ No newline at end of file +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDetailsVo.java new file mode 100644 index 0000000000..786153c55d --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDetailsVo.java @@ -0,0 +1,131 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.fincollectionconfirmation.as; + + +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationVo.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo
+ * Description: 收款确认表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象") +@Data +public class AsFinCollectionConfirmationDetailsVo implements Vo { + + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("收款日期") + private String collectionDate; // 收款日期 + @ApiModelProperty("收款银行") + private String collectionBank; // 收款银行 + @ApiModelProperty("收款银行账号") + private String collectionBankNum; // 收款银行账号 + @ApiModelProperty("收款方式key") + private String collectionTypeKey; // 收款方式key + @ApiModelProperty("收款方式value") + private String collectionTypeValue; // 收款方式value + @ApiModelProperty("付款方名称") + private String payerName; // 付款方名称 + @ApiModelProperty("收款金额") + private String collectionMoney; // 收款金额 + @ApiModelProperty("打款凭证Url") + private String paymentVoucherUrl; // 打款凭证Url + /*@ApiModelProperty("打款凭证附件名称") + private String paymentVoucherFileName;*/ // 打款凭证附件名称 + @ApiModelProperty("汇款确认书Url") + private String remittanceConfirmationUrl; // 汇款确认书Url + /*@ApiModelProperty("汇款确认书附件名称") + private String remittanceConfirmationFileName;*/ // 汇款确认书附件名称 + @ApiModelProperty("余额") + private String balance; // 余额 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("已选应收款项明细") + private List finSelectedReceivablesDetaileds; // 已选应收款项明细 + @ApiModelProperty("打款凭证附件") + private List paymentVoucherAppendixs; // 打款凭证附件 + @ApiModelProperty("汇款确认书附件") + private List remittanceConfirmationAppendixs; // 汇款确认书附件 + + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + + @ApiModelProperty("单据编号") + private String billNo; + + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + + private String reason; + + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("销售专员用户sid") + private String staffUserSid; + @ApiModelProperty("销售专员部门名称") + private String staffDeptName; + @ApiModelProperty("销售专员部门sid") + private String staffDeptSid; + @ApiModelProperty("组织全路径") + private String orgSidPath; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDto.java new file mode 100644 index 0000000000..f015956619 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDto.java @@ -0,0 +1,87 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.as; + +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.Valid; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/11/18 14:48 + */ +@Data +public class AsFinCollectionConfirmationDto implements Dto { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("sid") + private String sid; // 收款确认单sid + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款日期") + private String collectionDate; // 收款日期 + @ApiModelProperty("收款银行key") + private String collectionBankKey; // 收款银行key + @ApiModelProperty("收款银行") + private String collectionBank; // 收款银行 + @ApiModelProperty("收款银行账号key") + private String collectionBankNumKey; // 收款银行账号key + @ApiModelProperty("收款银行账号") + private String collectionBankNum; // 收款银行账号 + @ApiModelProperty("收款方式key") + private String collectionTypeKey; // 收款方式key + @ApiModelProperty("收款方式value") + private String collectionTypeValue; // 收款方式value + @ApiModelProperty("付款方名称") + private String payerName; // 付款方名称 + @ApiModelProperty("收款金额") + private String collectionMoney; // 收款金额 + @ApiModelProperty("打款凭证Url") + private String paymentVoucherUrl; // 打款凭证Url + @ApiModelProperty("汇款确认书Url") + private String remittanceConfirmationUrl; // 汇款确认书Url + /* @ApiModelProperty("余额") + private String balance;*/ + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）") + private Integer paymentState; // 审核状态 + @ApiModelProperty("已选应收款项明细") + @Valid + private List finSelectedReceivablesDetaileds; // 已选应收款项明细 + @ApiModelProperty("打款凭证附件") + private List paymentVoucherAppendixs; // 打款凭证附件 + @ApiModelProperty("汇款确认书附件") + private List remittanceConfirmationAppendixs; // 汇款确认书附件 + + @ApiModelProperty("申请部门") + private String createDept; + + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + @ApiModelProperty("申请部门sid") + private String createDeptSid; + + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; + + + @ApiModelProperty("组织全路径") + private String orgSidPath; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationQuery.java new file mode 100644 index 0000000000..4d07a6d85e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationQuery.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.fincollectionconfirmation.as; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-fincenter(销售相关)
+ * File: FinCollectionConfirmationQuery.java
+ * Class: com.yxt.anrui.fincenter.api.fincollectionconfirmation.FinCollectionConfirmationQuery
+ * Description: 收款确认表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件") +@Data +public class AsFinCollectionConfirmationQuery implements Query { + + @ApiModelProperty("收款开始日期") + private String collectionStartDate; // 收款开始日期 + @ApiModelProperty("收款结束日期") + private String collectionEndDate; // 收款结束日期 + @ApiModelProperty("收款银行") + private String collectionBank; // 收款银行 + @ApiModelProperty("收款方式key") + private String collectionTypeKey; // 收款方式key + @ApiModelProperty("认款状态") + private String subscriptionState; // 认款状态 + //后端自己赋值的 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid + + @ApiModelProperty("状态：0申请，1确认") + private String state; + + + private String payerName; + + private String auditState; + + @ApiModelProperty("申请部门") + private String createDept; // 申请部门 + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("申请开始日期") + private String createStartDate; // 申请开始日期 + @ApiModelProperty("申请结束日期") + private String createEndDate; // 申请结束日期 + @ApiModelProperty("收款金额") + private String collectionMoney; // 收款金额 + @ApiModelProperty("收款账号") + private String finBillNo; + @ApiModelProperty("使用组织sid") + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationVo.java new file mode 100644 index 0000000000..df671e1822 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationVo.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.fincollectionconfirmation.as; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationVo.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo
+ * Description: 收款确认表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象") +@Data +public class AsFinCollectionConfirmationVo implements Vo { + + private static final long serialVersionUID = 6561005289102689912L; + @ApiModelProperty("收款确认单sid") + private String sid; // 收款确认单sid + @ApiModelProperty("收款日期") + private String collectionDate; // 收款日期 + @ApiModelProperty("收款银行") + private String collectionBank; // 收款银行 + @ApiModelProperty("收款银行账号") + private String collectionBankNum; // 收款银行账号 + @ApiModelProperty("收款方式value") + private String collectionTypeValue; // 收款方式value + @ApiModelProperty("付款方名称") + private String payerName; // 付款方名称 + @ApiModelProperty("收款金额") + private String collectionMoney; // 收款金额 + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）") + private Integer auditState; // 审核状态 + @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）") + private Integer subscriptionState; // 审核状态 + + @ApiModelProperty("是否允许认款") + private boolean showHandle; + + @ApiModelProperty("余额") + private String balance; + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + + @ApiModelProperty("申请人") + private String createByName; + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 + + @ApiModelProperty("是否有撤回按钮") + private boolean recallAtn; + private String createBySid; + + @ApiModelProperty("是否金融认款") + private boolean loan; + private String source; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedDto.java new file mode 100644 index 0000000000..80a4ffeffd --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedDto.java @@ -0,0 +1,54 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.as; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author Fan + * @description + * @date 2024/11/18 15:32 + */ +@Data +public class AsFinSelectedReceivablesDetailedDto { + + @ApiModelProperty("创建人") + private String createByName; // 创建人接口 + @ApiModelProperty("合同sid") + private String contractSid; // 合同sid + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("车架号") + @JsonProperty("VIN") + private String VIN; // 车架号 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("联系电话") + private String customerPhone; // 联系电话 + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + @ApiModelProperty("当前应收金额") + private String currentReceivableMoney; // 当前应收金额 + /* @ApiModelProperty("上次认款金额") + private String lastSubscriptionMoney; // 上次认款金额*/ + @ApiModelProperty("认款金额") + @NotBlank(message = "认款金额不能为空") + private String subscriptionMoney; // 认款金额 + @ApiModelProperty("认款申请日期") + private String subscriptionDate; // 认款申请日期 + @ApiModelProperty("收款确认单sid") + private String collSid; // 收款确认单sid + + @ApiModelProperty("应收未收款项sid") + private String receivablesSid; + + @ApiModelProperty("款项状态") + private String kxState; + private int subscribedOf; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedVo.java new file mode 100644 index 0000000000..79fadbad75 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedVo.java @@ -0,0 +1,93 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.as; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/18 15:54 + */ +@Data +public class AsFinSelectedReceivablesDetailedVo { + + + @ApiModelProperty("已选应收款项sid") + private String sid; // 已选应收款项sid + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + + @ApiModelProperty("合同sid") + private String contractSid; // 合同sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + + @ApiModelProperty("车架号") + @JsonProperty("VIN") + private String VIN; // 车架号 + + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + + @ApiModelProperty("联系电话") + private String customerPhone; // 联系电话 + + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + + @ApiModelProperty("当前应收金额") + private String currentReceivableMoney; // 当前应收金额 + + @ApiModelProperty("认款金额") + private String subscriptionMoney; // 认款金额 + + @ApiModelProperty("未认款金额") + private String noSubscriptionMoney; // 未认款金额 + + @ApiModelProperty("认款申请日期") + private String subscriptionDate; // 认款申请日期 + + @ApiModelProperty("收款确认单sid") + private String collSid; // 收款确认单sid + + @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）") + private Integer auditState; // 审核状态 + + @ApiModelProperty("审核时间") + private String auditDate; // 审核时间 + + @ApiModelProperty("备注") + private String remarks; // 备注 + + @ApiModelProperty("款项类型value") + private String paymentTypeValue; // 款项类型value + + @ApiModelProperty("应收未收款项sid") + private String receivablesSid; + + private String sumAll; + + @ApiModelProperty("全款贷款key:1是全款，2贷款") + private String payTypeKey; + @ApiModelProperty("全款贷款") + private String payType; + + private int subscribedOf; + + @ApiModelProperty("余额") + private String balance; + @ApiModelProperty("款项状态") + private String kxState; + private String vehMark; + private String billType; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 2087862d6f..f4b4d71ceb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -61,6 +63,11 @@ public interface FinUncollectedReceivablesDetailedFeign { @PostMapping("/listAll") public ResultBean> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query); + @ApiOperation("售后应收未收款项列表") + @PostMapping("/asListAll") + public ResultBean> asListAll(@RequestBody AsFinUncollectedReceivablesDetailedQuery query); + + @ApiOperation("新增或修改保存") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 67cd08b989..c7b0dc0c4e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -55,6 +57,11 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/listAll无法访问"); } + @Override + public ResultBean> asListAll(AsFinUncollectedReceivablesDetailedQuery query) { + return null; + } + @Override public ResultBean saveOrUpdate(FinUncollectedReceivablesDetailedDto dto){ return ResultBean.fireFail().setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/saveOrUpdate无法访问"); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsDetailsOfReceivablesAndUncollectedItemsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsDetailsOfReceivablesAndUncollectedItemsVo.java new file mode 100644 index 0000000000..8cd1959ebf --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsDetailsOfReceivablesAndUncollectedItemsVo.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/18 13:34 + */ +@Data +public class AsDetailsOfReceivablesAndUncollectedItemsVo { + + @ApiModelProperty("应收未收款项sid") + private String sid; // 应收未收款项sid + @ApiModelProperty("维修单号") + private String billNo; // 维修单号 + @ApiModelProperty("车架号") + private String VIN; // 车架号 + private String vehMark; // 车牌号 + private String customerPhone; // 电话 + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + @ApiModelProperty("当前应收金额") + private String currentReceivableMoney; // 当前应收金额 + @ApiModelProperty("应收金额") + private String reveivableMoney; + @ApiModelProperty("维修单类型") + private String billType; + + @ApiModelProperty("合同sid") + private String contractSid; // 合同sid + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + + + @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）") + private int subscribedOf; + + @ApiModelProperty("应收未收sid") + private String receivablesSid; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsFinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsFinUncollectedReceivablesDetailedQuery.java new file mode 100644 index 0000000000..6a8724e273 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsFinUncollectedReceivablesDetailedQuery.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/11/18 13:49 + */ +@Data +public class AsFinUncollectedReceivablesDetailedQuery implements Query { + + @ApiModelProperty("维修单号") + private String billNo; // 维修单号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + private String vinNo; + private String vehMark; + @ApiModelProperty("联系电话") + private String customerPhone; // 联系电话 + + @ApiModelProperty("当前组织全路径sid") + private String orgPath; + private String createBySid; + private String deptSid; + @ApiModelProperty("应收款项sid") + private String[] sids; // 应收款项sid + + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 6c03379aef..da5e35f278 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.AppFinCollectionConfirmationInitRskVo; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; @@ -191,4 +192,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper selectSids(String busVehSid); -} \ No newline at end of file + + IPage asListPagess(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 176e3283c5..0ebe3999b6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -494,4 +494,13 @@ ON fs.receivablesSid = fu.sid WHERE fu.busVinSid = #{busVehSid} - \ No newline at end of file + + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 5282de3f9b..c3309c144e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -29,6 +29,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationQuery; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.base.utils.PagerUtil; @@ -137,6 +141,24 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF return finCollectionConfirmationService.selectSids(busVehSid); } + //---------------------------售后认款---------------------- + @Override + public ResultBean asSave(AsFinCollectionConfirmationDto dto) { + return finCollectionConfirmationService.asSave(dto); + } + + @Override + public ResultBean asFetchBySid(String sid) { + return finCollectionConfirmationService.asFetchBySid(sid); + } + + @Override + public ResultBean> asListPagess(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finCollectionConfirmationService.asListPagess(pq); + return rb.success().setData(pv); + } + //------------------------金融认款申请----------------------------------- @Override public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0fb4d038e6..11d7d2cd78 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -56,6 +56,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.as.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; @@ -78,6 +79,8 @@ import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService; import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService; import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService; +import com.yxt.anrui.fin.fegin.as.asbusrepairbill.AsBusrepairBillFeign; +import com.yxt.anrui.fin.fegin.as.asbusrepairbill.FinBusrepairBillVo; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -222,6 +225,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -449,6 +454,121 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); + BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AsFinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney()) ? new BigDecimal(dto.getCollectionMoney()) : BigDecimal.ZERO) != 0) { + return rb.setMsg("认款总额与收款金额不符"); + } + List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); + List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); + if (finSelectedReceivablesDetailedDtos.size() > 0) { + for (AsFinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) { + if (StringUtils.isBlank(v.getSubscriptionMoney())) { + return rb.setMsg("认款金额不允许为空"); + } + } + } + List stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + List stringList1 = stringList.stream().distinct().collect(Collectors.toList()); + if (stringList.size() != stringList1.size()) { + return rb.setMsg("认款选择的数据存在问题，请检查是否重复"); + } + } + //根据用户sid查询分公司sid + String useOrgSid = ""; + if (StringUtils.isNotBlank(dto.getOrgPath())) { + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + } else { + useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + } + //对收款申请进行赋值操作 + FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); + BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid"); + finCollectionConfirmation.setSource("03"); + String orgPath = dto.getOrgPath(); + finCollectionConfirmation.setOrgSidPath(orgPath); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); + if (sysOrganizationVoResultBean.getData() != null) { + finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + } + sid = finCollectionConfirmation.getSid(); + finCollectionConfirmation.setCreateBySid(dto.getUserSid()); + finCollectionConfirmation.setUseOrgSid(useOrgSid); + //附件保存:打款凭证附件 + paymentVoucherAppendixs.stream().forEach(v -> { + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + BeanUtil.copyProperties(v, commonAppendixDto); + String s = commonAppendixDto.getFilePath(); + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid()); + commonAppendixDto.setFilePath(s); + commonAppendixDto.setCreateBySid(dto.getUserSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + }); + String payFilePath = paymentVoucherAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); + finCollectionConfirmation.setPaymentVoucherUrl(payFilePath); + //汇款确认书附件保存 + remittanceConfirmationAppendixs.stream().forEach(v -> { + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + BeanUtil.copyProperties(v, commonAppendixDto); + String s = commonAppendixDto.getFilePath(); + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid()); + commonAppendixDto.setFilePath(s); + commonAppendixDto.setCreateBySid(dto.getUserSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + }); + String remFilePath = remittanceConfirmationAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); + finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath); + if (finSelectedReceivablesDetailedDtos.size() > 0) { + //认款明细保存 + String finalSid = sid; + String finalUseOrgSid = useOrgSid; + finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选 + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); + BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid"); + finSelectedReceivablesDetailed.setCollSid(finalSid); + finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid); + //设置审核状态为待审核(1待审核/2已驳回/3已审核) + finSelectedReceivablesDetailed.setAuditState(1); + finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid()); + //认款日期默认为当天的日期 + finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today()); + finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath()); + finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName()); + finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); + if (v.getSubscribedOf() == 0) { + //应收未收减去相应的认款 + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + }); + } + finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney()); + finCollectionConfirmation.setAuditState(1); + //1未认款/2部分认款/3已认款 + finCollectionConfirmation.setPaymentState(1); + //添加单据编号 + String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid()); + finCollectionConfirmation.setBillNo(billNo); + baseMapper.insert(finCollectionConfirmation); + return rb.success().setMsg("添加成功"); + } + public ResultBean saveAllDto(FinCollectionConfirmationDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -641,6 +761,74 @@ public class FinCollectionConfirmationService extends MybatisBaseService asFetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + AsFinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new AsFinCollectionConfirmationDetailsVo(); + FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); + BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); + + List paymentVoucherAppendixs = new ArrayList<>(); + List remittanceConfirmationAppendixs = new ArrayList<>(); + CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery(); + commonAppendixSelectQuery.setLinkSid(sid); + //打款凭证附件 + commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + ResultBean> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); + if (listResultBean.getSuccess()) { + for (CommonAppendixVo commonApp : listResultBean.getData()) { + FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo(); + //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath()); + BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo); + paymentVoucherAppendixs.add(paymentVoucherAppendixVo); + } + } + finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs); + commonAppendixSelectQuery = new CommonAppendixSelectQuery(); + commonAppendixSelectQuery.setLinkSid(sid); + //汇款确认书附件 + commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); + listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); + if (listResultBean.getSuccess()) { + for (CommonAppendixVo commonApp : listResultBean.getData()) { + FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo(); + //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath()); + BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo); + remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo); + } + } + finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); + List list = new ArrayList<>(); + if (!finSelectedReceivablesDetailedVos.isEmpty()) { + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + AsFinSelectedReceivablesDetailedVo vo = new AsFinSelectedReceivablesDetailedVo(); + BeanUtil.copyProperties(finSelectedReceivablesDetailedVo, vo); + if (StringUtils.isNotBlank(finSelectedReceivablesDetailedVo.getContractSid())) { + String asBillSid = finSelectedReceivablesDetailedVo.getContractSid(); // 售后维修单sid + FinBusrepairBillVo busrepairBillVo = asBusrepairBillFeign.fetchVehMarkAndTypeBySid(asBillSid); + if (null != busrepairBillVo) { + if (StringUtils.isNotBlank(busrepairBillVo.getBillType())) { + vo.setBillType(busrepairBillVo.getBillType()); + } + if (StringUtils.isNotBlank(busrepairBillVo.getVehMark())) { + vo.setVehMark(busrepairBillVo.getVehMark()); + } + } + } + list.add(vo); + } + } + finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(list); + if (finCollectionConfirmation.getAuditState() == 2) { + String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已驳回，原因是：" + finCollectionConfirmation.getReason(); + finCollectionConfirmationDetailsVo.setReason(confirmationDetails); + } else if (finCollectionConfirmation.getAuditState() == 3) { + String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已确认"; + finCollectionConfirmationDetailsVo.setReason(confirmationDetails); + } + return rb.success().setData(finCollectionConfirmationDetailsVo); + } + public ResultBean fetchByAllSid(String sid) { ResultBean rb = ResultBean.fireFail(); FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo(); @@ -3977,7 +4165,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSettleVo = loanSettleApplyFeign.getFinSettleVo(planDetails.getBusVinSid(), v.getReceivablesName(),v.getSubscriptionMoney()); + ResultBean finSettleVo = loanSettleApplyFeign.getFinSettleVo(planDetails.getBusVinSid(), v.getReceivablesName(), v.getSubscriptionMoney()); if (finSettleVo.getSuccess()) { SettleFinVo finVo = finSettleVo.getData(); voucherDetail.setPayCostTitleValue(v.getReceivablesName()); @@ -5571,4 +5759,83 @@ public class FinCollectionConfirmationService extends MybatisBaseService sids = baseMapper.selectSids(busVehSid); return rb.success().setData(sids); } + + + public PagerVo asListPagess(PagerQuery pq) { + AsFinCollectionConfirmationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + String collectionStartDate = query.getCollectionStartDate(); + String collectionEndDate = query.getCollectionEndDate(); + qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); + String createStartDate = query.getCreateStartDate(); + String createEndDate = query.getCreateEndDate(); + qw.apply(StringUtils.isNotEmpty(createStartDate), "date_format (createDate,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndDate), "date_format (createDate,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getCollectionBank())) { + qw.eq("collectionBankKey", query.getCollectionBank()); + } + if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { + qw.eq("collectionTypeKey", query.getCollectionTypeKey()); + } + if (StringUtils.isNotBlank(query.getSubscriptionState())) { + qw.eq("paymentState", query.getSubscriptionState()); + } + if (StringUtils.isNotBlank(query.getPayerName())) { + qw.like("payerName", query.getPayerName()); + } + if (StringUtils.isNotBlank(query.getCreateDept())) { + qw.like("createDept", query.getCreateDept()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getCollectionMoney())) { + qw.eq("collectionMoney", query.getCollectionMoney()); + } + qw.eq("source","03"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.asListPagess(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 29ec2a6dd9..c129460c21 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -31,6 +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.fin.api.finuncollectedreceivablesdetailed.*; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -142,4 +143,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper exportCustomerBillExcel( @Param(Constants.WRAPPER) QueryWrapper qw); List selexportCustomerBillExcelDetails(@Param("contractNo") String contractNo); + + List asListAll(@Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 5086716da8..97928b7920 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -1051,4 +1051,41 @@ WHERE m.collectionMoney != 0 + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 1074433290..02d8761c8d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -27,6 +27,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -73,6 +75,13 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece return rb.success().setData(list); } + @Override + public ResultBean> asListAll(AsFinUncollectedReceivablesDetailedQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = finUncollectedReceivablesDetailedService.asListAll(query); + return rb.success().setData(list); + } + @Override @ApiOperation("新增或修改保存") @PostMapping("/saveOrUpdate") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 8c22a44d80..d72bfef44e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -42,6 +42,8 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardA import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo; import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; @@ -252,6 +254,51 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService return list; } + + /** + * 售后应收未收列表 + * @param query + * @return + */ + public List asListAll(AsFinUncollectedReceivablesDetailedQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDeptSid())) { + qw.eq("furd.staffDeptSid", query.getDeptSid()); + } +// qw.eq("furd.createBySid", query.getCreateBySid()); + String[] sids = query.getSids(); + if (sids != null) { + for (String sid : sids) { + if (StringUtils.isNotBlank(sid)) { + qw.ne("furd.sid", sid); + } + } + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("furd.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getVehMark())) { + qw.like("furd.vehMark", query.getVehMark()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("furd.customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("furd.VIN", query.getVinNo()); + } + if (StringUtils.isNotBlank(query.getCustomerPhone())) { + qw.like("furd.customerPhone", query.getCustomerPhone()); + } + qw.apply("furd.currentReceivableMoney > 0"); + qw.apply("(furd.receivablesName = '材料费' OR furd.receivablesName = '工时费' OR furd.receivablesName = '其他费用')"); + qw.orderBy(true, true, "furd.contractNo") + .orderBy(true, true, "furd.VIN") + .orderBy(true, true, "furd.receivablesName") + ; + List list = baseMapper.asListAll(qw); + return list; + } + public ResultBean saveOrUpdateDto(FinUncollectedReceivablesDetailedDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -1383,4 +1430,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } return list; } + + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/AsBusrepairBillFeign.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/AsBusrepairBillFeign.java new file mode 100644 index 0000000000..2abb21cbed --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/AsBusrepairBillFeign.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.fin.fegin.as.asbusrepairbill; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@FeignClient( + contextId = "yxt-as-AsBusrepairBill", + name = "yxt-as", + path = "v1/AsBusrepairBill") +public interface AsBusrepairBillFeign { + + @ApiOperation("获取维修单车牌号和单据类型") + @GetMapping("/fetchVehMarkAndTypeBySid") + public FinBusrepairBillVo fetchVehMarkAndTypeBySid(@RequestParam("sid") String sid); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/FinBusrepairBillVo.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/FinBusrepairBillVo.java new file mode 100644 index 0000000000..a8fbcf0a13 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/FinBusrepairBillVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.fin.fegin.as.asbusrepairbill; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/18 17:33 + */ +@Data +public class FinBusrepairBillVo { + + private String billType; + private String vehMark; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/FinBusrepairBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/FinBusrepairBillVo.java new file mode 100644 index 0000000000..ea77c2dc36 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/FinBusrepairBillVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/18 17:33 + */ +@Data +public class FinBusrepairBillVo { + + private String billType; + private String vehMark; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index fc1e2b26cd..378c177edd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -131,6 +131,14 @@ public class AsBusrepairBillRest { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { return asBusrepairBillService.fetchDetailsBySid(sid); } + + @ApiOperation("获取维修单车牌号和单据类型") + @GetMapping("/fetchVehMarkAndTypeBySid") + public FinBusrepairBillVo fetchVehMarkAndTypeBySid(@RequestParam("sid") String sid) { + return asBusrepairBillService.fetchVehMarkAndTypeBySid(sid); + } + + @ApiOperation("获取维修单开票信息") @GetMapping("/fetchInvoiceBySid") public AsBusrepairBillInvoice fetchInvoiceBySid(@RequestParam("sid") String sid) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 289abf398d..5171a172d3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -1554,6 +1554,7 @@ public class AsBusrepairBillService extends MybatisBaseService 0) { + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); + finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); + finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); + finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); + finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); + finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); + finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo()); + AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); + if (null != billVech) { + if (StringUtils.isNotBlank(billVech.getVinNo())) { + finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); + finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); + } + } + finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid()); + finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName()); + finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); + finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); + finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); + finUncollectedReceivablesDetailedDto.setReceivablesName("其他费用"); + finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(otherAmountAll.toString()); + finUncollectedReceivablesDetailedDto.setReveivableMoney(otherAmountAll.toString()); + finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); + finUncollectedReceivablesDetailedDto.setKxState("01"); + finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); + } } asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date())); asBusrepairBill.setNodeCode(6); @@ -3004,4 +3054,19 @@ public class AsBusrepairBillService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public FinBusrepairBillVo fetchVehMarkAndTypeBySid(String sid) { + FinBusrepairBillVo vo = new FinBusrepairBillVo(); + AsBusrepairBill asBusrepairBill = fetchBySid(sid); + if (null != asBusrepairBill) { + vo.setBillType(asBusrepairBill.getBillType()); + } + AsBusrepairBillVech vech = asBusrepairBillVechService.fetchByBillSid(sid); + if (null != vech) { + if (StringUtils.isNotBlank(vech.getVehMark())) { + vo.setVehMark(vech.getVehMark()); + } + } + return vo; + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java index f96bab985a..018e3524aa 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java @@ -45,4 +45,4 @@ public class AsBusrepairBillInvoiceService extends MybatisBaseService