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

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

 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.format.annotation.DateTimeFormat;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "项目活动", tags = "项目活动")
 public class TaBuildingDynamicController extends BaseController {
 
     @Autowired
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
         binder.registerCustomEditor(Date.class, editor);
     }
-
+    
+    @ApiOperation(value = "后台管理端查询项目活动列表", notes = "后台管理端查询项目活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "项目名称"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "isEnlist", paramType = "query",value = "是否报名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "time", paramType = "query",value = "日期")
+    })
     @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
                                              @RequestParam("pageSize")Integer pageSize,
      * @param request
      * @return
      */
+    @ApiOperation(value = "微信端查询项目活动列表", notes = "微信端查询项目活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = Boolean.class, name = "mine", paramType = "query")
+    })
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
 
         return responseBean;
     }
-
-    /**
-     * 活动列表
-     * @param pageNum
-     * @param pageSize
-     * @param request
-     * @return
-     */
+    
+    @ApiOperation(value = "微信端查询收藏项目活动列表", notes = "微信端查询收藏项目活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
+    })
     @RequestMapping(value = "/wx/save/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxSaveBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
      * @param dynamicId
      * @return
      */
+    @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
+    })
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
                                              HttpServletRequest request){
      * @param request
      * @return
      */
+    @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "活动详细信息")
+    })
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
                                                 HttpServletRequest request){
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
         return responseBean;
     }
-
-
+    
+    
+    @ApiOperation(value = "后端活动添加", notes = "后端微信活动添加")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         responseBean.addSuccess(dynamic);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端活动更新", notes = "后端微信活动更新")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
     public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端置顶", notes = "后端置顶")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "weight", paramType = "query",value = "权重")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
     public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         }
         return responseBean;
     }
-
+    
+    
+    @ApiOperation(value = "后端删除", notes = "后端删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "id", paramType = "query",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
     public ResponseBean buildingDynamicdelect(@RequestParam(value = "id",required = false)String id) {
         ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
         return responseBean;
     }
-
-
+    
+    @ApiOperation(value = "后端发布活动", notes = "后端发布活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "path",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
     public ResponseBean send(@PathVariable String dynamicId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端取消活动", notes = "后端取消活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "path",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
     public ResponseBean cancel(@PathVariable String dynamicId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端活动详情", notes = "后端活动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/Details", method = RequestMethod.GET)
     public ResponseBean buildingDynamicDetails(@RequestParam("dynamicId")String dynamicId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean.addSuccess(dynamic);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端报名列表", notes = "后端报名列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
         map.put("pageSize", page.getSize());
         return ResponseBean.success(map);
     }
-
+    
+    @ApiOperation(value = "后端结束活动", notes = "后端结束活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "parameter", paramType = "body",value = "活动ID dynamicId 和 top")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/finish" ,method =RequestMethod.PUT)
     public  ResponseBean buildingDynamicFinish(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();

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

 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaGoodsService;
 import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "商品", tags = "商品")
 public class TaGoodsController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaGoodsController.class);
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "后台商品列表", notes = "后台商品列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "goodsName", paramType = "query",value = "商品名称"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "priceLesser", paramType = "query",value = "价格小"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "priceGreater", paramType = "query",value = "价格大"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "状态")
+    })
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.GET)
     public ResponseBean taGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
      * @param taGoods 实体对象
      * @return
      */
+    @ApiOperation(value = "后台商品保存", notes = "后台商品保存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
+    })
     @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
     public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
      * @param taGoods 实体对象
      * @return
      */
+    @ApiOperation(value = "后台商品修改", notes = "后台商品修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
+    })
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
     public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
      * @param taGoods 实体对象
      * @return
      */
+    @ApiOperation(value = "后台商品状态变更", notes = "后台商品状态变更")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
+    })
     @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
     public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台商品详情", notes = "后台商品详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
+    })
     @RequestMapping(value="/admin/taGoods/{id}",method= RequestMethod.GET)
     public ResponseBean taGoodsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "微信商品列表", notes = "微信商品列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
+    })
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "微信商品详情", notes = "微信商品详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
+    })
     @RequestMapping(value="/wx/goods/{id}",method= RequestMethod.GET)
     public ResponseBean wxGoodsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
      * @param request
      * @return
      */
+    @ApiOperation(value = "微信兑换商品接口", notes = "微信兑换商品接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
+    })
     @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.POST)
     public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

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

 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TdPointsRules;
 import com.huiju.estateagents.service.ITdPointsRulesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "积分", tags = "积分")
 public class TdPointsRulesController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdPointsRulesController.class);
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "后台积分列表", notes = "后台积分列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "type", paramType = "query",value = "类型")
+    })
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.GET)
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             Integer orgId = getOrgId(request);
-            queryWrapper.eq("org_id",orgId);
+            //queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "微信积分列表", notes = "微信积分列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "type", paramType = "query",value = "类型")
+    })
     @RequestMapping(value="/wx/tdPointsRules",method= RequestMethod.GET)
     public ResponseBean tdWxPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
      * @param tdPointsRules 实体对象
      * @return
      */
+    @ApiOperation(value = "后台积分规则修改", notes = "后台积分规则修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TdPointsRules", name = "tdPointsRules", paramType = "body",value = "积分详细数据")
+    })
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.PUT)
     public ResponseBean tdPointsRulesUpdate(@RequestBody TdPointsRules tdPointsRules){
         ResponseBean responseBean = new ResponseBean();
      * @param tdPointsRules 实体对象
      * @return
      */
+    @ApiOperation(value = "后台积分规则停用启用", notes = "后台积分规则停用启用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TdPointsRules", name = "tdPointsRules", paramType = "body",value = "积分详细数据")
+    })
     @RequestMapping(value="/admin/tdPointsRules/change",method= RequestMethod.PUT)
     public ResponseBean tdPointsRulesChange(@RequestBody TdPointsRules tdPointsRules){
         ResponseBean responseBean = new ResponseBean();
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台积分规则详情", notes = "后台积分规则详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "积分id")
+    })
     @RequestMapping(value="/admin/tdPointsRules/{id}",method= RequestMethod.GET)
     public ResponseBean tdPointsRulesGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();

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

         for (TaPerson taPerson:taPersonList){
             QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
             taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
+            taRecommendCustomerQuery.eq("status",1);
             /*推荐客户总数*/
             int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
             taPerson.setRecommendCount(recommendCount);