rk
11 小时以前 580f4d3c2ca9eee53eee95a4de2f6610b790780a
server/dmmall_web/src/main/java/com/doumee/api/web/ActivityApi.java
@@ -30,17 +30,17 @@
@Slf4j
public class ActivityApi extends ApiController{
    @LoginRequired
    @ApiOperation(value = "活动报名", notes = "小程序端")
    @PostMapping("/activitySign")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    @Transactional(rollbackFor = Exception.class)
    public ApiResponse<ActivitySignResponse> activitySign(@RequestBody ActivitySignRequest activitySignRequest) {
        activitySignRequest.setMemberId(getMemberId());
        return  ApiResponse.success("操作成功",activitySignService.signActivity(activitySignRequest));
    }
//    @LoginRequired
//    @ApiOperation(value = "活动报名", notes = "小程序端")
//    @PostMapping("/activitySign")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
//    })
//    @Transactional(rollbackFor = Exception.class)
//    public ApiResponse<ActivitySignResponse> activitySign(@RequestBody ActivitySignRequest activitySignRequest) {
//        activitySignRequest.setMemberId(getMemberId());
//        return  ApiResponse.success("操作成功",activitySignService.signActivity(activitySignRequest));
//    }
    /**
@@ -48,7 +48,7 @@
     * @param pageWrap
     * @return
     */
    @LoginRequired
//    @LoginRequired
    @ApiOperation(value = "分页获取 资讯/探店/活动列表", notes = "小程序端")
    @PostMapping("/getActivityCard")
    public ApiResponse<PageData<ActivityCardDTO>> getActivityCard(@RequestBody PageWrap<ActivityPageListRequest> pageWrap){
@@ -67,53 +67,53 @@
        return ApiResponse.success(activityService.getActivity(activityId,getMemberId()));
    }
    /**
     * 获取活动id
     * @param activityId 活动ID
     * @return
     */
    @LoginRequired
    @ApiOperation(value = "商户中心-获取活动详情信息", notes = "小程序端")
    @GetMapping("/getShopOrgActivity")
    public ApiResponse<BaseActivity> getShopOrgActivity(Integer activityId){
        return ApiResponse.success(activityService.getActivity(activityId));
    }
//    /**
//     * 获取活动id
//     * @param activityId 活动ID
//     * @return
//     */
//    @LoginRequired
//    @ApiOperation(value = "商户中心-获取活动详情信息", notes = "小程序端")
//    @GetMapping("/getShopOrgActivity")
//    public ApiResponse<BaseActivity> getShopOrgActivity(Integer activityId){
//        return ApiResponse.success(activityService.getActivity(activityId));
//    }
    /**
     * 咨询、探店详细信息
     * @param activityId
     * @return
     */
    @LoginRequired
    @ApiOperation(value = "咨询、探店详细信息", notes = "小程序端")
    @GetMapping("/getActivityProbeShopDTO")
    public ApiResponse<ActivityProbeShopDTO> getActivityProbeShopDTO(Integer activityId){
        return ApiResponse.success(activityService.getActivityProbeShopDTO(activityId,getMemberId()));
    }
//    @LoginRequired
//    @ApiOperation(value = "咨询、探店详细信息", notes = "小程序端")
//    @GetMapping("/getActivityProbeShopDTO")
//    public ApiResponse<ActivityProbeShopDTO> getActivityProbeShopDTO(Integer activityId){
//        return ApiResponse.success(activityService.getActivityProbeShopDTO(activityId,getMemberId()));
//    }
    /**
     * 获取该城市下的最热探店视频
     * @param pageWrap
     * @return
     */
    @LoginRequired
    @ApiOperation(value = "获取该城市下的最热探店视频列表", notes = "小程序端")
    @PostMapping("/getActivityVideoDTO")
    public ApiResponse<PageData<ActivityVideoDTO>> getActivityVideoDTO(PageWrap<Integer> pageWrap){
        return ApiResponse.success(activityService.getActivityVideoDTO(pageWrap));
    }
//    @LoginRequired
//    @ApiOperation(value = "获取该城市下的最热探店视频列表", notes = "小程序端")
//    @PostMapping("/getActivityVideoDTO")
//    public ApiResponse<PageData<ActivityVideoDTO>> getActivityVideoDTO(PageWrap<Integer> pageWrap){
//        return ApiResponse.success(activityService.getActivityVideoDTO(pageWrap));
//    }
    /**
     *获取收藏的 资讯/探店/活动分页列表
     * @param pageWrap
     * @return
     */
    @LoginRequired
    @ApiOperation(value = "获取收藏的 资讯/探店/活动 分页列表", notes = "小程序端")
    @PostMapping("/getUserCollectActivityCard")
    public ApiResponse<PageData<ActivityCardDTO>> getUserCollectActivityCard(@RequestBody  PageWrap pageWrap){
        return ApiResponse.success(activityService.getUserCollectActivityCard(pageWrap,getMemberId()));
    }
//    @LoginRequired
//    @ApiOperation(value = "获取收藏的 资讯/探店/活动 分页列表", notes = "小程序端")
//    @PostMapping("/getUserCollectActivityCard")
//    public ApiResponse<PageData<ActivityCardDTO>> getUserCollectActivityCard(@RequestBody  PageWrap pageWrap){
//        return ApiResponse.success(activityService.getUserCollectActivityCard(pageWrap,getMemberId()));
//    }
    /**
@@ -121,12 +121,12 @@
     * @param pageWrap
     * @return
     */
    @LoginRequired
    @ApiOperation(value = "获取我参与活动列表 not_start  having  over", notes = "小程序端")
    @PostMapping("/getUserActivitySignCard")
    public ApiResponse<PageData<MemberActivitySignDTO>> getUserActivitySignCard(@RequestBody PageWrap<String> pageWrap){
        return ApiResponse.success(activityService.getUserActivitySignCard(pageWrap,getMemberId()));
    }
//    @LoginRequired
//    @ApiOperation(value = "获取我参与活动列表 not_start  having  over", notes = "小程序端")
//    @PostMapping("/getUserActivitySignCard")
//    public ApiResponse<PageData<MemberActivitySignDTO>> getUserActivitySignCard(@RequestBody PageWrap<String> pageWrap){
//        return ApiResponse.success(activityService.getUserActivitySignCard(pageWrap,getMemberId()));
//    }
    /**
@@ -134,24 +134,24 @@
     * @param pageWrap
     * @return
     */
    @LoginRequired
    @ApiOperation(value = "获取商家活动列表", notes = "小程序端")
    @PostMapping("/getShopActivitySignCard")
    public ApiResponse<PageData<ShopActivitySignDTO>> getShopActivitySignCard(@RequestBody PageWrap<ShopActivitySignDTO> pageWrap){
        return ApiResponse.success(activityService.getShopActivitySignCard(pageWrap));
    }
//    @LoginRequired
//    @ApiOperation(value = "获取商家活动列表", notes = "小程序端")
//    @PostMapping("/getShopActivitySignCard")
//    public ApiResponse<PageData<ShopActivitySignDTO>> getShopActivitySignCard(@RequestBody PageWrap<ShopActivitySignDTO> pageWrap){
//        return ApiResponse.success(activityService.getShopActivitySignCard(pageWrap));
//    }
    /**
     *获取活动参加用户
     * @param pageWrap
     * @return
     */
    @LoginRequired
    @ApiOperation(value = "获取活动参加用户", notes = "小程序端")
    @PostMapping("/getActivitySignUserDTO")
    public ApiResponse<PageData<ActivitySignUserDTO>> getActivitySignUserDTO(@RequestBody PageWrap<Integer> pageWrap){
        return ApiResponse.success(activityService.getActivitySignUserDTO(pageWrap));
    }
//    @LoginRequired
//    @ApiOperation(value = "获取活动参加用户", notes = "小程序端")
//    @PostMapping("/getActivitySignUserDTO")
//    public ApiResponse<PageData<ActivitySignUserDTO>> getActivitySignUserDTO(@RequestBody PageWrap<Integer> pageWrap){
//        return ApiResponse.success(activityService.getActivitySignUserDTO(pageWrap));
//    }
    /**
@@ -159,14 +159,14 @@
     *商家 新增/编辑活动
     * @param baseActivity
     */
    @LoginRequired
    @ApiOperation(value = "获取我参与活动列表 not_start  having  over", notes = "小程序端")
    @PostMapping("/creatOrUpdateShopOrgActivity")
    public ApiResponse creatOrUpdateShopOrgActivity(@RequestBody BaseActivity baseActivity){
        activityService.creatOrUpdateShopOrgActivity(baseActivity,getMemberId());
        return ApiResponse.success(null);
    }
//    @LoginRequired
//    @ApiOperation(value = "获取我参与活动列表 not_start  having  over", notes = "小程序端")
//    @PostMapping("/creatOrUpdateShopOrgActivity")
//    public ApiResponse creatOrUpdateShopOrgActivity(@RequestBody BaseActivity baseActivity){
//
//        activityService.creatOrUpdateShopOrgActivity(baseActivity,getMemberId());
//        return ApiResponse.success(null);
//    }