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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.1</version>
+	<version>v3.5.1-2019-11-21</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -372,6 +372,8 @@ public class TaUserController extends BaseController {
             taUserQueryWrapper.eq(null != status,"status",status);
             if(null != isConsultant && isConsultant == 1){
                 taUserQueryWrapper.eq("is_consultant",true);
+            }else if (null != isConsultant && isConsultant == 0){
+                taUserQueryWrapper.eq("is_consultant",false);
             }
             taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
             IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);

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

@@ -171,6 +171,9 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
     public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
         TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
+        if(null == taPersonVisitRecord){
+            return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
+        }
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
         taPersonVisitRecord.setRecordId(id);
         Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();

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

@@ -315,13 +315,29 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name", taRecommendCustomer.getName());
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
         queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
-            return ResponseBean.error("当前客户已被报备, 不能再次报备", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            String conName = "";
+            TaPerson conPerson = taPersonMapper.selectById(result.get(0).getRealtyConsultant());
+            if (null != conPerson){
+                if(params.getString("realtyConsultant").equals(conPerson.getPersonId())){
+                   return  ResponseBean.success("bound");
+                }
+                conName = conPerson.getName();
+            }else {
+                TaUser conUser = userService.getById(result.get(0).getRealtyConsultant());
+                if(null != conUser){
+                    if(params.getString("realtyConsultant").equals(conUser.getUserId().toString())){
+                        return ResponseBean.success("bound");
+                    }
+                    conName = conUser.getUserName();
+
+                }
+            }
+            return ResponseBean.error("您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);

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

@@ -54,6 +54,9 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
         if (null != uvs && uvs.size() > 0) {
             for(int i=0;i<uvs.size();i++){
                 uvs.get(i).setCreateDate(LocalDateTime.now());
+                uvs.get(i).setNameOrnick(taPerson.getNickname());
+                uvs.get(i).setPersonId(taPerson.getPersonId());
+                uvs.get(i).setPhotoOravatar(taPerson.getAvatarurl());
             }
             if(this.updateBatchById(uvs)){
                 return ResponseBean.success("");

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -3,14 +3,18 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
 
-                SELECT
-                    tade.*,
-                    tp.NAME AS sharePersonName,
-                    tp.company AS orgName
-                FROM
-                    ta_activity_dynamic_enlist tade
-                    LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
-                    LEFT JOIN ta_person tp ON tspf.share_person = tp.person_id
+            SELECT
+            tade.*,
+            IFNULL(tp.nickname,tu.user_name) AS sharePersonName,
+            IFNULL(tp.company,tu.org_name)AS orgName
+            FROM
+            ta_activity_dynamic_enlist tade
+            LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id
+            AND tspf.target_type = 'dynamic_share'
+            AND tspf.STATUS = 1
+            AND tade.person_id = tspf.person_id
+            LEFT JOIN ta_person tp ON tspf.share_person = tp.person_id AND tspf.share_person_type != 'Realty Consultant'
+            LEFT JOIN ta_user tu ON tspf.share_person = tu.user_id AND tspf.share_person_type = 'Realty Consultant'
                 <where>
                     tade.dynamic_id = #{dynamicId}
                     AND tade.org_id = #{orgId}

src/main/resources/mapper/TaBuildingMapper.xml

@@ -201,7 +201,10 @@
     </select>
 
     <select id="countNumByHeavy" resultType="java.lang.Integer">
-      select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy} and t.dynamic_id != #{dynamicId}
+      select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy}
+      <if test="dynamicId != null and dynamicId != ''">
+          and t.dynamic_id != #{dynamicId}
+      </if>
     </select>
 
 </mapper>

src/main/resources/mapper/TaMiniFormidsMapper.xml

@@ -8,7 +8,7 @@
             ta_mini_formids t
         WHERE
             t.openid = #{openid}
-        AND ADDDATE(t.create_date, INTERVAL 7 DAY) >= now()
+        AND ADDDATE(t.create_date, INTERVAL 6 DAY) >= now()
         ORDER BY t.create_date ASC
         LIMIT 1
     </select>