bugfix

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -208,9 +208,15 @@ public class MiniAppController {
             if(!taRecommendCustomerService.updateById(customers)){
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
-            person.setRecommendPerson(customers.getRecommendPerson());
-            TaPerson recommender = taPersonService.getById(customers.getRecommendPerson());
-            person.setRecommendPersonType(recommender.getPersonType());
+            if(null != customers.getRecommendPerson()&&!StringUtils.isEmpty(customers.getRecommendPerson())){
+                person.setRecommendPerson(customers.getRecommendPerson());
+                person.setRecommendPerson(customers.getRecommendPerson());
+                TaPerson recommender = taPersonService.getById(customers.getRecommendPerson());
+                if(null != recommender.getPersonType()&&!StringUtils.isEmpty(recommender.getPersonType())){
+                    person.setRecommendPersonType(recommender.getPersonType());
+                }
+            }
+
             QueryWrapper<TaCustomerPerson> customerPersonQueryWrapper = new QueryWrapper<>();
             customerPersonQueryWrapper.eq("person_id",person.getPersonId());
             customerPersonQueryWrapper.eq("customer_id",customers.getCustomerId());

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -75,6 +75,27 @@ public class TaBuildingController extends BaseController {
         return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
     }
 
+    /**
+     * 楼盘列表
+     * @param pageNum
+     * @param pageSize
+     * @param name
+     * @param code
+     * @return
+     */
+    @GetMapping("/admin/buildinglist/select")
+    public ResponseBean buildingListSelect(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                     @RequestParam(value = "name", required = false)String name,
+                                     @RequestParam(value = "code", required = false)String code,
+                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
+                                     @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
+                                     @RequestParam(value = "marketStatus",required = false)String marketStatus,
+                                     @RequestParam(value = "cityId",required = false)Integer cityId,
+                                     @RequestParam(value = "isMain",required = false)Integer isMain){
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
+    }
+
     /**
      * 更新楼盘
      * @param parameter

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -318,5 +318,7 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+
+
 }
 

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

@@ -30,6 +30,14 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      */
     List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
 
+    /**
+     * 楼盘列表
+     * @param page
+     * @return
+     */
+    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
+
+
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
     void setFieldNum(@Param("buildingId") String buildingId, @Param("field") String field, @Param("increment") int increment);
 

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

@@ -21,7 +21,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     String getCustomerPersonId(@Param("customerId")String customerId);
 
-    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId);
+    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId,@Param("personId")String personId);
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -26,6 +26,14 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      */
     ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
 
+    /**
+     * 楼盘列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
+
     /**
      * 楼盘详情
      * @param id

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

@@ -73,6 +73,16 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         return ResponseBean.success(page);
     }
+    @Override
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
+        Page<TaBuilding> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
+        page.setRecords(building);
+
+        return ResponseBean.success(page);
+    }
 
     @Override
     public ResponseBean buildingSelectId(String id) {

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

@@ -81,6 +81,9 @@ public class TaFavorServiceImpl extends ServiceImpl<TaFavorMapper, TaFavor> impl
         if (typeOf.equals("card")) {
             taPersonMapper.setFieldIncrement(like,"like_num", 1);
         }
+        if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
+            taPersonMapper.setFieldIncrement(like,"like_num", 1);
+        }
 
         // 如果是资讯点赞, 则 +1
         if(typeOf.equals(CommConstant.FAVOR_NEWS)) {

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

@@ -261,8 +261,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public TaRecommendCustomer getCustomerDetail(String customerId){
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId);
-        String personId = taRecommendCustomer.getPersonId();
+        String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());

src/main/resources/mapper/TaBuildingMapper.xml

@@ -30,6 +30,33 @@
         ORDER BY create_date DESC
     </select>
 
+    <select id="buildingListSelect" resultType="com.huiju.estateagents.entity.TaBuilding">
+        SELECT * FROM ta_building
+        <where>
+            status > -1
+            and  ta_building.building_status = 1
+            <if test="Name != null and Name != ''">
+                and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
+            </if>
+            <if test="Code != null and Code != ''">
+                and  ta_building.code like concat('%',#{Code,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="startDate != null">
+                and  TO_DAYS(ta_building.opening_date ) = TO_DAYS(#{startDate})
+            </if>
+            <if test="marketStatus != null and marketStatus != ''">
+                and  ta_building.market_status =#{marketStatus}
+            </if>
+            <if test="cityId != null and cityId != ''">
+                and  ta_building.city_id =#{cityId}
+            </if>
+            <if test="isMain != null and isMain != ''">
+                and  ta_building.is_main = #{isMain}
+            </if>
+        </where>
+        ORDER BY create_date DESC
+    </select>
+
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
          SELECT * FROM ta_building
          where status > -1

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -20,15 +20,15 @@ WHERE
     </select>
 
     <select id="getCustomerDetail" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
-        SELECT
+      SELECT
 	a.*,
-	(select c.visit_time FROM ta_person_visit_record c where b.person_id = c.person_id ORDER BY c.visit_time desc LIMIT 1) as visitTime,
-	(SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE b.person_id = d.person_id) as duration
+	(select c.visit_time FROM ta_person_visit_record c where c.person_id = #{personId} ORDER BY c.visit_time desc LIMIT 1) as visitTime,
+	(SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE d.person_id= #{personId}) as duration
 FROM
 	ta_recommend_customer a
-	LEFT JOIN ta_customer_person b on a.customer_id = b.customer_id
-	LEFT JOIN ta_person_visit_record c ON b.person_id = c.person_id
+	LEFT JOIN ta_person_visit_record c ON a.person_id = c.person_id
 	where a.customer_id = #{customerId}
+	GROUP BY a.customer_id
     </select>
 
     <select id="getCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">