更新sit

gis_cms/src/main/java/com/gis/cms/mapper/GoodsVoteMapper.java

@@ -25,5 +25,5 @@ public interface GoodsVoteMapper extends IBaseMapper<GoodsVoteEntity, Long> {
 
     @Select("select id from tb_goods_vote where is_delete=0 and goods_module_id=#{goodsModuleId} " +
             "and user_id=#{userId} and type=#{type} and id=#{goodsId}")
-    List<String> findByGoodsModuleIdAndUserIdAndTypeAndGoodsId(Long goodsModuleId, Long tokenUserId, String typeVote, Long goodsId);
+    List<String> findByGoodsModuleIdAndUserIdAndTypeAndGoodsId(Long goodsModuleId, Long userId, String type, Long goodsId);
 }

gis_cms/src/main/java/com/gis/cms/service/impl/GoodsServiceImpl.java

@@ -139,7 +139,7 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
             sql.append("select a.*, if(b.countLike > 0, 1, 0) isLike, if(b.countVote > 0, 1, 0) isVote from tb_goods a left join " +
                     "(select g.id,sum(case when v.type='like' and v.is_delete=0 and v.user_id=" + getTokenUserId() +" then 1 else 0 end )countLike, " +
                     "sum(case when v.type='vote' and v.is_delete=0  and v.user_id=" + getTokenUserId() +" then 1 else 0 end )countVote " +
-                    "from tb_goods g left join tb_goods_vote v on g.id=v.goods_id where g.is_delete=0 and v.is_delete=0 ) b " +
+                    "from tb_goods g left join tb_goods_vote v on g.id=v.goods_id where g.is_delete=0 and v.is_delete=0 GROUP BY g.id ) b " +
                     "on a.id=b.id where a.is_delete=0");
         } else { // 非登录
             sql.append("select a.* from tb_goods a where a.is_delete=0");

gis_cms/src/main/java/com/gis/cms/service/impl/GoodsVoteServiceImpl.java

@@ -12,6 +12,7 @@ import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.common.base.service.impl.IBaseServiceImpl;
 import com.gis.common.util.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -72,13 +73,18 @@ public class GoodsVoteServiceImpl extends IBaseServiceImpl<GoodsVoteEntity, Long
         // 每个用户每个板块能投的票数，按后台设置
         Long goodsModuleId = param.getGoodsModuleId();
 
-        List<String> votes = entityMapper.findByGoodsModuleIdAndUserIdAndTypeAndGoodsId(goodsModuleId, getTokenUserId(), TYPE_VOTE, param.getGoodsId());
+        Long tokenUserId = getTokenUserId();
+        if (tokenUserId == null){
+            return Result.failure(5001,"该用户没有登录");
+        }
+
+        List<String> votes = entityMapper.findByGoodsModuleIdAndUserIdAndTypeAndGoodsId(goodsModuleId, tokenUserId, TYPE_VOTE, param.getGoodsId());
         if (!CollectionUtils.isEmpty(votes)){
             return Result.failure("该用户已投票");
         }
 
         // 一个用户允许此模块的投标数
-        List<String> voteByUser = entityMapper.findByGoodsModuleIdAndUserIdAndType(goodsModuleId, getTokenUserId(), TYPE_VOTE);
+        List<String> voteByUser = entityMapper.findByGoodsModuleIdAndUserIdAndType(goodsModuleId, tokenUserId, TYPE_VOTE);
         GoodsModuleEntity moduleEntity = goodsModuleService.findById(goodsModuleId);
         if (voteByUser.size() >= moduleEntity.getVoteCount()){
             return Result.failure("已达到投票上限");