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-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyByOrderSidVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author fanzongzhe
+ * @description
+ * @date 2023/3/31 10:45
+ */
+@Data
+@ApiModel(value = "根据销售订单查询退车列表 视图数据对象", description = "根据销售订单查询退车列表 视图数据对象")
+public class BusSalesOrderReturnVehApplyByOrderSidVo implements Vo {
+
+    private String sid; // sid
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 申请日期
+    @ApiModelProperty("车型图片")
+    private String filePath ; // 车型图片
+    @ApiModelProperty("车型小名")
+    private String modelName; // 车型小名
+    @ApiModelProperty("车架号")
+    private String vinNo; // 订单台数
+    @ApiModelProperty("节点状态")
+    private String nodeState; // 节点状态
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeign.java

@@ -113,4 +113,11 @@ public interface BusSalesOrderReturnVehApplyFeign {
     @ApiOperation(value = "终止任务")
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody BusSalesOrderReturnVehApplyTaskQuery query);
+
+
+    @ApiOperation("根据销售订单sid查询退车列表")
+    @GetMapping("/listPageByOrderSid/{orderSid}")
+    @ResponseBody
+    public ResultBean listPageByOrderSid(@PathVariable("orderSid") String orderSid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeignFallback.java

@@ -110,4 +110,8 @@ public class BusSalesOrderReturnVehApplyFeignFallback implements BusSalesOrderRe
 	public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean listPageByOrderSid(String orderSid) { return null; }
+
 }

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

@@ -381,7 +381,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (images.getSuccess()) {
                 modelInfo.setModelImage(images.getData());
             }
-            //vo.setModelInfo(modelInfo);
+//            vo.setModelInfoVo(modelInfo);
         }
         /*************************************************补充说明附件*****************************************************/
         String imagesFile = entity.getImagesFile();
@@ -400,20 +400,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());
+                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());
+//            List<BusSalesVehicleOrderDetailsVo> busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid());
-            if (busSalesVehicleOrderDetailsVoList.size() != 0) {
+//            if (busSalesVehicleOrderDetailsVoList.size() != 0) {
-                vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList);
+//                vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList);
+//            }
             }
+            vo.setBusSalesOrderModel(busSalesOrderModelDetailsVo);
         }
         /*************************************************上装信息*****************************************************/
         if (BusSalesOrderConstantUtils.TopType.YES.getCode().equals(entity.getIsTop())) {
@@ -614,6 +623,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);
     }
@@ -3551,8 +3576,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     } else {
                         otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append("-");
                     }
-                } else {
-                    otherLoanSolutions = otherLoanSolutions.append("-");
                 }
 
                 //==========================方案汇总

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyByOrderSidVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -76,4 +77,11 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
 
 	@Select("SELECT * FROM bus_sales_order_return_veh_apply WHERE contractNo = #{contractId} and nodeState != '终止' and nodeState != '待提交' and nodeState != '发起申请'")
 	List<BusSalesOrderReturnVehApply> fetchByContractNo(String contractId);
+
+	/**
+	 * 根据销售订单返回退车列表
+	 * @param orderSid
+	 * @return
+	 */
+    List<BusSalesOrderReturnVehApplyByOrderSidVo> listPageByOrderSid(String orderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -53,4 +53,25 @@
         where applyNo LIKE concat(#{bill}, '%')
     </select>
 
+
+    <!--    根据销售订单查询退车列表-->
+    <select id="listPageByOrderSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyByOrderSidVo">
+
+        SELECT DISTINCT
+        bso.sid,
+        bas.filePath,
+        bso.modelName,
+        bsv.vinNo,
+        bso.createTime,
+        bso.nodeState
+        FROM bus_sales_order_return_veh_apply AS bso
+        LEFT JOIN bus_sales_order_return_veh AS bsv
+        ON bso.sid = bsv.mainSid
+        LEFT JOIN anrui_base.base_vehicle_model_appendix AS bas
+        ON bso.modelSid = bas.modelSid
+        WHERE bso.orderSid = #{orderSid}
+
+    </select>
+
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -39,12 +40,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyQuery;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeign;
-
 /**
  * Project: anrui_buscenter(销售订单退车) <br/>
  * File: BusSalesOrderReturnVehApplyFeignFallback.java <br/>
@@ -138,4 +133,12 @@ public class BusSalesOrderReturnVehApplyRest implements BusSalesOrderReturnVehAp
     public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
         return busSalesOrderReturnVehApplyService.breakProcess(query);
     }
+
+    @Override
+    public ResultBean listPageByOrderSid(String orderSid) {
+
+        return busSalesOrderReturnVehApplyService.listPageByOrderSid(orderSid);
+    }
+
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -39,6 +39,7 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 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.bussalesorderreturnvehapply.*;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.BusSalesOrderReturnVehApplyTaskQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
@@ -81,22 +82,13 @@ 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 com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApply;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyQuery;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto;
-import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeign;
 
-import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -318,7 +310,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 BusSalesOrderReturnVehApplyDetailsVo data = fetchDetailsVoBySid(busSalesOrderReturnVehApplyECTJ.getSid()).getData();
                 data.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVoArrayList);
                 return rb.success().setData(data);
-            };
+            }
+            ;
         }
         busSalesOrderReturnVehApplyDetailsVo.setOrderSid(orderSid);
         //制单日期
@@ -748,4 +741,49 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         String billNo = Rule.getBillNo(bill, i);
         return billNo;
     }
+
+    /**
+     * 根据销售订单返回退车列表
+     *
+     * @param orderSid 销售订单sid
+     * @return
+     */
+    public ResultBean listPageByOrderSid(String orderSid) {
+
+        List<BusSalesOrderReturnVehApplyByOrderSidVo> list = baseMapper.listPageByOrderSid(orderSid);
+        Map<String, Set<String>> map = new HashMap<>();
+        for (BusSalesOrderReturnVehApplyByOrderSidVo applyByOrderSidVo : list) {
+            String vinNo = applyByOrderSidVo.getVinNo();
+            String sid = applyByOrderSidVo.getSid();
+            Set<String> orDefault = map.getOrDefault(sid, new HashSet<String>());
+            orDefault.add(vinNo);
+            map.put(sid, orDefault);
+            if (StringUtils.isNotBlank(applyByOrderSidVo.getFilePath())) {
+                String filePath = applyByOrderSidVo.getFilePath();
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                filePath = urlPrefix + filePath;
+                applyByOrderSidVo.setFilePath(filePath);
+            }
+        }
+        List<BusSalesOrderReturnVehApplyByOrderSidVo> bsvList = new ArrayList<>();
+        for (Map.Entry<String, Set<String>> en : map.entrySet()) {
+            String key = en.getKey();
+            StringBuffer sb = new StringBuffer();
+            for (String vinNo : en.getValue()) {
+                sb.append(vinNo).append("\n");
+            }
+            sb.delete(sb.length() - 1, sb.length());
+            BusSalesOrderReturnVehApplyByOrderSidVo bsv = null;
+
+            for (BusSalesOrderReturnVehApplyByOrderSidVo applyByOrderSidVo : list) {
+                if (applyByOrderSidVo.getSid().equals(key)) {
+                    bsv = applyByOrderSidVo;
+                    break;
+                }
+            }
+            bsv.setVinNo(sb.toString());
+            bsvList.add(bsv);
+        }
+        return ResultBean.fireSuccess().setData(bsvList);
+    }
 }

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

@@ -516,12 +516,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutionsDetailService.insert(loanSolutionsDetail);
 
         } else {//外部金融的只需要录入厂家贴息
+            //查询金融方案
+            loanSolutions = new LoanSolutions();
             if(StringUtils.isNotBlank(dto.getTypeKey())){
                 loanSolutions.setType(dto.getType());
                 loanSolutions.setTypeKey(dto.getTypeKey());
             }
-            //查询金融方案
-            loanSolutions = new LoanSolutions();
             if (StringUtils.isBlank(dto.getFactoryDiscount())) {
                 loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
             }else{

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeign.java

@@ -69,4 +69,11 @@ public interface AppBusSalesOrderRetVehFeign {
     @PutMapping("/stopSalesOrderRetVehInfo")
     @ResponseBody
     ResultBean stopSalesOrderRetVehInfo(@RequestBody SaleOrderRetVehTaskQuery query);
+
+    @ApiOperation("根据销售订单sid查询退车列表")
+    @GetMapping("/listPageByOrderSid/{orderSid}")
+    @ResponseBody
+    public ResultBean listPageByOrderSid(@PathVariable("orderSid") String orderSid);
+
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehFeignFallback.java

@@ -97,4 +97,9 @@ public class AppBusSalesOrderRetVehFeignFallback implements AppBusSalesOrderRetV
     public ResultBean stopSalesOrderRetVehInfo(SaleOrderRetVehTaskQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean listPageByOrderSid(String orderSid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/AppBusSalesOrderReturnVehApplyByOrderSidVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/3/31 14:33
+ */
+@Data
+@ApiModel(value = "根据销售订单查询退车列表 视图数据对象", description = "根据销售订单查询退车列表 视图数据对象")
+public class AppBusSalesOrderReturnVehApplyByOrderSidVo {
+    private String sid; // sid
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 申请日期
+    @ApiModelProperty("车型图片")
+    private String filePath ; // 车型图片
+    @ApiModelProperty("车型小名")
+    private String modelName; // 车型小名
+    @ApiModelProperty("车架号")
+    private String vinNo; // 订单台数
+    @ApiModelProperty("节点状态")
+    private String nodeState; // 节点状态
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehRest.java

@@ -67,4 +67,9 @@ public class AppBusSalesOrderRetVehRest implements AppBusSalesOrderRetVehFeign {
     public ResultBean stopSalesOrderRetVehInfo(SaleOrderRetVehTaskQuery query) {
         return appBusSalesOrderRetVehService.stopSalesOrderRetVehInfo(query);
     }
+
+    @Override
+    public ResultBean listPageByOrderSid(String orderSid) {
+        return appBusSalesOrderRetVehService.listPageByOrderSid(orderSid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrderRetVeh/AppBusSalesOrderRetVehService.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.AppBusSalesOrderReturnVehApplyByOrderSidVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SubmitOrderRetVehDto;
@@ -41,6 +42,8 @@ import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class AppBusSalesOrderRetVehService {
 
@@ -120,4 +123,9 @@ public class AppBusSalesOrderRetVehService {
         }
         return rb.success().setData(resultBean.getData());
     }
+
+    public ResultBean listPageByOrderSid(String orderSid) {
+        ResultBean<List<AppBusSalesOrderReturnVehApplyByOrderSidVo>> list = busSalesOrderReturnVehApplyFeign.listPageByOrderSid(orderSid);
+        return list;
+    }
 }