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 a1d722836d..41a2b0c98f 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 @@ -40,4 +40,9 @@ public class AppFinSelectedReceivablesPaymentDetailsVo implements Vo { @ApiModelProperty("sid") private String sid; + @ApiModelProperty("付款方式value") + private String payType; + @ApiModelProperty("付款方式key:1全款、2贷款") + private String payTypeKey; + } 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 c090a6ac54..dbe6337396 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 @@ -70,4 +70,9 @@ public class AppFinSelectedReceivablesDetailedDto implements Dto { private String confirmDate; @ApiModelProperty("应收未收sid") private String receivablesSid; + + @ApiModelProperty("付款方式value") + private String payType; + @ApiModelProperty("付款方式key:1全款、2贷款") + private String payTypeKey; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java index 5757276ec4..72f9b030c4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java @@ -111,4 +111,9 @@ public class FinSelectedReceivablesDetailedVo implements Vo { private String receivablesSid; private String sumAll; + + @ApiModelProperty("全款贷款key:1是全款,2贷款") + private String payTypeKey; + @ApiModelProperty("全款贷款") + private String payType; } 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 2868989981..cd35e70175 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 @@ -41,4 +41,9 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo { private String busVinSid; + @ApiModelProperty("付款方式value") + private String payType; + @ApiModelProperty("付款方式key:1全款、2贷款") + private String payTypeKey; + } 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 4d173d988a..28d84f9d77 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 @@ -577,21 +577,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService paymentVoucherAppendixs = new ArrayList<>(); List remittanceConfirmationAppendixs = new ArrayList<>(); - /* String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl(); - String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();*/ - /* String[] split1 = remittanceConfirmationUrl.split(","); - String[] split = paymentVoucherUrl.split(","); - BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); - for (String s : split) { - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - String filePath = data.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - filePath = urlPrefix + filePath; - BeanUtil.copyProperties(data, paymentVoucherAppendixVo); - paymentVoucherAppendixVo.setFilePath(filePath); - paymentVoucherAppendixs.add(paymentVoucherAppendixVo); - }*/ CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery(); commonAppendixSelectQuery.setLinkSid(sid); //打款凭证附件 @@ -600,23 +585,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - String filePath = data.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - filePath = urlPrefix + filePath; - BeanUtil.copyProperties(data, remittanceConfirmationAppendixVo); - remittanceConfirmationAppendixVo.setFilePath(filePath); - remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo); - }*/ commonAppendixSelectQuery = new CommonAppendixSelectQuery(); commonAppendixSelectQuery.setLinkSid(sid); //汇款确认书附件 @@ -992,6 +966,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款","2"); finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null)); if(finSelectedReceivablesDetailedVos1_1.size()>0){ + for(int i = 0;i finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2"); finSelectedReceivablesDetailedVos2_1.removeAll(Collections.singleton(null)); if(finSelectedReceivablesDetailedVos2_1.size()>0){ + for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) { + + } } //简易订单-订金收取 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index cab249282d..aa5af91513 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -33,7 +33,9 @@ contractSid, currentReceivableMoney AS confirmMoney, VIN AS vin, - furd.busVinSid + furd.busVinSid, + furd.payType, + furd.payTypeKey FROM fin_uncollected_receivables_detailed furd ${ew.sqlSegment} @@ -84,7 +86,9 @@ subscriptionMoney as confirmMoney, VIN as vin, subscriptionDate as confirmDate, - auditState as `state` + auditState as `state`, + payType, + payTypeKey FROM fin_selected_receivables_detailed WHERE collSid = #{collectionBillSid} @@ -129,7 +133,8 @@ from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{state} - and receivablesName = #{type} and payTypeKey = #{payTypeKey} + and receivablesName = #{type} + and payTypeKey = #{payTypeKey} group by concat(customerName, customerPhone) @@ -138,12 +143,13 @@ select *, sum(subscriptionMoney) as sumAll from fin_selected_receivables_detailed where collSid = #{sid} - and auditState = #{state} - and receivablesName = #{type} and payTypeKey = #{payTypeKey} + and auditState = #{state} + and receivablesName = #{type} + and payTypeKey = #{payTypeKey} \ No newline at end of file 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 ab94172a6c..3bb469f4e5 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 @@ -32,4 +32,9 @@ public class SelectedReceivablesDetailedDto implements Dto { private String confirmDate; @ApiModelProperty("应收未收sid") private String receivablesSid; + + @ApiModelProperty("付款方式value") + private String payType; + @ApiModelProperty("付款方式key:1全款、2贷款") + private String payTypeKey; } 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 268a10721d..5281eedde3 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 @@ -41,4 +41,9 @@ public class UncollectedReceivablesDetailedVo implements Vo { @ApiModelProperty("sid") private String sid; + @ApiModelProperty("付款方式value") + private String payType; + @ApiModelProperty("付款方式key:1全款、2贷款") + private String payTypeKey; + }