完善销售订单流程相关接口的查询条件、销售订单中销售政策列表调整。

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java

@@ -25,7 +25,7 @@ import lombok.Data;
 public class BaseDiscountpackage extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("优惠情况")
+    @ApiModelProperty("sid")
     private String sid;
 
     @ApiModelProperty("优惠类型key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basediscountpackage;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/9 18:47
+ * @Description
+ */
+@Data
+public class BaseSalesDicountVo implements Vo {
+    private static final long serialVersionUID = 4299591364332099379L;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java

@@ -28,6 +28,6 @@ public class PcBaseVehicleOrderQuery implements Query {
     @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
     private Integer type;
 
-    @ApiModelProperty(value = "已选择的车辆的车架号")
+    @ApiModelProperty(value = "已选择的车辆的sid")
     private List<String> sidList = new ArrayList<>();
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java

@@ -43,6 +43,7 @@ public class BaseAffiliatCompanyService extends MybatisBaseService<BaseAffiliatC
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private BaseAffiliatCompanyAppendixService companyAppendixService;
+    @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
 
     /**
@@ -121,9 +122,9 @@ public class BaseAffiliatCompanyService extends MybatisBaseService<BaseAffiliatC
     public BaseAffiliatCompanyDetailsVo details(String sid) {
         BaseAffiliatCompany baseAffiliatCompany = fetchBySid(sid);
         BaseAffiliatCompanyDetailsVo baseAffiliatCompanyDetailsVo = baseMapper.details(sid);
-        if (baseAffiliatCompanyDetailsVo!=null){
-          String path = "";
-          List<BaseAffiliatCompanyAppendixVo> list = companyAppendixService.selByLinkSid(sid);
+        if (baseAffiliatCompanyDetailsVo != null) {
+            String path = "";
+            List<BaseAffiliatCompanyAppendixVo> list = companyAppendixService.selByLinkSid(sid);
             for (BaseAffiliatCompanyAppendixVo baseAffiliatCompanyAppendixVo : list) {
                 String filePath = baseAffiliatCompanyAppendixVo.getFilePath();
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
@@ -131,7 +132,7 @@ public class BaseAffiliatCompanyService extends MybatisBaseService<BaseAffiliatC
                 baseAffiliatCompanyAppendixVo.setFileUrl(path);
 
             }
-          baseAffiliatCompanyDetailsVo.setList(list);
+            baseAffiliatCompanyDetailsVo.setList(list);
         }
         if (StringUtils.isNotBlank(baseAffiliatCompany.getUseOrg())) { //使用组织sid
             List<String> list = Arrays.asList(baseAffiliatCompany.getUseOrg().split(","));
@@ -174,13 +175,13 @@ public class BaseAffiliatCompanyService extends MybatisBaseService<BaseAffiliatC
         if (StringUtils.isNotBlank(name)) {
             qw.like("bac.orgName", name);
         }
-        if(StringUtils.isNotBlank(staffSid)){
+        if (StringUtils.isNotBlank(staffSid)) {
             String orgSid = "";
             ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(staffSid);
             if (stringResultBean.getSuccess()) {
                 orgSid = stringResultBean.getData();
             }
-            qw.lambda().apply("FIND_IN_SET ('"+orgSid+"',bac.useOrg)");
+            qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',bac.useOrg)");
         }
         return baseMapper.namesDown(qw);
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -383,6 +383,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
     public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
         ResultBean<BaseVehmodelVo> rb = ResultBean.fireFail();
         BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid);
+        if(vo == null){
+            return rb.setData(new BaseVehmodelVo());
+        }
         return rb.success().setData(vo);
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java

@@ -51,8 +51,6 @@ public class BusDepositFictitiousDto implements Dto {
     private static final long serialVersionUID = 1634109479048286985L;
     @ApiModelProperty("虚拟订单编号")
     private String depositBillNo;
-    @ApiModelProperty("订金信息sid")
-    private String depositSid;
     @ApiModelProperty("订金剩余金额")
     private String depositPrice;
     @ApiModelProperty("本次结转金额")

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

@@ -14,6 +14,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -27,33 +29,44 @@ public class BusSalesOrderAllDto implements Dto {
     private static final long serialVersionUID = -734571880207951780L;
 
     private String sid;
-
-    @ApiModelProperty(value = "用户sid")
+    @ApiModelProperty(value = "用户sid", required = true)
+    @NotBlank(message = "用户sid不能为空")
     private String userSid;
-    @ApiModelProperty("销售部门sid")
+    @ApiModelProperty(value = "销售部门sid", required = true)
+    @NotBlank(message = "销售部门sid不能为空")
     private String orgSid;
-    @ApiModelProperty("销售部门")
+    @ApiModelProperty(value = "销售部门", required = true)
+    @NotBlank(message = "销售部门不能为空")
     private String orgName;
-    @ApiModelProperty("客户名称")
+    @ApiModelProperty(value = "客户名称", required = true)
+    @NotBlank(message = "客户名称不能为空")
     private String customerName;
-    @ApiModelProperty("客户sid")
+    @ApiModelProperty(value = "客户sid", required = true)
+    @NotBlank(message = "客户sid不能为空")
     private String customerSid;
-    @ApiModelProperty("销售专员")
+    @ApiModelProperty(value = "销售专员", required = true)
+    @NotBlank(message = "销售专员不能为空")
     private String staffName;
-    @ApiModelProperty("销售专员sid")
+    @ApiModelProperty(value = "销售专员sid", required = true)
+    @NotBlank(message = "销售专员sid不能为空")
     private String staffSid;
-    @ApiModelProperty("客户联系电话")
+    @ApiModelProperty(value = "客户联系电话", required = true)
+    @NotBlank(message = "客户联系电话不能为空")
     private String mobile;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("制单日期")
     private Date createDate;
-    @ApiModelProperty("开票类型key")
+    @ApiModelProperty(value = "开票类型key", required = true)
+    @NotBlank(message = "开票类型key不能为空")
     private String billingTypeKey;
     @ApiModelProperty("开票类型value")
+    @NotBlank(message = "开票类型不能为空")
     private String billingType;
     @ApiModelProperty("付款方式key")
+    @NotBlank(message = "付款方式key不能为空")
     private String payTypeKey;
     @ApiModelProperty("付款方式value")
+    @NotBlank(message = "付款方式不能为空")
     private String payType;
     @ApiModelProperty("挂靠公司sid")
     private String affiliatedCompanySid;
@@ -66,8 +79,10 @@ public class BusSalesOrderAllDto implements Dto {
     @ApiModelProperty("是否包含上装")
     private String isTop;
     @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
+    @NotBlank(message = "销售订单车辆类型不能为空")
     private String type;
     @ApiModelProperty(value = "主车车型信息")
+    @NotNull(message = "车型信息不能为空")
     private BusSalesOrderModelDto busSalesOrderModel;
     @ApiModelProperty(value = "现车车辆信息")
     private List<BusSalesOrderVehicleDto> busSalesOrderVehicleList;
@@ -85,4 +100,14 @@ public class BusSalesOrderAllDto implements Dto {
     private BusSalesOrderDepositDto busSalesOrderDeposit;
     @ApiModelProperty(value = "虚拟订单和订金关联信息")
     private List<BusDepositFictitiousDto> busDepositFictitiousList;
+
+    @ApiModelProperty(value = "客户类型key", required = true)
+    @NotBlank(message = "客户类型key不能为空")
+    private String customerClassKey;
+    @ApiModelProperty(value = "客户类型", required = true)
+    @NotBlank(message = "客户类型不能为空")
+    private String customerClass;
+    @ApiModelProperty(value = "客户头像", required = true)
+    @NotBlank(message = "客户头像不能为空")
+    private String customerPhoto;
 }

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

@@ -60,7 +60,7 @@ public interface BusSalesOrderFeign {
     public ResultBean<PagerVo<BusSalesOrderVo>> listPage(@RequestBody PagerQuery<BusSalesOrderQuery> pq);
 
     @ApiOperation("新增或修改")
-    @PostMapping("/save")
+    @PostMapping("/saveOrUpdate")
     @ResponseBody
     public ResultBean<String> save(@RequestBody BusSalesOrderAllDto dto);
 

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

@@ -4,11 +4,6 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Author dimengzhe
  * @Date 2022/5/6 15:13
@@ -24,8 +19,8 @@ public class BusSalesOrderFlowDto implements Dto {
     @ApiModelProperty("任务Id")
     private String taskId;
 
-    @ApiModelProperty("用户Id")
-    private String userId;
+//    @ApiModelProperty("用户Id")
+//    private String userId;
     @ApiModelProperty("用户Sid")
     private String userSid;
 
@@ -35,18 +30,18 @@ public class BusSalesOrderFlowDto implements Dto {
     @ApiModelProperty("流程实例Id")
     private String instanceId;
 
-    @ApiModelProperty("节点")
-    private String targetKey;
-
-    @ApiModelProperty("流程变量信息")
-    private Map<String, Object> values = new HashMap<>();
-
-    @ApiModelProperty("审批人")
-    private String assignee;
+//    @ApiModelProperty("节点")
+//    private String targetKey;
 
-    @ApiModelProperty("候选人")
-    private List<String> candidateUsers = new ArrayList<>();
+//    @ApiModelProperty("流程变量信息")
+//    private Map<String, Object> values = new HashMap<>();
 
-    @ApiModelProperty("审批组")
-    private List<String> candidateGroups = new ArrayList<>();
+//    @ApiModelProperty("审批人")
+//    private String assignee;
+//
+//    @ApiModelProperty("候选人")
+//    private List<String> candidateUsers = new ArrayList<>();
+//
+//    @ApiModelProperty("审批组")
+//    private List<String> candidateGroups = new ArrayList<>();
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java

@@ -54,12 +54,12 @@ public class BusSalesOrderDepositDto implements Dto {
     @ApiModelProperty("单台订金")
     private BigDecimal deposit;
     @ApiModelProperty("订金合计")
-    private BigDecimal depositAll;
+    private String depositAll;
     @ApiModelProperty("订金交纳方式")
     private String depositType;
     @ApiModelProperty("订金交纳方式key")
     private String depositTypeKey;
     @ApiModelProperty("需补交订金")
-    private BigDecimal makeUpDeposit;
+    private String makeUpDeposit;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java

@@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderInsuranceDto.java <br/>
@@ -54,7 +52,7 @@ public class BusSalesOrderInsuranceDto implements Dto {
     @ApiModelProperty("保险公司名称")
     private String insuranceName;
     @ApiModelProperty("单台车保费预估金额")
-    private BigDecimal insuranceCarMoney;
+    private String insuranceCarMoney;
     @ApiModelProperty("公司入保期数")
     private Integer insuranceNum;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java

@@ -62,7 +62,7 @@ public class BusSalesOrderPriceDto implements Dto {
     private String priceSum;
     @ApiModelProperty("计划提车地点")
     private String plannedPickUpLocation;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("计划提车日期")
     private Date plannedPickUpDate;
 

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

@@ -80,6 +80,12 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.saveOrUpdateOrder(dto);
     }
 
+    /**
+     * 删除/批量删除销售订单
+     *
+     * @param sids 销售订单sid数组
+     * @return
+     */
     @Override
     public ResultBean delBySids(String[] sids) {
         return busSalesOrderService.deleteSids(sids);

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

@@ -120,7 +120,7 @@
 
     <select id="selectPagePc" resultType="com.yxt.anrui.crm.api.crmvehicledemand.pc.PcCrmVehicleDemandVo">
         select cv.modelSid,
-               cv.comonConfigSid,
+               cv.comonConfigSid as modelConfigSid,
                cv.modelName           modelAlias,
                cv.sketChconfiguration config,
                cv.brandName