活动相关

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

@@ -121,17 +121,16 @@ public class ExtendContentController extends BaseController {
     }
 
     /**
-     * 微信 开屏 / 轮播图
+     * 微信 轮播图
      */
-    // @ApiOperation(value = "微信轮播图列表", notes = "微信轮播图列表")
+     @ApiOperation(value = "微信轮播图列表", notes = "微信轮播图列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "showType", paramType = "path",value = "填写banner"),
             @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 = "contentType", paramType = "query",value = "内容类型"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "contentType", paramType = "query",value = "内容类型:activity:活动,news:资讯,mall:积分商城"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "targetId", paramType = "query",value = ""),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "contentId", paramType = "query",value = "内容ID"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市ID")
+            @ApiImplicitParam(dataTypeClass = String.class, name = "contentId", paramType = "query",value = "内容ID")
     })
     @RequestMapping(value="/wx/extendContent/{showType}",method= RequestMethod.GET)
     public ResponseBean extendContentListShowType(@PathVariable(value = "showType") String showType,

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

@@ -22,6 +22,8 @@ import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.http.HttpStatus;
@@ -43,6 +45,7 @@ import java.util.concurrent.Executors;
 
 @RestController
 @RequestMapping("/api/wx")
+@Api(value = "微信登录相关", tags = "微信登录相关")
 public class MiniAppController extends BaseController {
 
     private Logger logger = LoggerFactory.getLogger(MiniAppController.class);
@@ -178,6 +181,7 @@ public class MiniAppController extends BaseController {
     /**
      * 登陆接口
      */
+    @ApiOperation(value = "小程序登录", notes = "小程序登录")
     @PostMapping("/login")
     public ResponseBean login(
             String code,

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

@@ -173,18 +173,20 @@ public class TaBuildingDynamicController extends BaseController {
      * @param request
      * @return
      */
-    // @ApiOperation(value = "微信端查询项目活动列表", notes = "微信端查询项目活动列表")
+     @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")
+            @ApiImplicitParam(dataTypeClass = String.class, name = "home", paramType = "query",value = "是否推首页"),
+            @ApiImplicitParam(dataTypeClass = Boolean.class, name = "mine", paramType = "query",value = "是否我的活动")
     })
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
                                                @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               @RequestParam(defaultValue = "false" )boolean home,
                                                @RequestParam(defaultValue = "false" )boolean mine,
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
                                                HttpServletRequest request){
@@ -199,7 +201,7 @@ public class TaBuildingDynamicController extends BaseController {
             TaPerson person = taPersons.get(0);
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId,home);
         }
 
         return responseBean;
@@ -264,11 +266,11 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     /**
-     * 活动详情
+     * 微信端查询活动详情
      * @param dynamicId
      * @return
      */
-    // @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
+     @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
     })
@@ -291,7 +293,7 @@ public class TaBuildingDynamicController extends BaseController {
      * @param dynamicId
      * @return
      */
-    // @ApiOperation(value = "微信端查询活报名动详情", notes = "微信端查询活报名动详情")
+     @ApiOperation(value = "微信端查询活报名动详情", notes = "微信端查询活报名动详情")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
     })
@@ -330,7 +332,7 @@ public class TaBuildingDynamicController extends BaseController {
      * @param enlistId
      * @return
      */
-    // @ApiOperation(value = "微信端活动签到", notes = "微信端活动签到")
+     @ApiOperation(value = "微信端活动签到", notes = "微信端活动签到")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "enlistId", paramType = "path",value = "活动报名ID")
     })
@@ -382,7 +384,7 @@ public class TaBuildingDynamicController extends BaseController {
      * @param request
      * @return
      */
-    // @ApiOperation(value = "微信端添加活动报名", notes = "微信端添加活动报名")
+     @ApiOperation(value = "微信端添加活动报名", notes = "微信端添加活动报名")
     @ApiImplicitParams({
             @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "")
     })

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

@@ -41,7 +41,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,boolean home);
 
     /**
      * 微信小程序 项目详情

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

@@ -80,7 +80,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         extendContentQuery.eq(StringUtils.isNotBlank(showPosition), "show_position",showPosition);
         extendContentQuery.eq(StringUtils.isNotBlank(targetId), "target_id",targetId);
         extendContentQuery.eq(StringUtils.isNotBlank(contentId), "content_id",contentId);
-        // activity(活动) 或 project(项目) 或 news（咨迅）
+        // activity(活动) 或 mall(积分商城) 或 news（咨迅）
         extendContentQuery.eq(StringUtils.isNotBlank(contentType), "content_type",contentType);
         extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
         extendContentQuery.eq(null != cityId && cityId != 0, "city_id", cityId);

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

@@ -96,7 +96,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,boolean home) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -111,6 +111,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
         buildingDynamicQueryWrapper.eq("org_id",orgId);
+        buildingDynamicQueryWrapper.eq(home,"home",home);
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
@@ -398,6 +399,15 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return ResponseBean.success(hashMap);
     }
 
+    /**
+     * 获取我的活动列表
+     * @param pageNumber
+     * @param pageSize
+     * @param building
+     * @param person
+     * @param orgId
+     * @return
+     */
     @Override
     public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();