From c6a6764eb64dd63f0a8d54d0528e67e62e900eea Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Mon, 25 Apr 2022 11:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=84=8F=E5=90=91=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdepositvehicle/BusDepositVehicleService.java   | 4 ++--
 .../AppCrmCustomerTempBasicsDetailsVo.java                | 2 ++
 .../crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java | 5 +++++
 .../crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml     | 8 +++++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
index 1d77a64ceb..68c1fbae94 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
@@ -263,8 +263,8 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
         String customerSid = appBusDepositVehicleCarListVo.getCustomerSid();
         ResultBean<AppCrmCustomerTempInfoVo> CustomerTempDetails = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customerSid);
         vo.setMobile(CustomerTempDetails.getData().getMobile());
-        vo.setWeiXin(CustomerTempDetails.getData().getWeixin());
-        vo.setHeadImage(CustomerTempDetails.getData().getCustomerPhoto());
+//        vo.setWeiXin(CustomerTempDetails.getData().getWeixin());
+//        vo.setHeadImage(CustomerTempDetails.getData().getCustomerPhoto());
         vo.setCustomerName(CustomerTempDetails.getData().getName());
         vo.setCustomerSid(CustomerTempDetails.getData().getSid());
         String staffSid = CustomerTempDetails.getData().getStaffSid();
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java
index d4aa35ae91..57698ec8b7 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.crm.api.crmcustomertemp;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -97,6 +98,7 @@ public class AppCrmCustomerTempBasicsDetailsVo implements Vo {
     private String certificateTypeKey;
 
     @ApiModelProperty("证件号码")
+    @JsonProperty("IDNumber")
     private String IDNumber;
 
     @ApiModelProperty("证件有效期")
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java
index 63121369d5..87f1403194 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java
@@ -28,6 +28,11 @@ import java.util.List;
 @Data
 public class AppCrmCustomerTempInfoVo implements Vo {
 
+    @ApiModelProperty("客户sid")
+    private String sid;
+    @ApiModelProperty("销售人sid")
+    private String staffSid;
+
     @ApiModelProperty("客户类型")
     private String customerType;
     @ApiModelProperty("客户类型")
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index 520ce94039..589d073a7e 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -127,7 +127,7 @@
             resultType="com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempBasicsDetailsVo">
         SELECT cct.customerType,
                cct.customerTypeKey,
-               cct.`name`,
+               cct.contacts AS `name`,
                cct.mobile,
                cct.weixin,
                cct.companyName,
@@ -166,13 +166,15 @@
     <!--初始化客户详情 - 基础信息接口-->
     <select id="getAppCustomerTempDetailsBySid"
             resultType="com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo">
-        SELECT cct.customerType,
+        SELECT cct.sid,
+               cct.staffSid,
+               cct.customerType,
                cct.customerTypeKey,
                cct.companyName,
                cct.weiXin,
                cct.mobile,
                cct.emergencyMobile            AS mobile2,
-               cct.`name`,
+               cct.contacts                   AS `name`,
                cct.emergencyContact           AS name2,
                cct.address,
                cct.(province + city + county) AS addressNss,