fix #1094\

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>marketing</artifactId>
-	<version>v1.0.34</version>
+	<version>v1.0.36</version>
 	<name>marketing-cloud</name>
 	<description>新联康营销云</description>
 

src/main/java/com/yunzhi/marketing/mapper/TaPersonMapper.java

@@ -262,4 +262,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     Integer cancelConsulatant(@Param("personId") String personId);
 
     IPage<TaPerson> getMarketingList(Page<TaBuildingDynamic> page,@Param("buildingId") String buildingId);
+
+    TaPerson getByPhone(@Param("personId") String phone);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -388,6 +388,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 当前人员
         TaPerson person = taPersonMapper.getById(channelReportDTO.getPersonId());
 
+        // 查询报备客户
+        TaPerson reportPerson = taPersonMapper.getByPhone(channelReportDTO.getPhone());
+
         // 先查看在ta_recommend_customer 手机号是否存在
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaRecommendCustomer::getPhone,channelReportDTO.getPhone());
@@ -435,6 +438,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         // 入渠道推荐客户表
         ChannelCustomer channelCustomer = new ChannelCustomer();
+        if (null != reportPerson) {
+            channelCustomer.setPersonId(reportPerson.getPersonId());
+        }
         channelCustomer.setBuildingId(channelReportDTO.getBuildingId());
         channelCustomer.setName(channelReportDTO.getName());
         channelCustomer.setPicture(channelReportDTO.getPicture());
@@ -640,9 +646,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Override
     public ResponseBean averageReportCust(AverageReportDTO averageReportDTO) {
 
-
         // 当前人员
-        TaPerson person = taPersonMapper.getById(averageReportDTO.getPersonId());
+//        TaPerson person = taPersonMapper.getById(averageReportDTO.getPersonId());
+
+        // 查询报备客户
+        TaPerson reportPerson = taPersonMapper.getByPhone(averageReportDTO.getPhone());
 
         // 先查看在ta_recommend_customer 手机号是否存在
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
@@ -667,6 +675,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         // 入渠道推荐客户表
         ChannelCustomer channelCustomer = new ChannelCustomer();
+        if (null != reportPerson) {
+            channelCustomer.setPersonId(reportPerson.getPersonId());
+        }
+
         channelCustomer.setBuildingId(averageReportDTO.getBuildingId());
         channelCustomer.setName(averageReportDTO.getName());
         channelCustomer.setPicture(averageReportDTO.getPicture());

src/main/resources/mapper/TaPersonMapper.xml

@@ -649,6 +649,15 @@ FROM
         WHERE
         t.building_id = #{buildingId}
     </select>
+    <select id="getByPhone" resultType="com.yunzhi.marketing.entity.TaPerson">
+        SELECT
+            *
+        FROM
+            ta_person t
+        WHERE
+            t.phone = #{phone}
+          AND t.`status` &gt; -1
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.yunzhi.marketing.entity.TaPersonPositon">
         insert into ta_person_position