销售订单打印合同

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java

@@ -31,7 +31,7 @@ public class PrintConfirmDto implements Dto {
     private String customerName;
 
     @ApiModelProperty("是否优惠：1是0否")
-    private int isDiscount;
+    private String discountKey;
 
 /*    @ApiModelProperty("是否提前开票：1是0否")
     private int isAdvanceInvoice;
@@ -40,5 +40,5 @@ public class PrintConfirmDto implements Dto {
     private int isEntrustVehicle;*/
 
     @ApiModelProperty("是否在保险公司购买保险：1是0否")
-    private int isPurchasingInsurance;
+    private String insuranceKey;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -739,7 +739,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         map.put("priceRemarks", "");
         map.put("depositTotal", "");
         // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
-        if (dto.getIsDiscount() == 1) {
+        if ("1".equals(dto.getDiscountKey())) {
             // 现车
             if ("现车".equals(appOrderDetailsVo.getOrderType())) {
                 typeName = ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName();
@@ -1147,6 +1147,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
         //优惠说明
         //ToDo:
+
         //保险说明
         String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。";
         //车价合计

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -36,8 +36,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsurancePrintVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -54,6 +56,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -256,5 +259,10 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<String> getFlowOperateTitle(@SpringQueryMap SaleOrderQuery query);
 
+    @ApiOperation("合同生成")
+    @PostMapping("/contractInfo")
+    @ResponseBody
+    ResultBean<List<InsurancePrintVo>> contractInfo(@RequestBody InsuranceDto insuranceDto);
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -35,8 +35,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsurancePrintVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -48,6 +50,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderFeignFallback.java <br/>
@@ -223,4 +227,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<String> getFlowOperateTitle(SaleOrderQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<InsurancePrintVo>> contractInfo(InsuranceDto insuranceDto) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceDto.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/18 15:29
+ * @Description
+ */
+@Data
+public class InsuranceDto implements Dto {
+    private static final long serialVersionUID = -5257658534230972125L;
+
+    @ApiModelProperty("业务表sid")
+    private String businessSid;
+    @ApiModelProperty("是否优惠，1是，0否")
+    private String discountKey;
+    @ApiModelProperty("是否有保险：1是，0否")
+    private String insuranceKey;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsurancePrintVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/18 15:37
+ * @Description
+ */
+@Data
+public class InsurancePrintVo implements Vo {
+    private static final long serialVersionUID = 4039007386605616431L;
+
+    @ApiModelProperty("文件名称")
+    private String name;
+
+    @ApiModelProperty("下载路径")
+    private String downloadUrl;
+
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -36,8 +36,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsurancePrintVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -53,6 +55,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderFeignFallback.java <br/>
@@ -311,4 +315,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getFlowOperateTitle(query);
     }
 
+    @Override
+    public ResultBean<List<InsurancePrintVo>> contractInfo(InsuranceDto insuranceDto) {
+        return appBusSalesOrderService.contractInfo(insuranceDto);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -26,6 +26,10 @@
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.api.commoncontract.PrintConfirmDto;
+import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo;
@@ -72,8 +76,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsurancePrintVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -89,8 +95,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 
 /**
@@ -131,6 +140,8 @@ public class AppBusSalesOrderService {
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private CommonContractFeign commonContractFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -534,4 +545,13 @@ public class AppBusSalesOrderService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean<List<InsurancePrintVo>> contractInfo(InsuranceDto insuranceDto) {
+        ResultBean<List<InsurancePrintVo>> rb = ResultBean.fireFail();
+        PrintConfirmDto printConfirmDto = new PrintConfirmDto();
+        BeanUtil.copyProperties(insuranceDto,printConfirmDto);
+        ResultBean<List<PrintConfirmVo>> resultBean = commonContractFeign.printConfirm(printConfirmDto);
+        List<InsurancePrintVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InsurancePrintVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
 }