Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-08 bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -8,6 +8,9 @@

import javax.annotation.Resource;

import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.SysUser;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -55,6 +58,17 @@
import com.panzhihua.common.model.vos.neighbor.UnitActivityAnalysisVO;
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.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
@@ -85,6 +99,8 @@
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.PageUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @auther lyq
@@ -130,6 +146,8 @@
    private ComActActivityDAO comActActivityDAO;
    @Resource
    private ComPbCheckUnitDao comPbCheckUnitDao;
    @Resource
    private SysUserDao sysUserDao;
    /**
     * 分页查询邻里圈列表
     *
@@ -637,6 +655,20 @@
        }

        if (comActNeighborCircleCommentDAO.insert(circleCommentDO) > 0) {
            SysUser sysUser=sysUserDao.selectById(neighborCircleDO.getSolveId());
            if(sysUser!=null) {
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    if (neighborCircleDO.getBelongType()==2){
                        WxUtil.sendLongTimeTemplate(sysUser.getOpenid(),util.getAccessToken(),"你有一条新的评价信息",neighborCircleDO.getReleaseContent().substring(0,10)+"..","packageB/pages/partySecond/problemDetails/index?id="+neighborCircleDO.getId()+"&type=888");
                    }
                    if (neighborCircleDO.getBelongType()==3){
                        WxUtil.sendLongTimeTemplate(sysUser.getOpenid(),util.getAccessToken(),"你有一条新的评价信息",neighborCircleDO.getReleaseContent().substring(0,10)+"..","packageB/pages/partySecond/problemDetails/index?id="+neighborCircleDO.getId()+"&type=777");
                    }
            } catch (Exception e) {
                e.printStackTrace();
            }
            }
            return R.ok();
        } else {
            return R.fail("评论失败");
@@ -1069,7 +1101,42 @@
        if(StringUtils.isNotEmpty(comActNeighborCircleDO.getComment())){
            comActNeighborCircleDO.setCommentTime(new Date());
        }
        return R.ok(this.baseMapper.updateById(comActNeighborCircleDO));
        int result=this.baseMapper.updateById(comActNeighborCircleDO);
        if(result>0){
            SysUser sysUser=sysUserDao.selectById(comActNeighborCircleDO.getReleaseId());
            if(comActNeighborCircleDO.getOrderStatus()!=null){
                if(sysUser!=null) {
                    try {
                        WxXCXTempSend util = new WxXCXTempSend();
                        if (comActNeighborCircleDO.getBelongType()==2){
                            WxUtil.sendLongTimeTemplate(sysUser.getOpenid(),util.getAccessToken(),"你反馈的问题已被人认领",comActNeighborCircleDO.getReleaseContent().substring(0,10)+"..","packageB/pages/partySecond/problemDetails/index?id="+comActNeighborCircleDO.getId()+"&type=888");
                        }
                        if (comActNeighborCircleDO.getBelongType()==3){
                            WxUtil.sendLongTimeTemplate(sysUser.getOpenid(),util.getAccessToken(),"你反馈的需求已被人认领",comActNeighborCircleDO.getReleaseContent().substring(0,10)+"..","packageB/pages/partySecond/problemDetails/index?id="+comActNeighborCircleDO.getId()+"&type=777");
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }
            if(comActNeighborCircleDO.getSolveStatus()!=null){
                if(sysUser!=null) {
                    try {
                        WxXCXTempSend util = new WxXCXTempSend();
                        if (comActNeighborCircleDO.getBelongType()==2){
                            WxUtil.sendLongTimeTemplate(sysUser.getOpenid(),util.getAccessToken(),"你反馈的问题已被人处理",comActNeighborCircleDO.getReleaseContent().substring(0,10)+"..","packageB/pages/partySecond/problemDetails/index?id="+comActNeighborCircleDO.getId()+"&type=888");
                        }
                        if (comActNeighborCircleDO.getBelongType()==3){
                            WxUtil.sendLongTimeTemplate(sysUser.getOpenid(),util.getAccessToken(),"你反馈的需求已被人处理",comActNeighborCircleDO.getReleaseContent().substring(0,10)+"..","packageB/pages/partySecond/problemDetails/index?id="+comActNeighborCircleDO.getId()+"&type=777");
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }
            return R.ok(result);
        }
        return R.fail();
    }

    @Override