From f6fdef79304278ff87a4682c33573b6fdc5b9fc4 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 9 Sep 2019 15:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E7=82=B9=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epdc/form/EpdcNewsStatementFromDTO.java | 2 +- .../epdc/service/NewsUserAttitudeService.java | 14 ++++++++++++++ .../esua/epdc/service/impl/NewsServiceImpl.java | 16 +++++++++++++++- .../impl/NewsUserAttitudeServiceImpl.java | 11 +++++++++++ .../epdc/controller/EpdcAppUserController.java | 6 ++++++ 5 files changed, 47 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java index 602e5b7da..38910112b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java @@ -20,7 +20,7 @@ public class EpdcNewsStatementFromDTO implements Serializable { * newsId : 95429 */ @NotNull(message = "态度不能为空") - private Integer attitude; + private String attitude; @NotNull(message = "新闻id不能为空") private String newsId; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java index 6a23fb571..9075631f5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO; import com.elink.esua.epdc.entity.NewsUserAttitudeEntity; import java.util.List; @@ -92,4 +93,17 @@ public interface NewsUserAttitudeService extends BaseService implem public Result modifyStatement(EpdcNewsStatementFromDTO newsStatementFromDTO) { NewsDTO newsDTO = get(newsStatementFromDTO.getNewsId()); NewsUserAttitudeDTO newsUserAttitudeDTO = new NewsUserAttitudeDTO(); - + NewsUserAttitudeEntity userBehavior = newsUserAttitudeService.getUserBehavior(newsStatementFromDTO); + if (userBehavior != null && AppNewsLikeEnum.LIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.LIKE.value().equals(newsStatementFromDTO.getAttitude())) { + //您已经点过赞不能赞 + return new Result().error("您已经点过赞不能赞"); + } else if (userBehavior != null && AppNewsLikeEnum.LIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.UNLIKE.value().equals(newsStatementFromDTO.getAttitude())) { + //已经踩不能赞 + return new Result().error("您已经踩过不能赞"); + } else if (userBehavior != null && AppNewsLikeEnum.UNLIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.LIKE.value().equals(newsStatementFromDTO.getAttitude())) { + //已经踩 不能踩 + return new Result().error("您已经踩过不能踩"); + } else if (userBehavior != null && AppNewsLikeEnum.LIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.UNLIKE.value().equals(newsStatementFromDTO.getAttitude())) { + //已经赞 不能踩 + return new Result().error("您已经赞过不能踩"); + } //表态 0赞；1踩 NewsEntity newsEntity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class); if (AppNewsLikeEnum.LIKE.value().equals(newsStatementFromDTO.getAttitude())) { diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java index d027fada6..43c10dd53 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dao.NewsUserAttitudeDao; import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO; import com.elink.esua.epdc.entity.NewsUserAttitudeEntity; import com.elink.esua.epdc.redis.NewsUserAttitudeRedis; import com.elink.esua.epdc.service.NewsUserAttitudeService; @@ -101,4 +102,14 @@ public class NewsUserAttitudeServiceImpl extends BaseServiceImpl getInfoById(String id){ +// return +// } }