Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java

@@ -184,4 +184,7 @@ public class TaRecommendCustomer implements Serializable {
      */
     @TableField(exist = false)
     private String sharePersonName;
+
+    @TableField(exist = false)
+    private Map<String,String> geoInfo;
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -38,7 +38,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     TaPerson getById(@Param("personId") String personId);
 
 
-    List<String>getUserProjects(@Param("personId") String personId);
+    List<String>getUserProjects(@Param("personId") Integer personId);
 
     TaPerson selectByIdPerson(@Param("openid") String openid);
 

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

@@ -398,6 +398,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
                 taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
                 taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
 
+                //更改状态为已参与
+                taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 
             }
             return result;

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

@@ -15,13 +15,11 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.TdCity;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
-import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -63,6 +61,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    private TdCityMapper cityMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -437,13 +438,24 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public TaRecommendCustomer getCustomerDetail(String customerId){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
+        TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            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());
-            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
+            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getUserId()));
             taRecommendCustomer.setConsultant(consultant);
         }
         return taRecommendCustomer;

src/main/resources/mapper/HelpActivityMapper.xml

@@ -62,9 +62,13 @@
 			FROM
 				ta_help_activity a
 				WHERE
-                  a.org_id =#{orgId}
+                    a.org_id =#{orgId}
+                <if test="buildingId  == null ">
                   and  a.is_main = 1
-                  and  a.city_id = #{cityID}
+                </if>
+                <if test="cityID != null and cityID != ''">
+                      and  a.city_id = #{cityID}
+                </if>
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
@@ -79,9 +83,13 @@
 				FROM
 					ta_share_activity s
 					WHERE
-                        s.org_id =#{orgId}
+                    s.org_id =#{orgId}
+                <if test="buildingId  == null ">
                     and  s.sort = 1
+                </if>
+                <if test="cityID != null and cityID != ''">
                     and  s.city_id = #{cityID}
+                </if>
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>

src/main/resources/mapper/TaPersonMapper.xml

@@ -108,7 +108,7 @@ WHERE
 FROM
 	ta_person_building a
 	LEFT JOIN ta_building b ON a.building_id = b.building_id
-	WHERE a.person_id = #{personId}
+	WHERE a.user_id = #{personId}
     </select>
 
     <select id="selectByIdPerson" resultType="com.huiju.estateagents.entity.TaPerson">
@@ -536,11 +536,11 @@ FROM
            UPDATE ta_person a
         INNER JOIN (
             SELECT
-                t.*, s.name AS province
+                t.*, s.shortname AS province
             FROM
                 td_city t
             INNER JOIN td_city s ON t.parentid = s.id
-        ) b ON a.city like CONCAT(b.shortname, '%')
+        ) b ON a.city = b.shortname
         AND a.province = b.province
         set a.city = b.id
         where a.city IS NOT NULL