bug

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -88,9 +88,15 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TaPersonFromRecordMapper taPersonFromRecordMapper;
+
     @Autowired
     private TdPersonFromMapper tdPersonFromMapper;
 
+    @Autowired
+    private TdWxDictMapper tdWxDictMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -571,16 +577,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
-            Map<String,String>geoInfo = new HashMap<>();
-            geoInfo.put("provience",person.getProvince());
-            geoInfo.put("country",person.getCountry());
-            TdCity city = cityMapper.selectById(person.getCity());
-            if(null!=city){
-                geoInfo.put("city",city.getName());
-            }else {
-                geoInfo.put("city","未知");
-            }
-            taRecommendCustomer.setGeoInfo(geoInfo);
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
@@ -600,11 +596,29 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         //构造来源类型
         taRecommendCustomer.setPersonFrom("");
-        if (null != person && null != person.getFromCode()){
-            QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
-            tdPersonFromQueryWrapper.eq("from_code",person.getFromCode());
-            TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
-            taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+        if (null != person){
+            Map<String,String>geoInfo = new HashMap<>();
+            geoInfo.put("provience",person.getProvince());
+            geoInfo.put("country",person.getCountry());
+            TdCity city = cityMapper.selectById(person.getCity());
+            if(null!=city){
+                geoInfo.put("city",city.getName());
+            }else {
+                geoInfo.put("city","未知");
+            }
+            taRecommendCustomer.setGeoInfo(geoInfo);
+
+            QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",person.getOrgId());
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("is_first_time",1);
+            List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
+            if (taPersonFromRecords.size() > 0){
+                QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+                tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
+                taRecommendCustomer.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
+            }
         }
 
         return taRecommendCustomer;
@@ -612,7 +626,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
-        TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
+        TaPerson taPerson = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
             IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
@@ -656,26 +670,33 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 }
             });
             taPersonVisitRecordIPage.setRecords(records);
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
-            taRecommendCustomer.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
-            taRecommendCustomer.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
-            TdCity city = cityMapper.selectById(taRecommendCustomer.getCity());
+            taPerson.setVisitRecords(taPersonVisitRecordIPage);
+            taPerson.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
+            taPerson.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
+            taPerson.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
+            taPerson.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
+            TdCity city = cityMapper.selectById(taPerson.getCity());
             if(null != city){
-                taRecommendCustomer.setCity(city.getName());
+                taPerson.setCity(city.getName());
             }
 
             //构造来源类型
-            taRecommendCustomer.setPersonFrom("");
-            if (null != taRecommendCustomer.getFromCode()){
-                QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
-                tdPersonFromQueryWrapper.eq("from_code",taRecommendCustomer.getFromCode());
-                TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
-                taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+            taPerson.setPersonFrom("");
+            if (null != taPerson){
+                QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",taPerson.getOrgId());
+                queryWrapper.eq("person_id",taPerson.getPersonId());
+                queryWrapper.eq("is_first_time",1);
+                List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
+                if (taPersonFromRecords.size() > 0){
+                    QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+                    tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                    TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
+                    taPerson.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
+                }
             }
         }
-        return taRecommendCustomer;
+        return taPerson;
     }
 
     @Override

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -23,16 +23,20 @@
     </sql>
 
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select * from ta_person_visit_record t
+        select
+            t.* ,
+            b.parent_type_id from ta_person_visit_record t
+        left join td_biz_event_type b on t.event_type = b.type_id
         where t.person_id = #{personId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
-            AND t.building_id in
+            AND (b.parent_type_id = 'public' or t.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                 #{personBuilding.buildingId}
             </foreach>
+            )
         </if>
         <if test="buildingId != null and buildingId != ''">
-            AND t.building_id = #{buildingId}
+            AND (b.parent_type_id = 'public' or t.building_id = #{buildingId} )
         </if>
         order by t.visit_time desc
     </select>