Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -73,7 +73,8 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
         return responseBean;
     }
 
@@ -85,8 +86,10 @@ public class TaBuildingDynamicController extends BaseController {
      */
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
-                                             @RequestParam("buildingId")Integer buildingId){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId);
+                                             @RequestParam("buildingId")Integer buildingId,
+                                             HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
         return responseBean;
     }
 

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

@@ -27,13 +27,13 @@ public class TaActivityDynamicEnlist implements Serializable {
     /**
      * 报名ID
      */
-    @TableId(value = "favor_id", type = IdType.AUTO)
+    @TableId(value = "enlist_id", type = IdType.AUTO)
     private Integer enlist_id;
 
     /**
      * 活动ID
      */
-    private String dynamic_id;
+    private String dynamicId;
 
     /**
      * 姓名
@@ -43,7 +43,7 @@ public class TaActivityDynamicEnlist implements Serializable {
     /**
      * 楼盘id
      */
-    private String building_id;
+    private String buildingId;
 
     /**
      * 创建时间
@@ -55,5 +55,9 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private String phone;
 
+    /**
+     * favor_num
+     */
+
 
 }

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

@@ -118,6 +118,29 @@ public class TaBuildingDynamic implements Serializable {
     @TableField(exist = false)
     private  int count;
 
+    /**
+     * 是否报名1为已报名,0为未报名
+     */
+    @TableField(exist = false)
+    private String isSing;
 
+    /**
+     * 分享活动
+     */
+    private String shareNum;
 
+    /**
+     * 阅读量
+     */
+    private  String pvNum;
+
+    /**
+     * 收藏量
+     */
+    private  String saveNum;
+
+    /**
+     * 点赞
+     */
+    private  String favorNum;
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

@@ -53,4 +53,6 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      */
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
+
+    void updateTaBuildingDynamic(@Param("dynamicId") String dynamicId, @Param("sum") String sum);
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -34,5 +34,9 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     TaPerson getById(@Param("personId") String personId);
 
+
     List<String>getUserProjects(@Param("personId") String personId);
+
+    TaPerson selectByIdPerson(@Param("openid") String openid);
+
 }

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

@@ -34,14 +34,14 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid);
 
     /**
      * 微信小程序 项目详情
      * @param dynamicId
      * @return
      */
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId);
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid);
 
     /**
      * 动态管理添加

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

@@ -10,9 +10,11 @@ import com.huiju.estateagents.common.CommConstant;
 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.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -51,6 +53,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
 
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -81,7 +86,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -93,6 +98,16 @@ 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);
         }
@@ -105,11 +120,22 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId) {
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid) {
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
         buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+        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);
@@ -180,9 +206,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Override
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
         // 查询当前活动属于哪个楼盘
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamic_id());
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamicId());
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
-                               .setBuilding_id(taBuildingDynamic.getDynamicId());
+                               .setBuildingId(taBuildingDynamic.getDynamicId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
         return ResponseBean.success(state);
     }

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

@@ -9,14 +9,8 @@ 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.TaPerson;
-import com.huiju.estateagents.entity.TaPointsRecords;
-import com.huiju.estateagents.entity.TaShare;
-import com.huiju.estateagents.entity.TdPointsRules;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
-import com.huiju.estateagents.mapper.TaShareMapper;
-import com.huiju.estateagents.mapper.TdPointsRulesMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +40,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     @Autowired
     private TaPointsRecordsMapper taPointsRecordsMapper;
 
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
@@ -54,6 +51,14 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         }
 
         TaPerson taPerson = persons.get(0);
+        // 如果是分享活动, 则活动 + 1
+        if (typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            QueryWrapper<TaBuildingDynamic> taBuildingDynamicQuery= new QueryWrapper<>();
+            taBuildingDynamicQuery.eq("dynamic_id",id);
+            TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
+            taBuildingDynamicMapper.updateTaBuildingDynamic(taBuildingDynamic.getDynamicId(),taBuildingDynamic.getShareNum()+1);
+            return ResponseBean.success("成功");
+        }
 
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taPerson.getPersonId());
@@ -103,7 +108,6 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
             taPersonMapper.update(new TaPerson(), wrapper);
         }
-
         return ResponseBean.success("");
     }
 

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -75,5 +75,11 @@
         </set>
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
     </update>
+    <select id="updateTaBuildingDynamic">
+        UPDATE ta_building_dynamic
+        SET  share_num = #{sum}
+        WHERE
+	      dynamic_id = #{dynamicId}
+    </select>
 
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -91,6 +91,7 @@ FROM
 WHERE
 	a.person_id = #{personId}
     </select>
+
     <select id="getUserProjects" resultType="java.lang.String">
         SELECT
 	b.building_name
@@ -99,4 +100,9 @@ FROM
 	LEFT JOIN ta_building b ON a.building_id = b.building_id
 	WHERE a.person_id = #{personId}
     </select>
+
+    <select id="selectByIdPerson" resultType="com.huiju.estateagents.entity.TaPerson">
+        select * from ta_person where mini_openid = #{openid};
+
+    </select>
 </mapper>