|
|
|
@@ -1,11 +1,14 @@ |
|
|
|
package com.iformall.controller; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxActivity; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.enums.EnumActivityEnrollStatus; |
|
|
|
import com.iformall.enums.EnumActivityStatus; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxActivityService; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -87,18 +90,26 @@ public class WxActivityController extends BaseController { |
|
|
|
@GetMapping("/findById") |
|
|
|
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) |
|
|
|
public ResultData findById(Long id) { |
|
|
|
Map<String, Object> data = new HashMap<>(); |
|
|
|
WxActivity wxActivity = wxActivityService.getById(id); |
|
|
|
Integer activityStatus = wxActivityService.queryActivityStatus(id); |
|
|
|
data.put("activity", wxActivity); |
|
|
|
data.put("activityStatus", activityStatus); |
|
|
|
Long memberId; |
|
|
|
try { |
|
|
|
memberId = getMemberId(); |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
Integer activityStatus = wxActivityService.queryActivityStatus(id); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
if(e.getErrorCode() == ErrorCode.USER_IS_NOT_MEMBER.getCode()){ |
|
|
|
data.put("joinStatus", EnumActivityEnrollStatus.NOMEMBER.getCode()); |
|
|
|
return new ResultData(Result.SUCCESS, "查询成功", data); |
|
|
|
}else{ |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
} |
|
|
|
}catch (Exception e) { |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
Integer joinStatus = wxActivityService.queryJoinStatus(id, memberId); |
|
|
|
Map<String, Object> data = new HashMap<>(); |
|
|
|
data.put("activity", wxActivity); |
|
|
|
data.put("activityStatus", activityStatus); |
|
|
|
data.put("joinStatus", joinStatus); |
|
|
|
return new ResultData(Result.SUCCESS, "查询成功", data); |
|
|
|
} |
|
|
|
|