From f40cd3366f29c6793ba603f68592f4db84739f21 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 14:43:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=AD=BE=E5=88=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxActivityJoinController.java | 4 ++-- .../com/iformall/domain/po/WxActivity.java | 21 +++++++++++++------ .../impl/WxActivityJoinServiceImpl.java | 14 +++++++------ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index 75375e299..54c97ac34 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -55,8 +55,8 @@ public class WxActivityJoinController extends BaseController { @ApiOperation("签到") @PostMapping("sign") public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) { - if (wxActivityJoin.getId() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "Id不能为空"); + if (wxActivityJoin.getActivityId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } wxActivityJoin.setTenantId(getTenantId()); wxActivityJoin.setUserId(getUserId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 66155b3cf..00d7275fa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -94,27 +94,36 @@ public class WxActivity extends BaseEntity { @Transient - @io.swagger.annotations.ApiModelProperty(value = "小程序路径", name = "weappPath") + @io.swagger.annotations.ApiModelProperty(value = "报名小程序路径", name = "weappPath") protected String weappPath; @Transient @io.swagger.annotations.ApiModelProperty(value = "报名二维码", name = "weappSceneForJoin") protected String weappSceneForJoin; - public String getWeappSceneForSign() { + public String getWeappPath() { + return "pages/index/index?type=ra&id=" + id; + } + + public String getWeappSceneForJoin() { return "t:ra:" + id; } + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "签到小程序路径", name = "weappPath") + protected String weappPathForSign; + @Transient @io.swagger.annotations.ApiModelProperty(value = "签到二维码", name = "weappSceneForSign") protected String weappSceneForSign; - public String getWeappPath() { - return "pages/index/index?type=ra&id=" + id; + public String getWeappPathForSign() { + return "pages/index/index?type=si&id=" + id; } - public String getWeappSceneForJoin() { - return "t:ra:" + id; + public String getWeappSceneForSign() { + return "t:si:" + id; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index a5117a9f9..6f1decac8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -164,13 +164,15 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData sign(WxActivityJoin wxActivityJoin) { - WxActivityJoin activityJoin = wxActivityJoinMapper.selectByPrimaryKey(wxActivityJoin.getId()); - if (activityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { - activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); - wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); - return new ResultData(Result.SUCCESS); + //是否报名记录 + wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); + WxActivityJoin activityJoin = wxActivityJoinMapper.selectOne(wxActivityJoin); + if (activityJoin == null) { + return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); } - return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); + activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); + wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); + return new ResultData(Result.SUCCESS); } private void sendMessage(WxActivityJoin join, WxActivity activity) {