Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-09 b72d8fea21aa1cda28c44c57e3cee78c42db5847

Merge branch 'huacheng_push' into huacheng_test

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

@@ -655,7 +655,7 @@
        }

        if (comActNeighborCircleCommentDAO.insert(circleCommentDO) > 0) {
            SysUser sysUser=sysUserDao.selectById(neighborCircleDO.getSolveId());
            SysUser sysUser=sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,neighborCircleDO.getSolveId()));
            if(sysUser!=null) {
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
@@ -1103,7 +1103,7 @@
        }
        int result=this.baseMapper.updateById(comActNeighborCircleDO);
        if(result>0){
            SysUser sysUser=sysUserDao.selectById(comActNeighborCircleDO.getReleaseId());
            SysUser sysUser=sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,comActNeighborCircleDO.getReleaseId()));
            if(comActNeighborCircleDO.getOrderStatus()!=null){
                if(sysUser!=null) {
                    try {