From 3d89cef1215464ce592a794207bfd23b9ebf2440 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sun, 24 Apr 2022 08:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=A5=97=E6=89=93=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E9=A2=84=E4=BF=9D=E7=95=99=E4=B8=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/ContractTemplateEnum.java | 2 +- .../commoncontract/CommonContractService.java | 145 ++++++++++++++++-- .../buscenter/api/busorder/BusOrderVo.java | 3 + 3 files changed, 134 insertions(+), 16 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java index a1d9e21a4a..f5fbef4a01 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java @@ -10,7 +10,7 @@ public enum ContractTemplateEnum { CARSALECONTRACTNEW("car_sale_contract_new", "新车买卖合同（现车）"), CARSALECONTRACTNEWBLANK("car_sale_contract_new_blank", "新车买卖合同（现车）（空）"), // 空白 - CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同(订车)"), + CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同（订车）"), CARSALECONTRACTBOOKBLANK("car_sale_contract_book_blank", "新车买卖合同（订车）（空）"), // 空白 CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"), VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"), 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 dc7a5f3fd9..7d243efa74 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 @@ -562,6 +562,7 @@ public class CommonContractService extends MybatisBaseService> printConfirm(PrintConfirmDto dto) { Map map = new HashMap(); // 合同信息 - CommonContract contract = new CommonContract();//fetchBySid(dto.getSid()); + 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()); // 合同编号 @@ -700,6 +703,7 @@ public class CommonContractService extends MybatisBaseService map, BusOrderVo order) { @@ -727,6 +731,7 @@ public class CommonContractService extends MybatisBaseService getMap(Map map, PrintConfirmDto dto) { + Map commonContractMap = map; + /** + * 车辆登记合同参数： + * 甲方：${partyA} + * 乙方：${partyB} + * 签订时间：${createDate} + * 车辆出售方：${partyA} + * 车辆信息List: + * { + * 序号： + * 品牌：${item.brandName} + * 车架号：${item.VINNo} + * 发动机号：${item.engineNo} + * } + */ + //甲方为卖方，即xxx公司，即根据销售订单的单位sid查询单位的名称 + //乙方为受卖方，即销售订单的客户名称 + ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); + if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) { + BusOrderVo orderVo = busOrderVoResultBean.getData(); + //乙方 + commonContractMap.put("partyB", orderVo.getCustomerName()); + //客户名称 + commonContractMap.put("customerName", orderVo.getCustomerName()); + } + return commonContractMap; + + } + + /** + * 涉及高低开票的，需要打印两套合同： + * 1、一套按照成交价打印（记账） + * 2、一套为价格空白的合同（开票用） + * + * @param dto + * @param map + * @param vo + * @return 按照成交价打印的合同地址 + */ + /* public String getCarContract(PrintConfirmDto dto, Map map, BusOrderVo vo) { + //下载地址 + String url = ""; + //模板名称 + String typeName = ""; + //生成的word名称 + String docName = ""; + //判断是现车还是订车 + if ("01".equals(vo.getSaleTypeKey())) { + //现车 + //车辆含税总价为：主车单价*数量，大写 + + map.put("taxNum", vo.get); + typeName = ContractTemplateEnum.CARSALECONTRACTNEW.getName(); + + } + if ("02".equals(vo.getSaleTypeKey())) { + //订车 + + } + + }*/ + + /** + * 打印项-确认 + * + * @return + */ + /* public ResultBean> printConfirm1(PrintConfirmDto dto) { + Map map = new HashMap<>();*/ + /** + * 车辆登记合同参数： + * 甲方：${partyA} + * 乙方：${partyB} + * 签订时间：${createDate} + * 车辆出售方：${partyA} + * 车辆信息List: + * { + * 序号： + * 品牌：${item.brandName} + * 车架号：${item.VINNo} + * 发动机号：${item.engineNo} + * } + */ + //甲方为卖方，即xxx公司，即根据销售订单的单位sid查询单位的名称 + //乙方为受卖方，即销售订单的客户名称 + /* ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); + if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) { + BusOrderVo orderVo = busOrderVoResultBean.getData(); + //乙方 + map.put("partyB", orderVo.getCustomerName()); + //客户名称 + map.put("customerName", orderVo.getCustomerName()); + map.put("mobile", orderVo.getMobile()); + map.put("IDNumber", orderVo.getIDNumber()); + }*/ +// } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java index 9a30e46a95..a07dae04e5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java @@ -78,4 +78,7 @@ public class BusOrderVo implements Vo { private BigDecimal deposit; @ApiModelProperty(value = "分公司sid") private String useOrgSid; + + @ApiModelProperty(value = "提车方式") + private String saleTypeKey; }