Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandover.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.buscenter.api.busvehicledatahandover;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,6 +41,7 @@ public class BusVehicleDataHandover extends BaseEntity {
     @ApiModelProperty("交接人")
     private String recName; // 交接人
     @ApiModelProperty("交接时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date recDate; // 交接时间
     @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -160,7 +160,9 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
@@ -468,11 +470,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrderModelDetailsVo != null) {
             //查询现车车辆
             if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
-                if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())){
+                if (StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())) {
                     List<String> vinList = new ArrayList<>();
-                    vinList.add("不确定车架号("+entity.getNowCarUnknownVinNum()+")");
+                    vinList.add("不确定车架号(" + entity.getNowCarUnknownVinNum() + ")");
                     busSalesOrderModelDetailsVo.setVinNo(vinList);
-                }else{
+                } else {
                     List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
                     //包含采购系统的车架号
                     List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
@@ -523,7 +525,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             String topMessage = "";
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
-            if(busSalesOrderMakeup != null){
+            if (busSalesOrderMakeup != null) {
                 //颜色
                 if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
                     topMessage = topMessage + busSalesOrderMakeup.getColor();
@@ -602,7 +604,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         if (StringUtils.isNotBlank(totalValue.toString()) && !"0".equals(totalValue.toString())) {
             if (busSalesOrderPriceDetailsVo != null) {
-                BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()),2, BigDecimal.ROUND_CEILING);
+                BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()), 2, BigDecimal.ROUND_CEILING);
                 bigDecimalSing = bigDecimalSing.add(discountA);
             }
         }
@@ -1934,7 +1936,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
-            if (StringUtils.isBlank(record.getClosingDate())){
+            if (StringUtils.isBlank(record.getClosingDate())) {
                 record.setClosingDate("-");
             }
             /*************再次发起按钮显示****************/
@@ -3421,11 +3423,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //若前端传值的订单类型为0则为现车，为1采购订单，为2排产
             //数据库中1为现车，2为采购订单，3为排产
             if ("0".equals(modelInfo.getType())) {
-                if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())){
+                if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
                     List<String> vinList = new ArrayList<>();
-                    vinList.add("不确定车架号("+busSalesOrder.getNowCarUnknownVinNum()+")");
+                    vinList.add("不确定车架号(" + busSalesOrder.getNowCarUnknownVinNum() + ")");
                     modelInfo.setVinList(vinList);
-                }else{
+                } else {
                     //查询车架号
                     List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
                     //包含采购系统的车架号
@@ -3781,7 +3783,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     private AppOrderDetailsVo selectSolutions(AppOrderDetailsVo appOrderDetailsVo, String sid) {
-        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
+       /* ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
         List<OrderSolutionVo> list = new ArrayList<>();
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -4304,7 +4306,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 list.add(getValueSpanSize(nominalPriceValue.toString(), 2, 0, false));
             }
         }
-        appOrderDetailsVo.setFinanceForms(list);
+        appOrderDetailsVo.setFinanceForms(list);*/
+
+        ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails2(sid);
+        if (resultBean.getData() != null) {
+            List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
+            if(!financeForms.isEmpty()){
+                List<OrderSolutionVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OrderSolutionVo.class)).collect(Collectors.toList());
+                appOrderDetailsVo.setFinanceForms(voList);
+            }
+        }
         return appOrderDetailsVo;
     }
 
@@ -5031,10 +5042,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         commonContract.setCustomerType(appOrderDetailsVo.getCustomerType());
         commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
 
-        if(StringUtils.isBlank(busSalesOrder.getContractNo())){
+        if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
             commonContractFeign.saveContract(commonContract);
             baseMapper.updateContractNoBySid(commonContract.getContractNo(), sid);
-        }else{
+        } else {
             commonContract.setContractNo(busSalesOrder.getContractNo());
         }
         ResultBean<List<FinUncollectedReceivablesDetailed>> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo());
@@ -6624,7 +6635,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public ResultBean<AppOrderDetailsVo> getSaleOrderDetailsByContractNo(String contractNo) {
         ResultBean<AppOrderDetailsVo> rb = ResultBean.fireFail();
         BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
-        if(busSalesOrder == null){
+        if (busSalesOrder == null) {
             return rb.setMsg("该合同号的订单不存在");
         }
         ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(busSalesOrder.getSid());
@@ -7069,13 +7080,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         busSalesOrdersVo.setBusSalesOrderPrice(busSalesOrderPrice);
         BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.selectBySid(sid);
         busSalesOrdersVo.setBusSalesOrderMakeup(busSalesOrderMakeup);
-        if(busSalesOrderMakeup != null){
+        if (busSalesOrderMakeup != null) {
-            if(busSalesOrderMakeup.getTopPrice() != null){
+            if (busSalesOrderMakeup.getTopPrice() != null) {
                 busSalesOrdersVo.setSzPrice(busSalesOrderMakeup.getTopPrice().toString());
             }
         }
-        if(busSalesOrderModel != null){
+        if (busSalesOrderModel != null) {
-            if(busSalesOrderModel.getFinalPrice() != null){
+            if (busSalesOrderModel.getFinalPrice() != null) {
                 busSalesOrdersVo.setFinalPrice(busSalesOrderModel.getFinalPrice().toString());
             }
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java

@@ -234,10 +234,12 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
             }
         }
         dataMap.put("newList", newList);
+        String path = "";
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        try {
             //获取模板
             InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vinHandoverData.ftl");
             //生成word文件名
-        String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
             long seconds = System.currentTimeMillis();
             String typeName = dateStr + seconds + ".doc";
@@ -250,7 +252,11 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
             //生成出门证文件名
             String pdfName = "交车资料确认单" + dateStr + seconds + ".pdf";
             WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
-        String path = targetPath + pdfName;
+            path = targetPath + pdfName;
+        } catch (NoClassDefFoundError e) {
+            e.printStackTrace();
+            path = targetPath + "temp";
+        }
         return path;
     }
 
@@ -393,8 +399,9 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
             }
         }
         pdfVo.setPdfVos(pdfVos);
-        String s = commonCreatePdf(pdfVo);
+        //--------------生成pdf抛出异常----------------
         String template = "/template/";
+        String s = commonCreatePdf(pdfVo);
         String filePath = s.substring(docPdfComponent.getUploadTemplateUrl().length());
         if (!newSids.isEmpty()) {
             for (String newSid : newSids) {

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js

@@ -158,8 +158,8 @@ export function saveGeren(data) {
   })
 }
 
-// 查看款、票情况详情
+// 查看款、票情况详情--开票管理
-export function deliveredFinSelect(data) {
+export function deliveredByFinSelect(data) {
   return request({
     url: '/fin/v1/finvehicleinvoice/deliveredFinSelect',
     method: 'get',
@@ -170,3 +170,15 @@ export function deliveredFinSelect(data) {
   })
 }
 
+// 查看款、票情况详情 -- 开票申请、欠款开票申请等
+export function deliveredFinSelect(data) {
+  return request({
+    url: '/buscenter/v1/busdeliveredapply/deliveredFinSelect',
+    method: 'get',
+    params: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@@ -580,7 +580,7 @@ export default {
           return u
         })
       })
-      this.balance = parseInt(this.balanceCopy) - parseInt(resNum)
+      this.balance = parseFloat(this.balanceCopy) - parseFloat(resNum)
     },
     getlist() {
       if (this.formobj.purchaseSystemName === '') {
@@ -590,7 +590,7 @@ export default {
       this.listQuery.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.listQuery.purchaseSystemSid = this.formobj.purchaseSystemSid
       listAll(this.listQuery).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.overduereceivable_list = res.data
         }
       })

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/relation/coupon.vue

@@ -168,7 +168,7 @@
 </template>
 
 <script>
-import { deliveredFinSelect } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+import { deliveredByFinSelect } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 
 export default {
   name: 'PaymentTicket',
@@ -211,7 +211,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      deliveredFinSelect({ contractNo: contractId, vinSid: row.vinSid }).then((response) => {
+      deliveredByFinSelect({ contractNo: contractId, vinSid: row.vinSid }).then((response) => {
         if (response.success) {
           console.log(response.data)
           this.formobj = response.data

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -529,7 +529,7 @@ export default {
           return u
         })
       })
-      this.balance = parseInt(this.balanceCopy) - parseInt(resNum)
+      this.balance = parseFloat(this.balanceCopy) - parseFloat(resNum)
     },
     getlist() {
       if (this.formobj.purchaseSystemName === '') {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loansolutions;
 
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
 import com.yxt.common.core.result.ResultBean;
@@ -45,7 +42,7 @@ public interface LoanSolutionsFeign {
 
     @ApiOperation("保存金融方案2")
     @PostMapping("/save2")
-    ResultBean save2(@RequestBody SolutionsDto dto);
+    ResultBean save2(@RequestBody SolutionssDto dto);
 
     @ApiOperation("根据销售订单sid查询金融方案")
     @GetMapping("/selectDetailss")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loansolutions;
 
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
 import com.yxt.common.core.result.ResultBean;
@@ -37,7 +34,7 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
     }
 
     @Override
-    public ResultBean save2(SolutionsDto dto) {
+    public ResultBean save2(SolutionssDto dto) {
         return null;
     }
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java

@@ -0,0 +1,162 @@
+package com.yxt.anrui.riskcenter.api.loansolutions.app;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/15
+ **/
+@Data
+public class SolutionssDto implements Dto {
+    private static final long serialVersionUID = -4329637976311165379L;
+
+    @ApiModelProperty("关联sid")
+    private String busSid;
+    @ApiModelProperty("是否打包：1是0否")
+    private String isPack;
+    @ApiModelProperty("产品政策名称")
+    private String policyName;
+    @ApiModelProperty("产品政策sid")
+    private String policySid;
+    @ApiModelProperty("主车发票价")
+    private String mainVehicleAmount;
+    @ApiModelProperty("融资票据")
+    private String accessoriesAmount;
+    @ApiModelProperty("是否有融资票据")
+    private boolean accessoriesAmountCb;
+    @ApiModelProperty("挂车金额")
+    private String trailerAmount;
+    @ApiModelProperty("是否有挂车")
+    private boolean trailerAmountCb;
+    @ApiModelProperty("保险金额")
+    private String premium;
+    @ApiModelProperty("是否有保险")
+    private boolean premiumCb;
+    @ApiModelProperty("购置税")
+    private String purchaseTax;
+    @ApiModelProperty("是否有购置税")
+    private boolean purchaseTaxCb;
+    @ApiModelProperty("融资项目总额")
+    private String loanTotal;
+    @ApiModelProperty("首付款比例")
+    private String downPayRatio;
+    @ApiModelProperty("首付金额")
+    @NotBlank(message = "首付金额不能为空")
+    private String downPayAmount;
+    @ApiModelProperty("贷款金额")
+    private String loanAmount;
+    @ApiModelProperty("贷款期数")
+    @NotBlank(message = "产品期数不能为空")
+    private String loanPeriod;
+    @ApiModelProperty("贷款保证金比例")
+    private String bondRatio;
+    @ApiModelProperty("贷款保证金金额")
+    @NotBlank(message = "贷款保证金不能为空")
+    private String bondAmount;
+    @ApiModelProperty("厂家贴息")
+    @NotBlank(message = "厂家贴息不能为空")
+    private String factoryDiscount;
+    @ApiModelProperty("厂家贴息用途")
+    private String factoryDiscountUse;
+    @ApiModelProperty("厂家贴息用途")
+    private String factoryDiscountUseKey;
+    @ApiModelProperty("年利率")
+    private String policyYearRatio;
+    @ApiModelProperty("月还金额")
+    @NotBlank(message = "月还金额不能为空")
+    private String loanPayMoney;
+    @ApiModelProperty("利息总额")
+    private String loanInterest;
+    @ApiModelProperty("是否勾选其它融")
+    private boolean otherPolicyState;
+
+    @ApiModelProperty("贴息抵车款")
+    private String discountCar;
+
+    /*************************其他融和方案汇总*********************************/
+    @ApiModelProperty("其它融名称")
+    private String otherPolicyName;
+    @ApiModelProperty("其他融sid")
+    private String otherPolicySid;
+    @ApiModelProperty("其它融贷款金额")
+    private String otherPolicyAmount;
+    @ApiModelProperty("其它融期数")
+    private String otherPolicyPeriod;
+    @ApiModelProperty("其它融月还")
+    private String otherPolicyMonthlyRepay;
+    @ApiModelProperty("其它融利息总额")
+    private String otherPolicyInterest;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
+
+    @ApiModelProperty("'融资首付")
+    private String loanDownPay;
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+    @ApiModelProperty("总贷款金额")
+    private String loanAmountTotal;
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("月还金额")
+    private String monthlyRepay;
+    @ApiModelProperty("利息总额")
+    private String interest;
+    @ApiModelProperty("预计首期还款日")
+    private String returnTime;
+
+
+    /*********************************金融方案费用明细*****************************/
+
+    @ApiModelProperty("融资首付")
+    private String downPayAmounts;
+    @ApiModelProperty("贷款保证金")
+    private String bondAmounts;
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+    @ApiModelProperty("服务费")
+    @NotBlank(message = "服务费不能为空")
+    private String serviceAmount;
+    @ApiModelProperty("代收意外险")
+    private String proxyAccidentPremium;
+    @ApiModelProperty("上牌费")
+    private String registerAmount;
+    @ApiModelProperty("运管费")
+    private String operationAmount;
+    @ApiModelProperty("补车价")
+    private String vehOtherPrice;
+    @ApiModelProperty("其它费用")
+    private String otherAmount;
+    @ApiModelProperty("其它费用说明")
+    private String otherAmountRemark;
+    @ApiModelProperty("办理方式选择")
+    private String dealWay;
+    @ApiModelProperty("办理方式选择key")
+    private String dealWayKey;
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
+    @ApiModelProperty("代收首年保险费")
+    private String proxyPremium;
+    @ApiModelProperty("代收购置费")
+    private String proxyPurchasetax;
+    @ApiModelProperty("抵顶首年保险费")
+    private String offsetPremium;
+    @ApiModelProperty("抵顶购置税")
+    private String offsetPurchasetax;
+    @ApiModelProperty("抵顶费用合计")
+    private String offsetTotal;
+    @ApiModelProperty("应收合计")
+    private String receivableTotal;
+    @ApiModelProperty("实收合计")
+    private String realTotal;
+    @ApiModelProperty("车辆总价")
+    private String vehTotalPrice;
+    @ApiModelProperty("名义留购价")
+    private String nominalPrice;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java

@@ -2,10 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loansolutions;
 
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
 import com.yxt.common.core.result.ResultBean;
@@ -48,7 +45,7 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
     }
 
     @Override
-    public ResultBean save2(SolutionsDto dto) {
+    public ResultBean save2(SolutionssDto dto) {
         return loanSolutionsService.save2(dto);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -837,10 +837,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutions.setOtherPolicyState(1);
             String loanDownPay = dto.getLoanDownPay();
             loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+
         } else {
             BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
             String loanDownPay = dto.getLoanDownPay();
             loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyAmount(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyInterest(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyPeriod("");
+            loanSolutionsOtherpolicy.setOtherPolicyYearRatio("");
+            loanSolutionsOtherpolicy.setOtherPolicyName("");
             loanSolutions.setOtherPolicyState(0);
         }
         baseMapper.insert(loanSolutions);
@@ -1397,10 +1404,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         return rate;
     }
 
-    public ResultBean save2(SolutionsDto dto) {
+    public ResultBean save2(SolutionssDto dto) {
         SolutionDetailsDto solutionDetailsDto = new SolutionDetailsDto();
         BeanUtil.copyProperties(dto, solutionDetailsDto);
-        solutionDetailsDto.setBusSid(dto.getSaleOrderSid());
+        solutionDetailsDto.setBusSid(dto.getBusSid());
         ResultBean resultBean = saveDtoss(solutionDetailsDto);
         return resultBean;
     }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.risk.solutions;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java

@@ -0,0 +1,165 @@
+package com.yxt.anrui.terminal.api.risk.solutions;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/15
+ **/
+@Data
+public class AppSolutionssDto implements Dto {
+    private static final long serialVersionUID = 939727612021140148L;
+
+    @ApiModelProperty("关联sid")
+    @JsonProperty("saleOrderSid")
+    private String busSid;
+    @ApiModelProperty("是否打包：1是0否")
+    private String isPack;
+    @ApiModelProperty("产品政策名称")
+    private String policyName;
+    @ApiModelProperty("产品政策sid")
+    private String policySid;
+    @ApiModelProperty("主车发票价")
+    private String mainVehicleAmount;
+    @ApiModelProperty("融资票据")
+    private String accessoriesAmount;
+    @ApiModelProperty("是否有融资票据")
+    private boolean accessoriesAmountCb;
+    @ApiModelProperty("挂车金额")
+    private String trailerAmount;
+    @ApiModelProperty("是否有挂车")
+    private boolean trailerAmountCb;
+    @ApiModelProperty("保险金额")
+    private String premium;
+    @ApiModelProperty("是否有保险")
+    private boolean premiumCb;
+    @ApiModelProperty("购置税")
+    private String purchaseTax;
+    @ApiModelProperty("是否有购置税")
+    private boolean purchaseTaxCb;
+    @ApiModelProperty("融资项目总额")
+    private String loanTotal;
+    @ApiModelProperty("首付款比例")
+    private String downPayRatio;
+    @ApiModelProperty("首付金额")
+    @NotBlank(message = "首付金额不能为空")
+    private String downPayAmount;
+    @ApiModelProperty("贷款金额")
+    private String loanAmount;
+    @ApiModelProperty("贷款期数")
+    @NotBlank(message = "产品期数不能为空")
+    private String loanPeriod;
+    @ApiModelProperty("贷款保证金比例")
+    private String bondRatio;
+    @ApiModelProperty("贷款保证金金额")
+    @NotBlank(message = "贷款保证金不能为空")
+    private String bondAmount;
+    @ApiModelProperty("厂家贴息")
+    @NotBlank(message = "厂家贴息不能为空")
+    private String factoryDiscount;
+    @ApiModelProperty("厂家贴息用途")
+    private String factoryDiscountUse;
+    @ApiModelProperty("厂家贴息用途")
+    private String factoryDiscountUseKey;
+    @ApiModelProperty("年利率")
+    private String policyYearRatio;
+    @ApiModelProperty("月还金额")
+    @NotBlank(message = "月还金额不能为空")
+    private String loanPayMoney;
+    @ApiModelProperty("利息总额")
+    private String loanInterest;
+    @ApiModelProperty("是否勾选其它融")
+    private boolean otherPolicyState;
+
+    @ApiModelProperty("贴息抵车款")
+    @JsonProperty("factoryDiscountUseMoney")
+    private String discountCar;
+
+    /*************************其他融和方案汇总*********************************/
+    @ApiModelProperty("其它融名称")
+    private String otherPolicyName;
+    @ApiModelProperty("其他融sid")
+    private String otherPolicySid;
+    @ApiModelProperty("其它融贷款金额")
+    private String otherPolicyAmount;
+    @ApiModelProperty("其它融期数")
+    private String otherPolicyPeriod;
+    @ApiModelProperty("其它融月还")
+    private String otherPolicyMonthlyRepay;
+    @ApiModelProperty("其它融利息总额")
+    private String otherPolicyInterest;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
+
+    @ApiModelProperty("'融资首付")
+    private String loanDownPay;
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+    @ApiModelProperty("总贷款金额")
+    private String loanAmountTotal;
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("月还金额")
+    private String monthlyRepay;
+    @ApiModelProperty("利息总额")
+    private String interest;
+    @ApiModelProperty("预计首期还款日")
+    private String returnTime;
+
+
+    /*********************************金融方案费用明细*****************************/
+
+    @ApiModelProperty("融资首付")
+    private String downPayAmounts;
+    @ApiModelProperty("贷款保证金")
+    private String bondAmounts;
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+    @ApiModelProperty("服务费")
+    @NotBlank(message = "服务费不能为空")
+    private String serviceAmount;
+    @ApiModelProperty("代收意外险")
+    private String proxyAccidentPremium;
+    @ApiModelProperty("上牌费")
+    private String registerAmount;
+    @ApiModelProperty("运管费")
+    private String operationAmount;
+    @ApiModelProperty("补车价")
+    private String vehOtherPrice;
+    @ApiModelProperty("其它费用")
+    private String otherAmount;
+    @ApiModelProperty("其它费用说明")
+    private String otherAmountRemark;
+    @ApiModelProperty("办理方式选择")
+    private String dealWay;
+    @ApiModelProperty("办理方式选择key")
+    private String dealWayKey;
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
+    @ApiModelProperty("代收首年保险费")
+    private String proxyPremium;
+    @ApiModelProperty("代收购置费")
+    private String proxyPurchasetax;
+    @ApiModelProperty("抵顶首年保险费")
+    private String offsetPremium;
+    @ApiModelProperty("抵顶购置税")
+    private String offsetPurchasetax;
+    @ApiModelProperty("抵顶费用合计")
+    private String offsetTotal;
+    @ApiModelProperty("应收合计")
+    private String receivableTotal;
+    @ApiModelProperty("实收合计")
+    private String realTotal;
+    @ApiModelProperty("车辆总价")
+    private String vehTotalPrice;
+    @ApiModelProperty("名义留购价")
+    private String nominalPrice;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java

@@ -26,6 +26,11 @@ public interface SolutionsFeign {
     @ResponseBody
     ResultBean save(@RequestBody AppSolutionsDto dto);
 
+    @ApiOperation("保存金融方案")
+    @PostMapping("/save2")
+    @ResponseBody
+    ResultBean save2(@RequestBody AppSolutionssDto dto);
+
     @ApiOperation("初始化金融方案")
     @GetMapping("/selectDetailsVo")
     @ResponseBody
@@ -47,7 +52,7 @@ public interface SolutionsFeign {
     ResultBean<AppSolutionVo> selectDetailsVo2(@RequestParam("saleOrderSid") String busSid);
 
     @ApiOperation("计算")
-    @GetMapping("/detailsVo2")
+    @PostMapping("/calc")
     @ResponseBody
     ResultBean<AppSolutionVo> detailsVo2(@RequestBody AppSolutionQuery query);
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java

@@ -28,6 +28,11 @@ public class SolutionsRest implements SolutionsFeign {
         return solutionsService.save(dto);
     }
 
+    @Override
+    public ResultBean save2(AppSolutionssDto dto) {
+        return solutionsService.save2(dto);
+    }
+
     @Override
     public ResultBean<AppSolutionsDetailsVo> selectDetailsVo(String saleOrderSid) {
         return solutionsService.selectDetailsVo(saleOrderSid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java

@@ -6,10 +6,7 @@ import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
 import com.yxt.anrui.terminal.api.risk.solutions.*;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -124,4 +121,15 @@ public class SolutionsService {
         BeanUtil.copyProperties(solutionssVo, appSolutionVo);
         return rb.success().setData(appSolutionVo);
     }
+
+    public ResultBean save2(AppSolutionssDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        SolutionssDto solutionsDto = new SolutionssDto();
+        BeanUtil.copyProperties(dto, solutionsDto);
+        ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
 }