魏超 5 gadus atpakaļ
vecāks
revīzija
b971e37e55

+ 2
- 4
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Parādīt failu

@@ -385,10 +385,8 @@ public class TaUserController extends BaseController {
385 385
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
386 386
                 e.setTaTagsList(taTagsList);
387 387
 
388
-                QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
389
-                personQueryWrapper.eq("user_id", e.getUserId());
390
-                TaPerson person = iTaPersonService.getOne(personQueryWrapper);
391
-                e.setMiniStatus(null == person ? 0 : 1);
388
+                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
389
+                e.setMiniStatus(0 == person ? 0 : 1);
392 390
             });
393 391
             result.setRecords(taUserList);
394 392
             responseBean.addSuccess(result);

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Parādīt failu

@@ -232,6 +232,7 @@ public class TaShareActivityController extends BaseController {
232 232
         try {
233 233
 
234 234
             TaShareActivity taShareActivity = iTaShareActivityService.getById(id);
235
+            taShareActivity.setGroupBuyPeople(iTaShareActivityService.countGroupBuyPeople(taShareActivity));
235 236
             responseBean.addSuccess(taShareActivity);
236 237
         }catch (Exception e){
237 238
             e.printStackTrace();

+ 7
- 0
src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java Parādīt failu

@@ -5,6 +5,7 @@ import com.huiju.estateagents.entity.TaChannel;
5 5
 import com.huiju.estateagents.entity.TaPerson;
6 6
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
7 7
 import com.huiju.estateagents.po.PersonPO;
8
+import io.swagger.models.auth.In;
8 9
 import org.apache.ibatis.annotations.*;
9 10
 
10 11
 import java.io.Serializable;
@@ -196,4 +197,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
196 197
 
197 198
     //更新city拼音为cityId
198 199
     void upDatePersonCityToId (@Param("personId")String personId);
200
+
201
+    /**
202
+     * 判断置业顾问绑定状态
203
+     * @return
204
+     */
205
+    Integer judgeBindStatusByCondition(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phone") String phone);
199 206
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ITaPersonService.java Parādīt failu

@@ -90,4 +90,6 @@ public interface ITaPersonService extends IService<TaPerson> {
90 90
 
91 91
     //更新city拼音为cityId
92 92
     void upDatePersonCityToId (String personId);
93
+
94
+    Integer judgeBindStatusByCondition(Integer userId, Integer orgId, String phone);
93 95
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java Parādīt failu

@@ -43,4 +43,6 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
43 43
      * @return
44 44
      */
45 45
     ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId);
46
+
47
+    Integer countGroupBuyPeople(TaShareActivity taShareActivity);
46 48
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Parādīt failu

@@ -756,6 +756,11 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
756 756
         taPersonMapper.upDatePersonCityToId(personId);
757 757
     }
758 758
 
759
+    @Override
760
+    public Integer judgeBindStatusByCondition(Integer userId, Integer orgId, String phone) {
761
+        return taPersonMapper.judgeBindStatusByCondition(userId, orgId, phone);
762
+    }
763
+
759 764
 
760 765
     public String codeGenerator (){
761 766
         double r = Math.random();

+ 5
- 2
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java Parādīt failu

@@ -54,15 +54,18 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
54 54
         List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
55 55
         for (TaShareActivity taShareActivity : taShareActivities){
56 56
             Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
57
-            Integer groupPeoplePeople = taShareRecordMapper.countGroupBuyPeople(taShareActivity.getGroupActivityId());
58 57
             taShareActivity.setParticipateNum(participateNum);
59
-            taShareActivity.setGroupBuyPeople(groupPeoplePeople);
58
+            taShareActivity.setGroupBuyPeople(countGroupBuyPeople(taShareActivity));
60 59
         }
61 60
         taNewsIPage.setRecords(taShareActivities);
62 61
         responseBean.addSuccess(taNewsIPage);
63 62
         return responseBean;
64 63
     }
65 64
 
65
+    @Override
66
+    public Integer countGroupBuyPeople(TaShareActivity taShareActivity){
67
+        return taShareRecordMapper.countGroupBuyPeople(taShareActivity.getGroupActivityId());
68
+    }
66 69
     @Override
67 70
     public void updateActivityToUnStart() {
68 71
         taShareActivityMapper.updateActivityToUnStart();

+ 5
- 0
src/main/resources/mapper/TaPersonMapper.xml Parādīt failu

@@ -551,4 +551,9 @@ FROM
551 551
         and a.person_id = #{personId}
552 552
     </update>
553 553
 
554
+    <select id="judgeBindStatusByCondition" resultType="java.lang.Integer">
555
+        select count(1) from ta_user a
556
+        LEFT JOIN ta_person b on a.user_id = b.user_id
557
+        where a.org_id = #{orgId} and b.user_id = #{userId} and a.phone = #{phone} and b.person_type = 'Realty Consultant'
558
+    </select>
554 559
 </mapper>