myPerson &myActivity

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@ import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -293,4 +295,57 @@ public class TaPersonController extends BaseController {
     boolean isEmpty(String str) {
         return null == str || "".equals(str.trim());
     }
+
+    /**
+     * 获取收藏置业顾问列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/wx/savedPerson")
+    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
+                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        try {
+            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+    }
+    /**
+     * 获取收藏置业顾问列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/wx/joinedActivity/{phone}")
+    public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
+                                             @RequestParam(defaultValue = "10") int pageSize,@PathVariable String phone){
+
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        try {
+            String buidling = "";
+            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,phone,buidling);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+    }
+
+
 }

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

@@ -59,7 +59,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getSavedConsaultants(int pageNumber, int pageSize,String personId);
 
-//    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
 
 
 }

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

@@ -69,6 +69,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
     @Override
     public TaPerson mergePersonWxInfo(WxMaUserInfo userInfo) {
         // 先查询是否存在用户
@@ -665,9 +671,23 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     }
 
-//    @Override
-//    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building){
-//        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
-//
-//    }
+    @Override
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building){
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
+        activityDynamicEnlistQueryWrapper.eq("phone",phone);
+        if(!StringUtils.isEmpty(building)){
+            activityDynamicEnlistQueryWrapper.eq("building_id",building);
+        }
+        List<TaActivityDynamicEnlist> activityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(activityDynamicEnlistQueryWrapper);
+        List<String>activityIds = new ArrayList<>();
+        for (int i=0;i<activityDynamicEnlists.size();i++){
+            activityIds.add(activityDynamicEnlists.get(i).getDynamicId());
+        }
+        IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaBuildingDynamic> empty = new QueryWrapper<>();
+        empty.orderBy(true,false,"start_date");
+        return taBuildingDynamicMapper.selectPage(page,empty);
+
+
+    }
 }