Pārlūkot izejas kodu

新加活动字段

dingxin 5 gadus atpakaļ
vecāks
revīzija
0a69de149a

+ 6
- 3
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Parādīt failu

73
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
73
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
74
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
74
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
75
                                                HttpServletRequest request){
75
                                                HttpServletRequest request){
76
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
76
+        String openid = JWTUtils.getSubject(request);
77
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
77
         return responseBean;
78
         return responseBean;
78
     }
79
     }
79
 
80
 
85
      */
86
      */
86
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
87
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
87
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
88
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
88
-                                             @RequestParam("buildingId")Integer buildingId){
89
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId);
89
+                                             @RequestParam("buildingId")Integer buildingId,
90
+                                             HttpServletRequest request){
91
+        String openid = JWTUtils.getSubject(request);
92
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
90
         return responseBean;
93
         return responseBean;
91
     }
94
     }
92
 
95
 

+ 7
- 3
src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java Parādīt failu

27
     /**
27
     /**
28
      * 报名ID
28
      * 报名ID
29
      */
29
      */
30
-    @TableId(value = "favor_id", type = IdType.AUTO)
30
+    @TableId(value = "enlist_id", type = IdType.AUTO)
31
     private Integer enlist_id;
31
     private Integer enlist_id;
32
 
32
 
33
     /**
33
     /**
34
      * 活动ID
34
      * 活动ID
35
      */
35
      */
36
-    private String dynamic_id;
36
+    private String dynamicId;
37
 
37
 
38
     /**
38
     /**
39
      * 姓名
39
      * 姓名
43
     /**
43
     /**
44
      * 楼盘id
44
      * 楼盘id
45
      */
45
      */
46
-    private String building_id;
46
+    private String buildingId;
47
 
47
 
48
     /**
48
     /**
49
      * 创建时间
49
      * 创建时间
55
      */
55
      */
56
     private String phone;
56
     private String phone;
57
 
57
 
58
+    /**
59
+     * favor_num
60
+     */
61
+
58
 
62
 
59
 }
63
 }

+ 23
- 0
src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java Parādīt failu

118
     @TableField(exist = false)
118
     @TableField(exist = false)
119
     private  int count;
119
     private  int count;
120
 
120
 
121
+    /**
122
+     * 是否报名1为已报名,0为未报名
123
+     */
124
+    @TableField(exist = false)
125
+    private String isSing;
121
 
126
 
127
+    /**
128
+     * 分享活动
129
+     */
130
+    private String shareNum;
122
 
131
 
132
+    /**
133
+     * 阅读量
134
+     */
135
+    private  String pvNum;
136
+
137
+    /**
138
+     * 收藏量
139
+     */
140
+    private  String saveNum;
141
+
142
+    /**
143
+     * 点赞
144
+     */
145
+    private  String favorNum;
123
 }
146
 }

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

53
      */
53
      */
54
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
54
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
55
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
55
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
56
+
57
+    void updateTaBuildingDynamic(@Param("dynamicId") String dynamicId, @Param("sum") String sum);
56
 }
58
 }

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

34
 
34
 
35
     TaPerson getById(@Param("personId") String personId);
35
     TaPerson getById(@Param("personId") String personId);
36
 
36
 
37
+
37
     List<String>getUserProjects(@Param("personId") String personId);
38
     List<String>getUserProjects(@Param("personId") String personId);
39
+
40
+    TaPerson selectByIdPerson(@Param("openid") String openid);
41
+
38
 }
42
 }

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

34
      * 微信小程序 项目动态管理列表
34
      * 微信小程序 项目动态管理列表
35
      * @return
35
      * @return
36
      */
36
      */
37
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId);
37
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid);
38
 
38
 
39
     /**
39
     /**
40
      * 微信小程序 项目详情
40
      * 微信小程序 项目详情
41
      * @param dynamicId
41
      * @param dynamicId
42
      * @return
42
      * @return
43
      */
43
      */
44
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId);
44
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid);
45
 
45
 
46
     /**
46
     /**
47
      * 动态管理添加
47
      * 动态管理添加

+ 30
- 4
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Parādīt failu

10
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
10
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
11
 import com.huiju.estateagents.entity.TaBuilding;
11
 import com.huiju.estateagents.entity.TaBuilding;
12
 import com.huiju.estateagents.entity.TaBuildingDynamic;
12
 import com.huiju.estateagents.entity.TaBuildingDynamic;
13
+import com.huiju.estateagents.entity.TaPerson;
13
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
14
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
14
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
15
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
15
 import com.huiju.estateagents.mapper.TaBuildingMapper;
16
 import com.huiju.estateagents.mapper.TaBuildingMapper;
17
+import com.huiju.estateagents.mapper.TaPersonMapper;
16
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
18
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
17
 import org.springframework.beans.factory.annotation.Autowired;
19
 import org.springframework.beans.factory.annotation.Autowired;
18
 import org.springframework.beans.propertyeditors.CustomDateEditor;
20
 import org.springframework.beans.propertyeditors.CustomDateEditor;
51
     @Autowired
53
     @Autowired
52
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
54
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
53
 
55
 
56
+    @Autowired
57
+    private TaPersonMapper taPersonMapper;
58
+
54
 
59
 
55
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
60
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
56
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
61
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
81
     }
86
     }
82
 
87
 
83
     @Override
88
     @Override
84
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId) {
89
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid) {
85
         Page<TaBuildingDynamic> page = new Page<>();
90
         Page<TaBuildingDynamic> page = new Page<>();
86
         page.setCurrent(pageNum);
91
         page.setCurrent(pageNum);
87
         page.setSize(pageSize);
92
         page.setSize(pageSize);
93
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
98
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
94
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间),2:未开始(展示活动报名时间),3:结束(不展示)
99
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间),2:未开始(展示活动报名时间),3:结束(不展示)
95
         for (TaBuildingDynamic taBuildingDynamic:records){
100
         for (TaBuildingDynamic taBuildingDynamic:records){
101
+            QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
102
+            TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
103
+            if (null == taPerson){
104
+                return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
105
+            }
106
+            activityDynamicEnlist.eq("phone", taPerson.getPhone());
107
+            TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
108
+            if (null == taActivityDynamicEnlistPhone){
109
+                taBuildingDynamic.setIsSing("1");
110
+            }
96
             // 获取当前时间状态
111
             // 获取当前时间状态
97
             taBuildingDynamic= timeCondition(taBuildingDynamic);
112
             taBuildingDynamic= timeCondition(taBuildingDynamic);
98
         }
113
         }
105
     }
120
     }
106
 
121
 
107
     @Override
122
     @Override
108
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId) {
123
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid) {
109
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
124
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
110
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
125
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
111
         buildingDynamicQueryWrapper.eq("status",1);
126
         buildingDynamicQueryWrapper.eq("status",1);
112
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
127
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
128
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
129
+        if (null == taPerson){
130
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
131
+        }
132
+        // 查询是否报名
133
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
134
+        activityDynamicEnlist.eq("phone", taPerson.getPhone());
135
+        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
136
+        if (null == taActivityDynamicEnlistPhone){
137
+            buildingDynamic.setIsSing("1");
138
+        }
113
         // 获取报名总数
139
         // 获取报名总数
114
         QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
140
         QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
115
         taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
141
         taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
180
     @Override
206
     @Override
181
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
207
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
182
         // 查询当前活动属于哪个楼盘
208
         // 查询当前活动属于哪个楼盘
183
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamic_id());
209
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamicId());
184
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
210
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
185
-                               .setBuilding_id(taBuildingDynamic.getDynamicId());
211
+                               .setBuildingId(taBuildingDynamic.getDynamicId());
186
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
212
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
187
         return ResponseBean.success(state);
213
         return ResponseBean.success(state);
188
     }
214
     }

+ 13
- 9
src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java Parādīt failu

9
 import com.huiju.estateagents.base.ResponseBean;
9
 import com.huiju.estateagents.base.ResponseBean;
10
 import com.huiju.estateagents.common.CommConstant;
10
 import com.huiju.estateagents.common.CommConstant;
11
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.common.StringUtils;
12
-import com.huiju.estateagents.entity.TaPerson;
13
-import com.huiju.estateagents.entity.TaPointsRecords;
14
-import com.huiju.estateagents.entity.TaShare;
15
-import com.huiju.estateagents.entity.TdPointsRules;
16
-import com.huiju.estateagents.mapper.TaPersonMapper;
17
-import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
18
-import com.huiju.estateagents.mapper.TaShareMapper;
19
-import com.huiju.estateagents.mapper.TdPointsRulesMapper;
12
+import com.huiju.estateagents.entity.*;
13
+import com.huiju.estateagents.mapper.*;
20
 import com.huiju.estateagents.service.ITaShareService;
14
 import com.huiju.estateagents.service.ITaShareService;
21
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.beans.factory.annotation.Autowired;
22
 import org.springframework.stereotype.Service;
16
 import org.springframework.stereotype.Service;
46
     @Autowired
40
     @Autowired
47
     private TaPointsRecordsMapper taPointsRecordsMapper;
41
     private TaPointsRecordsMapper taPointsRecordsMapper;
48
 
42
 
43
+    @Autowired
44
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
45
+
49
     @Override
46
     @Override
50
     public ResponseBean saveData(String openid, String typeOf, String id) {
47
     public ResponseBean saveData(String openid, String typeOf, String id) {
51
         List<TaPerson> persons = getPersonsByOpenId(openid);
48
         List<TaPerson> persons = getPersonsByOpenId(openid);
54
         }
51
         }
55
 
52
 
56
         TaPerson taPerson = persons.get(0);
53
         TaPerson taPerson = persons.get(0);
54
+        // 如果是分享活动, 则活动 + 1
55
+        if (typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
56
+            QueryWrapper<TaBuildingDynamic> taBuildingDynamicQuery= new QueryWrapper<>();
57
+            taBuildingDynamicQuery.eq("dynamic_id",id);
58
+            TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
59
+            taBuildingDynamicMapper.updateTaBuildingDynamic(taBuildingDynamic.getDynamicId(),taBuildingDynamic.getShareNum()+1);
60
+            return ResponseBean.success("成功");
61
+        }
57
 
62
 
58
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
63
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
59
         queryWrapper.eq("person_id", taPerson.getPersonId());
64
         queryWrapper.eq("person_id", taPerson.getPersonId());
103
             wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
108
             wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
104
             taPersonMapper.update(new TaPerson(), wrapper);
109
             taPersonMapper.update(new TaPerson(), wrapper);
105
         }
110
         }
106
-
107
         return ResponseBean.success("");
111
         return ResponseBean.success("");
108
     }
112
     }
109
 
113
 

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

75
         </set>
75
         </set>
76
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
76
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
77
     </update>
77
     </update>
78
+    <select id="updateTaBuildingDynamic">
79
+        UPDATE ta_building_dynamic
80
+        SET  share_num = #{sum}
81
+        WHERE
82
+	      dynamic_id = #{dynamicId}
83
+    </select>
78
 
84
 
79
 </mapper>
85
 </mapper>

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

91
 WHERE
91
 WHERE
92
 	a.person_id = #{personId}
92
 	a.person_id = #{personId}
93
     </select>
93
     </select>
94
+
94
     <select id="getUserProjects" resultType="java.lang.String">
95
     <select id="getUserProjects" resultType="java.lang.String">
95
         SELECT
96
         SELECT
96
 	b.building_name
97
 	b.building_name
99
 	LEFT JOIN ta_building b ON a.building_id = b.building_id
100
 	LEFT JOIN ta_building b ON a.building_id = b.building_id
100
 	WHERE a.person_id = #{personId}
101
 	WHERE a.person_id = #{personId}
101
     </select>
102
     </select>
103
+
104
+    <select id="selectByIdPerson" resultType="com.huiju.estateagents.entity.TaPerson">
105
+        select * from ta_person where mini_openid = #{openid};
106
+
107
+    </select>
102
 </mapper>
108
 </mapper>