From 221e51866a2a6c1c60ce8bc8a038d2308694063c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sun, 19 Mar 2023 09:41:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 5 ----- 1 file changed, 5 deletions(-) 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 3825268aaa..ec5d782724 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 @@ -1290,11 +1290,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Mon, 20 Mar 2023 09:02:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 2 +- .../FinUncollectedReceivablesDetailedService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ec5d782724..327235f4ab 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 @@ -1158,7 +1158,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { qw.notIn("sid", params.getSidList()); } - qw.ne("currentReceivableMoney", 0);//应收金额 + qw.gt("currentReceivableMoney", 0);//应收金额 ResultBean> baseVehicleTempstateFeignList = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); List baseVehicleTempstates = baseVehicleTempstateFeignList.getData(); if (baseVehicleTempstates.size() > 0) { 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 fb3ab0d5da..2950ca2ed3 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 @@ -139,7 +139,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService qw.eq("subscriptionState", query.getSubscriptionState()); } //当前应收金额 - qw.ne("currentReceivableMoney", new BigDecimal("0")); + qw.gt("currentReceivableMoney", new BigDecimal("0")); String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). From 7adc2da54e9cf64cd14f86fdafdc195531686a88 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 20 Mar 2023 11:38:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppFinSelectedReceivablesPaymentDetailsVo.java | 4 ++++ .../AppFinSelectedReceivablesDetailedDto.java | 4 ++++ .../AppFinUncollectedReceivablesDetailedVo.java | 4 ++++ .../FinCollectionConfirmationService.java | 6 +++++- .../FinSelectedReceivablesDetailedMapper.xml | 8 ++++++-- .../collectionConfirm/SelectedReceivablesDetailedDto.java | 5 ++++- .../UncollectedReceivablesDetailedVo.java | 4 ++++ 7 files changed, 31 insertions(+), 4 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java index 41a2b0c98f..f5cb1fcd0b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java @@ -44,5 +44,9 @@ public class AppFinSelectedReceivablesPaymentDetailsVo implements Vo { private String payType; @ApiModelProperty("付款方式key:1全款、2贷款") private String payTypeKey; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("分公司sid") + private String useOrgSid; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java index 9b04cc5901..38df19ed89 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java @@ -77,4 +77,8 @@ public class AppFinSelectedReceivablesDetailedDto implements Dto { private String payType; @ApiModelProperty("付款方式key:1全款、2贷款") private String payTypeKey; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java index cd35e70175..959456796a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java @@ -45,5 +45,9 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo { private String payType; @ApiModelProperty("付款方式key:1全款、2贷款") private String payTypeKey; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("分公司sid") + private String useOrgSid; } 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 327235f4ab..156d317ad3 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 @@ -1027,6 +1027,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService ${ew.sqlSegment} @@ -118,7 +120,9 @@ subscriptionDate as confirmDate, auditState as `state`, payType, - payTypeKey + payTypeKey, + customerSid, + useOrgSid FROM fin_selected_receivables_detailed WHERE collSid = #{collectionBillSid} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/SelectedReceivablesDetailedDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/SelectedReceivablesDetailedDto.java index 3bb469f4e5..42ea74042e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/SelectedReceivablesDetailedDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/SelectedReceivablesDetailedDto.java @@ -1,6 +1,5 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; -import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,4 +36,8 @@ public class SelectedReceivablesDetailedDto implements Dto { private String payType; @ApiModelProperty("付款方式key:1全款、2贷款") private String payTypeKey; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("分公司sid") + private String useOrgSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java index 5281eedde3..85d17b3ed6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java @@ -45,5 +45,9 @@ public class UncollectedReceivablesDetailedVo implements Vo { private String payType; @ApiModelProperty("付款方式key:1全款、2贷款") private String payTypeKey; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("分公司sid") + private String useOrgSid; } From 90a1c0308d5f39100b640acd319ca21161ce35f8 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 20 Mar 2023 14:23:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 3 +++ 1 file changed, 3 insertions(+) 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 156d317ad3..2754c9952d 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 @@ -358,6 +358,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + return rb.setMsg("认款金额不允许大于当前应收金额"); + } } } From 2f8a76fae8de06ed2e4e65e9ddd35a068ad5666d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 20 Mar 2023 17:51:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 2754c9952d..daf0f8c79a 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 @@ -241,7 +241,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService