From bb3508871f992ad9ec166b84f8c5d987ee17b809 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Aug 2022 10:05:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=AA=8C=E8=BD=A6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=82=E5=AE=B6=E5=85=A5=E5=BA=93=E6=97=A5?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/supplychain/yancheguanli/yancheguanliAdd.vue | 6 +++--- .../src/views/supplychain/yancheguanli/yancheguanliInfo.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue index 051301293d..12ab5038be 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue @@ -20,7 +20,7 @@ v-model="temp.vin" placeholder="请输入车架号" class="addinputw" - :readonly="temp.purchaseKey !== '001' && temp.purchaseKey !== '002'" + :readonly="temp.purchaseKey !== '001' && temp.purchaseKey !== '002' && temp.purchaseKey !== '004'" /> @@ -59,10 +59,10 @@ class="addinputw addinputw_copy"/> - + - {{temp.priceDate}} + {{temp.inboundDate}} From 074baa0a91ba011bed3b6ecc7d709e6d2e8bb132 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 18 Aug 2022 10:24:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractFeign.java | 5 +- .../CommonContractFeignFallback.java | 14 +- .../api/commoncontract/PrintConfirmDto.java | 4 +- .../BusVehicleApplyService.java | 7 +- .../commoncontract/CommonContractRest.java | 4 +- .../commoncontract/CommonContractService.java | 453 +++-- .../新车买卖合同（现车）.ftl | 1565 +++++++++++++++ ...车买卖合同（现车）（空）.ftl | 1565 +++++++++++++++ .../新车买卖合同（订车）.ftl | 1689 +++++++++++++++++ ...车买卖合同（订车）（空）.ftl | 1689 +++++++++++++++++ .../BusDepositFictitiousDetailsVo.java | 6 + .../BusDepositFictitiousFeign.java | 4 +- .../BusDepositFictitiousFeignFallback.java | 5 + .../app/order/AppOrderDetailsVo.java | 2 +- .../app/order/AppOrderModelInfoVo.java | 3 + .../app/order/AppOrderTopInfoVo.java | 3 + .../BusDepositFictitiousMapper.xml | 13 +- .../BusDepositFictitiousRest.java | 17 +- .../BusSalesOrderMakeupMapper.xml | 3 +- 19 files changed, 6861 insertions(+), 190 deletions(-) create mode 100644 anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）.ftl create mode 100644 anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）（空）.ftl create mode 100644 anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）.ftl create mode 100644 anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）（空）.ftl diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index bc46130c2d..f98d0f0396 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.io.IOException; import java.text.ParseException; +import java.util.List; import java.util.Map; /** @@ -130,9 +131,9 @@ public interface CommonContractFeign { @GetMapping("/printItemSet") public ResultBean printItemSet(@RequestParam("busSid") String busSid, @RequestParam("customerName") String customerName); - /* @ApiOperation(value = "打印项确认(生成word后转为pdf)") + @ApiOperation(value = "打印项确认(生成word后转为pdf)") @PostMapping("/printConfirm") - public ResultBean> printConfirm(@RequestBody PrintConfirmDto dto);*/ + public ResultBean> printConfirm(@RequestBody PrintConfirmDto dto); /******************************************************新车买卖合同审核（流程）******************************************************/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index 508f38fcbf..3eef59cd0f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -37,11 +37,11 @@ public class CommonContractFeignFallback implements CommonContractFeign { return null; } - /* @Override - public ResultBean save(CommonContractDto dto) { - return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/save无法访问"); - } -*/ + /* @Override + public ResultBean save(CommonContractDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/save无法访问"); + } + */ @Override public ResultBean update(CommonContractDto dto, String sid) { return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/update无法访问"); @@ -139,11 +139,11 @@ public class CommonContractFeignFallback implements CommonContractFeign { return rb.setMsg("接口anrui-base/commoncontract/printItemSet无法访问"); } - /* @Override + @Override public ResultBean printConfirm(PrintConfirmDto dto) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/commoncontract/printConfirm无法访问"); - }*/ + } @Override public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) { diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java index 6eb46a4add..d56febb587 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java @@ -33,11 +33,11 @@ public class PrintConfirmDto implements Dto { @ApiModelProperty("是否优惠：1是0否") private int isDiscount; - @ApiModelProperty("是否提前开票：1是0否") +/* @ApiModelProperty("是否提前开票：1是0否") private int isAdvanceInvoice; @ApiModelProperty("是否委托提车：1是0否") - private int isEntrustVehicle; + private int isEntrustVehicle;*/ @ApiModelProperty("是否在保险公司购买保险：1是0否") private int isPurchasingInsurance; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index eb31fb5773..0967278bc3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -25,6 +25,7 @@ import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService; import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; @@ -491,9 +492,9 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 02e544a0c6..43e098afcc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -401,10 +401,10 @@ public class CommonContractRest implements CommonContractFeign { return commonContractService.printItemSet(busSid, customerName); } - /* @Override + @Override public ResultBean> printConfirm(PrintConfirmDto dto) { return commonContractService.printConfirm(dto); - }*/ + } public List getSheetVal(Sheet sheet, int[] resultCell) throws ParseException { SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); 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 574768478a..e140dbed8d 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 @@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; @@ -11,14 +12,17 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; -import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; -import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -32,20 +36,23 @@ 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.DateUtils; +import com.yxt.common.base.utils.MoneyToChineseUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.File; -import java.math.BigDecimal; +import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.*; import java.util.stream.Collectors; /** @@ -113,6 +120,10 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -571,151 +582,142 @@ public class CommonContractService extends MybatisBaseService> printConfirm(PrintConfirmDto dto) { - Map map = new HashMap(); - // 合同信息 - CommonContract contract = fetchBySid(dto.getSid()); -// CommonContract contract = new CommonContract();//fetchBySid(dto.getSid()); - map.put("partyA", contract.getPartyA()); // 甲方 - map.put("partyB", contract.getPartyB()); // 乙方 - map.put("contractNo", contract.getContractNo()); // 合同编号 - map.put("createDate", contract.getCreateDate()); // 签订时间 - // 客户信息; - - BusOrderVo order = busOrderFeign.fetchSid(dto.getBusSid()).getData(); - map.put("customerName", order.getCustomerName()); // 联系电话 - map.put("mobile", order.getMobile()); // 联系电话 - map.put("IDNumber", order.getIDNumber()); // 身份证号 - // 车型、主车信息 - ResultBean model = busOrderModelFeign.getAppBusOrderModelInfoBySid(dto.getBusSid()); - map.put("modelName", model.getData().getModelName()); // 车型 - map.put("modelConfig", model.getData().getModelotherConfig()); // 配置（只有订车有） ？待确认 - map.put("mainVehicleNum", model.getData().getQuantity()); // 主车数量 - map.put("mainVehicleSinglePrice", model.getData().getSingle_price()); // 单台成交价 - ResultBean vinNo = busOrderVehicleFeign.getVehicleVINNoByOrderSid(dto.getBusSid()); - map.put("VINNo", vinNo.getData()); // 车架号 - // 上装信息 - AppBaseModelSzconfigDetailsVo szconfig = baseModelSzconfigService.getAppBaseModelSzconfigDetailsVo(model.getData().getSid()); - map.put("topName", szconfig.getTopName()); // 上装 - // 挂车信息 - AppBaseTrailerDetailsVo trailer = baseTrailerService.getAppBaseTrailerDetailsVo(model.getData().getSid()); - map.put("trailerName", trailer.getOtherConfig()); // 挂车 - map.put("trailerNum", model.getData().getQuantity()); // 挂车数量 ？待确认 - map.put("trailerSinglePrice", StringUtils.isBlank(trailer.getTrailerPrince()) ? "" : trailer.getTrailerPrince()); // 挂车单台成交价 ？待确认 - // 优惠说明信息 - ResultBean> discountList = busOrderDiscountFeign.getAppDiscountListVoByOrderSid(order.getOrderSid()); - map.put("discountDetail", ""); // 优惠说明 ？待确认 - if (discountList.getSuccess()) { - map.put("discountDetail", discountList.getData().get(0).getDetail()); // 优惠说明 ？待确认 - } - // 保险说明信息 - map.put("insuranceDetail", "首次在本店投保，第二、三年继续在本店续保。（不在公司投保的，不显示）"); // 保险说明 ？待确认 - // 车辆交付地点 - map.put("deliveryPlace", model.getData().getExpected_takecar_location()); - - List list = new ArrayList<>(); - try { - ExecutorService executor = Executors.newFixedThreadPool(5); - Future future1 = executor.submit(() -> { - return genCarSaleContract(dto, map, order); - }); - Future future2 = executor.submit(() -> { - return genVehicleRegistration(dto, map); - }); - Future future3 = executor.submit(() -> { - // 客户开票申请书（暂时先不考虑） - if (dto.getIsAdvanceInvoice() == 1) { - return genAdvanceInvoice(dto, map); - } else { - return ""; - } - }); - Future future4 = executor.submit(() -> { - // 委托提车授权书 - if (dto.getIsEntrustVehicle() == 1) { - return genEntrustVehicle(dto, map); - } else { - return ""; - } - }); - Future future5 = executor.submit(() -> { - return genCarSaleContractBlank(dto, map, order); - }); - - future1.get(); - future2.get(); - future3.get(); - future4.get(); - future5.get(); - PrintConfirmVo printConfirmVo = null; - if (StringUtils.isNotBlank(future1.get())) { - printConfirmVo = new PrintConfirmVo(); - // 待确认：现车或订车 - // 现车 -// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName())); - // 订车 - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName())); - printConfirmVo.setDownloadUrl(future1.get()); - list.add(printConfirmVo); - } - if (StringUtils.isNotBlank(future2.get())) { - printConfirmVo = new PrintConfirmVo(); - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.VEHICLEREGISTRATION.getName())); - printConfirmVo.setDownloadUrl(future2.get()); - list.add(printConfirmVo); - } - if (StringUtils.isNotBlank(future3.get())) { - printConfirmVo = new PrintConfirmVo(); - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CUSTOMERINVOICINGAPPLICATION.getName())); - printConfirmVo.setDownloadUrl(future3.get()); - list.add(printConfirmVo); - } - if (StringUtils.isNotBlank(future4.get())) { - printConfirmVo = new PrintConfirmVo(); - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.ENTRUSTPICKUPAUTHORIZATION.getName())); - printConfirmVo.setDownloadUrl(future4.get()); - list.add(printConfirmVo); - } - if (StringUtils.isNotBlank(future5.get())) { - printConfirmVo = new PrintConfirmVo(); - // 待确认：现车或订车 - // 现车 -// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName())); - // 订车 - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName())); - printConfirmVo.setDownloadUrl(future5.get()); - list.add(printConfirmVo); - } - } catch (Exception e) { - e.printStackTrace(); - return new ResultBean().fail().setMsg("生成文件失败"); - } - return new ResultBean().success().setData(list); - }*/ + /**public ResultBean> printConfirm(PrintConfirmDto dto) { + Map map = new HashMap(); + // 合同信息 + CommonContract contract = fetchBySid(dto.getSid()); + // CommonContract contract = new CommonContract();//fetchBySid(dto.getSid()); + map.put("partyA", contract.getPartyA()); // 甲方 + map.put("partyB", contract.getPartyB()); // 乙方 + map.put("contractNo", contract.getContractNo()); // 合同编号 + map.put("createDate", contract.getCreateDate()); // 签订时间 + // 客户信息; + + BusOrderVo order = busOrderFeign.fetchSid(dto.getBusSid()).getData(); + map.put("customerName", order.getCustomerName()); // 联系电话 + map.put("mobile", order.getMobile()); // 联系电话 + map.put("IDNumber", order.getIDNumber()); // 身份证号 + // 车型、主车信息 + ResultBean model = busOrderModelFeign.getAppBusOrderModelInfoBySid(dto.getBusSid()); + map.put("modelName", model.getData().getModelName()); // 车型 + map.put("modelConfig", model.getData().getModelotherConfig()); // 配置（只有订车有） ？待确认 + map.put("mainVehicleNum", model.getData().getQuantity()); // 主车数量 + map.put("mainVehicleSinglePrice", model.getData().getSingle_price()); // 单台成交价 + ResultBean vinNo = busOrderVehicleFeign.getVehicleVINNoByOrderSid(dto.getBusSid()); + map.put("VINNo", vinNo.getData()); // 车架号 + // 上装信息 + AppBaseModelSzconfigDetailsVo szconfig = baseModelSzconfigService.getAppBaseModelSzconfigDetailsVo(model.getData().getSid()); + map.put("topName", szconfig.getTopName()); // 上装 + // 挂车信息 + AppBaseTrailerDetailsVo trailer = baseTrailerService.getAppBaseTrailerDetailsVo(model.getData().getSid()); + map.put("trailerName", trailer.getOtherConfig()); // 挂车 + map.put("trailerNum", model.getData().getQuantity()); // 挂车数量 ？待确认 + map.put("trailerSinglePrice", StringUtils.isBlank(trailer.getTrailerPrince()) ? "" : trailer.getTrailerPrince()); // 挂车单台成交价 ？待确认 + // 优惠说明信息 + ResultBean> discountList = busOrderDiscountFeign.getAppDiscountListVoByOrderSid(order.getOrderSid()); + map.put("discountDetail", ""); // 优惠说明 ？待确认 + if (discountList.getSuccess()) { + map.put("discountDetail", discountList.getData().get(0).getDetail()); // 优惠说明 ？待确认 + } + // 保险说明信息 + map.put("insuranceDetail", "首次在本店投保，第二、三年继续在本店续保。（不在公司投保的，不显示）"); // 保险说明 ？待确认 + // 车辆交付地点 + map.put("deliveryPlace", model.getData().getExpected_takecar_location()); + + List list = new ArrayList<>(); + try { + ExecutorService executor = Executors.newFixedThreadPool(5); + Future future1 = executor.submit(() -> { + return genCarSaleContract(dto, map, order); + }); + Future future2 = executor.submit(() -> { + return genVehicleRegistration(dto, map); + }); + Future future3 = executor.submit(() -> { + // 客户开票申请书（暂时先不考虑） + if (dto.getIsAdvanceInvoice() == 1) { + return genAdvanceInvoice(dto, map); + } else { + return ""; + } + }); + Future future4 = executor.submit(() -> { + // 委托提车授权书 + if (dto.getIsEntrustVehicle() == 1) { + return genEntrustVehicle(dto, map); + } else { + return ""; + } + }); + Future future5 = executor.submit(() -> { + return genCarSaleContractBlank(dto, map, order); + }); + + future1.get(); + future2.get(); + future3.get(); + future4.get(); + future5.get(); + PrintConfirmVo printConfirmVo = null; + if (StringUtils.isNotBlank(future1.get())) { + printConfirmVo = new PrintConfirmVo(); + // 待确认：现车或订车 + // 现车 + // printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName())); + // 订车 + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName())); + printConfirmVo.setDownloadUrl(future1.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future2.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.VEHICLEREGISTRATION.getName())); + printConfirmVo.setDownloadUrl(future2.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future3.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CUSTOMERINVOICINGAPPLICATION.getName())); + printConfirmVo.setDownloadUrl(future3.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future4.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.ENTRUSTPICKUPAUTHORIZATION.getName())); + printConfirmVo.setDownloadUrl(future4.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future5.get())) { + printConfirmVo = new PrintConfirmVo(); + // 待确认：现车或订车 + // 现车 + // printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName())); + // 订车 + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName())); + printConfirmVo.setDownloadUrl(future5.get()); + list.add(printConfirmVo); + } + } catch (Exception e) { + e.printStackTrace(); + return new ResultBean().fail().setMsg("生成文件失败"); + } + return new ResultBean().success().setData(list); + }**/ /** * 生成 新车买卖合同(现车或订车) pdf * * @param dto */ - private String genCarSaleContract(PrintConfirmDto dto, Map map, BusOrderVo order) { + private String genCarSaleContract(PrintConfirmDto dto, Map map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; - // 车辆税信息 - map.put("taxSum", "1111"); // 车辆含税 ？待确认 - map.put("taxSumUpper", "壹仟壹佰壹拾壹"); // 车辆含税（大写） ？待确认 - // 乙方缴纳订金 - map.put("deposit", order.getDeposit()); // 订金 - map.put("useDeposit", "true"); // 判断是否展示括号中的内容 ？待确认：用本人交纳的虚拟订金的，需要显示订金后面括弧 中的说明 - map.put("date", order.getCreateDate()); // 订金缴纳日期 ？待确认 - map.put("deposit1", ""); // 总订金 ？待确认 - map.put("deposit2", ""); // 用于缴纳的订金 ？待确认 - - // 目标路径 ？ 待确认：如何区分现车和订车 - // 现车 -// String typeName = ContractTemplateEnum.CARSALECONTRACTNEW.getName(); - // 订车 - String typeName = ContractTemplateEnum.CARSALECONTRACTBOOK.getName(); - String docName = typeName + "（" + order.getCustomerName() + "）.doc"; + String typeName = ""; + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + typeName = ContractTemplateEnum.CARSALECONTRACTNEW.getName(); + } else { + typeName = ContractTemplateEnum.CARSALECONTRACTBOOK.getName(); + } + String docName = typeName + "（" + appOrderDetailsVo.getName() + "）.doc"; Map resultMap = docPdfComponent.createDocToPdf(map, typeName, docName); url = resultMap.get("prefixTemplateUrl"); return url; @@ -726,25 +728,28 @@ public class CommonContractService extends MybatisBaseService map, BusOrderVo order) { + private String genCarSaleContractBlank(PrintConfirmDto dto, Map map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; String typeName = ""; String docName = ""; + map.put("totalPrice", ""); + map.put("priceRemarks", ""); + map.put("depositTotal", ""); // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） - // 合同金额 ？ 待确定 - BigDecimal contractAmount = order.getContractAmount(); - if (contractAmount == null) { - // 待确定 ? 现车或订车 + if (dto.getIsDiscount() == 1) { // 现车 - typeName = ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName(); - // 订车 - typeName = ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName(); - docName = typeName + "（" + order.getCustomerName() + "）.doc"; + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + typeName = ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName(); + } else { + // 订车 + typeName = ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName(); + } + docName = typeName + "（" + appOrderDetailsVo.getName() + "）.doc"; Map map2 = docPdfComponent.createDocToPdf(map, typeName, docName); - url += ", " + map2.get("prefixTemplateUrl"); + url += map2.get("prefixTemplateUrl"); } return url; } @@ -922,7 +927,7 @@ public class CommonContractService extends MybatisBaseService commonContractVos = new ArrayList<>(); List sceneSignUrlList = new ArrayList<>(); - if (StringUtils.isNotBlank(appdixUrl)){ + if (StringUtils.isNotBlank(appdixUrl)) { String[] appdixUrls = appdixUrl.split(","); for (String url : appdixUrls) { String urlPrefix = fileUploadComponent.getUrlPrefix(); @@ -930,14 +935,14 @@ public class CommonContractService extends MybatisBaseService> printConfirm(PrintConfirmDto dto) { + ResultBean> rb = ResultBean.fireFail(); + List list = new ArrayList<>(); + Map map = new HashMap<>(); + String sid = dto.getBusSid(); + //查询销售订单的信息 + ResultBean resultBean = busSalesOrderFeign.getSaleOrderDetails(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); + //甲方 + String createOrgName = appOrderDetailsVo.getSalesOrg(); + //乙方 + String customerName = appOrderDetailsVo.getName(); + //联系电话 + String mobile = appOrderDetailsVo.getPhone(); + //身份证号 + //根据客户sid查询客户的身份证号 + sid = appOrderDetailsVo.getCustomerSid(); + ResultBean crmResultBean = crmCustomerTempFeign.fetchSid(sid); + if (!crmResultBean.getSuccess()) { + return rb.setMsg(crmResultBean.getMsg()); + } + CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); + //身份证号 + String idNo = crmCustomerTempVo.getIDNumber(); + //查询销售订单的车型信息 + AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo(); + //车型 + String modelName = "车型：" + appOrderModelInfoVo.getModelName() + "。"; + //配置 + String modelConfig = "配置：" + appOrderModelInfoVo.getConfig() + "。"; + //上装 + if (appOrderDetailsVo.getTopInfo() != null) { + AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo(); + String topName = topInfo.getTopName(); + topName = "上装：" + topName + "。"; + map.put("topName", topName); + } + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + //查询台数 + String num = priceInfo.getNumber(); + //单台成交价 + String transactionPrice = priceInfo.getTransactionPrice(); + String remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + //优惠说明 + //ToDo: + //保险说明 + String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。"; + //车价合计 + String totalPrice = priceInfo.getTotalPrice(); + //车价合计大写 + String priceRemarks = MoneyToChineseUtils.convert(Double.valueOf(totalPrice).doubleValue()); + //交纳订金 + AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); + String depositTotal = depositInfo.getDepositTotal(); + if ("02".equals(depositInfo.getDepositTypeKey())) { + ResultBean> listResultBean = busDepositFictitiousFeign.detailsList(depositInfo.getSid()); + List listResultBeanData = listResultBean.getData(); + listResultBeanData.removeAll(Collections.singleton(null)); + if (!listResultBeanData.isEmpty()) { + String depositRemarks = "（其中乙方在"; + for (BusDepositFictitiousDetailsVo v : listResultBeanData) { + String b = v.getPaymentDate() + "转入甲方的" + v.getDeposit() + "元中的" + v.getPrice() + "元用于本次订金，"; + depositRemarks = depositRemarks + b; + } + depositRemarks = depositRemarks + "）"; + map.put("depositRemarks", depositRemarks); + } + } + //车辆交付地点 + String address = priceInfo.getAddress(); + //组装到文档相对应的字段中 + map.put("createOrgName", createOrgName); + map.put("customerName", customerName); + map.put("mobile", mobile); + map.put("idNo", idNo); + map.put("modelName", modelName); + map.put("modelConfig", modelConfig); + map.put("remarks", remarks); + map.put("insuranceInfo", insuranceInfo); + map.put("totalPrice", totalPrice); + map.put("priceRemarks", priceRemarks); + map.put("depositTotal", depositTotal); + map.put("address", address); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + return genCarSaleContract(dto, map, appOrderDetailsVo); + }); + PrintConfirmVo printConfirmVo = null; + if (StringUtils.isNotBlank(future1.get())) { + printConfirmVo = new PrintConfirmVo(); + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName())); + } else { + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName())); + } + printConfirmVo.setDownloadUrl(future1.get()); + list.add(printConfirmVo); + } + Future future2 = pool.submit(() -> { + return genCarSaleContractBlank(dto, map, appOrderDetailsVo); + }); + if (StringUtils.isNotBlank(future2.get())) { + printConfirmVo = new PrintConfirmVo(); + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName())); + } else { + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName())); + } + printConfirmVo.setDownloadUrl(future2.get()); + list.add(printConfirmVo); + } + } catch (Exception e) { + e.printStackTrace(); + return rb.setMsg("生成文件失败"); + } + + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）.ftl b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）.ftl new file mode 100644 index 0000000000..f961050382 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）.ftl @@ -0,0 +1,1565 @@ + + + + + Administrator + 孟哲 + 2 + 0 + 2022-01-06T06:45:00Z + 2022-08-17T08:56:00Z + 2022-08-17T08:56:00Z + 1 + 147 + 839 + 6 + 1 + 985 + 16 + + + 2052-11.1.0.12302 + 00792B5205314B0BB2CF2B94EA12F497 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同（现车） + + + + + + + + + + + + + + + + + + + + + 合同编号：${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方(出卖方) ： + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + 乙方(买受方）： + + + + + + + + + + ${customerName!} + + + + + + + + + 联系电话 + + + + + + + + + + ${mobile!} + + + + + + + + + 身份证号码： + + + + + + + + + + ${idNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙方从甲方以全款方式购买现车，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 标的车辆基本信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + + + + + + + + + + + + + + + + + + ${topName!} + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + ${insuranceInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆含税总价 + + + + + + + + + 为 + + + + + + + + + + ${totalPrice!} + + + + + + + + + 元（大写 + + + + + + + + + + ${priceRemarks!} + + + + + + + + + ）。 + + + + + + + + + + + + + + + + + + + + + + 三、乙方向甲方交纳订金 + + + + + + + + + + ${depositTotal!} + + + + + + + + + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交付地点 + + + + + + + + + + ${address!} + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 七、乙方交纳订金后在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 + + + + + + + + + + + + + + + + + + + + + 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + 九、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 地址： + + + + + + + + + + + + + + + + + + + + 年 月 日 年 月 日 + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）（空）.ftl b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）（空）.ftl new file mode 100644 index 0000000000..f961050382 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（现车）（空）.ftl @@ -0,0 +1,1565 @@ + + + + + Administrator + 孟哲 + 2 + 0 + 2022-01-06T06:45:00Z + 2022-08-17T08:56:00Z + 2022-08-17T08:56:00Z + 1 + 147 + 839 + 6 + 1 + 985 + 16 + + + 2052-11.1.0.12302 + 00792B5205314B0BB2CF2B94EA12F497 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同（现车） + + + + + + + + + + + + + + + + + + + + + 合同编号：${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方(出卖方) ： + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + 乙方(买受方）： + + + + + + + + + + ${customerName!} + + + + + + + + + 联系电话 + + + + + + + + + + ${mobile!} + + + + + + + + + 身份证号码： + + + + + + + + + + ${idNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙方从甲方以全款方式购买现车，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 标的车辆基本信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + + + + + + + + + + + + + + + + + + ${topName!} + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + ${insuranceInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆含税总价 + + + + + + + + + 为 + + + + + + + + + + ${totalPrice!} + + + + + + + + + 元（大写 + + + + + + + + + + ${priceRemarks!} + + + + + + + + + ）。 + + + + + + + + + + + + + + + + + + + + + + 三、乙方向甲方交纳订金 + + + + + + + + + + ${depositTotal!} + + + + + + + + + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交付地点 + + + + + + + + + + ${address!} + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 七、乙方交纳订金后在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 + + + + + + + + + + + + + + + + + + + + + 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + 九、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 地址： + + + + + + + + + + + + + + + + + + + + 年 月 日 年 月 日 + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）.ftl b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）.ftl new file mode 100644 index 0000000000..e20325ee1b --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）.ftl @@ -0,0 +1,1689 @@ + + + + + Administrator + 孟哲 + 2 + 1 + 2022-01-06T06:45:00Z + 2022-08-17T08:57:00Z + 2022-08-17T08:57:00Z + 1 + 148 + 844 + 7 + 1 + 991 + 16 + + + 2052-11.1.0.12302 + B71BDE97B2C641119C880AE97128EC86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同（订车） + + + + + + + + + + + + + + + + + + + + + 合同编号：${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方(出卖方) ： + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + 乙方(买受方）： + + + + + + + + + + ${customerName!} + + + + + + + + + 联系电话： + + + + + + + + + + ${mobile!} + + + + + + + + + 身份证号码： + + + + + + + + + + ${idNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙方从甲方以全款方式订购车辆，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方按照乙方要求订购排产的车辆信息如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + + + + + + + + + + + + + + + + + + + ${topName!} + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + + ${insuranceInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆含税总价 + + + + + + + + + 为 + + + + + + + + + + ${totalPrice!} + + + + + + + + + 元（大写 + + + + + + + + + + ${priceRemarks!} + + + + + + + + + ）。 + + + + + + + + + + + + + + + + + + + + + + 三、乙方向甲方交纳订金 + + + + + + + + + + ${depositTotal!} + + + + + + + + + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交付地点 + + + + + + + + + + ${address!} + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 + + + + + + + + + + + + + + + + + + + + + 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + 九、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 地址： + + + + + + + + + + + + + + + + + + + + 年 月 日 年 月 日 + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）（空）.ftl b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）（空）.ftl new file mode 100644 index 0000000000..e20325ee1b --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/新车买卖合同（订车）（空）.ftl @@ -0,0 +1,1689 @@ + + + + + Administrator + 孟哲 + 2 + 1 + 2022-01-06T06:45:00Z + 2022-08-17T08:57:00Z + 2022-08-17T08:57:00Z + 1 + 148 + 844 + 7 + 1 + 991 + 16 + + + 2052-11.1.0.12302 + B71BDE97B2C641119C880AE97128EC86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同（订车） + + + + + + + + + + + + + + + + + + + + + 合同编号：${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方(出卖方) ： + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + 乙方(买受方）： + + + + + + + + + + ${customerName!} + + + + + + + + + 联系电话： + + + + + + + + + + ${mobile!} + + + + + + + + + 身份证号码： + + + + + + + + + + ${idNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙方从甲方以全款方式订购车辆，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方按照乙方要求订购排产的车辆信息如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + + + + + + + + + + + + + + + + + + + ${topName!} + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + + ${insuranceInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆含税总价 + + + + + + + + + 为 + + + + + + + + + + ${totalPrice!} + + + + + + + + + 元（大写 + + + + + + + + + + ${priceRemarks!} + + + + + + + + + ）。 + + + + + + + + + + + + + + + + + + + + + + 三、乙方向甲方交纳订金 + + + + + + + + + + ${depositTotal!} + + + + + + + + + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交付地点 + + + + + + + + + + ${address!} + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 + + + + + + + + + + + + + + + + + + + + + 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + 九、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 地址： + + + + + + + + + + + + + + + + + + + + 年 月 日 年 月 日 + + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java index e7a2ef374f..35f9e8ee2d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java @@ -63,4 +63,10 @@ public class BusDepositFictitiousDetailsVo implements Vo { @ApiModelProperty("款项支付委托书") private String payPath; + @ApiModelProperty("付款日期") + private String paymentDate; + @ApiModelProperty("虚拟订单订金") + @JsonSerialize(using = ToStringSerializer.class) + private String deposit; + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeign.java index 04a2712027..968a76b568 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeign.java @@ -61,5 +61,7 @@ public interface BusDepositFictitiousFeign { @ApiOperation("订金使用记录接口") @GetMapping("/getDepositRecords/{depositBillNo}") public ResultBean> getDepositRecords(@PathVariable("depositBillNo") String depositBillNo); - + @ApiOperation("查询订金使用") + @GetMapping("/detailsList/{sid}") + ResultBean> detailsList(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java index c0c68e7e1f..abd308478e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java @@ -52,4 +52,9 @@ public class BusDepositFictitiousFeignFallback implements BusDepositFictitiousFe public ResultBean> getDepositRecords(String depositBillNo) { return null; } + + @Override + public ResultBean> detailsList(String sid) { + return null; + } } \ No newline at end of file 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 1048256f47..fe0cb274d8 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 @@ -69,7 +69,7 @@ public class AppOrderDetailsVo implements Vo { @ApiModelProperty("是否有保险信息") private Boolean insuranceState; - @ApiModelProperty("是否有保险说明") + @ApiModelProperty("是否有补充说明") private Boolean remarksState; @ApiModelProperty("用户sid") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java index 29ed3a31d2..972a08e1e8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java @@ -34,4 +34,7 @@ public class AppOrderModelInfoVo implements Vo { private List orderList = new ArrayList<>(); @ApiModelProperty(value = "合计数量") private String total; + + @ApiModelProperty("配置") + private String config; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java index 712adf19f5..7046dcc988 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java @@ -26,4 +26,7 @@ public class AppOrderTopInfoVo implements Vo { private List contractImages = new ArrayList<>(); @ApiModelProperty(value = "合同附件string拼接：后端内部使用") private String contractPath; + + @ApiModelProperty(value = "上装名称") + private String topName; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml index 313123fabb..74911bdef5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml @@ -12,11 +12,14 @@ From 7d6553da3407f5959e6997fa6b1cb1770456f30a Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Thu, 18 Aug 2022 13:37:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?pc=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCurrentCarDetailConfigVo.java | 3 + .../anrui/base/common/enums/BillTypeEnum.java | 4 +- .../biz/basevehicle/BaseVehicleMapper.xml | 61 ++-- .../busdeposit/AppBusDepositBusDetailsVo.java | 6 + .../AppBusDepositBuscenterDetailVo.java | 6 + .../buscenter/api/busdeposit/BusDeposit.java | 20 +- .../AppBusDepositVehicleDetailVo.java | 9 +- .../AppBusDepositVehicleDetailsInitVo.java | 11 +- .../AppBusDepositVehicleDto.java | 2 +- .../AppBusDepositBuscenterDto.java | 6 + .../biz/busdeposit/BusDepositService.java | 5 + .../BusDepositVehicleService.java | 14 +- .../busmaindeposit/BusMainDepositMapper.java | 2 + .../busmaindeposit/BusMainDepositMapper.xml | 8 + .../busmaindeposit/BusMainDepositService.java | 309 ++++++++++-------- .../vehicle/DepositVehicleCarListDto.java | 5 + .../vehicle/DepositVehicleCarListVo.java | 4 + 17 files changed, 276 insertions(+), 199 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java index 1b476c3d12..d28c625631 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java @@ -46,4 +46,7 @@ public class AppCurrentCarDetailConfigVo implements Vo { @ApiModelProperty(value = "现车和排产车总数") private String num; + @ApiModelProperty(value = "颜色") + private String color; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index eb7a26e44c..b7744a2892 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -16,7 +16,9 @@ public enum BillTypeEnum { CJTKSQ("CJTKSQ", "厂家退库申请"), FYSQ("FYSQ","费用申请"), FKSQ("FKSQ","付款申请"), - KCDDBGSQ("KCDDBG","库存地点变更申请") + KCDDBGSQ("KCDDBG","库存地点变更申请"), + JYDDDJSQ("JYDDDJSQ","简易订单订金收取"), + JYDDCLYD("JYDDCLYD","简易订单车辆预定"), ; private String billType; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index eeae673ce0..4a9ec57806 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -181,7 +181,7 @@ @@ -296,8 +296,8 @@ resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo"> SELECT bv.guidedPrice AS price FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid WHERE bvm.sid = #{modelSid} ORDER BY bv.guidedPrice ASC @@ -305,14 +305,14 @@ @@ -335,8 +335,8 @@ bmc.packingCase, bvm.insideCode FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} @@ -355,7 +355,7 @@ bmc.carColor, - bv.location, + bv.locationName as location, @@ -415,8 +415,8 @@ bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.`department`) as vehModelInfor FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` + LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} LIMIT 1 @@ -469,8 +469,8 @@ bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.`department`) as vehModelInfor FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` + LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1 @@ -584,11 +584,11 @@ (select SUM(distinct cast((cast(bo.platformNo as signed) - IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity from bus_vehicle_order bo - LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid + LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid where bo.useOrgSid = bvc.useOrgSid AND bd.vehicleSid = bvm.sid) AS produceCarNum FROM base_vehicle_model bvm - LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid + LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid WHERE bvc.modelSid = #{modelSid} AND bvc.useOrgSid != #{useOrg} group by bvc.useOrgSid @@ -601,21 +601,22 @@ bvm.vehicleAlias AS model, bvm.brandName AS brand, bvm.carBrand AS brandSid, + bmc.carColor AS color, ( (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND bv.modelConfigSid = bvc.configurationItemsSid AND lockedState = '03') - + + + (SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvm.sid AND bvad.configSid = bvc.configurationItemsSid) - ) AS num + ) AS num FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} @@ -800,14 +801,14 @@ carColor AS color, locationName AS address FROM base_vehicle bv - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid - ${ew.customSqlSegment} + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index e9717915b8..01a9acfab7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -32,6 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; +import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto; @@ -88,10 +91,12 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.xml.crypto.Data; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -184,7 +189,7 @@ public class BusMainDepositService extends MybatisBaseService wrapper.like("bd.draweeName", query.getName()).or().like("bdv.customerName", query.getName())); + qw.and(wrapper -> wrapper.like("bd.draweeName", query.getName()).or().like("bdvc.customerName", query.getName())); } if (StringUtils.isNotBlank(query.getStartTime())) { @@ -702,70 +707,94 @@ public class BusMainDepositService extends MybatisBaseService saveDepositInfo(AppBusDepositBuscenterDto dto) { + ResultBean rb = ResultBean.fireFail(); AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData(); - Date date = new Date(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); //判断订单sid是否有值(无值 新增 有值 修改) if (StringUtils.isBlank(dto.getVirtualOrderSid())) { //新增 BusMainDeposit busMainDeposit = new BusMainDeposit(); - busMainDeposit.setSid(UUID.randomUUID().toString()); - Map map = generateBillNo(dto.getUserSid()); - busMainDeposit.setBillNo(map.get("billNo_Num")); + busMainDeposit.setBillNo(getApplyCode1(dto)); busMainDeposit.setStaffSid(data.getStaffSid()); - busMainDeposit.setStaffName(data.getStaffName()); - busMainDeposit.setOrgSid(data.getOrgSid()); + busMainDeposit.setStaffName(dto.getStaffName()); + busMainDeposit.setOrgSid(useOrgSid); + busMainDeposit.setOrgName(dto.getDepartmentName()); busMainDeposit.setCreateBySid(dto.getUserSid()); - busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + data.getOrgName()); busMainDeposit.setDepositBillType("订金收取"); busMainDeposit.setDepositBillTypeKey("01"); - busMainDeposit.setCreateDate(dateFormat.format(date)); + busMainDeposit.setCreateDate(dateFormat.format(new Date())); baseMapper.insert(busMainDeposit); BusDeposit busDeposit = new BusDeposit(); busDeposit.setBillNo(busMainDeposit.getBillNo()); busDeposit.setBillSid(busMainDeposit.getSid()); busDeposit.setStaffSid(busMainDeposit.getStaffSid()); - busDeposit.setStaffName(data.getStaffName()); - busDeposit.setOrgSid(data.getOrgSid()); - busDeposit.setOrgName(sysOrganizationVo.getName() + "-" + data.getOrgName()); - busDeposit.setCreateDate(dateFormat.format(date)); + busDeposit.setStaffName(busMainDeposit.getStaffName()); + busDeposit.setOrgSid(busMainDeposit.getOrgSid()); + busDeposit.setCreateDate(dateFormat.format(new Date())); setBusDeposit(busDeposit, dto); //付款凭证 busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages())); busDepositService.insert(busDeposit); //添加客户信息 appSetBusDepositCustomer(dto, busDeposit.getBillSid()); - return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("添加成功"); + return rb.success().setData(busMainDeposit.getSid()); } else { //修改 BusMainDeposit busMainDeposit = baseMapper.selectBySid(dto.getVirtualOrderSid()); - String nodeState = busMainDeposit.getNodeState(); - if (StringUtils.isBlank(nodeState)) { //判断订单状态是否是未提交和拨回到发起人状态 - BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid()); - //付款凭证 - busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages())); - busDeposit.setCreateDate(dateFormat.format(date)); - busDeposit.setCollectionBankSid(dto.getCollectionBankSid()); - setBusDeposit(busDeposit, dto); - busDepositService.updateById(busDeposit); - busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid()); - appSetBusDepositCustomer(dto, busDeposit.getBillSid()); - return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("修改成功"); - } else if (nodeState.equals("待提交") && nodeState.equals("已驳回")) { - BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid()); - //付款凭证 - busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages())); - busDeposit.setCreateDate(dateFormat.format(date)); - busDeposit.setCollectionBankSid(dto.getCollectionBankSid()); - setBusDeposit(busDeposit, dto); - busDepositService.updateById(busDeposit); - busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid()); - appSetBusDepositCustomer(dto, busDeposit.getBillSid()); - return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("修改成功"); + if (busMainDeposit == null) { + return rb.setMsg("该订单不存在"); } - return new ResultBean().fail().setMsg("已提交办理审批中不可修改!"); + BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid()); + //付款凭证 + busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages())); + busDeposit.setCreateDate(dateFormat.format(new Date())); + busDeposit.setCollectionBankSid(dto.getCollectionBankSid()); + setBusDeposit(busDeposit, dto); + busDepositService.updateById(busDeposit); + busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid()); + appSetBusDepositCustomer(dto, busDeposit.getBillSid()); + return rb.success().setData(busMainDeposit.getSid()); + } + } + + public String getApplyCode1(AppBusDepositBuscenterDto dto) { + String userSid = dto.getUserSid(); + //获取分公司sid + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.JYDDDJSQ.getBillType()); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + + public String getApplyCode2(AppBusDepositVehicleDto dto) { + String userSid = dto.getUserSid(); + //获取分公司sid + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.JYDDCLYD.getBillType()); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); } + return billNo; } /** @@ -776,13 +805,12 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); - variables.put("businessSid", businessSid); - variables.put("isLoan", true); - variables.put("orgSid", orgSid);//部门sid - ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); - if (resultBean.getSuccess() && resultBean.getData() != null) { - Map map = (Map) resultBean.getData(); - /*saveSysFormLink(map);*/ - //更新虚拟订单审批（订金）业务表中的流程状态 - modifiBusMainDepositFlowState(businessSid, - ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId - map.get("nodeState"),//state - map.get("procInsId"),//procInstSid - map.get("taskDefKey")//nodeSid - ); - } - return resultBean; - } - - private void modifiBusMainDepositFlowState(String businessSid, - String proDefId,//procDefId - String nodeState,//state - String procInsId,//procInstSid - String taskDefKey//nodeSid - ) { - baseMapper.modifiBusDepositFlowState(businessSid, - proDefId,//procDefId - nodeState,//state - procInsId,//procInstSid - taskDefKey); - } +// String orgSid = checkUserOrg(dto.getUserSid()); +// // String businessSid = dto.getSid(); +// ResultBean resultBean1 = saveOrUpdateDeposit(dto); +// String businessSid = resultBean1.getData().toString(); +// Map variables = new HashMap<>(); +// variables.put("businessSid", businessSid); +// variables.put("isLoan", true); +// variables.put("orgSid", orgSid);//部门sid +// ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); +// if (resultBean.getSuccess() && resultBean.getData() != null) { +// Map map = (Map) resultBean.getData(); +// /*saveSysFormLink(map);*/ +// //更新虚拟订单审批（订金）业务表中的流程状态 +// modifiBusMainDepositFlowState(businessSid, +// ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId +// map.get("nodeState"),//state +// map.get("procInsId"),//procInstSid +// map.get("taskDefKey")//nodeSid +// ); +// } + return new ResultBean(); + } + +// private void modifiBusMainDepositFlowState(String businessSid, +// String proDefId,//procDefId +// String nodeState,//state +// String procInsId,//procInstSid +// String taskDefKey//nodeSid +// ) { +// baseMapper.modifiBusDepositFlowState(businessSid, +// proDefId,//procDefId +// nodeState,//state +// procInsId,//procInstSid +// taskDefKey); +// } /*public ResultBean submitMainDespoitApprove(BusDepositDto dto) { String orgSid = checkUserOrg(dto.getUserSid()); String businessSid = ""; @@ -962,37 +987,37 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); - variables.put("businessSid", businessSid); - variables.put("isLoan", true); - variables.put("orgSid", orgSid); - ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables); - if (resultBean.getSuccess() && resultBean.getData() != null) { - Map map = (Map) resultBean.getData(); - saveSysFormLink(map); - } - return resultBean; +// String orgSid = checkUserOrg(dto.getUserSid()); +// String businessSid = ""; +// if (StringUtils.isBlank(orgSid)) { +// return new ResultBean().fail().setMsg("用户组织机构不能为空"); +// } +// // 验证 +// if (StringUtils.isBlank(dto.getSid())) { +// // 调用保存接口 +// ResultBean resultBean = saveDepositVehicle(dto); +// if (!resultBean.getSuccess()) { +// return resultBean.setMsg("提交失败"); +// } +// businessSid = resultBean.getData().toString(); +// } else { +// // 调用更新接口 +// ResultBean resultBean = updateDepositVehicle(dto, dto.getSid()); +// if (!resultBean.getSuccess()) { +// return resultBean.setMsg("提交失败"); +// } +// businessSid = dto.getSid(); +// } +// Map variables = new HashMap<>(); +// variables.put("businessSid", businessSid); +// variables.put("isLoan", true); +// variables.put("orgSid", orgSid); +// ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables); +// if (resultBean.getSuccess() && resultBean.getData() != null) { +// Map map = (Map) resultBean.getData(); +// saveSysFormLink(map); +// } + return new ResultBean(); } /** @@ -1128,49 +1153,53 @@ public class BusMainDepositService extends MybatisBaseService reserveCarInfo(AppBusDepositVehicleDto dto) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); if (StringUtils.isBlank(dto.getVirtualOrderSid())) {//新增 BusMainDeposit busMainDeposit = new BusMainDeposit(); - busMainDeposit.setSid(UUID.randomUUID().toString()); - Map map = generateBillNo(dto.getUserSid()); - busMainDeposit.setBillNo(map.get("billNo_Num")); + busMainDeposit.setBillNo(getApplyCode2(dto)); busMainDeposit.setCreateBySid(dto.getUserSid()); - busMainDeposit.setStaffSid(appUserOrgInfoVo.getStaffSid()); - busMainDeposit.setStaffName(appUserOrgInfoVo.getStaffName()); - busMainDeposit.setOrgSid(appUserOrgInfoVo.getOrgSid()); - busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + appUserOrgInfoVo.getOrgName()); + busMainDeposit.setStaffSid(data.getStaffSid()); + busMainDeposit.setStaffName(dto.getStaffName()); + busMainDeposit.setOrgSid(useOrgSid); + busMainDeposit.setOrgName(dto.getDepartmentName()); busMainDeposit.setDepositBillType("车辆预订"); busMainDeposit.setDepositBillTypeKey("02"); - busMainDeposit.setCreateDate(dateFormat.format(date)); + busMainDeposit.setCreateDate(dateFormat.format(new Date())); baseMapper.insert(busMainDeposit); // 车辆客户信息 BusDepositVehicleCustomer customer = new BusDepositVehicleCustomer(); - String customerSid = dto.getCustomerSid(); - AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customerSid).getData(); - customer.setCustomerSid(customerSid); - customer.setCustomerName(dto.getCustomerName()); - customer.setCustomerMobile(dto.getMobile()); + BeanUtils.copyProperties(dto, customer, "sid"); + AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customer.getCustomerSid()).getData(); customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType()); customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey()); - customer.setCustomerPhoto(appCrmCustomerTempInfoVo.getCustomerPhoto()); + customer.setCustomerMobile(dto.getMobile()); customer.setBillSid(busMainDeposit.getSid()); busDepositVehicleCustomerService.save(customer); //添加车辆信息 appSetBusDepositVehicle(dto, busMainDeposit); - return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("添加成功"); + return rb.success().setData(busMainDeposit.getSid()); } else {//修改 BusMainDeposit busMainDeposit = fetchBySid(dto.getVirtualOrderSid()); + BeanUtils.copyProperties(dto, busMainDeposit, "sid"); baseMapper.updateById(busMainDeposit); busDepositVehicleService.delByBillSid(dto.getVirtualOrderSid()); + busDepositVehicleCustomerService.delByBillSid(dto.getVirtualOrderSid()); + BusDepositVehicleCustomer customer = new BusDepositVehicleCustomer(); + BeanUtils.copyProperties(dto, customer, "sid"); + AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customer.getCustomerSid()).getData(); + customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType()); + customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey()); + customer.setCustomerMobile(dto.getMobile()); + customer.setBillSid(busMainDeposit.getSid()); + busDepositVehicleCustomerService.save(customer); appSetBusDepositVehicle(dto, busMainDeposit); - return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("修改成功"); + return rb.success().setData(busMainDeposit.getSid()); } } - /** * 新增/修改虚拟订单订金收取添加车辆信息方法 * @@ -1905,11 +1934,7 @@ public class BusMainDepositService extends MybatisBaseService> rb = new ResultBean<>(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); -// Map formVariables = query.getFormVariables(); - //判断流程分支 -// Map map = IsTrue(formVariables.get("businessSid")); -// bv.setFormVariables(map); - bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId()); + bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppGetNodeVo.class)).collect(Collectors.toList()); @@ -1920,11 +1945,7 @@ public class BusMainDepositService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); -// Map formVariables = query.getFormVariables(); - //判断流程分支 -// Map map = IsTrue(formVariables.get("businessSid")); -// bv.setFormVariables(map); - bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId()); + bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppGetNodeVo.class)).collect(Collectors.toList()); @@ -1971,7 +1992,7 @@ public class BusMainDepositService extends MybatisBaseService resultBean = flowableFeign.revokeProcess(flowTaskVo); if (!resultBean.getSuccess()) { - return rb.setMsg("操作失败!"); + return rb.setMsg(resultBean.getMsg()); } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); return rb.success().setData(resultBean.getData()); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListDto.java index 46cbe9f51a..5c7684e12e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,4 +32,8 @@ public class DepositVehicleCarListDto implements Dto { private String modelSid; @ApiModelProperty(value = "车辆sid") private String carSid; + @ApiModelProperty(value = "颜色") + @JsonProperty("color") + private String colour; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListVo.java index 3c14c729f7..46d64cc236 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,6 +38,9 @@ public class DepositVehicleCarListVo implements Vo { private String carName; @ApiModelProperty(value = "预定日期") private String reserveDate; + @ApiModelProperty(value = "颜色") + @JsonProperty("color") + private String colour; } From 430d55c2e986df1f104cd3af598a95b75213a7ea Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Aug 2022 13:53:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AE=80=E6=98=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95--=E8=AE=A2=E9=87=91=E6=94=B6=E5=8F=96?= =?UTF-8?q?=E3=80=81=E8=BD=A6=E8=BE=86=E9=A2=84=E5=AE=9A=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=92=8C=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/flow/jianyidingdan.js | 59 +- .../src/api/jichuxinxi/busdeposit.js | 22 +- .../src/components/uploadFile/upload.vue | 1 + .../xunidingdanFlow/cheliangyuding.vue | 660 ++++---- .../xunidingdanFlow/cheliangyudingEdit.vue | 611 ++++--- .../xunidingdanFlow/cheliangyudingInfo.vue | 356 ++-- .../xunidingdanFlow/dingjinshouqu.vue | 195 ++- .../xunidingdanFlow/dingjinshouquEdit.vue | 872 +++++----- .../xunidingdanFlow/dingjinshouquInfo.vue | 352 ++-- .../relation/xuanzecheliang.vue | 299 ++++ .../xunidingdanFlow/relation/xuanzekehu.vue | 269 +++ .../relation/xuanzekehuAdd.vue | 948 +++++++++++ .../xunidingdan/com/xuanzecheliang.vue | 390 +++-- .../xunidingdan/com/xuanzekehu.vue | 439 +++-- .../xunidingdan/com/xuanzekehuAdd.vue | 1480 ++++++----------- .../xunidingdan/xunidingdanAdd.vue | 285 ++-- .../xunidingdan/xunidingdanguanli.vue | 121 +- .../xunidingdan/xunidingdaninfo.vue | 216 +-- .../xunidingdan/xunidingjinAdd.vue | 309 ++-- .../xunidingdan/xunidingjininfo.vue | 159 +- 20 files changed, 4359 insertions(+), 3684 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehu.vue create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehuAdd.vue diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js index 1a6f760e07..af8371c324 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js @@ -2,59 +2,80 @@ import request from '@/utils/request' export default { // 车辆预定流程审批（同意） 已改 - agreeCheliangTask: function(params) { + agreeCheliangTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/completeVehicle', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 订金收取流程审批（同意） 已改 - agreeDingjinTask: function(params) { + agreeDingjinTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/completeDeposit', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 流程审批（驳回） 已改 - rejectTask: function(params) { + rejectTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/reject', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 流程审批（终止） 已改 - breakTask: function(params) { + breakTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/breakProcess', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 流程审批（撤回） 已改 - revokeTask: function(params) { + revokeTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/revokeProcess', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 审批流程（同意）获取下一环节 已改 getNextNodesForSubmit: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/getNextNodesForSubmit', - method: 'get', - params: data + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 审批流程（驳回、终止）获取上一环节 已改 getPreviousNodesForReject: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/getPreviousNodesForReject', - method: 'get', - params: data + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 读取xml文件 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js index 141958d81a..49124f0d7b 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js @@ -1,8 +1,7 @@ import request from '@/utils/request' -import qs from 'qs' // 简易订单页面接口 -//条件分页查询数据的列表 (8.12测试) +// 条件分页查询数据的列表 (8.12测试) export function listPage(data) { return request({ url: '/buscenter/v1/busmaindeposit/listPage', @@ -14,7 +13,7 @@ export function listPage(data) { }) } -//根据sid批量删除 (8.12测试) +// 根据sid批量删除 (8.12测试) export function deleteBySids(data) { return request({ url: '/buscenter/v1/busmaindeposit/deleteBySids', @@ -26,8 +25,7 @@ export function deleteBySids(data) { }) } - -//==========订金收取 +// ==========订金收取 // 保存虚拟订单（订金）(8.12已改) export function saveDing(data) { return request({ @@ -56,7 +54,7 @@ export function submitApprove(data) { export function depositDetail(data) { return request({ url: 'buscenter/v1/busdeposit/init/depositDetail/' + data.virtualOrderSid + '/' + data.userSid, - method: 'get', + method: 'get' }) } @@ -64,12 +62,11 @@ export function depositDetail(data) { export function fetchSid(data) { return request({ url: 'buscenter/v1/busdeposit/getDepositInfoDetails/' + data, - method: 'get', + method: 'get' }) } - -//==========预定车辆 +// ==========预定车辆 // 保存虚拟订单（预定车辆） (8.12已改) export function saveChe(data) { return request({ @@ -85,7 +82,7 @@ export function saveChe(data) { // 提交虚拟订单(车辆)审批流程 (8.12已改) export function submitVehicleApprove(data) { return request({ - url: 'buscenter/v1/busmaindeposit', + url: 'buscenter/v1/busmaindeposit/submitVirtualOrderVehicle', method: 'post', data: data, headers: { @@ -110,11 +107,10 @@ export function selectSid(data) { export function getReserveCarDetails(data) { return request({ url: 'buscenter/v1/busdepositvehicle/getReserveCarDetails/' + data, - method: 'get', + method: 'get' }) } - // 获取下拉框 export function typeValues(data) { return request({ @@ -133,7 +129,7 @@ export function kehu(data) { }) } -//订单批量删除主车优惠情况 +// 订单批量删除主车优惠情况 export function getDelDis(data) { return request({ url: '/buscenter/v1/busorder/delDis/' + data, diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue index 3bded014c6..97b711ed69 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue @@ -238,6 +238,7 @@ } }, handlePictureCardPreview(file) { + this.dialogVisible = true this.dialogImageUrl = file.url }, // 上传失败 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue index 9eb9f682c4..e1a071c142 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue @@ -1,74 +1,79 @@