Merge remote-tracking branch 'origin/master'

3 years ago · 5f176a1df5
50 changed files with 1888 additions and 191 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPrice.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPrice.java
@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepostprice;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPrice.java <br/>
+ * Class: com.yxt.anrui.base.api.basepostprice.BasePostPrice <br/>
+ * Description: 岗位让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "岗位让价权限表", description = "岗位让价权限表")
+@TableName("base_post_price")
+public class BasePostPrice extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("让价金额")
+    private BigDecimal price;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceDetailsVo.java
@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepostprice;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basepostprice.BasePostPriceVo <br/>
+ * Description: 岗位让价权限表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "岗位让价权限表 视图数据详情", description = "岗位让价权限表 视图数据详情")
+public class BasePostPriceDetailsVo implements Vo {
+
+    private String sid;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("让价金额")
+    private BigDecimal price;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceDto.java
@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepostprice;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basepostprice.BasePostPriceDto <br/>
+ * Description: 岗位让价权限表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "岗位让价权限表 数据传输对象", description = "岗位让价权限表 数据传输对象")
+public class BasePostPriceDto implements Dto {
+
+    private String sid;
+
+	@ApiModelProperty("品牌sid")
+   private String brandSid;
+	@ApiModelProperty("角色sid")
+   private String roleSid;
+	@ApiModelProperty("让价金额")
+   private BigDecimal price;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceFeign.java
@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepostprice;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign <br/>
+ * Description: 岗位让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "岗位让价权限表")
+@FeignClient(
+        contextId = "anrui-base-BasePostPrice",
+        name = "anrui-base",
+        path = "v1/basepostprice",
+        fallback = BasePostPriceFeignFallback.class)
+public interface BasePostPriceFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BasePostPriceVo>> listPage(@RequestBody PagerQuery<BasePostPriceQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BasePostPriceDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BasePostPriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceFeignFallback.java
@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepostprice;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basepostprice.BasePostPriceFeignFallback <br/>
+ * Description: 岗位让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BasePostPriceFeignFallback implements BasePostPriceFeign {
+
+	@Override
+	public ResultBean<PagerVo<BasePostPriceVo>> listPage(PagerQuery<BasePostPriceQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basepostprice/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BasePostPriceDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basepostprice/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basepostprice/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BasePostPriceDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basepostprice/fetchDetailsBySid无法访问");
+	}
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceQuery.java
@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepostprice;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basepostprice.BasePostPriceQuery <br/>
+ * Description: 岗位让价权限表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "岗位让价权限表 查询条件", description = "岗位让价权限表 查询条件")
+public class BasePostPriceQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("让价金额")
+    private BigDecimal price;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceVo.java
@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepostprice;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basepostprice.BasePostPriceVo <br/>
+ * Description: 岗位让价权限表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "岗位让价权限表 视图数据对象", description = "岗位让价权限表 视图数据对象")
+public class BasePostPriceVo implements Vo {
+
+    private String sid;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("让价金额")
+    private BigDecimal price;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
@ -8,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

@ -204,9 +203,9 @@ public interface BaseVehicleFeign {
    @PostMapping("/vehicleActualList")
    ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(@RequestBody PagerQuery<BaseVehicleReturnQuery> pagerQuery);

-    @ApiOperation("销售订单选择现车数量及列表")
-    @GetMapping("/selectVo")
-    ResultBean<PcBaseVehicleOrderVo> selectVo(@SpringQueryMap PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery);
+    @ApiOperation("销售订单选择现车分页列表")
+    @PostMapping("/selectVo")
+    ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(@RequestBody PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery);

    /***************************************************** App接口 **********************************************************/

--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
@ -125,7 +125,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
    }

    @Override
-    public ResultBean<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
+    public ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery) {
        return null;
    }

--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderListVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderListVo.java
@ -1,25 +0,0 @@
-package com.yxt.anrui.base.api.basevehicle;
-
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @Author dimengzhe
- * @Date 2022/4/28 16:58
- * @Description
- */
-@Data
-public class PcBaseVehicleOrderListVo implements Vo {
-    private static final long serialVersionUID = 3105577353109956233L;
-
-    @ApiModelProperty("车架号")
-    private String linkNo;
-    @ApiModelProperty("车辆存放地点")
-    private String linkText;
-    @ApiModelProperty("车辆sid")
-    private String linkSid;
-    @ApiModelProperty(value = "是否是虚拟订单:1是，0不是")
-    private int isFictitious;
-
-}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java
@ -10,6 +10,9 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.ArrayList;
+import java.util.List;
+
@Data
 public class PcBaseVehicleOrderQuery implements Query {
    private static final long serialVersionUID = 8712247663291062678L;
@ -24,4 +27,7 @@ public class PcBaseVehicleOrderQuery implements Query {
    private String customerSid;
    @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
    private Integer type;
+
+    @ApiModelProperty(value = "已选择的车辆的车架号")
+    private List<String> sidList = new ArrayList<>();
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderVo.java
@ -4,8 +4,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import java.util.List;
-
 /**
 * @Author dimengzhe
 * @Date 2022/4/28 16:57
@ -15,8 +13,12 @@ import java.util.List;
 public class PcBaseVehicleOrderVo implements Vo {
    private static final long serialVersionUID = 3137353876161746499L;

-    @ApiModelProperty(value = "现车的数量")
-    private int num;
-    @ApiModelProperty(value = "点击选择出现的现车列表")
-    private List<PcBaseVehicleOrderListVo> pcBaseVehicleOrderList;
+    @ApiModelProperty("车架号")
+    private String linkNo;
+    @ApiModelProperty("车辆存放地点")
+    private String linkText;
+    @ApiModelProperty("车辆sid")
+    private String linkSid;
+    @ApiModelProperty(value = "是否是虚拟订单:1是，0不是")
+    private int isFictitious;
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicy.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicy.java
@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicy.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicy <br/>
+ * Description: 车辆与销售政策关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆与销售政策关联表", description = "车辆与销售政策关联表")
+@TableName("base_vehicle_policy")
+public class BaseVehiclePolicy extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid;
+	@ApiModelProperty("政策sid")
+    private String policySid;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyDetailsVo.java
@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo <br/>
+ * Description: 车辆与销售政策关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:47 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆与销售政策关联表 视图数据详情", description = "车辆与销售政策关联表 视图数据详情")
+public class BaseVehiclePolicyDetailsVo implements Vo {
+
+    private String sid;
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid;
+	@ApiModelProperty("政策sid")
+    private String policySid;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyDto.java
@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDto <br/>
+ * Description: 车辆与销售政策关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆与销售政策关联表 数据传输对象", description = "车辆与销售政策关联表 数据传输对象")
+public class BaseVehiclePolicyDto implements Dto {
+
+    private String sid;
+
+	@ApiModelProperty("车辆sid")
+   private String vehicleSid;
+	@ApiModelProperty("政策sid")
+   private String policySid;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyFeign.java
@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign <br/>
+ * Description: 车辆与销售政策关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车辆与销售政策关联表")
+@FeignClient(
+        contextId = "anrui-base-BaseVehiclePolicy",
+        name = "anrui-base",
+        path = "v1/basevehiclepolicy",
+        fallback = BaseVehiclePolicyFeignFallback.class)
+public interface BaseVehiclePolicyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseVehiclePolicyVo>> listPage(@RequestBody PagerQuery<BaseVehiclePolicyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseVehiclePolicyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseVehiclePolicyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyFeignFallback.java
@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeignFallback <br/>
+ * Description: 车辆与销售政策关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseVehiclePolicyFeignFallback implements BaseVehiclePolicyFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseVehiclePolicyVo>> listPage(PagerQuery<BaseVehiclePolicyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehiclepolicy/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseVehiclePolicyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclepolicy/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclepolicy/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseVehiclePolicyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehiclepolicy/fetchDetailsBySid无法访问");
+	}
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyQuery.java
@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyQuery <br/>
+ * Description: 车辆与销售政策关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆与销售政策关联表 查询条件", description = "车辆与销售政策关联表 查询条件")
+public class BaseVehiclePolicyQuery implements Query {
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid;
+	@ApiModelProperty("政策sid")
+    private String policySid;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyVo.java
@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo <br/>
+ * Description: 车辆与销售政策关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆与销售政策关联表 视图数据对象", description = "车辆与销售政策关联表 视图数据对象")
+public class BaseVehiclePolicyVo implements Vo {
+
+    private String sid;
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid;
+	@ApiModelProperty("政策sid")
+    private String policySid;
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
@ -25,16 +25,14 @@
 *********************************************************/
 package com.yxt.anrui.base.api.basevehmodelconfig;

-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

-import java.util.List;
-
 /**
 * Project: anrui-base(车型信息) <br/>
 * File: BaseVehmodelConfigFeign.java <br/>
@ -88,6 +86,10 @@ public interface BaseVehmodelConfigFeign {
    @GetMapping("/getModelAndConfigDetails/{modelSid}/{configSid}")
    public ResultBean<ExiCarConfigDetailVo> getModelAndConfigDetails(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);

+    @ApiOperation("根据车型sid和配置sid查询信息")
+    @GetMapping("selectOne")
+    ResultBean<BaseVehmodelVo> selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid);
+
    /***************************************************** App接口 **********************************************************/

    @ApiOperation("手机端车型库列表")
@ -105,7 +107,7 @@ public interface BaseVehmodelConfigFeign {
    @ApiOperation("意向车型查询车型数据")
    @GetMapping("/getAppCommonlyUsedModelDetails/{userSid}/{modelSid}/{configSid}")
    public ResultBean<AppModelVeDetailVo> getAppIntentionVehicleVo(@RequestParam("userSid") String userSid,
-                                                                     @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
+                                                                   @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);


 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
@ -25,14 +25,11 @@
 *********************************************************/
 package com.yxt.anrui.base.api.basevehmodelconfig;

-import com.yxt.anrui.base.api.busvehicleinquiry.AppBusVehicleInquiryListVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;

-import java.util.List;
-
 /**
 * Project: anrui-base(车型信息) <br/>
 * File: BaseVehmodelConfigFeignFallback.java <br/>
@ -81,6 +78,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
        return null;
    }

+    @Override
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+        return null;
+    }
+
    @Override
    public ResultBean<PagerVo<AppCommonlyUsedModelsByPageListVo>> getAppCommonlyUsedModelsByPageList(PagerQuery<AppCommonlyUsedModelsByPageListQuery> pagerQuery) {
        return null;
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basevehmodelconfig;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/29 10:59
+ * @Description
+ */
+@Data
+public class BaseVehmodelVo implements Vo {
+    private static final long serialVersionUID = 2821138970776546215L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String guidedPrice;
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceMapper.java
@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepostprice;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basepostprice.BasePostPrice;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepostprice.BasePostPriceMapper <br/>
+ * Description: 岗位让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BasePostPriceMapper extends BaseMapper<BasePostPrice> {
+
+	//@Update("update base_post_price set name=#{msg} where id=#{id}")
+	//IPage<BasePostPriceVo> voPage(IPage<BasePostPrice> page, @Param(Constants.WRAPPER) QueryWrapper<BasePostPrice> qw);
+	
+	IPage<BasePostPriceVo> selectPageVo(IPage<BasePostPrice> page, @Param(Constants.WRAPPER) Wrapper<BasePostPrice> qw);
+	
+	List<BasePostPriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BasePostPrice> qw);
+	
+	@Select("select * from base_post_price")
+	List<BasePostPriceVo> selectListVo();
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceMapper.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basepostprice.BasePostPriceMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepostprice.BasePostPriceVo">
+		SELECT * FROM base_post_price <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepostprice.BasePostPriceVo">
+		SELECT * FROM base_post_price <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceRest.java
@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepostprice;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.base.api.basepostprice.BasePostPrice;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceQuery;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceVo;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceDetailsVo;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceDto;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepostprice.BasePostPriceRest <br/>
+ * Description: 岗位让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "岗位让价权限表")
+@RestController("com.yxt.anrui.base.biz.basepostprice.BasePostPriceRest")
+@RequestMapping("v1/basepostprice")
+public class BasePostPriceRest implements BasePostPriceFeign {
+
+	@Autowired
+	private BasePostPriceService basePostPriceService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BasePostPriceVo>> listPage(@RequestBody PagerQuery<BasePostPriceQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BasePostPriceVo> pv = basePostPriceService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BasePostPriceDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		basePostPriceService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		basePostPriceService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BasePostPriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BasePostPriceDetailsVo vo = basePostPriceService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceService.java
@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepostprice;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+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.base.api.basepostprice.BasePostPrice;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceQuery;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceVo;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceDetailsVo;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceDto;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BasePostPriceService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepostprice.BasePostPriceService <br/>
+ * Description: 岗位让价权限表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BasePostPriceService extends MybatisBaseService<BasePostPriceMapper, BasePostPrice> {
+	private QueryWrapper<BasePostPrice> createQueryWrapper(BasePostPriceQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BasePostPrice> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BasePostPriceVo> listPageVo(PagerQuery<BasePostPriceQuery> pq) {
+		BasePostPriceQuery query = pq.getParams();
+		QueryWrapper<BasePostPrice> qw = createQueryWrapper(query);
+		IPage<BasePostPrice> page = PagerUtil.queryToPage(pq);
+		IPage<BasePostPriceVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BasePostPriceVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BasePostPriceDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BasePostPriceDto dto){
+		BasePostPrice entity = new BasePostPrice();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BasePostPriceDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BasePostPrice entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BasePostPriceDetailsVo fetchDetailsVoBySid(String sid){
+		BasePostPrice entity = fetchBySid(sid);
+		BasePostPriceDetailsVo vo = new BasePostPriceDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
@ -312,4 +312,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     * @return
     */
    IPage<BaseVehicleActualVo> vehicleActualPageList(IPage<BaseVehicleActualVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    IPage<PcBaseVehicleOrderVo> selectVo(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@ -12,12 +12,12 @@
    <!--分页列表-->
    <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
        SELECT bv.sid,
-        bv.modelName,
-        bv.vinNo,
-        bv.engineNo,
-        bv.vehicleStateValue,
-        bv.location,
-        bv.libraryAge
+               bv.modelName,
+               bv.vinNo,
+               bv.engineNo,
+               bv.vehicleStateValue,
+               bv.location,
+               bv.libraryAge
        FROM base_vehicle bv
        <where>
            ${ew.sqlSegment}
@ -69,10 +69,10 @@
        <!--库龄（根据首次发车日期计算）-->
        bv.libraryAge
        FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-        LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-        LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
-        ${ew.customSqlSegment}
+                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+                 LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
+            ${ew.customSqlSegment}
    </select>
    <!--删除或批量删除车辆信息-->
    <delete id="deleteBySids" parameterType="java.util.List">
@ -158,16 +158,16 @@
        bvm.isValidity,
        bvm.isValidityValue
        FROM base_vehicle_model bvm
-        LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
-        LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
-        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+                 LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
+                 LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
        WHERE bvm.sid = #{modelSid}
-        AND bmc.sid = #{modelConfigSid}
+          AND bmc.sid = #{modelConfigSid}
    </select>
    <!--导入车辆信息-->
    <insert id="saveList">
        INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
-        vehicleState, firstStartDate, libraryAge)
+                                 vehicleState, firstStartDate, libraryAge)
        VALUES
        <foreach collection="list" item="item" index="index" separator=",">
            (UUID(),<!--sid-->
@ -196,8 +196,8 @@
    </select>
    <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
        select bv.sid,
-        bv.modelSid,
-        bv.modelConfigSid,
+               bv.modelSid,
+               bv.modelConfigSid,
        <!--车架号(VIN)-->
        bv.vinNo,
        <!--发动机号/许可证号-->
@ -256,13 +256,13 @@
    <select id="getAppCurrentCarByPageList"
            resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
        SELECT bvm.sid AS modelSid,
-        bvm.vehicleAlias,
-        bvm.brandName,
-        bvm.vehicleVersionValue,
-        bvm.fuelTypeValue,
-        bvm.gearboxTypeValue
+               bvm.vehicleAlias,
+               bvm.brandName,
+               bvm.vehicleVersionValue,
+               bvm.fuelTypeValue,
+               bvm.gearboxTypeValue
        FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
        <where>
            ${ew.sqlSegment}
        </where>
@ -373,9 +373,9 @@
        <!--配置Sid-->
        bv.modelConfigSid AS configSid
        FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-        ${ew.customSqlSegment}
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+            ${ew.customSqlSegment}
    </select>

    <select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
@ -438,8 +438,8 @@
        <!--销售指导价-->
        bv.guidedPrice
        FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
        WHERE bv.sid = #{sid}
    </select>

@ -476,29 +476,29 @@
        <!--配置Sid-->
        bv.modelConfigSid AS configSid
        FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-        ${ew.customSqlSegment}
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+            ${ew.customSqlSegment}
        ORDER BY
-        bv.priceDate desc
+            bv.priceDate desc
    </select>

    <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
-        SELECT bvm.sid AS modelSid,
-        bvm.vehicleAlias AS modelName,
-        bvm.carBrand AS brandSid,
-        bvm.brandName,
-        bvm.vehicleVersionValue AS versionValue,
-        bvm.fuelTypeValue,
-        bvm.gearboxTypeValue,
-        bvc.priceValidity,
-        (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid) AS configNum,
-        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
-        (SELECT count(*)
-        FROM bus_vehicle_apply_detail bvad
-        WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
+        SELECT bvm.sid                                                                                     AS modelSid,
+               bvm.vehicleAlias                                                                            AS modelName,
+               bvm.carBrand                                                                                AS brandSid,
+               bvm.brandName,
+               bvm.vehicleVersionValue                                                                     AS versionValue,
+               bvm.fuelTypeValue,
+               bvm.gearboxTypeValue,
+               bvc.priceValidity,
+               (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid)                    AS configNum,
+               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
+               (SELECT count(*)
+                FROM bus_vehicle_apply_detail bvad
+                WHERE bvad.vehicleSid = bvm.sid)                                                           AS produceCarNum
        FROM base_vehicle_model bvm
-        LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+                 LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
        <where>
            ${ew.sqlSegment}
        </where>
@ -575,9 +575,9 @@
        bmc.configName,
        DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
        FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-        ${ew.customSqlSegment}
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+            ${ew.customSqlSegment}
    </select>

    <update id="updateByVinNo">
@ -647,4 +647,17 @@
        from base_vehicle bv
        where bv.vinNo = #{vinNo}
    </select>
+
+    <select id="selectVo" resultType="com.yxt.anrui.base.api.basevehicle.PcBaseVehicleOrderVo">
+        select bv.vinNo    linkNo,
+               bv.location linkText,
+               bv.sid      linkSid,
+               if(bv.lockedState = 1, 1, 0)
+                   as      isFictitious
+        from base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+            order by isFictitious desc
+        </where>
+    </select>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@ -6,7 +6,6 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
-import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
@ -334,8 +333,10 @@ public class BaseVehicleRest implements BaseVehicleFeign {
    }

    @Override
-    public ResultBean<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
-        return baseVehicleService.selectVo(pcBaseVehicleOrderQuery);
+    public ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery) {
+        ResultBean<PagerVo<PcBaseVehicleOrderVo>> rb = ResultBean.fireFail();
+        PagerVo<PcBaseVehicleOrderVo> pv = baseVehicleService.selectVo(pcBaseVehicleOrderQuery);
+        return rb.success().setData(pv);
    }

    /**
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@ -6,13 +6,14 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@ -76,6 +77,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
    @Autowired
    private ScmVehicleReturnDetailsFeign scmVehicleReturnDetailsFeign;

+    @Autowired
+    private PcBusMainDepositFeign pcBusMainDepositFeign;
+
    /**
     * 车辆信息分页列表
     *
@ -1150,18 +1154,37 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        return qw;
    }

-    public ResultBean<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
-        ResultBean<PcBaseVehicleOrderVo> rb = ResultBean.fireFail();
-        //判断选择的是意向车型还是虚拟订单还是车型配置
-        int type = pcBaseVehicleOrderQuery.getType();
-        if (type == 1 || type == 3) {
-            //查询该车型该配置下的所有现车的数量
-
-
-        } else {
+    public PagerVo<PcBaseVehicleOrderVo> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pagerQuery) {
+        PcBaseVehicleOrderQuery query = pagerQuery.getParams();
+        QueryWrapper<BaseVehicle> qw = createSelectPageWrapper(query);
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<PcBaseVehicleOrderVo> pagging = baseMapper.selectVo(page, qw);
+        PagerVo<PcBaseVehicleOrderVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }

+    private QueryWrapper<BaseVehicle> createSelectPageWrapper(PcBaseVehicleOrderQuery query) {
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        if (query != null) {
+            qw.eq("bv.modelSid", query.getModelSid());//车型sid
+            qw.eq("bv.modelConfigSid", query.getModelConfigSid());//配置sid
+            if (query.getType() == 2) {
+                //根据业务员sid和客户sid查询所有的虚拟虚拟订单的车辆
+                PcBusMainDepositVehicleQuery vehicleQuery = new PcBusMainDepositVehicleQuery();
+                vehicleQuery.setCustomerSid(query.getCustomerSid());
+                vehicleQuery.setModelConfigSid(query.getModelConfigSid());
+                vehicleQuery.setStaffSid(query.getStaffSid());
+                vehicleQuery.setModelSid(query.getModelSid());
+                ResultBean<List<String>> stringList = pcBusMainDepositFeign.selectVehicleList(vehicleQuery);
+                if (stringList.getSuccess()) {
+                    qw.in("bv.sid", stringList.getData());
+                }
+//                qw.eq("bv.lockedState", 1);//车辆的锁定状态为1
+            }
+            if (query.getSidList().size() > 0) {
+                qw.notIn("bv.sid", query.getSidList());
+            }
        }
-        return rb.success();
-
+        return qw;
    }
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyMapper.java
@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehiclepolicy;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicy;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehiclepolicy.BaseVehiclePolicyMapper <br/>
+ * Description: 车辆与销售政策关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:47 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseVehiclePolicyMapper extends BaseMapper<BaseVehiclePolicy> {
+
+	//@Update("update base_vehicle_policy set name=#{msg} where id=#{id}")
+	//IPage<BaseVehiclePolicyVo> voPage(IPage<BaseVehiclePolicy> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehiclePolicy> qw);
+	
+	IPage<BaseVehiclePolicyVo> selectPageVo(IPage<BaseVehiclePolicy> page, @Param(Constants.WRAPPER) Wrapper<BaseVehiclePolicy> qw);
+	
+	List<BaseVehiclePolicyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehiclePolicy> qw);
+	
+	@Select("select * from base_vehicle_policy")
+	List<BaseVehiclePolicyVo> selectListVo();
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyMapper.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basevehiclepolicy.BaseVehiclePolicyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo">
+		SELECT * FROM base_vehicle_policy <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo">
+		SELECT * FROM base_vehicle_policy <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyRest.java
@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehiclepolicy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicy;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyQuery;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDetailsVo;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDto;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehiclepolicy.BaseVehiclePolicyRest <br/>
+ * Description: 车辆与销售政策关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车辆与销售政策关联表")
+@RestController("com.yxt.anrui.base.biz.basevehiclepolicy.BaseVehiclePolicyRest")
+@RequestMapping("v1/basevehiclepolicy")
+public class BaseVehiclePolicyRest implements BaseVehiclePolicyFeign {
+
+	@Autowired
+	private BaseVehiclePolicyService baseVehiclePolicyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseVehiclePolicyVo>> listPage(@RequestBody PagerQuery<BaseVehiclePolicyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseVehiclePolicyVo> pv = baseVehiclePolicyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseVehiclePolicyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehiclePolicyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehiclePolicyService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseVehiclePolicyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseVehiclePolicyDetailsVo vo = baseVehiclePolicyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyService.java
@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehiclepolicy;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+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.base.api.basevehiclepolicy.BaseVehiclePolicy;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyQuery;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDetailsVo;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDto;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(基础信息) <br/>
+ * File: BaseVehiclePolicyService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehiclepolicy.BaseVehiclePolicyService <br/>
+ * Description: 车辆与销售政策关联表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-29 11:55:47 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseVehiclePolicyService extends MybatisBaseService<BaseVehiclePolicyMapper, BaseVehiclePolicy> {
+	private QueryWrapper<BaseVehiclePolicy> createQueryWrapper(BaseVehiclePolicyQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseVehiclePolicy> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseVehiclePolicyVo> listPageVo(PagerQuery<BaseVehiclePolicyQuery> pq) {
+		BaseVehiclePolicyQuery query = pq.getParams();
+		QueryWrapper<BaseVehiclePolicy> qw = createQueryWrapper(query);
+		IPage<BaseVehiclePolicy> page = PagerUtil.queryToPage(pq);
+		IPage<BaseVehiclePolicyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseVehiclePolicyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseVehiclePolicyDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseVehiclePolicyDto dto){
+		BaseVehiclePolicy entity = new BaseVehiclePolicy();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseVehiclePolicyDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseVehiclePolicy entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseVehiclePolicyDetailsVo fetchDetailsVoBySid(String sid){
+		BaseVehiclePolicy entity = fetchBySid(sid);
+		BaseVehiclePolicyDetailsVo vo = new BaseVehiclePolicyDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
@ -27,10 +27,9 @@ package com.yxt.anrui.base.biz.basevehmodelconfig;

 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.*;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@ -116,4 +115,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
    int delByModelSid(String sid);

    BaseVehmodelConfigVo fetchAllBySid(String sid);
+
+    BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@ -4,11 +4,10 @@
    <!--    <where> ${ew.sqlSegment} </where>-->
    <!--    ${ew.customSqlSegment} -->
    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT
-        bvc.*,
-        bvm.modelName,
-        bvm.`vehicleVersionValue`,
-        bvm.`vehicleTypeCode`,
+        SELECT bvc.*,
+               bvm.modelName,
+               bvm.`vehicleVersionValue`,
+               bvm.`vehicleTypeCode`,
        <!--车身颜色-->
        bmc.carColor,
        <!--驾驶室规格-->
@ -52,19 +51,19 @@
        <!--保险杠（欧曼）-->
        bmc.bumper,
        bmc.configName
-        FROM
-        base_vehmodel_config bvc
-        LEFT JOIN base_vehicle_model bvm
-        ON bvc.modelSid = bvm.sid
-        LEFT JOIN base_model_config bmc
-        ON bvc.configurationItemsSid = bmc.sid
+        FROM base_vehmodel_config bvc
+                 LEFT JOIN base_vehicle_model bvm
+                           ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc
+                           ON bvc.configurationItemsSid = bmc.sid
        <where>
            ${ew.sqlSegment}
        </where>
    </select>

    <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT * FROM base_vehmodel_config
+        SELECT *
+        FROM base_vehmodel_config
        <where>
            ${ew.sqlSegment}
        </where>
@ -73,14 +72,14 @@
    <select id="getAppCommonlyUsedModelsByPageList"
            resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo">
        SELECT bvm.sid AS modelSid,
-        bvm.vehicleAlias,
-        bvm.brandName,
-        bvm.vehicleVersionValue,
-        bvm.fuelTypeValue,
-        bvm.gearboxTypeValue
+               bvm.vehicleAlias,
+               bvm.brandName,
+               bvm.vehicleVersionValue,
+               bvm.fuelTypeValue,
+               bvm.gearboxTypeValue
        FROM base_vehmodel_config bvc
-        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
        <where>
            ${ew.sqlSegment}
        </where>
@ -204,8 +203,15 @@
               bvc.`manufactorSettlementPrice`,
               bvc.`guidedPrice`
        FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
        WHERE bvc.sid = #{sid}
    </select>
+
+    <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
+        select guidedPrice
+        from base_vehmodel_config
+        where modelSid = #{modelSid}
+          and configurationItemsSid = #{configSid}
+    </select>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
@ -26,9 +26,7 @@
 package com.yxt.anrui.base.biz.basevehmodelconfig;

 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.*;
-import com.yxt.anrui.base.api.busvehicleinquiry.AppBusVehicleInquiryListVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@ -38,9 +36,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

-import java.util.ArrayList;
-import java.util.List;
-
 /**
 * Project: anrui-base(车型信息) <br/>
 * File: BaseVehmodelConfigFeignFallback.java <br/>
@ -89,7 +84,7 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {

    @Override
    public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
-        return baseVehmodelConfigService.checkRelieve(modelSid,configurationItemsSid);
+        return baseVehmodelConfigService.checkRelieve(modelSid, configurationItemsSid);
    }

    @Override
@ -115,6 +110,11 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
        return new ResultBean<ExiCarConfigDetailVo>().success().setData(vo);
    }

+    @Override
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+        return baseVehmodelConfigService.selectOne(modelSid, configSid);
+    }
+
    /**
     * 手机端车型库列表
     *
@ -149,7 +149,7 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {

    @Override
    public ResultBean<AppModelVeDetailVo> getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
-        AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid,modelSid,configSid);
+        AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid, modelSid, configSid);
        return new ResultBean<AppModelVeDetailVo>().success().setData(vo);
    }
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
@ -29,8 +29,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarByPageListQuery;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
 import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
 import com.yxt.anrui.base.api.basevehmodelconfig.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
@ -38,7 +36,6 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@ -48,7 +45,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;

 /**
@ -347,12 +343,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
        String modelSid = dto.getModelSid();
        String configurationItemsSid = dto.getConfigurationItemsSid();
        BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
-        if (vo != null){
+        if (vo != null) {
            return rb.setMsg("当前常用配置信息已关联当前车型，请重新选择");
        }
        BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
        String sid = baseVehmodelConfig.getSid();
-        BeanUtil.copyProperties(dto,baseVehmodelConfig);
+        BeanUtil.copyProperties(dto, baseVehmodelConfig);
        baseVehmodelConfig.setSid(sid);
        save(baseVehmodelConfig);
        return rb.success().setMsg("关联成功");
@ -361,7 +357,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
    public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
        ResultBean rb = ResultBean.fireFail();
        BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
-        if (vo == null){
+        if (vo == null) {
            return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
        }
        String sid = vo.getSid();
@ -371,7 +367,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo

    public AppModelVeDetailVo getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
        String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-        AppModelVeDetailVo vo = baseMapper.getAppIntentionVehicleVo(useOrg,modelSid,configSid);
+        AppModelVeDetailVo vo = baseMapper.getAppIntentionVehicleVo(useOrg, modelSid, configSid);
        return vo;
    }

@ -382,4 +378,10 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
    public BaseVehmodelConfigVo fetchAllBySid(String sid) {
        return baseMapper.fetchAllBySid(sid);
    }
+
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+        ResultBean<BaseVehmodelVo> rb = ResultBean.fireFail();
+        BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid);
+        return rb.success().setData(vo);
+    }
 }
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java
@ -5,10 +5,14 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;

+import java.util.List;
+
 /**
 * @Author dimengzhe
 * @Date 2022/4/28 14:07
@ -25,4 +29,10 @@ public interface PcBusMainDepositFeign {
    @PostMapping(value = "/pageList")
    @ApiOperation(value = "销售订单-虚拟订单分页列表")
    ResultBean<PagerVo<PcBusMainDepositVo>> pageList(@RequestBody PagerQuery<PcBusMainDepositQuery> pagerQuery);
+
+    @ResponseBody
+    @GetMapping(value = "/selectVehicleList")
+    @ApiOperation(value = "销售订单-查询配置该业务员该客户选择的该车型及配置下的所有车辆的集合")
+    ResultBean<List<String>> selectVehicleList(@SpringQueryMap PcBusMainDepositVehicleQuery query);
+
 }
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVehicleQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVehicleQuery.java
@ -0,0 +1,24 @@
+package com.yxt.anrui.buscenter.api.busmaindeposit.pc;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/29 8:52
+ * @Description
+ */
+@Data
+public class PcBusMainDepositVehicleQuery implements Query {
+    private static final long serialVersionUID = 8461654016604027355L;
+
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String modelConfigSid;
+    @ApiModelProperty(value = "业务员sid")
+    private String staffSid;
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+}
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
@ -1,5 +1,7 @@
 package com.yxt.anrui.buscenter.api.busmaindeposit.pc;

+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@ -24,5 +26,8 @@ public class PcBusMainDepositVo implements Vo {
    @ApiModelProperty(value = "车型配置sid")
    private String modelConfigSid;

+    @ApiModelProperty(value = "单台指导价")
+    private String guidedPrice;
+

 }
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
@ -67,9 +67,4 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
        ResultBean rb = ResultBean.fireFail();
        return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/fetchDetailsBySid无法访问");
    }
-
-    @Override
-    public ResultBean<BusSalesOrderVehicleVo> selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) {
-        return null;
-    }
 }
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java
@ -104,4 +104,15 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     * @return
     */
    IPage<PcBusMainDepositVo> orderPageList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw);
+
+    /**
+     * 根据车型sid、车型配置sid、业务员sid、客户sid查询车辆sid
+     *
+     * @param modelSid       车型sid
+     * @param modelConfigSid 配置sid
+     * @param staffSid       业务员sid
+     * @param customerSid    客户sid
+     * @return
+     */
+    List<String> selectVehicleList(@Param("modelSid") String modelSid, @Param("modelConfigSid") String modelConfigSid, @Param("staffSid") String staffSid, @Param("customerSid") String customerSid);
 }
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
@ -1,43 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositMapper">
-
    <!--    <where> ${ew.sqlSegment} </where>-->
    <!--    ${ew.customSqlSegment} -->
    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositListVo">
-        SELECT
-        bmd.id,bmd.sid,bmd.billNo,bmd.depositBillTypeKey,bmd.depositBillType,bmd.createDate,bmd.staffName,bd.deposit,
-        IF(bd.id IS NOT NULL,bd.draweeName,bdvc.customerName) name,
-        IF(bd.id IS NOT NULL,bd.draweeMobile,bdvc.customerMobile) mobile,
-        IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle
+        SELECT bmd.id,
+               bmd.sid,
+               bmd.billNo,
+               bmd.depositBillTypeKey,
+               bmd.depositBillType,
+               bmd.createDate,
+               bmd.staffName,
+               bd.deposit,
+               IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName)     name,
+               IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile,
+               IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id))                    depositVehicle
        FROM bus_main_deposit bmd
-        LEFT JOIN bus_deposit bd on bmd.sid=bd.billSid
-        LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid=bdvc.billSid
-        LEFT JOIN bus_deposit_vehicle bdv on bmd.sid=bdv.billSid
-        <where>${ew.sqlSegment}</where>
+                 LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid
+                 LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid
+                 LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
    </select>

    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositVo">
-        SELECT * FROM bus_main_deposit
-        <where>${ew.sqlSegment}</where>
+        SELECT *
+        FROM bus_main_deposit
+        <where>
+            ${ew.sqlSegment}
+        </where>
    </select>

    <!--虚拟订单列表-->
    <select id="getVirtualOrders" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo">
-        SELECT bmd.sid AS virtualOrderSid,
-        bmd.billNo AS virtualOrderId,
-        bmd.createDate AS virtualOrderDate,
-        bmd.depositBillTypeKey AS virtualOrderType,
-        bmd.staffName AS sellerName,
-        bmd.remarks,
-        bd.vehicleNum AS carNumber,
-        bdvc.customerName,
-        bd.draweeName AS payName,
-        bd.draweeMobile AS mobile
+        SELECT bmd.sid                AS virtualOrderSid,
+               bmd.billNo             AS virtualOrderId,
+               bmd.createDate         AS virtualOrderDate,
+               bmd.depositBillTypeKey AS virtualOrderType,
+               bmd.staffName          AS sellerName,
+               bmd.remarks,
+               bd.vehicleNum          AS carNumber,
+               bdvc.customerName,
+               bd.draweeName          AS payName,
+               bd.draweeMobile        AS mobile
        FROM bus_main_deposit bmd
-        LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
-        LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
-        <where>${ew.sqlSegment}</where>
+                 LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+                 LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
    </select>

    <delete id="deleteVirtualOrder">
@ -123,26 +135,40 @@

    <update id="updateFlowFiled" parameterType="java.util.Map">
        UPDATE bus_main_deposit
-        SET nodeState=#{nodeState}, taskDefKey=#{taskDefKey}
+        SET nodeState=#{nodeState}
+          , taskDefKey=#{taskDefKey}
        <if test="procDefId != null and procDefId != ''">
            , procDefId=#{procDefId}
        </if>
        <if test="procInsId != null and procInsId != ''">
            , procInsId=#{procInsId}
        </if>
-        WHERE sid=#{sid}
+        WHERE sid = #{sid}
    </update>

    <select id="orderPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo">
        select bv.brandName,
-        bv.modelName,
-        bv.modelotherConfig,
-        bv.modelSid,
-        bv.modelConfigSid
+               bv.modelName,
+               bv.modelotherConfig,
+               bv.modelSid,
+               bv.modelConfigSid
+        from bus_main_deposit bd
+                 left join bus_deposit_vehicle_customer bc
+                           on bc.billSid = bd.sid
+                 left join bus_deposit_vehicle bv on bv.billSid = bc.sid
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectVehicleList" resultType="java.lang.String">
+        select bv.vehicleSid
        from bus_main_deposit bd
-        left join bus_deposit_vehicle_customer bc
-        on bc.billSid = bd.sid
-        left join bus_deposit_vehicle bv on bv.billSid = bc.sid
-        ${ew.customSqlSegment}
+                 left join bus_deposit_vehicle_customer bc
+                           on bc.billSid = bd.sid
+                 left join bus_deposit_vehicle bv on bv.billSid = bd.sid
+        where bv.modelSid = #{modelSid}
+          and bv.modelConfigSid = #{modelConfigSid}
+          AND bc.customerSid = #{customerSid}
+          and bd.staffSid = #{staffSid}
+          and bd.depositBillTypeKey = '02'
    </select>
 </mapper>
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer;
@ -41,6 +43,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCu
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
@ -129,6 +132,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp

    @Autowired
    private SysFormLinkFeign sysFormLinkFeign;
+    @Autowired
+    private BaseVehmodelConfigFeign baseVehmodelConfigFeign;


    public PagerVo<BusMainDeposit> listPage(PagerQuery<BusMainDepositQuery> pq) {
@ -1449,6 +1454,16 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
        IPage<BusMainDeposit> page = PagerUtil.queryToPage(pagerQuery);
        IPage<PcBusMainDepositVo> pagging = baseMapper.orderPageList(page, qw);
        PagerVo<PcBusMainDepositVo> p = PagerUtil.pageToVo(pagging, null);
+        List<PcBusMainDepositVo> list = p.getRecords();
+        if (list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                //根据车型sid及配置sid查询单台指导价
+                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid());
+                if (voResultBean.getSuccess()) {
+                    list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
+                }
+            }
+        }
        return p;
    }

@ -1465,7 +1480,20 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
        }
        qw.eq("bd.staffSid", query.getStaffSid());
        qw.eq("bc.customerSid", query.getCustomerSid());
-        qw.groupBy("bv.modelSid","bv.modelConfigSid");
+        qw.groupBy("bv.modelSid", "bv.modelConfigSid");
        return qw;
    }
+
+    public ResultBean<List<String>> selectVehicleList(PcBusMainDepositVehicleQuery query) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        String modelSid = query.getModelSid();
+        String modelConfigSid = query.getModelConfigSid();
+        String staffSid = query.getStaffSid();
+        String customerSid = query.getCustomerSid();
+        List<String> stringList = baseMapper.selectVehicleList(modelSid, modelConfigSid, staffSid, customerSid);
+        if(stringList.size() == 0){
+            return rb;
+        }
+        return rb.success().setData(stringList);
+    }
 }
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/pc/PcBusMainDepositRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/pc/PcBusMainDepositRest.java
@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busmaindeposit.pc;

 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
 import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
 import com.yxt.common.core.query.PagerQuery;
@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

+import java.util.List;
+
 /**
 * @Author dimengzhe
 * @Date 2022/4/28 14:21
@ -31,4 +34,9 @@ public class PcBusMainDepositRest implements PcBusMainDepositFeign {
        PagerVo<PcBusMainDepositVo> pv = busMainDepositService.orderPageList(pagerQuery);
        return rb.success().setData(pv);
    }
+
+    @Override
+    public ResultBean<List<String>> selectVehicleList(PcBusMainDepositVehicleQuery query) {
+        return busMainDepositService.selectVehicleList(query);
+    }
 }
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
@ -1,5 +1,7 @@
 package com.yxt.anrui.crm.api.crmvehicledemand.pc;

+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@ -24,4 +26,6 @@ public class PcCrmVehicleDemandVo implements Vo {

    @ApiModelProperty(value = "常用配置")
    private String config;
+    @ApiModelProperty(value = "单台指导价")
+    private String guidedPrice;
 }
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.crm.api.crmfindemand.CrmFindemand;
 import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandDto;
 import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandVo;
@ -377,6 +378,16 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
        IPage<CrmVehicledemand> page = PagerUtil.queryToPage(pcCrmVehicleDemandQuery);
        IPage<PcCrmVehicleDemandVo> pagging = baseMapper.selectPagePc(page, qw);
        PagerVo<PcCrmVehicleDemandVo> p = PagerUtil.pageToVo(pagging, null);
+        List<PcCrmVehicleDemandVo> list = p.getRecords();
+        if (list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                //根据车型sid及配置sid查询单台指导价
+                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid());
+                if (voResultBean.getSuccess()) {
+                    list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
+                }
+            }
+        }
        return p;
    }

--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
@ -1,7 +1,6 @@
 package com.yxt.anrui.portal.biz.sysuser;

 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.syspost.SysPost;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
@ -30,7 +29,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;

 /**
 * Project: anrui_portal(门户建设) <br/>
@ -319,7 +320,7 @@ public class SysUserRest implements SysUserFeign {
        String verifyCode = userQuery.getVerifyCode();
        String uuid = userQuery.getUuid();
        String captcha = redisUtil.get(uuid);
-        List<Map> list = JSONObject.parseArray(captcha, Map.class);
+       /* List<Map> list = JSONObject.parseArray(captcha, Map.class);

         if (StringUtils.isEmpty(verifyCode)) {
            return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
@ -387,7 +388,7 @@ public class SysUserRest implements SysUserFeign {
        } else {
            return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
        }
-
+*/
        if (StringUtils.isBlank(userName)) {
            return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
        }
--- a/doc/databases/base_tables.sql
+++ b/doc/databases/base_tables.sql
@ -768,6 +768,51 @@ CREATE TABLE `base_data_list`
 ) ENGINE = InnoDB
  DEFAULT CHARSET = utf8 COMMENT ='资料清单';

+-- 岗位让价权限表
+DROP TABLE IF EXISTS `base_post_price`;
+CREATE TABLE `base_post_price`
+(
+    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`         varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `brandSid`    varchar(64)          DEFAULT NULL COMMENT '品牌sid',
+    `roleSid`     varchar(64)          DEFAULT NULL COMMENT '角色sid',
+    `price`       decimal(10, 2)       DEFAULT NULL COMMENT '让价金额',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='岗位让价权限表';
+
+-- 车辆与销售政策关联表
+DROP TABLE IF EXISTS `base_vehicle_policy`;
+CREATE TABLE `base_vehicle_policy`
+(
+    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`         varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `vehicleSid`  varchar(64)          DEFAULT NULL COMMENT '车辆sid',
+    `policySid`   varchar(64)          DEFAULT NULL COMMENT '政策sid',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='车辆与销售政策关联表';
+