Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java

@@ -27,13 +27,13 @@ package com.yxt.anrui.buscenter.api.bussalesorder;
 
 
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.common.core.vo.Vo;
@@ -114,6 +114,7 @@ public class BusSalesOrderDetailsVo implements Vo {
     private String type;
     @ApiModelProperty(value = "主车车型信息")
     private BusSalesOrderModelDetailsVo busSalesOrderModel = new BusSalesOrderModelDetailsVo();
+//    private AppOrderModelInfoVo modelInfoVo = new AppOrderModelInfoVo();
     @ApiModelProperty(value = "价格信息")
     private BusSalesOrderPriceDetailsVo busSalesOrderPrice = new BusSalesOrderPriceDetailsVo();
     @ApiModelProperty(value = "保险说明")
@@ -161,4 +162,9 @@ public class BusSalesOrderDetailsVo implements Vo {
     private String procInstId;
     @ApiModelProperty("节点状态")
     private String nodeState;
+
+    @ApiModelProperty("是否是三方金融")
+    private boolean finPlanState;
+
+    private SolutionsDetailsssVo solutionsDetailsssVo;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java

@@ -0,0 +1,154 @@
+package com.yxt.anrui.buscenter.api.bussalesorder;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/31 17:05
+ * @Description
+ */
+@Data
+public class SolutionsDetailsssVo {
+
+
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+
+    //金融方案主表
+
+    @ApiModelProperty("类型：01自营非担保，02外部金融")
+    private String type;
+    @ApiModelProperty("类型：01自营非担保，02外部金融")
+    private String typeKey;
+    private String isPack;
+    @ApiModelProperty("产品政策名称")
+    private String policyName;
+    @ApiModelProperty("产品政策sid")
+    private String policySid;
+    @ApiModelProperty("融资项目总额")
+    private String loanTotal;
+    @ApiModelProperty("主车发票价")
+    private String mainVehicleAmount;
+    @ApiModelProperty("融资票据")
+    private String accessoriesAmount;
+    @ApiModelProperty("挂车金额")
+    private String trailerAmount;
+    @ApiModelProperty("购置税")
+    private String purchaseTax;
+    @ApiModelProperty("保险金额")
+    private String premium;
+    @ApiModelProperty("车损上浮")
+    private String vehDamageFloat;
+    @ApiModelProperty("首付款比例")
+    private String downPayRatio;
+    @ApiModelProperty("首付金额")
+    private String downPayAmount;
+    @ApiModelProperty("贷款金额")
+    private String loanAmount;
+    @ApiModelProperty("贷款期数")
+    private String loanPeriod;
+    @ApiModelProperty("保证金比例")
+    private String bondRatio;
+    @ApiModelProperty("保证金金额")
+    private String bondAmount;
+    @ApiModelProperty("厂家贴息")
+    private String factoryDiscount;
+    @ApiModelProperty("厂家贴息用途")
+    private String factoryDiscountUse;
+    @ApiModelProperty("年利率")
+    private String policyYearRatio;
+    @ApiModelProperty("贷款月还")
+    private String loanPayMoney;
+    @ApiModelProperty("贷款利息")
+    private String loanInterest;
+    @ApiModelProperty("是否有融资票据")
+    private boolean accessoriesAmountCb;
+    @ApiModelProperty("是否有挂车")
+    private boolean trailerAmountCb;
+    @ApiModelProperty("是否有购置税")
+    private boolean purchaseTaxCb;
+    @ApiModelProperty("是否有保险")
+    private boolean premiumCb;
+    @ApiModelProperty("是否有车损上浮")
+    private boolean vehDamageFloatCb;
+    @ApiModelProperty("是否勾选其它融")
+    private boolean otherPolicyState;
+
+    //其他融
+
+    @ApiModelProperty("其它融名称")
+    private String otherPolicyName;
+    @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 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("服务费")
+    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 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-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java

@@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderModelVo.java <br/>
@@ -74,9 +77,9 @@ public class BusSalesOrderModelDetailsVo implements Vo {
     @ApiModelProperty("上装")
     private String tops;
     @ApiModelProperty("车架号")
-    private String vinNo;
+    private List<String> vinNo = new ArrayList<>();
     @ApiModelProperty("采购订单编号")
-    private String linkNo;
+    private List<String> linkNo = new ArrayList<>();
     @ApiModelProperty("采购数量")
     private String purNum;
 

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

@@ -375,7 +375,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (images.getSuccess()) {
                 modelInfo.setModelImage(images.getData());
             }
-            //vo.setModelInfo(modelInfo);
+//            vo.setModelInfoVo(modelInfo);
         }
         /*************************************************补充说明附件*****************************************************/
         String imagesFile = entity.getImagesFile();
@@ -394,20 +394,29 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         /*************************************************主车信息*****************************************************/
         BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
         if (busSalesOrderModelDetailsVo != null) {
-            vo.setBusSalesOrderModel(busSalesOrderModelDetailsVo);
-        }
-        //查询现车车辆
-        if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
-            List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleListVoList = busSalesOrderVehicleService.detailsList(entity.getSid());
+
+            //查询现车车辆
+            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
+                List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
+                //包含采购系统的车架号
+                List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
+                busSalesOrderModelDetailsVo.setVinNo(vinList);
+           /* List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleListVoList = busSalesOrderVehicleService.detailsList(entity.getSid());
             if (busSalesOrderVehicleListVoList.size() != 0) {
                 vo.setBusSalesOrderVehicleList(busSalesOrderVehicleListVoList);
+            }*/
+            } else if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(entity.getType())) {
+                List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
+                //包含采购系统的采购订单编号
+                List<String> stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList());
+                busSalesOrderModelDetailsVo.setLinkNo(stringList);
+                //查询采购订单
+//            List<BusSalesVehicleOrderDetailsVo> busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid());
+//            if (busSalesVehicleOrderDetailsVoList.size() != 0) {
+//                vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList);
+//            }
             }
-        } else if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(entity.getType())) {
-            //查询采购订单
-            List<BusSalesVehicleOrderDetailsVo> busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid());
-            if (busSalesVehicleOrderDetailsVoList.size() != 0) {
-                vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList);
-            }
+            vo.setBusSalesOrderModel(busSalesOrderModelDetailsVo);
         }
         /*************************************************上装信息*****************************************************/
         if (BusSalesOrderConstantUtils.TopType.YES.getCode().equals(entity.getIsTop())) {
@@ -608,6 +617,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             vo.setBusSalesOrderotherMessageDetailsVo(busSalesOrderotherMessageDetailsVo);
+            //=========================金融方案
+            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
+            if(solutionsDetailsVoResultBean.getData() != null){
+                SolutionsDetailsssVo solutionsDetailsssVo = new SolutionsDetailsssVo();
+                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(),solutionsDetailsssVo);
+                vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
+            }
+            if("2".equals(entity.getPayTypeKey())){
+                vo.setFinPlanState(true);
+            }else{
+                if("1".equals(entity.getFinancePlan())){
+                    vo.setFinPlanState(false);
+                }else{
+                    vo.setFinPlanState(true);
+                }
+            }
         }
         return rb.success().setData(vo);
     }