bugfix

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

@@ -10,9 +10,11 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -26,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -45,6 +48,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    private ITaPersonService taPersonService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -79,9 +85,21 @@ public class TaBuildingDynamicController extends BaseController {
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")String buildingId,
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               @RequestParam(defaultValue = "false" )boolean mine,
                                                HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        ResponseBean  responseBean = new ResponseBean();
+        if(mine){
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
+        }else {
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        }
+
         return responseBean;
     }
 

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

@@ -49,13 +49,25 @@ public class TaPersonController extends BaseController {
     @GetMapping("/wx/cards")
     public ResponseBean getCardList(@RequestParam(defaultValue = "1") int pageNumber,
                                     @RequestParam(defaultValue = "10") int pageSize,
-                                    @RequestParam(defaultValue = "false") boolean mine) {
+                                    @RequestParam(defaultValue = "false") boolean mine,HttpServletRequest request) {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        if (mine){
+            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);
+            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+            return ResponseBean.success(result);
+        }else {
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
+            return ResponseBean.success(result);
+        }
+
 
-        IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
-        return ResponseBean.success(result);
     }
 
     /**
@@ -324,21 +336,26 @@ public class TaPersonController extends BaseController {
 
     }
     /**
-     * 获取收藏置业顾问列表
+     * 获取我参加过的活动列表
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @GetMapping("/wx/joinedActivity/{phone}")
+    @GetMapping("/wx/joinedActivity/")
     public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
-                                             @RequestParam(defaultValue = "10") int pageSize,@PathVariable String phone){
+                                             @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 {
-            String buidling = "";
-            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,phone,buidling);
+            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,person.getPhone(),"");
             return ResponseBean.success(result);
         }catch (Exception e){
             e.printStackTrace();