移动端销售订单和pc端销售订单相互调式

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java

@@ -24,4 +24,7 @@ public class BaseVehmodelVo implements Vo {
 
     @ApiModelProperty(value = "品牌sid")
     private String brandSid;
+
+    @ApiModelProperty(value = "配置")
+    private String configName;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -318,6 +318,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
                 qw.notIn("sid", params.getSidList());
             }
         }
+        qw.eq("salesPolicyKey", "0002");
         return qw;
     }
 

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

@@ -211,7 +211,7 @@
     </select>
 
     <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
-        select bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid
+        select bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid,bmc.configName
         from base_vehmodel_config bvc
                      left join base_vehicle_model bm on bvc.modelSid = bm.sid
                      left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid

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

@@ -111,8 +111,8 @@ public class BusSalesOrderAllDto implements Dto {
     @ApiModelProperty(value = "客户类型", required = true)
     @NotBlank(message = "客户类型不能为空")
     private String customerClass;
-    @ApiModelProperty(value = "客户头像", required = true)
-    @NotBlank(message = "客户头像不能为空")
+    @ApiModelProperty(value = "客户头像")
+//    @NotBlank(message = "客户头像不能为空")
     private String customerPhoto;
 
     @ApiModelProperty(value = "选择的现车的车辆sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java

@@ -49,8 +49,6 @@ import java.math.BigDecimal;
 @ApiModel(value = "销售订单-主车车型", description = "销售订单-主车车型")
 public class BusSalesOrderModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "类型")
-    private Integer type;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
     @ApiModelProperty(value = "品牌sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java

@@ -52,9 +52,6 @@ public class BusSalesOrderModelDto implements Dto {
 
     private static final long serialVersionUID = -216156078782065154L;
 
-    @ApiModelProperty(value = "类型")
-    private Integer type;
-
     @ApiModelProperty(value = "品牌")
     @NotBlank(message = "参数错误：品牌")
     private String brandName;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -35,14 +35,14 @@
     </update>
 
     <select id="getPriceInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo">
-        select bp.plannedPickUpLocation    as address,
-               bp.plannedPickUpLocationKey as addressKey,
-               bp.singleFinalPrice         as overallPrice,
-               bp.plannedPickUpDate        as date,
-               bp.quantity                 as number,
-               bp.singleGuildPrice         as guidancePrice,
-               bp.priceSum                 as totalPrice,
-               bm.finalPrice               as transactionPrice
+        select bp.plannedPickUpLocation                      as address,
+               bp.plannedPickUpLocationKey                   as addressKey,
+               bp.singleFinalPrice                           as overallPrice,
+               date_format(bp.plannedPickUpDate, '%Y-%m-%d') as date,
+               bp.quantity                                   as number,
+               bp.singleGuildPrice                           as guidancePrice,
+               bp.priceSum                                   as totalPrice,
+               bm.finalPrice                                 as transactionPrice
         from bus_sales_order_price bp
                  left join bus_sales_order_model bm on bm.salesOrderSid = bp.salesOrderSid
         where bp.salesOrderSid = #{sid}

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

@@ -123,7 +123,6 @@
         select cv.modelSid,
                cv.comonConfigSid as   modelConfigSid,
                cv.modelName           modelAlias,
-               cv.sketChconfiguration config,
                cv.brandName,
                cct.staffSid
         from crm_vehicledemand cv

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

@@ -402,6 +402,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     list.get(i).setModelName(voResultBean.getData().getModelName());
                     list.get(i).setOtherConfig(voResultBean.getData().getOtherConfig());
                     list.get(i).setBrandSid(voResultBean.getData().getBrandSid());
+                    list.get(i).setConfig(voResultBean.getData().getConfigName());
                 }
             }
         }
@@ -424,8 +425,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                 qw.like("cv.sketChconfiguration", query.getModelConfigName());
             }
             qw.eq("cv.customerSid", query.getCustomerSid());
-
         }
+        //是否意向：0非意向，1意向
+        qw.eq("states", 1);
         return qw;
     }