Merge remote-tracking branch 'origin/div' into div

admin

2020-06-22 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java

@@ -354,7 +354,7 @@
        if (robotId == null)

            throw new UserCloudException(1, "云发单机器人不存在");



        List<String> list = AitaokerApiUtil.getContract(12793);

        List<String> list = AitaokerApiUtil.getContract(robotId);

        if (list == null || list.size() == 0)

            throw new UserCloudException(1, "未检索到对应群");



@@ -364,7 +364,7 @@
            String result = redisManager.getCommonString(key);

            if (!StringUtil.isNullOrEmpty(result)) {

                String groupName = null;

                WeiXinGroupDTO groupDetail = AitaokerApiUtil.getGroupDetail(12793, roomId);

                WeiXinGroupDTO groupDetail = AitaokerApiUtil.getGroupDetail(robotId, roomId);

                if (groupDetail != null) {

                    groupName = groupDetail.getGroupName();

                }