pc端客户洽谈金融需求

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -84,7 +84,7 @@ public class BaseVehicleStateEnum {
         TC("14", "退车"),
         JCZBTIJ("15", "交车准备提交"),
         JCTJ("16", "交车提交"),
-        CKKP_SAVE("17", "出库申请保存"),
+//        CKKP_SAVE("17", "出库申请保存"),
         CKKP_DELETE("18", "出库申请修改"),
         QKKPTJ("19","欠款开票提交"),
         QKKPZZ("20","欠款开票终止"),

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -91,9 +91,9 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                 }else if(BaseVehicleStateEnum.OperateTypeEnum.JCTJ.getTypeKey().equals(operateType)){
                     //交车提交后，则更新小状态为503已交车
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JC_STATE_3.getStateKey());
-                }else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey().equals(operateType)){
+                }/*else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_3.getStateKey());
-                }else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey().equals(operateType)){
+                }*/else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
                 }else if(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey().equals(operateType)){
                     baseVehicleState.setCarryInvoiceState("1");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -116,7 +116,7 @@
         left join bus_sales_order bo on bv.salesOrderSid = bo.sid
         left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
         where bo.contractNo = #{contractId}
-        and bs.busState != '401' and (bs.finState != '1' or bs.carryVehicleState != '1')
+        and (bs.busState != '401' or bs.busState != '403') and (bs.finState != '1' or bs.carryVehicleState != '1')
         and bv.linkSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -2111,7 +2111,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             baseMapper.insert(busDeliveredApply);
             sid = busDeliveredApply.getSid();
-            List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
+           /* List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
             List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
             vinSidList.removeAll(Collections.singleton(null));
             if (!vinSidList.isEmpty()) {
@@ -2122,7 +2122,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     stateDtoList.add(baseVehicleStateDto);
                 });
                 ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
-            }
+            }*/
 
         } else {
             //根据出库申请sid查询出库申请是否存在
@@ -2287,7 +2287,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails);
             }
             baseMapper.updateById(busDeliveredApply);
-            stateDtoList = new ArrayList<>();
+          /*  stateDtoList = new ArrayList<>();
             vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
             vinSidList.removeAll(Collections.singleton(null));
             if (!vinSidList.isEmpty()) {
@@ -2299,7 +2299,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     finalStateDtoList.add(baseVehicleStateDto);
                 });
                 ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
-            }
+            }*/
         }
         return rb.success().setData(sid);
     }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java

@@ -83,4 +83,7 @@ public class CrmVehicledemand extends BaseEntity {
     private String financePlan;
     @ApiModelProperty(value = "金融方案value")
     private String financePlanValue;
+
+    private String typeKey;
+    private String type;
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java

@@ -43,13 +43,13 @@ public interface CrmVehicledemandFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<CrmVehicledemandVo>> listPage(@RequestBody PagerQuery<CrmVehicledemandQuery> pq);
 
-    @ApiOperation("根据条件查询所有数据列表")
+   /* @ApiOperation("根据条件查询所有数据列表")
     @PostMapping("/listAll")
     public ResultBean<List<CrmVehicledemandVo>> listAll(@RequestBody CrmVehicledemandQuery query);
 
     @ApiOperation("所有数据列表")
     @GetMapping("/list")
-    public ResultBean<List<CrmVehicledemandVo>> list();
+    public ResultBean<List<CrmVehicledemandVo>> list();*/
 
     /**
      * 意向车型新增保存
@@ -72,9 +72,9 @@ public interface CrmVehicledemandFeign {
      * @param sid 意向车型的sid
      * @return
      */
-    @ApiOperation("修改保存")
+  /*  @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
-    public ResultBean update(@RequestBody CrmVehicledemandDto dto, @PathVariable("sid") String sid);
+    public ResultBean update(@RequestBody CrmVehicledemandDto dto, @PathVariable("sid") String sid);*/
 
     /**
      * 意向车型的批量删除
@@ -82,7 +82,7 @@ public interface CrmVehicledemandFeign {
      * @param sid
      * @return
      */
-    @ApiOperation("删除记录")
+ /*   @ApiOperation("删除记录")
     @GetMapping("/del/{sid}")
     public ResultBean del(@PathVariable("sid") String sid);
 
@@ -90,15 +90,24 @@ public interface CrmVehicledemandFeign {
     @GetMapping("/fetch/{id}")
     public ResultBean<CrmVehicledemandVo> fetch(@PathVariable("id") String id);
 
+    */
+
     /**
      * 意向车型的编辑回显
      *
      * @param sid
      * @return
-     */
+     *//*
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchSid/{sid}")
-    public ResultBean<CrmVehicledemandVo> fetchSid(@PathVariable("sid") String sid);
+    public ResultBean<CrmVehicledemandVo> fetchSid(@PathVariable("sid") String sid);*/
+    @ApiOperation("详情、编辑初始化")
+    @GetMapping("/details")
+    ResultBean<CrmVehicledemandsVo> details(@RequestParam("sid") String sid);
+
+    @ApiOperation("删除/批量删除")
+    @DeleteMapping("/deleteAll")
+    ResultBean deleteAll(@RequestBody String[] sids);
 
 
     /********************************** App接口 *********************************/

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java

@@ -31,7 +31,7 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign {
         return rb.setMsg("接口anrui-crm/crmvehicledemand/listPage无法访问");
     }
 
-    @Override
+  /*  @Override
     public ResultBean<List<CrmVehicledemandVo>> listAll(CrmVehicledemandQuery query) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-crm/crmvehicledemand/listAll无法访问");
@@ -41,7 +41,7 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign {
     public ResultBean<List<CrmVehicledemandVo>> list() {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-crm/crmvehicledemand/list无法访问");
-    }
+    }*/
 
     @Override
     public ResultBean save(CrmVehicledemandDto dto) {
@@ -54,6 +54,16 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign {
     }
 
     @Override
+    public ResultBean<CrmVehicledemandsVo> details(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteAll(String[] sids) {
+        return null;
+    }
+
+   /* @Override
     public ResultBean update(CrmVehicledemandDto dto, String sid) {
         return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/update无法访问");
     }
@@ -72,7 +82,7 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign {
     @Override
     public ResultBean<CrmVehicledemandVo> fetchSid(String sid) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean delBySid(String sid) {

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java

@@ -60,9 +60,5 @@ public class CrmVehicledemandsDto implements Dto {
     private String financePlan;
     @ApiModelProperty("金融方案value")
     private String financePlanValue;
-    @ApiModelProperty("客户类型")
-    private String customerType;
-    @ApiModelProperty("客户类型key")
-    private String customerTypeKey;
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsVo.java

@@ -0,0 +1,58 @@
+package com.yxt.anrui.crm.api.crmvehicledemand;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/28
+ **/
+@Data
+public class CrmVehicledemandsVo {
+
+    @ApiModelProperty("车辆需求sid")
+    private String sid;
+    private String customerSid;
+    @ApiModelProperty("购车方式")
+    private String purchaseMethod;
+    @ApiModelProperty("购车方式Value")
+    private String purchaseMethodValue;
+    @ApiModelProperty("资金来源、担保类型")
+    private String type;
+    @ApiModelProperty("资金来源、担保类型key")
+    private String typeKey;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("常用配置sid")
+    private String comonConfigSid;
+    @ApiModelProperty("常用配置")
+    private String sketChconfiguration;
+    @ApiModelProperty("其它配置说明")
+    private String otherConfig;
+    @ApiModelProperty("换选装内容")
+    private String changeOptions;
+    @ApiModelProperty("预计提车日期")
+    private String estimatedPickupDate;
+    @ApiModelProperty("销售参考价")
+    private String saleReferencePrice;
+
+    @ApiModelProperty("车型报价")
+    private String vehicleModelOffer;
+    @ApiModelProperty("数量")
+    private String number;
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    private CrmSolutions crmSolutions = new CrmSolutions();
+    @ApiModelProperty("金融方案key")
+    private String financePlan;
+    @ApiModelProperty("金融方案value")
+    private String financePlanValue;
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java

@@ -35,10 +35,10 @@ public interface CrmVehicledemandMapper extends BaseMapper<CrmVehicledemand> {
 
     IPage<CrmVehicledemandVo> selectPageVo(IPage<CrmVehicledemand> page, @Param(Constants.WRAPPER) Wrapper<CrmVehicledemand> qw);
 
-    List<CrmVehicledemandVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmVehicledemand> qw);
+//    List<CrmVehicledemandVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmVehicledemand> qw);
 
-    @Select("select * from crm_vehicledemand")
+   /* @Select("select * from crm_vehicledemand")
-    List<CrmVehicledemandVo> selectListVo();
+    List<CrmVehicledemandVo> selectListVo();*/
 
     List<CrmVehicledemandVo> fetchByCustomerSid(String customerSid);
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@@ -11,13 +11,13 @@
         </where>
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandVo">
+   <!-- <select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandVo">
         SELECT *
         FROM crm_vehicledemand
         <where>
             ${ew.sqlSegment}
         </where>
-    </select>
+    </select>-->
 
     <select id="fetchByCustomerSid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandVo">
         SELECT *

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java

@@ -44,7 +44,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
+   /* @Override
     public ResultBean<List<CrmVehicledemandVo>> listAll(@RequestBody CrmVehicledemandQuery query) {
         ResultBean rb = ResultBean.fireFail();
         List<CrmVehicledemandVo> list = crmVehicledemandService.listAllVo(query);
@@ -56,7 +56,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
         ResultBean rb = ResultBean.fireFail();
         List<CrmVehicledemandVo> list = crmVehicledemandService.listVo();
         return rb.success().setData(list);
-    }
+    }*/
 
     @Override
     public ResultBean save(CrmVehicledemandDto dto) {
@@ -68,14 +68,24 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
         return crmVehicledemandService.save2(dto);
     }
 
+    @Override
+    public ResultBean<CrmVehicledemandsVo> details(String sid) {
+        return crmVehicledemandService.details(sid);
+    }
+
+    @Override
+    public ResultBean deleteAll(String[] sids) {
+        return crmVehicledemandService.deleteAll(sids);
+    }
+/*
     @Override
     public ResultBean update(CrmVehicledemandDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         crmVehicledemandService.updateAllBySid(dto, sid);
         return rb.success();
-    }
+    }*/
 
-    @Override
+  /*  @Override
     public ResultBean del(String sid) {
         ResultBean rb = ResultBean.fireFail();
         crmVehicledemandService.delAll(sid);
@@ -94,7 +104,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
         ResultBean rb = ResultBean.fireFail();
         CrmVehicledemandVo vo = crmVehicledemandService.fetchAllBySid(sid);
         return rb.success().setData(vo);
-    }
+    }*/
 
     @Override
     public ResultBean delBySid(String sid) {

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -21,7 +21,9 @@ import com.yxt.anrui.crm.biz.crmvehiclefinance.CrmVehicleFinanceService;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssDto;
+import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateSolutionsVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -29,11 +31,13 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -72,19 +76,19 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
     @Autowired
     private LoanSolutionsFeign loanSolutionsFeign;
 
-    public PagerVo<CrmVehicledemand> listPage(PagerQuery<CrmVehicledemandQuery> pq) {
+/*    public PagerVo<CrmVehicledemand> listPage(PagerQuery<CrmVehicledemandQuery> pq) {
         CrmVehicledemandQuery query = pq.getParams();
         QueryWrapper<CrmVehicledemand> qw = createQueryWrapper(query);
         IPage<CrmVehicledemand> page = PagerUtil.queryToPage(pq);
         IPage<CrmVehicledemand> pagging = baseMapper.selectPage(page, qw);
         PagerVo<CrmVehicledemand> p = PagerUtil.pageToVo(pagging, null);
         return p;
-    }
+    }*/
 
-    public List<CrmVehicledemand> listAll(CrmVehicledemandQuery query) {
+  /*  public List<CrmVehicledemand> listAll(CrmVehicledemandQuery query) {
         QueryWrapper<CrmVehicledemand> qw = createQueryWrapper(query);
         return baseMapper.selectList(qw);
-    }
+    }*/
 
     private QueryWrapper<CrmVehicledemand> createQueryWrapper(CrmVehicledemandQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -129,27 +133,27 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         return p;
     }
 
-    public List<CrmVehicledemandVo> listAllVo(CrmVehicledemandQuery query) {
+ /*   public List<CrmVehicledemandVo> listAllVo(CrmVehicledemandQuery query) {
         QueryWrapper<CrmVehicledemand> qw = createQueryWrapper(query);
         return baseMapper.selectListAllVo(qw);
-    }
+    }*/
 
-    public List<CrmVehicledemandVo> listVo() {
+   /* public List<CrmVehicledemandVo> listVo() {
         return baseMapper.selectListVo();
-    }
+    }*/
 
-    public void saveOrUpdateDto(CrmVehicledemandDto dto) {
+   /* public void saveOrUpdateDto(CrmVehicledemandDto dto) {
         CrmVehicledemand entity = new CrmVehicledemand();
         dto.fillEntity(entity);
         this.saveOrUpdate(entity);
-    }
+    }*/
 
-    public CrmVehicledemandVo fetchByIdVo(String id) {
+   /* public CrmVehicledemandVo fetchByIdVo(String id) {
         CrmVehicledemand entity = this.fetchById(id);
         CrmVehicledemandVo vo = new CrmVehicledemandVo();
         BeanUtil.copyProperties(entity, vo);
         return vo;
-    }
+    }*/
 
     public List<CrmVehicledemandVo> fetchByCustomerSid(String customerSid) {
         return baseMapper.fetchByCustomerSid(customerSid);
@@ -284,7 +288,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         return crmVehicledemandVo;
     }
 
-    public void updateAllBySid(CrmVehicledemandDto dto, String sid) {
+   /* public void updateAllBySid(CrmVehicledemandDto dto, String sid) {
         this.updateBySid(dto.toMap(), sid);
         CrmFindemandDto crmFindemandDto = dto.getCrmFindemandDto();
         crmFindemandService.delByDemandSid(sid);
@@ -296,7 +300,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
             crmFindemand.setDemandSid(sid);
             crmFindemandService.save(crmFindemand);
         }
-    }
+    }*/
 
     public IPage<AppCrmVehicledemandVo> getVisitListSid(PagerQuery<AppCrmVehicledemandQuery> pagerQuery) {
         IPage<AppCrmVehicledemandQuery> page = PagerUtil.queryToPage(pagerQuery);
@@ -521,8 +525,10 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {//新增
             CrmVehicledemand crmVehicledemand = new CrmVehicledemand();
+            sid = crmVehicledemand.getSid();
             BeanUtil.copyProperties(dto, crmVehicledemand, "sid");
             crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid());
+            crmVehicledemand.setStates("1");
             //新增客户的金融方案
             if ("01".equals(dto.getFinancePlan())) {//资方常规
                 CrmSolutions crmSolutions = dto.getCrmSolutions();
@@ -532,7 +538,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     solutionsDto.setSaleOrderSid(sid);
                     if ("2".equals(dto.getTypeKey())) {
                         solutionsDto.setShowMore(false);
-                    } else if ("3".equals(dto.getTypeKey()) || "4".equals(dto.getTypeKey())) {
+                    } else if ("3".equals(dto.getTypeKey())) {
+                        solutionsDto.setShowMore(true);
+                    }else if("4".equals(dto.getTypeKey())){
                         solutionsDto.setShowMore(true);
                     }
                     ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
@@ -580,4 +588,42 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         }
         return rb.success();
     }
+
+    public ResultBean<CrmVehicledemandsVo> details(String sid) {
+        CrmVehicledemandsVo crmVehicledemandsVo = new CrmVehicledemandsVo();
+        ResultBean<CrmVehicledemandsVo> rb = ResultBean.fireFail();
+        CrmVehicledemand crmVehicledemand = fetchBySid(sid);
+        if (crmVehicledemand == null) {
+            return rb.setMsg("该车辆需求不存在");
+        }
+        BeanUtil.copyProperties(crmVehicledemand, crmVehicledemandsVo);
+        if (!"1".equals(crmVehicledemand.getTypeKey())) {
+            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailByApplySid(sid);
+            if (solutionsDetailsVoResultBean.getData() != null) {
+                CrmSolutions loanTemplateSolutionsVo = new CrmSolutions();
+                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), loanTemplateSolutionsVo);
+                if ("2".equals(crmVehicledemandsVo.getTypeKey())) {
+                    loanTemplateSolutionsVo.setShowMore(false);
+                } else if ("3".equals(crmVehicledemandsVo.getTypeKey()) || "4".equals(crmVehicledemandsVo.getTypeKey())) {
+                    loanTemplateSolutionsVo.setShowMore(true);
+                }
+                crmVehicledemandsVo.setCrmSolutions(loanTemplateSolutionsVo);
+            }
+        }
+        return rb.success().setData(crmVehicledemandsVo);
+    }
+
+    public ResultBean deleteAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> sidsList = Arrays.asList(sids);
+        if (sidsList.size() == 0) {
+            return rb.setMsg("请选择要删除的数据");
+        }
+        for (int i = 0; i < sidsList.size(); i++) {
+            String sid = sidsList.get(i);
+            baseMapper.delBySid(sid);
+            loanSolutionsFeign.deleteByOrderSid(sid);
+        }
+        return rb.success();
+    }
 }