| @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping; | |||||
| import org.springframework.web.bind.annotation.RestController; | import org.springframework.web.bind.annotation.RestController; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.util.HashMap; | |||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * @author gongbiao | * @author gongbiao | ||||
| @@ -33,7 +35,7 @@ public class WxActivityController extends BaseController { | |||||
| @GetMapping("/queryStatus") | @GetMapping("/queryStatus") | ||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | ||||
| public ResultData queryStatus(Long id) { | public ResultData queryStatus(Long id) { | ||||
| return wxActivityService.queryStatus(id); | |||||
| return new ResultData(wxActivityService.queryStatus(id)); | |||||
| } | } | ||||
| @ApiOperation("根据id查询接口") | @ApiOperation("根据id查询接口") | ||||
| @@ -41,7 +43,11 @@ public class WxActivityController extends BaseController { | |||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | ||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| WxActivity wxActivity = wxActivityService.getById(id); | WxActivity wxActivity = wxActivityService.getById(id); | ||||
| return new ResultData(Result.SUCCESS, "查询成功", wxActivity); | |||||
| Integer status = wxActivityService.queryStatus(id); | |||||
| Map<String, Object> data = new HashMap<>(); | |||||
| data.put("activity", wxActivity); | |||||
| data.put("status", status); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", data); | |||||
| } | } | ||||
| @ApiOperation("输出富文本内容") | @ApiOperation("输出富文本内容") | ||||
| @@ -95,22 +95,26 @@ public class WxActivity extends BaseEntity { | |||||
| protected String weappPath; | protected String weappPath; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value = "小程序二维码Scene", name = "weappScene") | |||||
| protected String weappScene; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "报名二维码", name = "weappSceneForJoin") | |||||
| protected String weappSceneForJoin; | |||||
| public String getWeappSceneForSign() { | |||||
| return "t:ra:" + id; | |||||
| } | |||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value = "签到二维码", name = "weappSceneForSign") | |||||
| protected String weappSceneForSign; | |||||
| public String getWeappPath() { | public String getWeappPath() { | ||||
| if (type == null) | |||||
| return "pages/index/index"; | |||||
| return "pages/index/index?type=bd&bt=" + type + "&id=" + id; | |||||
| return "pages/index/index?type=ra&id=" + id; | |||||
| } | } | ||||
| public String getWeappScene() { | |||||
| if (type == null) | |||||
| return ""; | |||||
| return "t:bd:" + type + ":" + id; | |||||
| public String getWeappSceneForJoin() { | |||||
| return "t:ra:" + id; | |||||
| } | } | ||||
| public static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), CoverImg_ASC("`cover_img` ASC"), CoverImg_DESC("`cover_img` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), SubTitle_ASC("`sub_title` ASC"), SubTitle_DESC("`sub_title` DESC"), StartTime_ASC("`start_time` ASC"), StartTime_DESC("`start_time` DESC"), EndTime_ASC("`end_time` ASC"), EndTime_DESC("`end_time` DESC"), Type_ASC("`type` ASC"), Type_DESC("`type` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ActivityTime_ASC("`activity_start_time` ASC"), ActivityTime_DESC("`activity_start_time` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); | Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), CoverImg_ASC("`cover_img` ASC"), CoverImg_DESC("`cover_img` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), SubTitle_ASC("`sub_title` ASC"), SubTitle_DESC("`sub_title` DESC"), StartTime_ASC("`start_time` ASC"), StartTime_DESC("`start_time` DESC"), EndTime_ASC("`end_time` ASC"), EndTime_DESC("`end_time` DESC"), Type_ASC("`type` ASC"), Type_DESC("`type` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ActivityTime_ASC("`activity_start_time` ASC"), ActivityTime_DESC("`activity_start_time` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); | ||||
| private String value; | private String value; | ||||
| @@ -43,6 +43,6 @@ public interface WxActivityService { | |||||
| ResultData sendToCampaign(Long id); | ResultData sendToCampaign(Long id); | ||||
| ResultData queryStatus(Long id); | |||||
| Integer queryStatus(Long id); | |||||
| } | } | ||||
| @@ -162,31 +162,31 @@ public class WxActivityServiceImpl implements WxActivityService { | |||||
| campaign.setProduceType(EnumCampaignProductType.ACTIVITY_JOIN.getCode()); | campaign.setProduceType(EnumCampaignProductType.ACTIVITY_JOIN.getCode()); | ||||
| campaign.setProduceId(wxActivity.getId()); | campaign.setProduceId(wxActivity.getId()); | ||||
| campaign.setPagePath(wxActivity.getWeappPath()); | campaign.setPagePath(wxActivity.getWeappPath()); | ||||
| campaign.setPageScene(wxActivity.getWeappScene()); | |||||
| campaign.setPageScene(wxActivity.getWeappSceneForJoin()); | |||||
| return wxCampaignService.addForPath(campaign); | return wxCampaignService.addForPath(campaign); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData queryStatus(Long id) { | |||||
| public Integer queryStatus(Long id) { | |||||
| WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); | WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); | ||||
| if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { | if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { | ||||
| return new ResultData(EnumActivityEnrollStatus.NOT_START.getCode()); | |||||
| return EnumActivityEnrollStatus.NOT_START.getCode(); | |||||
| } | } | ||||
| if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { | if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { | ||||
| return new ResultData(EnumActivityEnrollStatus.END.getCode()); | |||||
| return EnumActivityEnrollStatus.END.getCode(); | |||||
| } | } | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| if (wxActivity.getStartTime().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { | if (wxActivity.getStartTime().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { | ||||
| //报名未开始 | //报名未开始 | ||||
| if (wxActivity.getStartTime().before(date)) { | if (wxActivity.getStartTime().before(date)) { | ||||
| return new ResultData(EnumActivityEnrollStatus.NOT_START.getCode()); | |||||
| return EnumActivityEnrollStatus.NOT_START.getCode(); | |||||
| } | } | ||||
| if (wxActivity.getEndTime().before(date)) { | if (wxActivity.getEndTime().before(date)) { | ||||
| //报名结束 | //报名结束 | ||||
| return new ResultData(EnumActivityEnrollStatus.END.getCode()); | |||||
| return EnumActivityEnrollStatus.END.getCode(); | |||||
| } | } | ||||
| } | } | ||||
| return new ResultData(EnumActivityEnrollStatus.END.getCode()); | |||||
| return EnumActivityEnrollStatus.END.getCode(); | |||||
| } | } | ||||