From 647c73834b2c6828a613fab6c1299db9455b0c77 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 19 Jul 2022 14:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=B4=BD=E8=B0=88=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorMapper.xml | 4 ++-- .../BaseDistributorService.java | 8 +++---- .../AppCrmVehicleDemandUpdateDto.java | 5 ++++ .../AppCrmVehicledemandDetailsVo.java | 5 ++++ .../AppCrmVehicledemandVo.java | 20 +++++++++++++--- .../crmvehicledemand/CrmVehicledemand.java | 5 ++++ .../CrmCustomerTempService.java | 14 ++++++++++- .../CrmVehicledemandMapper.java | 2 ++ .../CrmVehicledemandMapper.xml | 24 +++++++++++++++---- .../CrmVehicledemandService.java | 9 +++++-- 10 files changed, 80 insertions(+), 16 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index 7261372e16..18b9d8ee81 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -170,14 +170,14 @@ select * from base_distributor where sid = #{sid} - and length(disName) = 0 + and length(disName) > 0 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 71e127ea7b..d40b991726 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -580,15 +580,15 @@ public class BaseDistributorService extends MybatisBaseService 0) { diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java index d09beb7823..47168d20ee 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java @@ -33,4 +33,9 @@ public class AppCrmVehicleDemandUpdateDto implements Dto { @ApiModelProperty("意向车型sid") private String intentionSid; + + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java index ce2e362bf2..b8a21f5201 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java @@ -42,4 +42,9 @@ public class AppCrmVehicledemandDetailsVo implements Vo { @ApiModelProperty(value = "其他配置:pc") private String otherConfig; + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; + } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java index b227ae5622..aa35fb97c1 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java @@ -6,13 +6,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import java.util.Date; - @ApiModel(value = "客户车辆需求信息 视图数据对象", description = "客户车辆需求信息 视图数据对象") @Data public class AppCrmVehicledemandVo implements Vo { + private static final long serialVersionUID = -3885773306949969375L; @ApiModelProperty("车辆需求sid") private String sid; @@ -31,6 +29,22 @@ public class AppCrmVehicledemandVo implements Vo { @ApiModelProperty("购车方式value") private String purchaseType; + @ApiModelProperty(value = "购车方式key") + private String purchaseKey; + @ApiModelProperty(value = "客户sid") + private String customerSid; + @ApiModelProperty(value = "客户名称") + private String customerName; + @ApiModelProperty(value = "客户手机号") + private String customerMobile; + @ApiModelProperty(value = "购车方式key") + private String payTypeUpKey; + @ApiModelProperty(value = "购车方式value") + private String payTypeUpValue; + + @ApiModelProperty(value = "新建销售订单按钮是否显示") + private Boolean showAddOrderBtn; + } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java index f132c582dd..6f5385a5aa 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java @@ -78,4 +78,9 @@ public class CrmVehicledemand extends BaseEntity { @ApiModelProperty("常用配置sid") private String comonConfigSid; + + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 65c501fbe9..96088ff15a 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -12,6 +12,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.*; import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum; import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo; +import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand; import com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo; import com.yxt.anrui.crm.api.crmvisit.CrmVisitVo; import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto; @@ -338,7 +339,18 @@ public class CrmCustomerTempService extends MybatisBaseService appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid); - if (appCrmVehicledemandVos.size() > 0) { + appCrmVehicledemandVos.removeAll(Collections.singleton(null)); + if (!appCrmVehicledemandVos.isEmpty()) { + for (AppCrmVehicledemandVo v : appCrmVehicledemandVos) { + String vehicSid = v.getSid(); + //根据车辆需求sid查询是否已完善 + CrmVehicledemand crmVehicledemand = crmVehicledemandService.selectOneBySid(vehicSid); + if (crmVehicledemand != null) { + v.setShowAddOrderBtn(true); + } else { + v.setShowAddOrderBtn(false); + } + } vo.setAppCrmVehicledemandVos(appCrmVehicledemandVos); } else { List list = new ArrayList<>(); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java index 2ee9c0983e..283fd8ad0d 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java @@ -108,4 +108,6 @@ public interface CrmVehicledemandMapper extends BaseMapper { IPage getWantCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); void updateByPrice(@Param("sid") String sid); + + CrmVehicledemand selectOneBySid(String vehicSid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 22ff4b5c15..8f903e651b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -32,10 +32,17 @@ cvcd.modelName, cvcd.modelSid, cvcd.comonConfigSid, - cvcd.saleReferencePrice AS guidancePrice, - cvcd.createTime, - cvcd.purchaseMethodValue AS purchaseType + cvcd.saleReferencePrice AS guidancePrice, + DATE_FORMAT(cvcd.createTime, '%Y-%m-%d') as createTime, + cvcd.purchaseMethodValue AS purchaseType, + cvcd.purchaseMethod as purchaseKey, + cvcd.financePlan as payTypeUpKey, + cvcd.financePlanValue as payTypeUpValue, + cct.sid as customerSid, + cct.name as customerName, + cct.mobile as customerMobile FROM crm_vehicledemand cvcd + left join crm_customer_temp cct on cvcd.customerSid = cct.sid WHERE cvcd.customerSid = #{customerSid} AND cvcd.states = 1 @@ -99,7 +106,9 @@ cv.number, cv.estimatedPickupDate AS `date`, cv.otherConfig, - cv.sketChconfiguration as configName + cv.sketChconfiguration as configName, + cv.financePlan, + cv.financePlanValue FROM crm_vehicledemand cv WHERE cv.sid = #{intentionSid} @@ -152,4 +161,11 @@ set vehicleModelOffer = NULL where sid = #{sid} + + \ No newline at end of file diff --git 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 index d16d8b1080..955830bdbc 100644 --- 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 @@ -354,10 +354,11 @@ public class CrmVehicledemandService extends MybatisBaseService