Преглед на файлове

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

魏熙美 преди 5 години
родител
ревизия
3ea8215ad9

+ 90
- 20
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Целия файл

@@ -17,6 +17,10 @@ import com.huiju.estateagents.service.ITaBuildingDynamicService;
17 17
 import com.huiju.estateagents.service.ITaBuildingService;
18 18
 import com.huiju.estateagents.service.ITaPersonService;
19 19
 import com.huiju.estateagents.service.ITaSaveService;
20
+import io.swagger.annotations.Api;
21
+import io.swagger.annotations.ApiImplicitParam;
22
+import io.swagger.annotations.ApiImplicitParams;
23
+import io.swagger.annotations.ApiOperation;
20 24
 import org.springframework.beans.factory.annotation.Autowired;
21 25
 import org.springframework.beans.propertyeditors.CustomDateEditor;
22 26
 import org.springframework.format.annotation.DateTimeFormat;
@@ -45,6 +49,7 @@ import java.util.Map;
45 49
  */
46 50
 @RestController
47 51
 @RequestMapping("/api")
52
+@Api(value = "项目活动", tags = "项目活动")
48 53
 public class TaBuildingDynamicController extends BaseController {
49 54
 
50 55
     @Autowired
@@ -68,7 +73,18 @@ public class TaBuildingDynamicController extends BaseController {
68 73
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空,false反之
69 74
         binder.registerCustomEditor(Date.class, editor);
70 75
     }
71
-
76
+    
77
+    @ApiOperation(value = "后台管理端查询项目活动列表", notes = "后台管理端查询项目活动列表")
78
+    @ApiImplicitParams({
79
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
80
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
81
+            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "项目名称"),
82
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
83
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
84
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
85
+            @ApiImplicitParam(dataTypeClass = String.class, name = "isEnlist", paramType = "query",value = "是否报名"),
86
+            @ApiImplicitParam(dataTypeClass = String.class, name = "time", paramType = "query",value = "日期")
87
+    })
72 88
     @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
73 89
     public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
74 90
                                              @RequestParam("pageSize")Integer pageSize,
@@ -95,6 +111,14 @@ public class TaBuildingDynamicController extends BaseController {
95 111
      * @param request
96 112
      * @return
97 113
      */
114
+    @ApiOperation(value = "微信端查询项目活动列表", notes = "微信端查询项目活动列表")
115
+    @ApiImplicitParams({
116
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
117
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
118
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
119
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
120
+            @ApiImplicitParam(dataTypeClass = Boolean.class, name = "mine", paramType = "query")
121
+    })
98 122
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
99 123
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
100 124
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
@@ -118,14 +142,13 @@ public class TaBuildingDynamicController extends BaseController {
118 142
 
119 143
         return responseBean;
120 144
     }
121
-
122
-    /**
123
-     * 活动列表
124
-     * @param pageNum
125
-     * @param pageSize
126
-     * @param request
127
-     * @return
128
-     */
145
+    
146
+    @ApiOperation(value = "微信端查询收藏项目活动列表", notes = "微信端查询收藏项目活动列表")
147
+    @ApiImplicitParams({
148
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
149
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
150
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
151
+    })
129 152
     @RequestMapping(value = "/wx/save/buildingDynamiceList", method = RequestMethod.GET)
130 153
     public ResponseBean wxSaveBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
131 154
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
@@ -168,6 +191,10 @@ public class TaBuildingDynamicController extends BaseController {
168 191
      * @param dynamicId
169 192
      * @return
170 193
      */
194
+    @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
195
+    @ApiImplicitParams({
196
+            @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
197
+    })
171 198
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
172 199
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
173 200
                                              HttpServletRequest request){
@@ -183,6 +210,10 @@ public class TaBuildingDynamicController extends BaseController {
183 210
      * @param request
184 211
      * @return
185 212
      */
213
+    @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
214
+    @ApiImplicitParams({
215
+            @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "活动详细信息")
216
+    })
186 217
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
187 218
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
188 219
                                                 HttpServletRequest request){
@@ -198,8 +229,12 @@ public class TaBuildingDynamicController extends BaseController {
198 229
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
199 230
         return responseBean;
200 231
     }
201
-
202
-
232
+    
233
+    
234
+    @ApiOperation(value = "后端活动添加", notes = "后端微信活动添加")
235
+    @ApiImplicitParams({
236
+            @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
237
+    })
203 238
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
204 239
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter,HttpServletRequest request){
205 240
         ResponseBean responseBean = new ResponseBean();
@@ -215,7 +250,11 @@ public class TaBuildingDynamicController extends BaseController {
215 250
         responseBean.addSuccess(dynamic);
216 251
         return responseBean;
217 252
     }
218
-
253
+    
254
+    @ApiOperation(value = "后端活动更新", notes = "后端微信活动更新")
255
+    @ApiImplicitParams({
256
+            @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
257
+    })
219 258
     @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
220 259
     public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
221 260
         ResponseBean responseBean = new ResponseBean();
@@ -228,7 +267,12 @@ public class TaBuildingDynamicController extends BaseController {
228 267
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
229 268
         return responseBean;
230 269
     }
231
-
270
+    
271
+    @ApiOperation(value = "后端置顶", notes = "后端置顶")
272
+    @ApiImplicitParams({
273
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
274
+            @ApiImplicitParam(dataType = "Integer", name = "weight", paramType = "query",value = "权重")
275
+    })
232 276
     @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
233 277
     public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight,HttpServletRequest request){
234 278
         ResponseBean responseBean = new ResponseBean();
@@ -244,14 +288,22 @@ public class TaBuildingDynamicController extends BaseController {
244 288
         }
245 289
         return responseBean;
246 290
     }
247
-
291
+    
292
+    
293
+    @ApiOperation(value = "后端删除", notes = "后端删除")
294
+    @ApiImplicitParams({
295
+            @ApiImplicitParam(dataType = "String", name = "id", paramType = "query",value = "活动ID")
296
+    })
248 297
     @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
249 298
     public ResponseBean buildingDynamicdelect(@RequestParam(value = "id",required = false)String id) {
250 299
         ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
251 300
         return responseBean;
252 301
     }
253
-
254
-
302
+    
303
+    @ApiOperation(value = "后端发布活动", notes = "后端发布活动")
304
+    @ApiImplicitParams({
305
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "path",value = "活动ID")
306
+    })
255 307
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
256 308
     public ResponseBean send(@PathVariable String dynamicId, HttpServletRequest request) {
257 309
         ResponseBean responseBean = new ResponseBean();
@@ -264,7 +316,11 @@ public class TaBuildingDynamicController extends BaseController {
264 316
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
265 317
         return responseBean;
266 318
     }
267
-
319
+    
320
+    @ApiOperation(value = "后端取消活动", notes = "后端取消活动")
321
+    @ApiImplicitParams({
322
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "path",value = "活动ID")
323
+    })
268 324
     @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
269 325
     public ResponseBean cancel(@PathVariable String dynamicId, HttpServletRequest request) {
270 326
         ResponseBean responseBean = new ResponseBean();
@@ -276,7 +332,11 @@ public class TaBuildingDynamicController extends BaseController {
276 332
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
277 333
         return responseBean;
278 334
     }
279
-
335
+    
336
+    @ApiOperation(value = "后端活动详情", notes = "后端活动详情")
337
+    @ApiImplicitParams({
338
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID")
339
+    })
280 340
     @RequestMapping(value = "/admin/buildingDynamic/Details", method = RequestMethod.GET)
281 341
     public ResponseBean buildingDynamicDetails(@RequestParam("dynamicId")String dynamicId) {
282 342
         ResponseBean responseBean = new ResponseBean();
@@ -292,7 +352,13 @@ public class TaBuildingDynamicController extends BaseController {
292 352
         responseBean.addSuccess(dynamic);
293 353
         return responseBean;
294 354
     }
295
-
355
+    
356
+    @ApiOperation(value = "后端报名列表", notes = "后端报名列表")
357
+    @ApiImplicitParams({
358
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
359
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
360
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID")
361
+    })
296 362
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
297 363
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
298 364
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
@@ -310,7 +376,11 @@ public class TaBuildingDynamicController extends BaseController {
310 376
         map.put("pageSize", page.getSize());
311 377
         return ResponseBean.success(map);
312 378
     }
313
-
379
+    
380
+    @ApiOperation(value = "后端结束活动", notes = "后端结束活动")
381
+    @ApiImplicitParams({
382
+            @ApiImplicitParam(dataType = "String", name = "parameter", paramType = "body",value = "活动ID dynamicId 和 top")
383
+    })
314 384
     @RequestMapping(value = "/admin/buildingDynamic/finish" ,method =RequestMethod.PUT)
315 385
     public  ResponseBean buildingDynamicFinish(@RequestBody String parameter) {
316 386
         ResponseBean responseBean = new ResponseBean();

+ 45
- 0
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java Целия файл

@@ -13,6 +13,10 @@ import com.huiju.estateagents.entity.TaPerson;
13 13
 import com.huiju.estateagents.service.ITaBuildingService;
14 14
 import com.huiju.estateagents.service.ITaGoodsService;
15 15
 import com.huiju.estateagents.service.ITaPersonService;
16
+import io.swagger.annotations.Api;
17
+import io.swagger.annotations.ApiImplicitParam;
18
+import io.swagger.annotations.ApiImplicitParams;
19
+import io.swagger.annotations.ApiOperation;
16 20
 import org.slf4j.Logger;
17 21
 import org.slf4j.LoggerFactory;
18 22
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +44,7 @@ import java.util.Map;
40 44
  */
41 45
 @RestController
42 46
 @RequestMapping("/api")
47
+@Api(value = "商品", tags = "商品")
43 48
 public class TaGoodsController extends BaseController {
44 49
 
45 50
     private final Logger logger = LoggerFactory.getLogger(TaGoodsController.class);
@@ -59,6 +64,16 @@ public class TaGoodsController extends BaseController {
59 64
      * @param pageSize
60 65
      * @return
61 66
      */
67
+    @ApiOperation(value = "后台商品列表", notes = "后台商品列表")
68
+    @ApiImplicitParams({
69
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
70
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
71
+            @ApiImplicitParam(dataTypeClass = String.class, name = "goodsName", paramType = "query",value = "商品名称"),
72
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
73
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "priceLesser", paramType = "query",value = "价格小"),
74
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "priceGreater", paramType = "query",value = "价格大"),
75
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "状态")
76
+    })
62 77
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.GET)
63 78
     public ResponseBean taGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
64 79
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -95,6 +110,10 @@ public class TaGoodsController extends BaseController {
95 110
      * @param taGoods 实体对象
96 111
      * @return
97 112
      */
113
+    @ApiOperation(value = "后台商品保存", notes = "后台商品保存")
114
+    @ApiImplicitParams({
115
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
116
+    })
98 117
     @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
99 118
     public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods,HttpServletRequest request){
100 119
         ResponseBean responseBean = new ResponseBean();
@@ -143,6 +162,10 @@ public class TaGoodsController extends BaseController {
143 162
      * @param taGoods 实体对象
144 163
      * @return
145 164
      */
165
+    @ApiOperation(value = "后台商品修改", notes = "后台商品修改")
166
+    @ApiImplicitParams({
167
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
168
+    })
146 169
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
147 170
     public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods,HttpServletRequest request){
148 171
         ResponseBean responseBean = new ResponseBean();
@@ -169,6 +192,10 @@ public class TaGoodsController extends BaseController {
169 192
      * @param taGoods 实体对象
170 193
      * @return
171 194
      */
195
+    @ApiOperation(value = "后台商品状态变更", notes = "后台商品状态变更")
196
+    @ApiImplicitParams({
197
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
198
+    })
172 199
     @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
173 200
     public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods,HttpServletRequest request){
174 201
         ResponseBean responseBean = new ResponseBean();
@@ -196,6 +223,10 @@ public class TaGoodsController extends BaseController {
196 223
      * 根据id查询对象
197 224
      * @param id  实体ID
198 225
      */
226
+    @ApiOperation(value = "后台商品详情", notes = "后台商品详情")
227
+    @ApiImplicitParams({
228
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
229
+    })
199 230
     @RequestMapping(value="/admin/taGoods/{id}",method= RequestMethod.GET)
200 231
     public ResponseBean taGoodsGet(@PathVariable Integer id){
201 232
         ResponseBean responseBean = new ResponseBean();
@@ -215,6 +246,12 @@ public class TaGoodsController extends BaseController {
215 246
      * @param pageSize
216 247
      * @return
217 248
      */
249
+    @ApiOperation(value = "微信商品列表", notes = "微信商品列表")
250
+    @ApiImplicitParams({
251
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
252
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
253
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
254
+    })
218 255
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
219 256
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
220 257
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -260,6 +297,10 @@ public class TaGoodsController extends BaseController {
260 297
      * 根据id查询对象
261 298
      * @param id  实体ID
262 299
      */
300
+    @ApiOperation(value = "微信商品详情", notes = "微信商品详情")
301
+    @ApiImplicitParams({
302
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
303
+    })
263 304
     @RequestMapping(value="/wx/goods/{id}",method= RequestMethod.GET)
264 305
     public ResponseBean wxGoodsGet(@PathVariable Integer id){
265 306
         ResponseBean responseBean = new ResponseBean();
@@ -279,6 +320,10 @@ public class TaGoodsController extends BaseController {
279 320
      * @param request
280 321
      * @return
281 322
      */
323
+    @ApiOperation(value = "微信兑换商品接口", notes = "微信兑换商品接口")
324
+    @ApiImplicitParams({
325
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
326
+    })
282 327
     @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.POST)
283 328
     public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
284 329
         ResponseBean responseBean = new ResponseBean();

+ 32
- 1
src/main/java/com/huiju/estateagents/controller/TdPointsRulesController.java Целия файл

@@ -8,6 +8,10 @@ import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.CommConstant;
9 9
 import com.huiju.estateagents.entity.TdPointsRules;
10 10
 import com.huiju.estateagents.service.ITdPointsRulesService;
11
+import io.swagger.annotations.Api;
12
+import io.swagger.annotations.ApiImplicitParam;
13
+import io.swagger.annotations.ApiImplicitParams;
14
+import io.swagger.annotations.ApiOperation;
11 15
 import org.apache.commons.lang3.StringUtils;
12 16
 import org.slf4j.Logger;
13 17
 import org.slf4j.LoggerFactory;
@@ -32,6 +36,7 @@ import javax.servlet.http.HttpServletRequest;
32 36
  */
33 37
 @RestController
34 38
 @RequestMapping("/api")
39
+@Api(value = "积分", tags = "积分")
35 40
 public class TdPointsRulesController extends BaseController {
36 41
 
37 42
     private final Logger logger = LoggerFactory.getLogger(TdPointsRulesController.class);
@@ -46,6 +51,13 @@ public class TdPointsRulesController extends BaseController {
46 51
      * @param pageSize
47 52
      * @return
48 53
      */
54
+    @ApiOperation(value = "后台积分列表", notes = "后台积分列表")
55
+    @ApiImplicitParams({
56
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
57
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
58
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
59
+            @ApiImplicitParam(dataTypeClass = String.class, name = "type", paramType = "query",value = "类型")
60
+    })
49 61
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.GET)
50 62
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
51 63
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -58,7 +70,7 @@ public class TdPointsRulesController extends BaseController {
58 70
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
59 71
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
60 72
             Integer orgId = getOrgId(request);
61
-            queryWrapper.eq("org_id",orgId);
73
+            //queryWrapper.eq("org_id",orgId);
62 74
             queryWrapper.orderByDesc("create_date");
63 75
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
64 76
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
@@ -83,6 +95,13 @@ public class TdPointsRulesController extends BaseController {
83 95
      * @param pageSize
84 96
      * @return
85 97
      */
98
+    @ApiOperation(value = "微信积分列表", notes = "微信积分列表")
99
+    @ApiImplicitParams({
100
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
101
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
102
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
103
+            @ApiImplicitParam(dataTypeClass = String.class, name = "type", paramType = "query",value = "类型")
104
+    })
86 105
     @RequestMapping(value="/wx/tdPointsRules",method= RequestMethod.GET)
87 106
     public ResponseBean tdWxPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
88 107
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -165,6 +184,10 @@ public class TdPointsRulesController extends BaseController {
165 184
      * @param tdPointsRules 实体对象
166 185
      * @return
167 186
      */
187
+    @ApiOperation(value = "后台积分规则修改", notes = "后台积分规则修改")
188
+    @ApiImplicitParams({
189
+            @ApiImplicitParam(dataType = "TdPointsRules", name = "tdPointsRules", paramType = "body",value = "积分详细数据")
190
+    })
168 191
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.PUT)
169 192
     public ResponseBean tdPointsRulesUpdate(@RequestBody TdPointsRules tdPointsRules){
170 193
         ResponseBean responseBean = new ResponseBean();
@@ -187,6 +210,10 @@ public class TdPointsRulesController extends BaseController {
187 210
      * @param tdPointsRules 实体对象
188 211
      * @return
189 212
      */
213
+    @ApiOperation(value = "后台积分规则停用启用", notes = "后台积分规则停用启用")
214
+    @ApiImplicitParams({
215
+            @ApiImplicitParam(dataType = "TdPointsRules", name = "tdPointsRules", paramType = "body",value = "积分详细数据")
216
+    })
190 217
     @RequestMapping(value="/admin/tdPointsRules/change",method= RequestMethod.PUT)
191 218
     public ResponseBean tdPointsRulesChange(@RequestBody TdPointsRules tdPointsRules){
192 219
         ResponseBean responseBean = new ResponseBean();
@@ -213,6 +240,10 @@ public class TdPointsRulesController extends BaseController {
213 240
      * 根据id查询对象
214 241
      * @param id  实体ID
215 242
      */
243
+    @ApiOperation(value = "后台积分规则详情", notes = "后台积分规则详情")
244
+    @ApiImplicitParams({
245
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "积分id")
246
+    })
216 247
     @RequestMapping(value="/admin/tdPointsRules/{id}",method= RequestMethod.GET)
217 248
     public ResponseBean tdPointsRulesGet(@PathVariable Integer id){
218 249
         ResponseBean responseBean = new ResponseBean();

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Целия файл

@@ -638,6 +638,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
638 638
         for (TaPerson taPerson:taPersonList){
639 639
             QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
640 640
             taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
641
+            taRecommendCustomerQuery.eq("status",1);
641 642
             /*推荐客户总数*/
642 643
             int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
643 644
             taPerson.setRecommendCount(recommendCount);