Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-10 ffe024b3d809c540d267cea42bb951aefe357210

Merge branch 'sanshuohuitang_dev' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java

@@ -176,5 +176,7 @@
    private Integer userType;
    @ApiModelProperty("取消时间")
    private Date revokeDate;

    @ApiModelProperty("专家头像")
    @TableField(exist = false)
    private String expertAvatar;
}

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

@@ -99,6 +99,7 @@
//            }
            ComMediateType category = commediateTypeService.getById(comEvent1.getEventCategory());
            comEvent1.setEventCategoryName(category.getName());
            comEvent1.setExpertAvatar(comSanShuoExpertService.getById(comEvent1.getSpecialistId()).getAvatar());
        });
        return R.ok(list);
    }
@@ -175,6 +176,9 @@
/*        if (checkExist(comEvent.getOrderSn(), comEvent.getId())) {
            return R.fail(ReturnMsgConstants.DATA_EXIST);
        }*/
        //清除专家信息
        comEvent.setSpecialistId(null);
        comEvent.setSpecialistName(null);
        int flag = baseMapper.updateById(comEvent);
        return flag > 0 ? R.ok(comEvent, ReturnMsgConstants.UPDATE_SUCCESS) : R.fail(ReturnMsgConstants.UPDATE_FALSE);
    }