From aa6e58c6d7860873288de1b3e75c49a74be581c9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 18:56:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8C=87=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxActivityJoinController.java | 7 ++++++- .../iformall/service/impl/WxActivityJoinServiceImpl.java | 8 +------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index c18baaf45..fe00c456a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; +import com.iformall.exception.MallinkException; import com.iformall.service.WxActivityJoinService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -50,7 +51,11 @@ public class WxActivityJoinController extends BaseController { wxActivityJoin.setTenantId(getTenantId()); wxActivityJoin.setUserId(getUserId()); wxActivityJoin.setNickName(getUser().getNickName()); - return wxActivityJoinService.join(wxActivityJoin); + try { + return wxActivityJoinService.join(wxActivityJoin); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(), e.getMessage()); + } } @ApiOperation("签到") 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 25af72644..14e67748e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -12,7 +12,6 @@ import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; -import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.ExcelService; @@ -147,7 +146,6 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData join(WxActivityJoin wxActivityJoin) { - WxActivityJoin joinQuery = new WxActivityJoin(); joinQuery.setUserId(wxActivityJoin.getUserId()); joinQuery.setActivityId(wxActivityJoin.getActivityId()); @@ -169,11 +167,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); wxCreditHistory.setOperatorId(wxActivityJoin.getUserId()); - try { - wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - } catch (MallinkException e) { - return new ResultData(e.getErrorCode(), e.getMessage()); - } + wxCreditHistoryService.saveOrUpdate(wxCreditHistory); } //保存到报名表中 final IdWorker idWorker = IdWorker.get();