|
|
@@ -3,6 +3,7 @@ package com.iformall.controller.market; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.github.pagehelper.PageInfo; |
|
|
import com.github.pagehelper.PageInfo; |
|
|
import com.iformall.annotation.ApiVersion; |
|
|
import com.iformall.annotation.ApiVersion; |
|
|
|
|
|
import com.iformall.annotation.RequestTimeout; |
|
|
import com.iformall.common.ErrorCode; |
|
|
import com.iformall.common.ErrorCode; |
|
|
import com.iformall.common.Result; |
|
|
import com.iformall.common.Result; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.common.ResultData; |
|
|
@@ -34,6 +35,7 @@ import java.math.BigDecimal; |
|
|
import java.util.HashMap; |
|
|
import java.util.HashMap; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @author alascor |
|
|
* @author alascor |
|
|
@@ -320,8 +322,8 @@ public class WxVtwoPrizeDrawActivityController extends BaseController { |
|
|
@ApiVersion(group = SwaggerConstant.V_A_2_0) |
|
|
@ApiVersion(group = SwaggerConstant.V_A_2_0) |
|
|
@ApiOperation("活动发奖明细导出") |
|
|
@ApiOperation("活动发奖明细导出") |
|
|
@GetMapping("/grantExport") |
|
|
@GetMapping("/grantExport") |
|
|
|
|
|
@RequestTimeout(value = 3000, unit = TimeUnit.SECONDS) |
|
|
public void grantExport(@ModelAttribute WxVtwoActivityGrant activityGrant, HttpServletRequest request, HttpServletResponse response) { |
|
|
public void grantExport(@ModelAttribute WxVtwoActivityGrant activityGrant, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
|
|
|
|
|
if(activityGrant.getActivityId() == null){ |
|
|
if(activityGrant.getActivityId() == null){ |
|
|
throw new MallinkException(Result.ERROR,"活动ID 为空"); |
|
|
throw new MallinkException(Result.ERROR,"活动ID 为空"); |
|
|
} |
|
|
} |
|
|
|