From 1eda7d25372248ae7f32997a5d33f04acdcd5b48 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 18 Dec 2024 18:03:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyDetailsVo.java | 2 + .../finpaymentrecord/FinPaymentrecord.java | 2 + .../finpaymentrecord/FinPaymentrecordDto.java | 6 + .../FinPaymentrecordUpdateDto.java | 3 +- .../finpaymentrecord/FinPaymentrecordVo.java | 4 +- .../finpaymentapply/FinPaymentapplyMapper.xml | 3 +- .../FinPaymentapplyService.java | 47 +++++- .../FinPaymentrecordMapper.xml | 6 +- .../FinPaymentrecordService.java | 111 ++++++++++++- .../main/resources/ftl/prePaymentApply.ftl | 154 +++++++++++++++++- .../api/sysparameter/SysParameterFeign.java | 5 + .../SysParameterFeignFallback.java | 5 + .../biz/sysparameter/SysParameterMapper.java | 2 + .../biz/sysparameter/SysParameterMapper.xml | 9 + .../biz/sysparameter/SysParameterRest.java | 5 + .../biz/sysparameter/SysParameterService.java | 12 ++ 16 files changed, 362 insertions(+), 14 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 25796b36c1..3d9cbe5cd4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java @@ -107,4 +107,6 @@ public class FinPaymentapplyDetailsVo implements Vo { @ApiModelProperty("分公司sid") private String useOrgSid; + @ApiModelProperty("分公司sid") + private String orgSidPath; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java index 2d3da09e25..176a3f8a16 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java @@ -117,4 +117,6 @@ public class FinPaymentrecord extends BaseEntity { private String busRemarks; @ApiModelProperty(value = "付款手续费") private BigDecimal paymentCharges; + @ApiModelProperty("是否推送回款返利，0不推送，1推送") + private Integer isPushHkfl; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java index 32099d04f4..7d2e320acf 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java @@ -82,6 +82,10 @@ public class FinPaymentrecordDto implements Dto { private String busSid; @ApiModelProperty(value = "付款备注") private String payRemark; + @ApiModelProperty("付款方式Key，支票/转账") + private String payWayKey; + @ApiModelProperty("付款方式Value") + private String payWayValue; @ApiModelProperty("供应商编码") private String payCode; @@ -99,4 +103,6 @@ public class FinPaymentrecordDto implements Dto { @ApiModelProperty("付款时备注内容") private String busRemarks; + @ApiModelProperty("是否推送回款返利，0不推送，1推送") + private Integer isPushHkfl; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java index c3336df6e0..cc2c32f4b5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java @@ -54,5 +54,6 @@ public class FinPaymentrecordUpdateDto implements Dto { private String accountsReceive; @ApiModelProperty(value = "付款手续费") private String paymentCharges; - + @ApiModelProperty("是否推送回款返利，0不推送，1推送") + private Integer isPushHkfl; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java index 9f5386cfab..4a07cc2495 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java @@ -51,6 +51,7 @@ import java.util.List; public class FinPaymentrecordVo implements Vo { private static final long serialVersionUID = 6164912180325777872L; + private String id; private String sid; @ApiModelProperty("付款银行") private String payBank; @@ -90,5 +91,6 @@ public class FinPaymentrecordVo implements Vo { private String payCode; @ApiModelProperty("付款时备注") private String busRemarks; - + @ApiModelProperty("付款方式Value") + private String payWayValue; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index 3ecc29f0bf..cea535c140 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -103,7 +103,8 @@ fp.carBrandName, fp.isSales, fp.isSettle, - fp.useOrgSid + fp.useOrgSid, + fp.orgSidPath from fin_paymentapply fp where fp.sid = #{sid} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 13f5005747..111cbefba5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -67,6 +67,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; @@ -126,6 +127,8 @@ public class FinPaymentapplyService extends MybatisBaseService detailVoList = vo.getDetailsList(); detailVoList.removeAll(Collections.singleton(null)); if (!detailVoList.isEmpty()) { for (FinPaymentapplyDetailVo finPaymentapplyDetailVo : detailVoList) { + //款项名称 + finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailVo.getCostTitleKey()); + finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailVo.getCostTitleValue()); + //款项详情 + finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailVo.getCostTitleKey()); + finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailVo.getCostTitleValue()); + //付款方式 + finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailVo.getPaymentTypeKey()); + finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailVo.getPaymentType()); + //是否推送回款返利 + //Integer isPushHkfl = sysParameterFeign.fetchCountByParNoAndParValueAndUseOrgSid("YW_BTHKFL", finPaymentapplyDetailVo.getCostTitleKey() + finPaymentapplyDetailVo.getCostTitleValue() + "," + finPaymentapplyDetailVo.getPaymentTypeKey() + finPaymentapplyDetailVo.getPaymentType() + "," + finPaymentapplyDetailVo.getActualPay(), finPaymentapply.getUseOrgSid()).getData(); + /*if (isPushHkfl > 0) { + finPaymentrecordDto.setIsPushHkfl(0); + } else { + finPaymentrecordDto.setIsPushHkfl(1); + }*/ + finPaymentrecordDto.setIsPushHkfl(1); finPaymentrecordDto.setBusSid(finPaymentapplyDetailVo.getSid()); //收款银行账号 finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailVo.getReceivingAccount()); @@ -573,6 +590,30 @@ public class FinPaymentapplyService extends MybatisBaseService finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid()); + for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) { + //款项名称 + finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey()); + finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue()); + //款项详情 + finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey()); + finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue()); + //付款方式 + finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailsBelowDetailsVo.getPaymentTypeKey()); + finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailsBelowDetailsVo.getPaymentType()); + //是否推送回款返利 + finPaymentrecordDto.setIsPushHkfl(0); + finPaymentrecordDto.setBusSid(finPaymentapplyDetailsBelowDetailsVo.getSid()); + //收款银行账号 + finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailsBelowDetailsVo.getReceivingAccount()); + finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailsBelowDetailsVo.getBank()); + //金额 + if (finPaymentapplyDetailsBelowDetailsVo.getPayAccount() != null) { + finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowDetailsVo.getPayAccount().toString()); + finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailsBelowDetailsVo.getPayAccount().toString()); + } + finPaymentrecordService.saveDto(finPaymentrecordDto); + } } } } else { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml index feb907a3ca..19f4a1e961 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml @@ -4,7 +4,8 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java index 70800809ff..725a54cfd4 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java @@ -55,6 +55,11 @@ public class SysParameterRest implements SysParameterFeign { return parameterService.fetchOneByParNo(parNo); } + @Override + public ResultBean fetchCountByParNoAndParValueAndUseOrgSid(String parNo, String parameterValue, String useOrgSid) { + return parameterService.fetchCountByParNoAndParValueAndUseOrgSid(parNo,parameterValue,useOrgSid); + } + @Override public ResultBean> finListPage(PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java index a82cf2d9af..c654236f96 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java @@ -307,4 +307,16 @@ public class SysParameterService extends MybatisBaseService fetchCountByParNoAndParValueAndUseOrgSid(String parNo, String parameterValue, String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + String[] parValues = parameterValue.split(","); + for (String parValue : parValues) { + Integer count = baseMapper.fetchCountByParNoAndParValueAndUseOrgSid(parNo, parValue, useOrgSid); + if (count > 0){ + return rb.success().setData(count); + } + } + return rb.success().setData(0); + } }