diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java index 14aab6e47a..47cf9bd8b7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java @@ -73,15 +73,19 @@ public class MqPointCallbackController { log.warn("registerVolunteer mqMsg is empty"); return new Result().ok(true); } - BasePointEventMsg formDTO = ConvertUtils.sourceToTarget(mqMsg.getMsg(), BasePointEventMsg.class); + List formList = JSON.parseArray(mqMsg.getMsg(), BasePointEventMsg.class); try { //TODO 调用调整积分方法去给用户加减积分 userPointActionLogService. - userPointActionLogService.grantPointByEvent(EventEnum.REGISTER_VOLUNTEER.getEventTag(),formDTO); + formList.forEach(obj -> { + userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),obj); + }); + + } catch (Exception e) { logger.error("registerVolunteer consume fail", e); throw new RenException(EpmetErrorCode.SERVER_ERROR.getMsg()); } - log.info("registerVolunteer consumer success,formDTO:{}", JSON.toJSONString(formDTO)); + log.info("registerVolunteer consumer success,formDTO:{}", JSON.toJSONString(formList)); return new Result().ok(true); } @@ -98,15 +102,19 @@ public class MqPointCallbackController { log.warn("pubActiveLive mqMsg is empty"); return new Result().ok(true); } - BasePointEventMsg formDTO = ConvertUtils.sourceToTarget(mqMsg.getMsg(), BasePointEventMsg.class); + List formList = JSON.parseArray(mqMsg.getMsg(), BasePointEventMsg.class); + //BasePointEventMsg formDTO = ConvertUtils.sourceToTarget(mqMsg.getMsg(), BasePointEventMsg.class); try { //TODO 调用调整积分方法去给用户加减积分 userPointActionLogService. - userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),formDTO); + formList.forEach(obj -> { + userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),obj); + }); + } catch (Exception e) { logger.error("pubActiveLive consume fail", e); throw new RenException(EpmetErrorCode.SERVER_ERROR.getMsg()); } - log.info("pubActiveLive consumer success,formDTO:{}", JSON.toJSONString(formDTO)); + log.info("pubActiveLive consumer success,formDTO:{}", JSON.toJSONString(formList)); return new Result().ok(true); } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index c6a3986193..bf87baacc4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -175,9 +175,10 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl opt = rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst(); if(opt.isPresent()){ myself = opt.get(); - o.setMyPoint(myself.getTotalPoint()); + o.setMyPoint(null == myself.getTotalPoint() ? NumConstant.ZERO : myself.getTotalPoint()); o.setMyRanking(myself.getRank()); } else { + o.setMyPoint(NumConstant.ZERO); if (rankList.get(rankList.size() - NumConstant.ONE).getTotalPoint() > NumConstant.ZERO) { o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank() + NumConstant.ONE); } else { diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml index 3f709bd3b5..acaa1fb1e3 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml @@ -42,6 +42,7 @@ FROM point_rule WHERE DEL_FLAG = '0' + AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} AND EVENT_CODE = #{eventCode,jdbcType=VARCHAR} \ No newline at end of file