测试文档问题修改，单车返利预提构造流程图，补充流程数据库，流程接口开发

3 years ago · dd5d82adfd
24 changed files with 412 additions and 142 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java
@ -29,6 +29,7 @@ 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/>
@ -44,6 +45,7 @@ import io.swagger.annotations.ApiModelProperty;
 * @since 1.0
 */
@ApiModel(value = "车型调价申请车型表", description = "车型调价申请车型表")
+@Data
@TableName("base_model_modprice_model")
 public class BaseModelModpriceModel extends BaseEntity {
    private static final long serialVersionUID = 1L;
@ -66,115 +68,13 @@ public class BaseModelModpriceModel extends BaseEntity {
    
 	@ApiModelProperty("成本价")
    private String costPrice; // 成本价
+
+	@ApiModelProperty("现贷款销售指导价")
+	private String manufactorSettlementPrice; // 现贷款销售指导价
    
-	@ApiModelProperty("现销售指导价")
-    private String guidedPrice; // 现销售指导价
+	@ApiModelProperty("现全款销售指导价")
+    private String guidedPrice; // 现全款销售指导价
    
 	@ApiModelProperty("价格增减数额")
    private String incOrDecInPrice; // 价格增减数额
-
-	/**
-	 * @return 车型调价申请sid
-	 */
-	public String getMainSid(){
-		return mainSid;
-	}
-	
-	/**
-	 * @param mainSid 车型调价申请sid to set
-	 */
-	public void setMainSid(String mainSid){
-		this.mainSid = mainSid;
-	}
-	/**
-	 * @return 车型sid
-	 */
-	public String getModelSid(){
-		return modelSid;
-	}
-	
-	/**
-	 * @param modelSid 车型sid to set
-	 */
-	public void setModelSid(String modelSid){
-		this.modelSid = modelSid;
-	}
-	/**
-	 * @return 车型别名
-	 */
-	public String getVehicleAlias(){
-		return vehicleAlias;
-	}
-	
-	/**
-	 * @param vehicleAlias 车型别名 to set
-	 */
-	public void setVehicleAlias(String vehicleAlias){
-		this.vehicleAlias = vehicleAlias;
-	}
-	/**
-	 * @return 常用配置sid
-	 */
-	public String getConfigSid(){
-		return configSid;
-	}
-	
-	/**
-	 * @param configSid 常用配置sid to set
-	 */
-	public void setConfigSid(String configSid){
-		this.configSid = configSid;
-	}
-	/**
-	 * @return 常用配置名称
-	 */
-	public String getConfigName(){
-		return configName;
-	}
-	
-	/**
-	 * @param configName 常用配置名称 to set
-	 */
-	public void setConfigName(String configName){
-		this.configName = configName;
-	}
-	/**
-	 * @return 成本价
-	 */
-	public String getCostPrice(){
-		return costPrice;
-	}
-	
-	/**
-	 * @param costPrice 成本价 to set
-	 */
-	public void setCostPrice(String costPrice){
-		this.costPrice = costPrice;
-	}
-	/**
-	 * @return 现销售指导价
-	 */
-	public String getGuidedPrice(){
-		return guidedPrice;
-	}
-	
-	/**
-	 * @param guidedPrice 现销售指导价 to set
-	 */
-	public void setGuidedPrice(String guidedPrice){
-		this.guidedPrice = guidedPrice;
-	}
-	/**
-	 * @return 价格增减数额
-	 */
-	public String getIncOrDecInPrice(){
-		return incOrDecInPrice;
-	}
-	
-	/**
-	 * @param incOrDecInPrice 价格增减数额 to set
-	 */
-	public void setIncOrDecInPrice(String incOrDecInPrice){
-		this.incOrDecInPrice = incOrDecInPrice;
-	}
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java
@ -61,8 +61,10 @@ public class BaseModelModpriceModelDto implements Dto {
    private String configName; // 常用配置名称
 	@ApiModelProperty("成本价")
    private String costPrice; // 成本价
-	@ApiModelProperty("现销售指导价")
-    private String guidedPrice; // 现销售指导价
+	@ApiModelProperty("现贷款销售指导价")
+	private String manufactorSettlementPrice; // 现贷款销售指导价
+	@ApiModelProperty("现全款销售指导价")
+	private String guidedPrice; // 现全款销售指导价
 	@ApiModelProperty("价格增减数额")
    private String incOrDecInPrice; // 价格增减数额
 	@ApiModelProperty("备注")
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java
@ -61,8 +61,10 @@ public class BaseModelModpriceModelVo implements Vo {
    private String configName; // 常用配置名称
 	@ApiModelProperty("成本价")
    private String costPrice; // 成本价
-	@ApiModelProperty("现销售指导价")
-    private String guidedPrice; // 现销售指导价
+	@ApiModelProperty("现贷款销售指导价")
+	private String manufactorSettlementPrice; // 现贷款销售指导价
+	@ApiModelProperty("现全款销售指导价")
+	private String guidedPrice; // 现全款销售指导价
 	@ApiModelProperty("价格增减数额")
    private String incOrDecInPrice; // 价格增减数额
 	@ApiModelProperty("备注")
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
@ -90,6 +90,8 @@ public class BaseOutsourcingApplication extends BaseEntity {
    private String depositBankName; // 车款开户银行
    @ApiModelProperty("车款银行账号")
    private String bankAccount; // 车款银行账号
+    @ApiModelProperty("车款收款账户名称")
+    private String accountName; // 车款收款账户名称
 	@ApiModelProperty("台数")
    private Integer num; // 台数
 	@ApiModelProperty("订金")
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
@ -92,6 +92,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
    private String depositBankName; // 车款开户银行
    @ApiModelProperty("车款银行账号")
    private String bankAccount; // 车款银行账号
+    @ApiModelProperty("车款收款账户名称")
+    private String accountName; // 车款收款账户名称
 	@ApiModelProperty("台数")
    private Integer num; // 台数
 	@ApiModelProperty("订金")
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
@ -100,6 +100,8 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	private String depositBankName; // 车款开户银行
 	@ApiModelProperty("车款银行账号")
 	private String bankAccount; // 车款银行账号
+	@ApiModelProperty("车款收款账户名称")
+	private String accountName; // 车款收款账户名称
 	@ApiModelProperty("台数")
    private Integer num; // 台数
 	@ApiModelProperty("订金")
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java
@ -13,10 +13,10 @@ import lombok.Data;
 */
@Data
 public class BaseVehmodelConfigVos implements Vo {
-    @ApiModelProperty(value = "销售指导价")
+    @ApiModelProperty(value = "销售指导价（全款）")
    @JsonSerialize(using = ToStringSerializer.class)
    private String guidedPrice;
-    @ApiModelProperty(value = "厂家结算价")
+    @ApiModelProperty(value = "销售指导价（贷款）")
    private String manufactorSettlementPrice;
    @ApiModelProperty(value = "车型别名")
    private String vehicleAlias;
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
@ -99,14 +99,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
        if (StringUtils.isNotBlank(dto.getSpecification())) {
            configName += dto.getSpecification() + "/";
        }
-        //后桥速比
-        if (StringUtils.isNotBlank(dto.getRearAxleRatio())) {
-            configName += dto.getRearAxleRatio() + "/";
-        }
        //后桥
        if (StringUtils.isNotBlank(dto.getRearAxleValue())) {
            configName += dto.getRearAxleValue() + "/";
        }
+        //后桥速比
+        if (StringUtils.isNotBlank(dto.getRearAxleRatio())) {
+            configName += dto.getRearAxleRatio() + "/";
+        }
        //空调
        if (StringUtils.isNotBlank(dto.getAirConditioner())) {
            configName += dto.getAirConditioner() + "/";
@ -223,14 +223,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
        if (StringUtils.isNotBlank(dto.getSpecification())) {
            configName += dto.getSpecification() + "/";
        }
-        //后桥速比
-        if (StringUtils.isNotBlank(dto.getRearAxleRatio())) {
-            configName += dto.getRearAxleRatio() + "/";
-        }
        //后桥
        if (StringUtils.isNotBlank(dto.getRearAxleValue())) {
            configName += dto.getRearAxleValue() + "/";
        }
+        //后桥速比
+        if (StringUtils.isNotBlank(dto.getRearAxleRatio())) {
+            configName += dto.getRearAxleRatio() + "/";
+        }
        //空调
        if (StringUtils.isNotBlank(dto.getAirConditioner())) {
            configName += dto.getAirConditioner() + "/";
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
@ -361,7 +361,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
 //            String multimedia = StringUtils.isNotBlank(record.getMultimedia()) && "有".equals(record.getMultimedia()) ? ("多媒体") : "";
            String multimedia = StringUtils.isNotBlank(record.getMultimedia()) ? (record.getMultimedia() + "/") : "";

-            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + rearAxleValue + airConditioner + hubMaterial +
+            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                    baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
            record.setConfigName(configName);
        }
@ -655,6 +655,9 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
            //驾驶室规格
            String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification())
                    ? (appModelConfigListVo.getSpecification() + "/") : "";
+            //后桥
+            String rearAxleValue = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleValue())
+                    ? (appModelConfigListVo.getRearAxleValue() + "/") : "";
            //后桥速比
            String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio())
                    ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
@ -703,7 +706,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
 //                    && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
                    ? (appModelConfigListVo.getMultimedia() + "/") : "";

-            String configName = color + slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
+            String configName = color + slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                    baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
            appModelConfigListVo.setConfigName(configName);
        }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
@ -304,6 +304,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                    BigDecimal incOrDecInPrice = new BigDecimal(baseModelModpriceModelVo.getIncOrDecInPrice());
                    BigDecimal guidedPrice = new BigDecimal(baseModelModpriceModelVo.getGuidedPrice());
                    guidedPrice = guidedPrice.add(incOrDecInPrice);
+                    BigDecimal manufactorSettlementPrice = new BigDecimal(baseModelModpriceModelVo.getManufactorSettlementPrice());
+                    manufactorSettlementPrice = manufactorSettlementPrice.add(incOrDecInPrice);
                    String modelSid = baseModelModpriceModelVo.getModelSid();
                    String configSid = baseModelModpriceModelVo.getConfigSid();
                    String createOrgSid = baseModelModprice.getCreateOrgSid();
@ -311,7 +313,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                    if (baseVehmodelConfig == null) {
                        return rb.setMsg("车型配置不存在");
                    }
-                    baseVehmodelConfigMapper.updateGuidedPrice(guidedPrice, baseVehmodelConfig.getSid());
+                    baseVehmodelConfigMapper.updateGuidedPrice(guidedPrice,manufactorSettlementPrice,baseVehmodelConfig.getSid());
                }
            }else{
                //极光推送
--- 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
@ -414,6 +414,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba

            String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";

+            String rearAxleValue = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleValue()) ? (appModelConfigListVo.getRearAxleValue() + "/") : "";
+
            String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";

            String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
@ -442,7 +444,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba

            String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";

-            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
+            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                    baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
            appModelConfigListVo.setConfigName(configName);
        }
@ -1005,6 +1007,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba

        String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";

+        String rearAxleValue = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleValue()) ? (appModelConfigListVo.getRearAxleValue() + "/") : "";
+
        String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";

        String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
@ -1033,7 +1037,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba

        String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";

-        String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
+        String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
        vo.setConfig(configName);
        vo.setModel(appModelConfigListVo.getModel());
@ -1948,11 +1952,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
            return rb.setMsg("参数错误");
        }

-        //调出分公司车辆台账更新调车状态
-        boolean b = baseMapper.updateWitPinState(baseVehicle.getVinNo(), VehicleState.ShuntingEnum.WITPIN.getCode(), VehicleState.ShuntingEnum.WITPIN.getRemarks());
-        if (!b) {
-            return rb.setMsg("调车入库更新调出方车辆台账据失败");
-        }
+        //调出分公司车辆台账更新库存状态
+        baseMapper.updateVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(),VehicleState.StockEnum.DC_STOCK.getRemarks(),baseVehicle.getVinNo(),baseVehicle.getUseOrgSid());

        //新建调入分公司车辆台账，设置调入分公司sid
        BaseVehicle new_baseVehicle = new BaseVehicle();
@ -1965,11 +1966,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        copyBeanToBean(baseVehicle, new_baseVehicle);
        //BeanUtil.copyProperties(baseVehicle, new_baseVehicle, new CopyOptions().setIgnoreNullValue(true));
        //调车状态
-        new_baseVehicle.setWitPinState(VehicleState.ShuntingEnum.WITPURCHASE.getCode());
-        new_baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.WITPURCHASE.getRemarks());
+        //new_baseVehicle.setWitPinState(VehicleState.ShuntingEnum.WITPURCHASE.getCode());
+        //new_baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.WITPURCHASE.getRemarks());
        //库存状态
-        new_baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
-        new_baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+        new_baseVehicle.setVehicleState(VehicleState.StockEnum.DR_STOCK.getCode());
+        new_baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DR_STOCK.getRemarks());
        //锁定状态
        new_baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
        new_baseVehicle.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
@ -1977,8 +1978,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        new_baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
        new_baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
        //采购订单类型
-        new_baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.TC_ORDER.getCode());
-        new_baseVehicle.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.TC_ORDER.getRemarks());
+        new_baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.NG_ORDER.getCode());
+        new_baseVehicle.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.NG_ORDER.getRemarks());
        if (!save(new_baseVehicle)) {
            BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();

--- 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
@ -133,6 +133,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>

    BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);

-    @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice} where sid = #{sid}")
-    void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice,@Param("sid") String sid);
+    @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice} where sid = #{sid}")
+    void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice,@Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice,@Param("sid") String sid);
 }
--- 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
@ -398,7 +398,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
            String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
 //                    && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
                    ? (appModelConfigListVo.getMultimedia() + "/") : "";
-            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + rearAxleValue + airConditioner + hubMaterial +
+            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                    baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
            appModelConfigListVo.setConfigName(configName);
        }
@ -552,6 +552,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo

        String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio())
                ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
+
+        String rearAxleValue = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleValue())
+                ? (appModelConfigListVo.getRearAxleValue() + "/") : "";
        //空调
        String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner())
 //                && "有".equals(appModelConfigListVo.getAirConditioner()) ? ("空调" + "/") : "";
@ -591,7 +594,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
        String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
 //                && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
                ? (appModelConfigListVo.getMultimedia() + "/") : "";
-        String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
+        String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
        vo.setConfig(configName);
        vo.setModel(appModelConfigListVo.getModel());
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@ -30,6 +30,7 @@ public enum ProcDefEnum {
    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:400012"),
    BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
    BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
+    SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),
    ;

    ProcDefEnum(String proDefName, String proDefId) {
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java
@ -90,7 +90,6 @@ public interface ScmApplyInboundFeign {
    @PostMapping(value = "/getLSH")
    int selectNum(@RequestParam("bill") String bill);

-
    /*************************************************审批流程***************************************************/

 }
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeign.java
@ -25,14 +25,22 @@
 *********************************************************/
 package com.yxt.anrui.scm.api.scmvehrebatewithapply;

+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.ScmVehRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto;
 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.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;

+import javax.validation.Valid;
 import java.util.List;

 /**
@ -75,4 +83,38 @@ public interface ScmVehRebateWithApplyFeign {
    @GetMapping("/fetchDetailsBySid/{sid}")
    @ResponseBody
    public ResultBean<ScmVehRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**************************************单车返利预提审批流程*******************************************/
+
+    @ApiOperation("提交单车返利预提申请")
+    @PostMapping("/submitVehRebateWithApply")
+    public ResultBean submitVehRebateWithApply(@RequestBody @Valid SubmitScmVehRebateWithApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody ScmVehRebateWithApplyCompleteDto dto);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 }
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java
@ -25,6 +25,11 @@
 *********************************************************/
 package com.yxt.anrui.scm.api.scmvehrebatewithapply;

+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.ScmVehRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@ -69,4 +74,44 @@ public class ScmVehRebateWithApplyFeignFallback implements ScmVehRebateWithApply
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-scm/scmvehrebatewithapply/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return null;
+	}
 }
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeQuery.java
@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 10:42
+ * @Description
+ */
+@Data
+public class GetNodeQuery implements Query {
+    private static final long serialVersionUID = -5674867230708197611L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+}
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeVo.java
@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 11:09
+ * @Description
+ */
+@Data
+public class GetNodeVo implements Vo {
+    private static final long serialVersionUID = 8802774014747063504L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyCompleteDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyCompleteDto.java
@ -0,0 +1,42 @@
+package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class ScmVehRebateWithApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+//    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables = new HashMap<>();
+}
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyTaskQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyTaskQuery.java
@ -0,0 +1,56 @@
+package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 17:29
+ * @Description 终止、撤回、驳回查询参数
+ */
+@Data
+public class ScmVehRebateWithApplyTaskQuery implements Query {
+    private static final long serialVersionUID = -4006020771892400451L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+    /*@ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("节点")
+    private String targetKey;
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+    @ApiModelProperty("审批人")
+    private String assignee;
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();*/
+}
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/SubmitScmVehRebateWithApplyDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/SubmitScmVehRebateWithApplyDto.java
@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow;
+
+import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitScmVehRebateWithApplyDto extends ScmApplyInboundDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    /*@ApiModelProperty("意见")
+    private String comment;*/
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+   /* @ApiModelProperty("业务sid")
+    private String businessSid;
+    @ApiModelProperty("流程定义id")
+    private String modelId;
+    @ApiModelProperty("下一环节的代办人sid")
+    private String nextNodeUserSids;*/
+
+}
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
@ -25,6 +25,14 @@
 *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehrebatewithapply;

+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.ScmVehRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@ -92,4 +100,47 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign {
    public ResultBean<ScmVehRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return scmVehRebateWithApplyService.fetchAllDetailsVo(sid);
 	}
+
+	@Override
+	public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) {
+		return scmVehRebateWithApplyService.submitVehRebateWithApply(dto);
+	}
+
+	@Override
+	public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(dto, bv);
+		bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId());
+		return scmVehRebateWithApplyService.complete(bv);
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return scmVehRebateWithApplyService.revokeProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return scmVehRebateWithApplyService.taskReject(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return scmVehRebateWithApplyService.breakProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return scmVehRebateWithApplyService.flowRecord(procInsId);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return scmVehRebateWithApplyService.getNextNodesForSubmit(query);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return scmVehRebateWithApplyService.getPreviousNodesForReject(query);
+	}
 }
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
@ -28,8 +28,13 @@ package com.yxt.anrui.scm.biz.scmvehrebatewithapply;
 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.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto;
 import com.yxt.anrui.scm.biz.scmvehrebatewith.ScmVehRebateWithService;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
@ -172,4 +177,36 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
        scmVehRebateWithApplyDetailsVo.setScmVehRebateWiths(scmVehRebateWithDetailsVos);
        return rb.success().setData(scmVehRebateWithApplyDetailsVo);
    }
+
+    public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) {
+        return null;
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        return null;
+    }
+
+    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+        return null;
+    }
+
+    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+        return null;
+    }
+
+    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+        return null;
+    }
+
+    public ResultBean flowRecord(String procInsId) {
+        return null;
+    }
+
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        return null;
+    }
+
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        return null;
+    }
 }