From effbc25c4bd33dbdf0dca8cb43638a78e9c4b907 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 3 Jul 2023 13:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=90=88=E5=90=8C=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/order/AppBusSalesOrderVo.java | 7 +++ .../bussalesorder/BusSalesOrderService.java | 49 +++++++++++++------ ...UncollectedReceivablesDetailedService.java | 5 -- .../saleOrders/order/BusOrderSalesVo.java | 4 ++ 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index f38f199301..f0a42e8f3f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -197,4 +197,11 @@ public class AppBusSalesOrderVo implements Vo { private String distributorNameTwo; @ApiModelProperty("单车中介服务费2") private String distributorPriceTwo; + + @ApiModelProperty("App合同下载路径") + private String contractPath; + @ApiModelProperty("PC合同下载路径") + private String contractFilePath; + @ApiModelProperty("是否显示生成合同按钮") + private boolean showContractBtn2; } 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 1f3d488a3c..9cc9d615dc 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 @@ -164,6 +164,7 @@ import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherp import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; +import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.Base64; @@ -311,6 +312,8 @@ public class BusSalesOrderService extends MybatisBaseService vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); List orderVinList = busSalesOrderVehicleService.selectList(sid); - if(!vinList.isEmpty()){ + if (!vinList.isEmpty()) { for (int i = 0; i < vinLists.size(); i++) { VinListsVo vinListsVo = vinLists.get(i); BigDecimal initBigDecimalTwo = BigDecimal.ZERO; @@ -405,8 +408,8 @@ public class BusSalesOrderService extends MybatisBaseService stringList = listResultBean.getData(); initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add)); } - if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){ - vinList.set(i,vinList.get(i)+"促销("+initBigDecimalTwo.toString()+"元)"); + if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) { + vinList.set(i, vinList.get(i) + "促销(" + initBigDecimalTwo.toString() + "元)"); } } } @@ -1310,7 +1313,7 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid()); if (listResultBean.getSuccess()) { List stringList = listResultBean.getData(); - if(stringList.isEmpty()){ + if (stringList.isEmpty()) { appNowCarVo.setPromotion(false); - }else{ + } else { appNowCarVo.setPromotion(true); } } @@ -2599,9 +2602,9 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid()); if (listResultBean.getSuccess()) { List stringList = listResultBean.getData(); - if(stringList.isEmpty()){ + if (stringList.isEmpty()) { appNowCarVo.setPromotion(false); - }else{ + } else { appNowCarVo.setPromotion(true); } } @@ -3382,7 +3385,7 @@ public class BusSalesOrderService extends MybatisBaseService vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); List orderVinList = busSalesOrderVehicleService.selectList(sid); - if(!vinList.isEmpty()){ + if (!vinList.isEmpty()) { for (int i = 0; i < vinLists.size(); i++) { VinListsVo vinListsVo = vinLists.get(i); BigDecimal initBigDecimalTwo = BigDecimal.ZERO; @@ -3392,8 +3395,8 @@ public class BusSalesOrderService extends MybatisBaseService stringList = listResultBean.getData(); initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add)); } - if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){ - vinList.set(i,vinList.get(i)+"，促销("+initBigDecimalTwo.toString()+"元)"); + if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) { + vinList.set(i, vinList.get(i) + "，促销(" + initBigDecimalTwo.toString() + "元)"); } } } @@ -4030,9 +4033,9 @@ public class BusSalesOrderService extends MybatisBaseService pagging = baseMapper.getSaleOrdersByOrgPath(page, qw, pq.getParams().getName(), typeState, pagerQuery.getVinNo(), pagerQuery.getOrderingNo()); for (AppBusSalesOrderVo record : pagging.getRecords()) { record.setShowStopBtn(false); record.setShowContractBtn(false); + record.setShowContractBtn2(false); + //判断该合同是否有下载附件 + if (StringUtils.isNotBlank(record.getContractId())) { + String contractId = record.getContractId(); + CommonContract contract = commonContractFeign.selectByNo(contractId).getData(); + if (null != contract) { + if (StringUtils.isNotBlank(contract.getContractUrlAll())) { + record.setShowContractBtn2(true); + record.setContractPath(urlPrefix + contract.getContractUrlAll()); + record.setContractFilePath(temp + contract.getContractUrlAll()); + } + } + } + if (StringUtils.isNotBlank(record.getCustomerImage())) { record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); } @@ -6186,7 +6205,7 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(sid); if (!busSalesOrderVehicles.isEmpty()) { for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { - if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())){ + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { vinNo = vinNo + busSalesOrderVehicle.getLinkNo() + ","; } } @@ -6793,7 +6812,7 @@ public class BusSalesOrderService extends MybatisBaseService detailedListPageVo(PagerQuery pq) { - // Map dict = new HashMap<>(); //==============================分页开始==================================== FinUncollectedReceivablesDetailedQuery params = pq.getParams(); //车架号查询 @@ -514,11 +513,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } } } - // dict.put(record.getContractNo() + record.getVinNo(), dict.getOrDefault(record.getContractNo() + record.getVinNo(), true) ? record.getDownload() : false); } -// for (FinUncollectedReceivablesDetailedVo record : records) { -// record.setDownload(dict.get(record.getContractNo() + record.getVinNo())); -// } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java index ec5af23ab3..8eda443202 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java @@ -116,4 +116,8 @@ public class BusOrderSalesVo implements Vo { private String saler; @ApiModelProperty("车架号的展示") private String vinNo; + @ApiModelProperty("App合同下载路径") + private String contractPath; + @ApiModelProperty("是否显示生成合同按钮") + private boolean showContractBtn2; }