移动端客户，车型，虚拟订单bug修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -545,18 +545,20 @@
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
-        SELECT bvm.sid                                                                                     AS modelSid,
-               bvm.vehicleAlias                                                                            AS modelName,
+        SELECT bvm.sid                                                                                   AS modelSid,
+               bvm.vehicleAlias                                                                          AS modelName,
                bvm.brandName,
-               bvm.carBrand                                                                                AS brandSid,
-               bvm.vehicleVersionValue                                                                     AS versionValue,
+               bvm.carBrand                                                                              AS brandSid,
+               bvm.vehicleVersionValue                                                                   AS versionValue,
                bvm.fuelTypeValue,
                bvm.gearboxTypeValue,
-               (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid)                AS configNum,
-               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum
+               bv.guidedPrice,
+               (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid)              AS configNum,
+               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum
         FROM base_vehicle bv
                  LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
             ${ew.customSqlSegment}
+
     </select>
 
     <select id="vehicleReturnPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleReturnVo">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -800,11 +800,17 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         IPage<AppBaseVehicleNowModelQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppBaseVehicleNowModelVo> qw = nowModelQueryWrapper(pagerQuery.getParams());
-        return baseMapper.getNowModelList(page, qw);
+        IPage<AppBaseVehicleNowModelVo> nowModelList = baseMapper.getNowModelList(page, qw);
+        List<AppBaseVehicleNowModelVo> records = nowModelList.getRecords();
+        for (AppBaseVehicleNowModelVo record : records) {
+            record.setModelImage("www.baidu.com");
+        }
+        return nowModelList;
     }
 
     private QueryWrapper<AppBaseVehicleNowModelVo> nowModelQueryWrapper(AppBaseVehicleNowModelQuery pagerQuery) {
         QueryWrapper<AppBaseVehicleNowModelVo> qw = new QueryWrapper<>();
+        qw.eq("bv.lockedState", "03");
         if (StringUtils.isNotBlank(pagerQuery.getName())) { // 名称
             qw.like("bvm.vehicleAlias", pagerQuery.getName());
         }
@@ -841,8 +847,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bv.useOrg", pagerQuery.getUseOrg());
         }
-        qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0004").or().eq("bv.vehicleState", "0005"));
-        qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
+//        qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0004").or().eq("bv.vehicleState", "0005"));
+//        qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
         return qw;
     }
 
@@ -1216,6 +1222,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         IPage<AppBaseVinNowCarVo> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppBaseVinNowCarVo> pagging = baseMapper.getModelNowCarList(page, qw);
         for (AppBaseVinNowCarVo record : pagging.getRecords()) {
+            record.setCertificate("虚拟/正式");
             vinNowCarVos.add(record);
         }
         appBaseConfigNowCarVo.setRecords(vinNowCarVos);

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

@@ -25,7 +25,7 @@ public class AppBusSalesOrderAllDto implements Dto {
     private String customerSid;
     @ApiModelProperty("付款类型")
     private String invoiceValue;
-    @ApiModelProperty("挂靠公司类型 1 选择 2 手写")
+    @ApiModelProperty("挂靠公司类型 1 选择 0 手写")
     private String affiliatedType;
     @ApiModelProperty("选择挂靠公司名称")
     private String affiliatedOrgNameChoose;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -624,7 +624,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             qw.and(wrapper -> wrapper.like("bd.draweeName", query.getName()).or().like("bdv.customerName", query.getName()));
         }
         if (StringUtils.isNotBlank(query.getType())) {
-            qw.eq("bmd.depositBillType", query.getType());
+            qw.eq("bmd.depositBillTypeKey", query.getType());
         }
         return qw;
     }

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

@@ -1061,7 +1061,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (affiliatedType.equals("1")) {
                 busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                 busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
-            } else if (affiliatedType.equals("2")) {
+            } else if (affiliatedType.equals("0")) {
                 busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
             }
             save(busSalesOrder);

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

@@ -23,6 +23,9 @@ public class AppCrmVehicleDemandUpdateDto implements Dto {
     @ApiModelProperty("提车日期")
     private String date;
 
+    @ApiModelProperty("车型报价")
+    private String price;
+
     @ApiModelProperty("意向车型sid")
     private String intentionSid;
 }

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

@@ -114,7 +114,7 @@ public interface CrmVehicledemandFeign {
 
     @ApiOperation("手机端-修改意向车型（新）")
     @ResponseBody
-    @PostMapping("/saveVisitDemands")
+    @PutMapping("/saveVisitDemands")
     public ResultBean saveVisitDemands(@RequestBody AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto);
 
     @ApiOperation("手机端-意向车型详情（新）")

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

@@ -96,6 +96,7 @@
                cv.vehicleModelOffer   AS price,
                cv.comonConfigSid      AS configSid,
                cv.remarks,
+               cv.number,
                cv.estimatedPickupDate AS `date`
         FROM crm_vehicledemand cv
         WHERE cv.sid = #{intentionSid}

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

@@ -317,6 +317,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         CrmVehicledemand entity = new CrmVehicledemand();
         entity.setCustomerSid(appCrmVehicleDemandDto.getCustomerSid());
         entity.setModelSid(modelSid);
+        entity.setComonConfigSid(configSid);
         entity.setModelName(data.getModelName());
         entity.setBrandSid(data.getBrandSid());
         entity.setBrandName(data.getBrandName());
@@ -353,6 +354,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         entity.setRemarks(appCrmVehicleDemandUpdateDto.getRemarks());
         entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());
         entity.setEstimatedPickupDate(appCrmVehicleDemandUpdateDto.getDate());
+        entity.setVehicleModelOffer(appCrmVehicleDemandUpdateDto.getPrice());
         baseMapper.updateById(entity);
         return rb.success();
     }