From 09ffa0ed8ea5a5343c85da4209994ef1a6ae14d6 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 4 Jan 2023 22:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 9 +- .../main/resources/ftl/existingvehicles.ftl | 2 +- .../resources/ftl/existingvehicles_black.ftl | 2 +- .../app/order/AppOrderDetailsVo.java | 6 ++ .../bussalesorder/BusSalesOrderService.java | 50 ++++++++++ .../BusSalesOrderMakeupMapper.java | 2 + .../BusSalesOrderMakeupMapper.xml | 4 + .../BusSalesOrderMakeupService.java | 4 + .../FinCollectionConfirmationService.java | 97 +++++++++++-------- 9 files changed, 129 insertions(+), 47 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index d41bdc2a4f..10dd061b31 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -81,6 +81,7 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; +import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -1677,7 +1678,7 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - /* Future future1 = pool.submit(() -> { + /*Future future1 = pool.submit(() -> { return genCarSaleContract(dto, map, appOrderDetailsVo); }); Future future1_2 = pool.submit(() -> { @@ -1777,7 +1778,7 @@ public class CommonContractService extends MybatisBaseService future2 = pool.submit(() -> { + /*Future future2 = pool.submit(() -> { return genCarSaleContractBlank(dto, map, appOrderDetailsVo); }); Future future2_2 = pool.submit(() -> { diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index ca6a5ec966..cf28a9322a 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -1561,7 +1561,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index 3f623227ab..e67851dc7e 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -1561,7 +1561,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index 9ce27cf03f..a255a74a35 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -102,7 +102,13 @@ public class AppOrderDetailsVo implements Vo { //中介人2 private SubmitVo intermediary2; + @ApiModelProperty("是否包含保险：0不包含，1包括") private String isInsurance; + @ApiModelProperty("合同中的保险说明") + private String insuranceInfoMessage; + + @ApiModelProperty("合同中的上装信息") + private String topMessage; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 31d135206f..9bc40982d2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -80,6 +80,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDt import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; @@ -2751,6 +2752,8 @@ public class BusSalesOrderService extends MybatisBaseService discountList = busSalesOrderDiscountService.selectDiscount(sid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java index 31cce71ea1..59d6f87554 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java @@ -81,4 +81,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index d44affc286..d6cb820872 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -248,4 +248,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); - if (paymentVoucherAppendixs.size() == 0) { + /*if (paymentVoucherAppendixs.size() == 0) { return rb.setMsg("请上传打款凭证附件"); - } + }*/ List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); - if (remittanceConfirmationAppendixs.size() == 0) { + /*if (remittanceConfirmationAppendixs.size() == 0) { return rb.setMsg("请上传汇款确认书附件"); - } + }*/ if (finSelectedReceivablesDetailedDtos.size() > 0) { for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) { if (StringUtils.isBlank(v.getSubscriptionMoney())) { @@ -1302,42 +1302,51 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); + String uncollSid = ""; //查询该客户的车架号不为空的情况 List vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone()); - for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + vinListVo.removeAll(Collections.singleton(null)); + if(!vinListVo.isEmpty()){ + for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8)); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + uncollSid = vvvv.getReceivablesSid(); + } + } + //查询该客户的车架号为空的情况 + FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone()); + if(vvVo != null){ + uncollSid = vvVo.getReceivablesSid(); freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); freceivebillentry.setFSETTLETYPEIDType("customerPayType"); //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); //登记日期 freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8)); //收款用途 freceivebillentry.setFPURPOSEIDKey("001"); freceivebillentry.setFPURPOSEIDType("cw_skyt"); freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); fEntityList.add(freceivebillentry); } - //查询该客户的车架号为空的情况 - FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone()); - freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); - //结算方式 - freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); - freceivebillentry.setFSETTLETYPEIDType("customerPayType"); - //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); - //登记日期 - freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - //收款用途 - freceivebillentry.setFPURPOSEIDKey("001"); - freceivebillentry.setFPURPOSEIDType("cw_skyt"); - freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); - fEntityList.add(freceivebillentry); + //项目类别key、value arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); - FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(vvVo.getReceivablesSid()); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(uncollSid); if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { arReceivebill.setF_PAEZ_AssistantKey("001"); } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { @@ -1441,37 +1450,43 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); //查询该客户的车架号不为空的情况 List vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone()); - for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + vinListVo.removeAll(Collections.singleton(null)); + if(!vinListVo.isEmpty()){ + for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8)); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + } + } + + //查询该客户的车架号为空的情况 + FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone()); + if(vvVo != null){ freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); freceivebillentry.setFSETTLETYPEIDType("customerPayType"); //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); //登记日期 freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8)); //收款用途 freceivebillentry.setFPURPOSEIDKey("002"); freceivebillentry.setFPURPOSEIDType("cw_skyt"); freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); fEntityList.add(freceivebillentry); } - //查询该客户的车架号为空的情况 - FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone()); - freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); - //结算方式 - freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); - freceivebillentry.setFSETTLETYPEIDType("customerPayType"); - //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); - //登记日期 - freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - //收款用途 - freceivebillentry.setFPURPOSEIDKey("002"); - freceivebillentry.setFPURPOSEIDType("cw_skyt"); - freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); - fEntityList.add(freceivebillentry); //项目类别key、value arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); arReceivebill.setF_PAEZ_AssistantKey("006");