springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
@@ -87,7 +87,7 @@ if(this.getAppId().equals("wx118de8a734d269f0")){ //花城直接通过 addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes); addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no); addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes); }else { //查询社区自动审核是否开着 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -2,6 +2,7 @@ import javax.annotation.Resource; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.vos.LoginReturnsVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.community_backstage.util.MyAESUtil; @@ -33,6 +34,7 @@ @Resource private UserService userService; @OperLog(operModul="用户登录",operType = 1) @ApiOperation(value = "社区平台登录", response = LoginReturnVO.class) @PostMapping("login") public R login(@RequestBody LoginBody loginBody) { @@ -72,6 +74,7 @@ return tokenService.refreshToken(refreshToken); } @OperLog(operModul="用户登出",operType = 1) @ApiOperation(value = "用户登出") @PostMapping("logout") public R updateUserWeiXinPhone() { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.utlis.*; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.entity.SysUser; import com.panzhihua.service_community.model.dos.*; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -59,15 +60,6 @@ import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_community.entity.ComPbCheckUnit; import com.panzhihua.service_community.model.dos.ComActActivityDO; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleBrowseDO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousDO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO; import com.panzhihua.service_community.model.dos.ComPbMemberDO; import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService; import com.panzhihua.service_community.service.ComActNeighborCircleService; import com.panzhihua.service_community.service.ComActNeighborCircleTopicService; @@ -233,6 +225,7 @@ if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) { neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone()); } //判断当前邻里圈是否需要审核 if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){ //当邻里圈不需要审核才进入自动审核 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java
@@ -1,23 +1,12 @@ package com.panzhihua.service_community.service.impl; import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.annotation.Resource; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.service_community.service.ComActNeighborCircleTopicWestService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.constants.NeighborCircleConstants; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.neighbor.*; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; @@ -26,9 +15,17 @@ import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComActNeighborCircleBrowseWestService; import com.panzhihua.service_community.service.ComActNeighborCircleTopicWestService; import com.panzhihua.service_community.service.ComActNeighborCircleWestService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @auther lyq @@ -146,6 +143,7 @@ } neighborCircleDO.setTopicId(circleTopicDO.getId()); } //判断当前邻里圈是否需要审核 if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){ //当邻里圈不需要审核才进入自动审核 @@ -161,10 +159,7 @@ neighborCircleDO.setRefuseReason("内容违规"); } } if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no) && addNeighborCircleAppDTO.getWxExamineResult().equals(AddComActNeighborCircleAppDTO.isExamine.yes)){ neighborCircleDO.setStatus(ComActNeighborCircleWestDO.status.xs); } if(this.baseMapper.insert(neighborCircleDO) > 0){ return R.ok();
