移动端客户洽谈根据需求添加字段

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
     </select>
 
     <select id="selectBySidOne" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
         select *
         from base_distributor
         where sid = #{sid}
-          and length(invoPhone) = 0
+          and length(invoPhone) > 0
     </select>
 
     <update id="updateInvoiceBySid">

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<BaseDistributorMa
         //查询基础信息是否已完善
         BaseDistributor distributor = baseMapper.selectBySid(sid);
         if (distributor != null) {
-            vo.setBaseInfoState(0);
-        } else {
             vo.setBaseInfoState(1);
+        } else {
+            vo.setBaseInfoState(0);
         }
         BaseDistributor distributor1 = baseMapper.selectBySidOne(sid);
         if (distributor1 != null) {
-            vo.setInvoiceInfoState(0);
-        } else {
             vo.setInvoiceInfoState(1);
+        } else {
+            vo.setInvoiceInfoState(0);
         }
         int count = baseDistributorAppendixService.selectByLinkSid(sid);
         if (count > 0) {

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;
 }

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;
+
 }

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;
+
 
 
 }

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;
 }

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<CrmCustomerTempMa
 
             //意向车型
             List<AppCrmVehicledemandVo> 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<AppCrmVehicledemandVo> list = new ArrayList<>();

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<CrmVehicledemand> {
     IPage<AppOrderCrmVehicleDemandVo> getWantCarList(IPage<CrmVehicledemand> page, @Param(Constants.WRAPPER) QueryWrapper<CrmVehicledemand> qw);
 
     void updateByPrice(@Param("sid") String sid);
+
+    CrmVehicledemand selectOneBySid(String vehicSid);
 }

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

@@ -33,9 +33,16 @@
                cvcd.modelSid,
                cvcd.comonConfigSid,
                cvcd.saleReferencePrice                  AS guidancePrice,
-               cvcd.createTime,
+               DATE_FORMAT(cvcd.createTime, '%Y-%m-%d') as createTime,
-               cvcd.purchaseMethodValue AS purchaseType
+               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
     </select>
@@ -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}
     </select>
@@ -152,4 +161,11 @@
         set vehicleModelOffer = NULL
         where sid = #{sid}
     </update>
+
+    <select id="selectOneBySid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand">
+        select *
+        from crm_vehicledemand
+        where sid = #{vehicSid}
+          and length(financePlan) > 0
+    </select>
 </mapper>

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<CrmVehicledemand
         ResultBean rb = ResultBean.fireFail();
         String sid = appCrmVehicleDemandUpdateDto.getIntentionSid();
         CrmVehicledemand entity = fetchBySid(sid);
-        entity.setPurchaseMethod(appCrmVehicleDemandUpdateDto.getPurchaseMethod());
+        BeanUtil.copyProperties(appCrmVehicleDemandUpdateDto,entity);
+        /*entity.setPurchaseMethod(appCrmVehicleDemandUpdateDto.getPurchaseMethod());
         entity.setPurchaseMethodValue(appCrmVehicleDemandUpdateDto.getPurchaseMethodValue());
         entity.setRemarks(appCrmVehicleDemandUpdateDto.getRemarks());
-        entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());
+        entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());*/
         entity.setEstimatedPickupDate(appCrmVehicleDemandUpdateDto.getDate());
         if (StringUtils.isNotBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
             BigDecimal bigDecimal = new BigDecimal(appCrmVehicleDemandUpdateDto.getPrice());
@@ -473,4 +474,8 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         qw.eq("states", 1);
         return qw;
     }
+
+    public CrmVehicledemand selectOneBySid(String vehicSid) {
+        return baseMapper.selectOneBySid(vehicSid);
+    }
 }