|
@@ -1,6 +1,7 @@
|
1
|
1
|
package com.huiju.estateagents.controller;
|
2
|
2
|
|
3
|
3
|
import com.alibaba.fastjson.JSONObject;
|
|
4
|
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
4
|
5
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
5
|
6
|
import com.huiju.estateagents.base.BaseController;
|
6
|
7
|
import com.huiju.estateagents.base.ResponseBean;
|
|
@@ -164,10 +165,12 @@ public class TaShareActivityController extends BaseController {
|
164
|
165
|
* @param id 实体ID
|
165
|
166
|
*/
|
166
|
167
|
@RequestMapping(value="/admin/taShareActivity/{id}",method= RequestMethod.GET)
|
167
|
|
- public ResponseBean taShareActivityGet(@PathVariable Integer id){
|
|
168
|
+ public ResponseBean taShareActivityGet(@PathVariable Integer id, HttpServletRequest request){
|
168
|
169
|
ResponseBean responseBean = new ResponseBean();
|
169
|
170
|
try {
|
170
|
|
- responseBean.addSuccess(iTaShareActivityService.getById(id));
|
|
171
|
+
|
|
172
|
+ TaShareActivity taShareActivity = iTaShareActivityService.getById(id);
|
|
173
|
+ responseBean.addSuccess(taShareActivity);
|
171
|
174
|
}catch (Exception e){
|
172
|
175
|
e.printStackTrace();
|
173
|
176
|
logger.error("taShareActivityDelete -=- {}",e.toString());
|
|
@@ -176,6 +179,29 @@ public class TaShareActivityController extends BaseController {
|
176
|
179
|
return responseBean;
|
177
|
180
|
}
|
178
|
181
|
|
|
182
|
+ /**
|
|
183
|
+ *获取用户平均积分
|
|
184
|
+ */
|
|
185
|
+ @RequestMapping( value = "/admin/taShareActivity/avgScore", method = RequestMethod.GET)
|
|
186
|
+ public ResponseBean taShareActivityAgvScore(HttpServletRequest request){
|
|
187
|
+ ResponseBean responseBean = new ResponseBean();
|
|
188
|
+ try{
|
|
189
|
+ Integer orgId = getOrgId(request);
|
|
190
|
+ Integer sumPoints = taPersonService.sumPointsByOrgId(orgId);
|
|
191
|
+ QueryWrapper<TaPerson> taPersonWrapper = new QueryWrapper<>();
|
|
192
|
+ taPersonWrapper.eq("org_id", orgId);
|
|
193
|
+ Integer personNum = taPersonService.count(taPersonWrapper);
|
|
194
|
+ TaShareActivity taShareActivity = new TaShareActivity();
|
|
195
|
+ taShareActivity.setAverageScore(sumPoints/personNum);
|
|
196
|
+ responseBean.addSuccess(taShareActivity);
|
|
197
|
+ }catch (Exception e){
|
|
198
|
+ e.printStackTrace();
|
|
199
|
+ logger.error("taShareActivityAgvScore -=- {}",e.toString());
|
|
200
|
+ responseBean.addError(e.getMessage());
|
|
201
|
+ }
|
|
202
|
+ return responseBean;
|
|
203
|
+ }
|
|
204
|
+
|
179
|
205
|
/**
|
180
|
206
|
* 根据id结束拼团活动
|
181
|
207
|
* @param id
|