bug fix

src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java

@@ -28,6 +28,8 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private String dynamicId;
 
+    private String personId;
+
     /**
      * 姓名
      */

src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java

@@ -122,7 +122,10 @@ public class TaBuildingDynamic implements Serializable {
      * 是否报名1为已报名,0为未报名
      */
     @TableField(exist = false)
-    private String isSing;
+    private Integer isSign;
+
+    @TableField(exist = false)
+    private Integer isSaved;
 
     /**
      * 分享活动

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

@@ -22,4 +22,6 @@ public interface ITaSaveService extends IService<TaSave> {
     ResponseBean cancelLike(String openid, String typeOf, String like);
 
     List<String> getTargesOfPerson(String personId, String tagertType);
+
+    TaSave getInfoBy(String personId, String tagertType, String savedTarget);
 }

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

@@ -8,15 +8,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
-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.entity.*;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Service;
@@ -50,13 +49,14 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private TaBuildingMapper buildingMapper;
 
-
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
     @Autowired
     private TaPersonMapper taPersonMapper;
 
+    @Autowired
+    private ITaSaveService iTaSaveService;
 
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -98,6 +98,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
+
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+        if (null == taPerson){
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
@@ -106,18 +112,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
         for (TaBuildingDynamic taBuildingDynamic:records){
-            QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
-            TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
-            if (null == taPerson){
-                return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            activityDynamicEnlist.eq("phone", taPerson.getPhone());
-            TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
-            if (null == taActivityDynamicEnlistPhone){
-                taBuildingDynamic.setIsSing("1");
-            }
-            // 获取当前时间状态
-            taBuildingDynamic= timeCondition(taBuildingDynamic);
+            setExtendInfo(taBuildingDynamic, taPerson);
         }
         HashMap<String, Object> map = new HashMap<>();
         map.put("list", records);
@@ -142,21 +137,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         if (null == taPerson){
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-        // 查询是否报名
-        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
-        activityDynamicEnlist.eq("phone", taPerson.getPhone());
-        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
-        if (null == taActivityDynamicEnlistPhone){
-            buildingDynamic.setIsSing("1");
-        }
-        // 获取报名总数
-        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
-        taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
-        taActivityDynamicEnlist.eq("building_id",buildingId);
-        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
-        buildingDynamic.setCount(applyCount);
-        // 获取当前时间状态
-        buildingDynamic = timeCondition(buildingDynamic);
+
+        setExtendInfo(buildingDynamic, taPerson);
 
         return ResponseBean.success(buildingDynamic);
     }
@@ -282,4 +264,35 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         }
         return taBuildingDynamic;
     }
+
+
+    private void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson) {
+        // 是否已报名
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
+        activityDynamicEnlist.eq("personId", taPerson.getPersonId());
+        activityDynamicEnlist.eq("dynamic_id", taBuildingDynamic.getDynamicId());
+        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
+        if (null == taActivityDynamicEnlistPhone){
+            taBuildingDynamic.setIsSign(1);
+        } else {
+            taBuildingDynamic.setIsSign(0);
+        }
+
+        // 获取报名总数
+        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
+        taActivityDynamicEnlist.eq("dynamic_id", taBuildingDynamic.getDynamicId());
+        taActivityDynamicEnlist.eq("building_id", taBuildingDynamic.getBuildingId());
+        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+        taBuildingDynamic.setCount(applyCount);
+
+        // 是否收藏
+        TaSave taSave = iTaSaveService.getInfoBy(taPerson.getPersonId(), CommConstant.FAVOR_ACTIVITY, taBuildingDynamic.getDynamicId());
+        if (null == taSave) {
+            taBuildingDynamic.setIsSaved(0);
+        } else {
+            taBuildingDynamic.setIsSaved(1);
+        }
+
+        timeCondition(taBuildingDynamic);
+    }
 }

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

@@ -139,6 +139,17 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         return taSaveMapper.getTargesOfPerson(personId, tagertType);
     }
 
+    @Override
+    public TaSave getInfoBy(String personId, String tagertType, String savedTarget) {
+        QueryWrapper<TaSave> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("tagert_type", tagertType);
+        queryWrapper.eq("saved_target", savedTarget);
+        queryWrapper.last("limit 1");
+
+        return taSaveMapper.selectOne(queryWrapper);
+    }
+
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }