Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-09 8cdaf6e5eacd24f6f0691ef8b430c43339f4ac5e

Merge branch 'huacheng_push' into huacheng_test

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

@@ -1104,8 +1104,8 @@
        int result=this.baseMapper.updateById(comActNeighborCircleDO);
        if(result>0){
            ComActNeighborCircleDO comActNeighborCircleDO1=this.baseMapper.selectById(comActNeighborCircleDO.getId());
            SysUser sysUser=sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,comActNeighborCircleDO1.getReleaseId()));
            if(comActNeighborCircleDO.getOrderStatus()!=null){
                SysUser sysUser=sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,comActNeighborCircleDO1.getReleaseId()));
                if(sysUser!=null) {
                    try {
                        WxXCXTempSend util = new WxXCXTempSend();
@@ -1121,6 +1121,7 @@
                }
            }
            if(comActNeighborCircleDO.getSolveStatus()==3){
                SysUser sysUser=sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,comActNeighborCircleDO1.getReleaseId()));
                if(sysUser!=null) {
                    try {
                        WxXCXTempSend util = new WxXCXTempSend();
@@ -1136,6 +1137,7 @@
                }
            }
            if(comActNeighborCircleDO.getSolveStatus()==4){
                SysUser sysUser=sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,comActNeighborCircleDO1.getSolveId()));
                if(sysUser!=null) {
                    try {
                        WxXCXTempSend util = new WxXCXTempSend();