diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalDto.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalDto.java index b04daa60d..fd568b8b0 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalDto.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalDto.java @@ -27,7 +27,7 @@ public class UserCoupleStatisticalDto extends BaseVo { /** * 发起者erbanNo */ - @FieldComment("发起者大鹅开黑号") + @FieldComment("发起者平台号") public Long inviteErbanNo; /** * 发起者昵称 @@ -39,9 +39,9 @@ public class UserCoupleStatisticalDto extends BaseVo { */ public Long acceptUid; /** - * 接收者大鹅开黑号 + * 接收者平台号 */ - @FieldComment("接受者大鹅开黑号") + @FieldComment("接受者平台号") public Long acceptErbanNo; /** * 接受者昵称 diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalParamDto.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalParamDto.java index fcf4fb06c..0c1ed36c0 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalParamDto.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserCoupleStatisticalParamDto.java @@ -22,7 +22,7 @@ public class UserCoupleStatisticalParamDto implements Serializable { */ private Long id; /** - * 用户大鹅开黑号 + * 用户平台号 */ private Long erbanNo; /** diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserDetailQueryDto.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserDetailQueryDto.java index f13c02f0f..0cb4277df 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserDetailQueryDto.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/dto/UserDetailQueryDto.java @@ -14,7 +14,7 @@ public class UserDetailQueryDto { private Byte flowChannelType = 0; /** - * 大鹅开黑号 + * 平台号 */ private String erbanNo; /** diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/crossRoomPk/BookCrossPkParam.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/crossRoomPk/BookCrossPkParam.java index 847cc5425..e20151f2e 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/crossRoomPk/BookCrossPkParam.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/crossRoomPk/BookCrossPkParam.java @@ -14,14 +14,14 @@ public class BookCrossPkParam { /** * 发起方房主uid */ - @NotNull(message = "邀请方大鹅开黑号不能为空") - @ApiModelProperty("必传:邀请方大鹅开黑号") + @NotNull(message = "邀请方平台号不能为空") + @ApiModelProperty("必传:邀请方平台号") private Long inviteErbanNo; /** * 接受方房主uid */ - @NotNull(message = "受邀请方大鹅开黑号不能为空") - @ApiModelProperty("必传:受邀请方大鹅开黑号") + @NotNull(message = "受邀请方平台号不能为空") + @ApiModelProperty("必传:受邀请方平台号") private Long inviteeErbanNo; /** * 操作人uid diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNoAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNoAdminService.java index 06bb64fe6..7560310e8 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNoAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNoAdminService.java @@ -161,10 +161,10 @@ import java.util.regex.Pattern; Long good = pErbanNo.getPrettyErbanNo(); if (!StringUtils.isEmpty(good)) { String goodNo = String.valueOf(good); - if (!goodNo.equals(String.valueOf(prettyErbanNo))) {//大鹅开黑号不包含prettyErbanNo + if (!goodNo.equals(String.valueOf(prettyErbanNo))) {//平台号不包含prettyErbanNo String ache = jedisService.hget(RedisKey.erban_no.getKey(), String.valueOf(prettyErbanNo));//从缓存中取未分配的靓号 if (!StringUtils.isEmpty(ache)) { - logger.error("该大鹅开黑号已经存在"); + logger.error("该平台号已经存在"); return 2; } else { long uid=0L; @@ -177,7 +177,7 @@ import java.util.regex.Pattern; } } } else { - logger.error("该大鹅开黑号已经存在"); + logger.error("该平台号已经存在"); return 2; } } else {//靓号不存在 @@ -191,20 +191,20 @@ import java.util.regex.Pattern; } else { String ache = jedisService.hget(RedisKey.erban_no.getKey(), String.valueOf(prettyErbanNo));//靓号必须不在全局缓存 if (!StringUtils.isEmpty(ache)) { - logger.error("该大鹅开黑号已经存在"); + logger.error("该平台号已经存在"); return 2; } else { Users usersByErBanNo = usersBaseService.getUsersByErBanNo(prettyErbanNo); if(usersByErBanNo!=null){ - logger.error("该大鹅开黑号已经存在"); + logger.error("该平台号已经存在"); return 2; } - if (!StringUtils.isEmpty(userId)) {//当前输入的大鹅开黑号必须在全局缓存中 + if (!StringUtils.isEmpty(userId)) {//当前输入的平台号必须在全局缓存中 String ache1 = jedisService.hget(RedisKey.erban_no.getKey(), String.valueOf(userId)); if (StringUtils.isEmpty(ache1)) { Users user = usersBaseService.getUsersByErBanNo(userId); if(StringUtils.isEmpty(user)){ - return 11;//当前输入的大鹅开黑号不存在 + return 11;//当前输入的平台号不存在 }else{ jedisService.hset(RedisKey.erban_no.getKey(),String.valueOf(user.getErbanNo()),user.getUid().toString()); } @@ -216,7 +216,7 @@ import java.util.regex.Pattern; if(!CollectionUtils.isEmpty(prettyList)){ for (PrettyErbanNo good : prettyList) { if (String.valueOf(good.getUserErbanNo()).equals(String.valueOf(userId))) { - logger.error("当前输入的大鹅开黑号已存在靓号,请换一个重试"); + logger.error("当前输入的平台号已存在靓号,请换一个重试"); return 8; } } @@ -260,7 +260,7 @@ import java.util.regex.Pattern; if (beautyNo == userId) {//不可设置本身 return 7; } - if (!StringUtils.isEmpty(userId)) {//判断当前输入的大鹅开黑号在缓存中是否存在 + if (!StringUtils.isEmpty(userId)) {//判断当前输入的平台号在缓存中是否存在 String ache = jedisService.hget(RedisKey.erban_no.getKey(), String.valueOf(userId)); if (StringUtils.isEmpty(ache)) { return 11; @@ -284,7 +284,7 @@ import java.util.regex.Pattern; if(!CollectionUtils.isEmpty(prettyList)){ for (PrettyErbanNo prettyErbanNo : prettyList) { if (String.valueOf(prettyErbanNo.getUserErbanNo()).equals(String.valueOf(userId))) { - logger.error("当前输入的大鹅开黑号已存在靓号,请换一个重试"); + logger.error("当前输入的平台号已存在靓号,请换一个重试"); return 8; } } @@ -343,14 +343,14 @@ import java.util.regex.Pattern; if (prettyErbanNo.getStatus() == 0) { return 2;//已经是解绑状态,无需解绑 } - Long userErbanNo = prettyErbanNo.getUserErbanNo();//获取原大鹅开黑号 + Long userErbanNo = prettyErbanNo.getUserErbanNo();//获取原平台号 Account account = accountService.getById(prettyErbanNo.getUserUid()); if(account != null){ if(!checkisPhone(account.getPhone())){ account.setPhone(String.valueOf(userErbanNo)); } account.setErbanNo(userErbanNo); - accountService.updateById(account);//改成普通的大鹅开黑号 + accountService.updateById(account);//改成普通的平台号 } Users user = usersService.getUsersByUid(prettyErbanNo.getUserUid()); //删除申请表 @@ -362,7 +362,7 @@ import java.util.regex.Pattern; } user.setErbanNo(userErbanNo); user.setHasPrettyErbanNo(false);//标记不是靓号 - usersMapper.updateByPrimaryKeySelective(user);//改成普通的大鹅开黑号 + usersMapper.updateByPrimaryKeySelective(user);//改成普通的平台号 Gson gson =new Gson(); String usersJson = gson.toJson(user); this.deleteUserRelateCache(prettyErbanNo.getUserUid().toString(), prettyErbanNo.getPrettyErbanNo().toString()); @@ -425,14 +425,14 @@ import java.util.regex.Pattern; if (!StringUtils.isEmpty(pretty)) { Byte status = pretty.getStatus(); if(status == 1){//在使用中 - Long userErbanNo = pretty.getUserErbanNo();//获取原大鹅开黑号 + Long userErbanNo = pretty.getUserErbanNo();//获取原平台号 Account account = accountService.getById(pretty.getUserUid()); if(account != null){ account.setErbanNo(userErbanNo); if(!checkisPhone(account.getPhone())){ account.setPhone(String.valueOf(userErbanNo)); } - //改成普通的大鹅开黑号 + //改成普通的平台号 accountService.updateById(account); } Users user = usersBaseService.getUsersByErBanNo(pretty.getPrettyErbanNo()); @@ -442,7 +442,7 @@ import java.util.regex.Pattern; } user.setErbanNo(userErbanNo); user.setHasPrettyErbanNo(false);//标记不是靓号 - usersMapper.updateByPrimaryKeySelective(user);//改成普通的大鹅开黑号 + usersMapper.updateByPrimaryKeySelective(user);//改成普通的平台号 Gson gson =new Gson(); String usersJson = gson.toJson(user); this.deleteUserRelateCache(user.getUid().toString(), pretty.getPrettyErbanNo().toString()); @@ -691,7 +691,7 @@ import java.util.regex.Pattern; if(!checkisPhone(user.getPhone())){ user.setPhone(String.valueOf(prettyErbanNo)); } - usersMapper.updateByPrimaryKeySelective(user);//把指定人的大鹅开黑号改成靓号 + usersMapper.updateByPrimaryKeySelective(user);//把指定人的平台号改成靓号 Gson gson =new Gson(); String usersJson = gson.toJson(user); this.deleteUserRelateCache(user.getUid().toString(), userErbanNo.toString()); @@ -699,7 +699,7 @@ import java.util.regex.Pattern; Account account = accountService.getAccountByErBanNo(userErbanNo); if (!StringUtils.isEmpty(account)) { account.setErbanNo(prettyErbanNo); - accountService.updateById(account);//把指定人的大鹅开黑号改成靓号 + accountService.updateById(account);//把指定人的平台号改成靓号 } PrettyErbanNoExample prettyErbanNoExample =new PrettyErbanNoExample(); prettyErbanNoExample.createCriteria().andStatusEqualTo((byte)0).andPrettyErbanNoEqualTo(prettyErbanNo); @@ -719,7 +719,7 @@ import java.util.regex.Pattern; account.setPhone(String.valueOf(prettyErbanNo)); } account.setErbanNo(prettyErbanNo); - //把指定人的大鹅开黑号改成靓号 + //把指定人的平台号改成靓号 accountService.updateById(account); } Users user = usersBaseService.getUsersByErBanNo(userId); @@ -729,7 +729,7 @@ import java.util.regex.Pattern; } user.setErbanNo(prettyErbanNo); user.setHasPrettyErbanNo(true); - usersMapper.updateByPrimaryKeySelective(user);//把指定人的大鹅开黑号改成靓号 + usersMapper.updateByPrimaryKeySelective(user);//把指定人的平台号改成靓号 Gson gson =new Gson(); String usersJson = gson.toJson(user); this.deleteUserRelateCache(user.getUid().toString(),userId.toString()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNumberAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNumberAdminService.java index fea947453..d1ac21b82 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNumberAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/PrettyNumberAdminService.java @@ -188,7 +188,7 @@ public class PrettyNumberAdminService extends AbstractCoreService oldList = Arrays.asList(erbanNoList.split(",")); if(type == 1){ - // 根据大鹅开黑号寻找 + // 根据平台号寻找 return getUserListByErbanNoList(oldList); }else if(type == 4){ return this.getUserListByUidList(oldList); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ChargeActivityService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ChargeActivityService.java index a7252b14c..dc36e9fbe 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ChargeActivityService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ChargeActivityService.java @@ -39,7 +39,7 @@ public class ChargeActivityService extends BaseService { private UsersService usersService; public int save(ChargeActivityWithBLOBs record) { - //指定房间id,由于页面传过来的是房主大鹅开黑号,所以需要转成房间号 + //指定房间id,由于页面传过来的是房主平台号,所以需要转成房间号 if(record.getRoomShow() == 1 && StringUtils.isNotEmpty(record.getRoomRule())) { ChargeActivityRoomRule roomRule = gson.fromJson(record.getRoomRule(), ChargeActivityRoomRule.class); if(null != roomRule.getErbanNo()) { @@ -62,11 +62,11 @@ public class ChargeActivityService extends BaseService { } record.setRoomRule(gson.toJson(roomRule)); } - //跳转类型为房间id,此时传入的也是房间大鹅开黑号 + //跳转类型为房间id,此时传入的也是房间平台号 if(record.getSkipType() == Constant.ActivitySkipType.ROOM) { Users user = usersService.getUserByErbanNo(NumberUtils.toLong(record.getSkipUrl())); if(user == null) { - throw new BusinessException("大鹅开黑号为" + record.getSkipUrl() + "的用户不存在!"); + throw new BusinessException("平台号为" + record.getSkipUrl() + "的用户不存在!"); } record.setSkipUrl(user.getErbanNo() + ":" + user.getUid()); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/FamilyPkConfigAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/FamilyPkConfigAdminService.java index 2553fce44..67f55d389 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/FamilyPkConfigAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/FamilyPkConfigAdminService.java @@ -96,7 +96,7 @@ public class FamilyPkConfigAdminService extends BaseService { Map map = familyCharmRecordVoList.stream().collect(Collectors.toMap(FamilyCharmRecordVo::getFamilyId,user -> user)); - // 判断输入的大鹅开黑号是否符合条件 + // 判断输入的平台号是否符合条件 List roomUids = this.queryRoomUidList(roomErbanNoListStr); String roomUidStr = StringUtils.collectionToDelimitedString(roomUids,","); Map repeatMap = new HashMap<>(); @@ -104,13 +104,13 @@ public class FamilyPkConfigAdminService extends BaseService { Users users = usersService.getUsersByUid(roomUid); FamilyMember familyMember = this.familyQueryService.getFamilyMember(roomUid); if(familyMember == null){ - throw new BusinessException("用户没有加入家族,大鹅开黑号为:"+users.getErbanNo()); + throw new BusinessException("用户没有加入家族,平台号为:"+users.getErbanNo()); } if(!map.containsKey(familyMember.getFamilyId())){ - throw new BusinessException("该用户所在家族并不是上周家族周星前6名,大鹅开黑号为"+roomUid+",家族id为"+familyMember.getFamilyId()); + throw new BusinessException("该用户所在家族并不是上周家族周星前6名,平台号为"+roomUid+",家族id为"+familyMember.getFamilyId()); } if(repeatMap.get(familyMember.getFamilyId()) != null && repeatMap.get(familyMember.getFamilyId())){ - throw new BusinessException("目前家族只允许每一个家族绑定一个房主,重复的大鹅开黑号为"+users.getErbanNo()); + throw new BusinessException("目前家族只允许每一个家族绑定一个房主,重复的平台号为"+users.getErbanNo()); } repeatMap.put(familyMember.getFamilyId(),true); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorAdminService.java index d14abfbaa..c3f5bb366 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorAdminService.java @@ -81,7 +81,7 @@ public class AnchorAdminService extends BaseService { //用户信息 Users users = usersBaseService.getUsersByErBanNo(Long.valueOf(erbanNoStr)); if(null == users) { - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的用户不存在!"); + throw new BusinessException("平台号为"+ erbanNo + "的用户不存在!"); } AnchorWhitelistExample anchorWhitelistExample = new AnchorWhitelistExample(); AnchorWhitelistExample.Criteria criteria = anchorWhitelistExample.createCriteria(); @@ -92,7 +92,7 @@ public class AnchorAdminService extends BaseService { if(!CollectionUtils.isEmpty(anchorWhitelists)){ AnchorWhitelist anchor = anchorWhitelists.get(0); if(anchor.getStatus() == 1){ - throw new BusinessException("大鹅开黑号为"+ erbanNo + "已存在列表中!"); + throw new BusinessException("平台号为"+ erbanNo + "已存在列表中!"); }else { anchor.setStatus(1); anchor.setOperateReason(reason); @@ -132,14 +132,14 @@ public class AnchorAdminService extends BaseService { //用户信息 Users users = usersBaseService.getUsersByErBanNo(erbanNo); if(null == users) { - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的用户不存在!"); + throw new BusinessException("平台号为"+ erbanNo + "的用户不存在!"); } AnchorWhitelistExample anchorWhitelistExample = new AnchorWhitelistExample(); anchorWhitelistExample.createCriteria().andErbanNoEqualTo(erbanNo); List anchorWhitelists = anchorWhitelistMapper.selectByExample(anchorWhitelistExample); if(CollectionUtils.isEmpty(anchorWhitelists)){ - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的主播不存在!"); + throw new BusinessException("平台号为"+ erbanNo + "的主播不存在!"); } AdminUser adminUser = adminUserService.getAdminUserById(adminId); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java index 7f5860aea..13410603a 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java @@ -177,7 +177,7 @@ public class AnchorCheckAdminService extends BaseService { OfficialGoldRecord officialGoldRecord = new OfficialGoldRecord(); BillRecord billRecord = new BillRecord(); Date date = new Date(); - //第一列为大鹅开黑号,第二列为金币数量 第三列为 钻石数量 第四列为备注 + //第一列为平台号,第二列为金币数量 第三列为 钻石数量 第四列为备注 Cell firstCell = row.getCell(row.getFirstCellNum()); Cell secondCell = row.getCell(row.getFirstCellNum() + 1); Cell thirthCell = row.getCell(row.getFirstCellNum() + 2); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/ClanAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/ClanAdminService.java index dcba66315..15ba207a0 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/ClanAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/ClanAdminService.java @@ -35,9 +35,9 @@ public interface ClanAdminService { /** * 添加家族 - * @param clanElderErbanNo 族长大鹅开黑号 + * @param clanElderErbanNo 族长平台号 * @param clanName 家族名称 - * @param hallOwnerErbanNo 会长大鹅开黑号 + * @param hallOwnerErbanNo 会长平台号 * @param level * @param avatar */ diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/impl/ClanAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/impl/ClanAdminServiceImpl.java index 742c07a39..71d5909fe 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/impl/ClanAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/clan/impl/ClanAdminServiceImpl.java @@ -140,15 +140,15 @@ public class ClanAdminServiceImpl implements ClanAdminService { try { Users clanElderUser = usersService.getUserByErbanNo(clanElderErbanNo); if (null == clanElderUser) { - throw new ServiceException("大鹅开黑号" + clanElderErbanNo + "对应用户不存在"); + throw new ServiceException("平台号" + clanElderErbanNo + "对应用户不存在"); } String errErbanNoStr = checkErbanNo(associateAccount); if (errErbanNoStr != null) { - throw new ServiceException("以下关联房间大鹅开黑号填写不正确[" + errErbanNoStr + "]"); + throw new ServiceException("以下关联房间平台号填写不正确[" + errErbanNoStr + "]"); } String multiErbanNo = multiAssociateAccountCheck(clanElderUser.getUid(), associateAccount); if (multiErbanNo != null) { - throw new ServiceException("以下关联房间大鹅开黑号已有其他关联号[" + errErbanNoStr + "]"); + throw new ServiceException("以下关联房间平台号已有其他关联号[" + errErbanNoStr + "]"); } if (StringUtils.isBlank(clanName)) { @@ -202,11 +202,11 @@ public class ClanAdminServiceImpl implements ClanAdminService { String errErbanNoStr = checkErbanNo(associateAccount); if (errErbanNoStr != null) { - throw new ServiceException("以下关联房间大鹅开黑号填写不正确[" + errErbanNoStr + "]"); + throw new ServiceException("以下关联房间平台号填写不正确[" + errErbanNoStr + "]"); } String multiErbanNo = multiAssociateAccountCheck(clanById.getClanElderUid(), associateAccount); if (multiErbanNo != null) { - throw new ServiceException("以下关联房间大鹅开黑号已有其他关联号[" + errErbanNoStr + "]"); + throw new ServiceException("以下关联房间平台号已有其他关联号[" + errErbanNoStr + "]"); } Users oldElder = usersService.getUsersByUid(clanById.getClanElderUid()); @@ -240,7 +240,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { hallOwnerErbanNoStrList = Arrays.asList(hallOwnerErbanNo.replaceAll(",", ",").split(",")); hallOwnerErbanNoStrList = hallOwnerErbanNoStrList.stream().distinct().collect(Collectors.toList()); } - // 先获取所有会长大鹅开黑号 + // 先获取所有会长平台号 List erbanNoList = clanAdminMapper.listHallOwnerErbanNoByClanId(clanId); List excludeUidList = null; // 以集合数量多的为主,获取发生变化的 用户列表 @@ -470,7 +470,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { Long erbanNo = Long.valueOf(erbanStr); Users user = usersService.getUserByErbanNo(erbanNo); if (null == user) { - throw new ServiceException("大鹅开黑号" + erbanStr + "对应用户不存在"); + throw new ServiceException("平台号" + erbanStr + "对应用户不存在"); } HallExample hallExample = new HallExample(); @@ -478,7 +478,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { .andOwnerUidEqualTo(user.getUid()); List hallList = hallmapper.selectByExample(hallExample); if (CollectionUtils.isEmpty(hallList)) { - throw new ServiceException("大鹅开黑号" + erbanStr + "对应的工会不存在"); + throw new ServiceException("平台号" + erbanStr + "对应的工会不存在"); } Hall hall = hallList.get(0); @@ -487,7 +487,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { .eq(ClanHall::getStatus, Constant.status.valid); ClanHall clanHall = clanHallService.getOne(clanHallQuery); if (null != clanHall && !hallIdInDB.contains(clanHall.getHallId())) { - throw new ServiceException("大鹅开黑号" + erbanStr + "对应的工会已加入其它家族"); + throw new ServiceException("平台号" + erbanStr + "对应的工会已加入其它家族"); } hallIdInputList.add(hall.getId()); @@ -595,7 +595,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { Long erbanNo = Long.valueOf(erbanStr); Users user = usersService.getUserByErbanNo(erbanNo); if (null == user) { - throw new ServiceException("大鹅开黑号" + erbanStr + "对应用户不存在"); + throw new ServiceException("平台号" + erbanStr + "对应用户不存在"); } HallExample hallExample = new HallExample(); @@ -603,7 +603,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { .andOwnerUidEqualTo(user.getUid()); List hallList = hallmapper.selectByExample(hallExample); if (CollectionUtils.isEmpty(hallList)) { - throw new ServiceException("大鹅开黑号" + erbanStr + "对应的工会不存在"); + throw new ServiceException("平台号" + erbanStr + "对应的工会不存在"); } Hall hall = hallList.get(0); @@ -612,7 +612,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { .eq(ClanHall::getStatus, Constant.status.valid); ClanHall clanHall = clanHallService.getOne(queryWrapper); if (null != clanHall) { - throw new ServiceException("大鹅开黑号" + erbanStr + "对应的工会已加入其它家族"); + throw new ServiceException("平台号" + erbanStr + "对应的工会已加入其它家族"); } hallIdList.add(hall.getId()); } @@ -667,7 +667,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { public void superSaveOrUpdate(Long superErbanNo, String superManageErbanNo, Integer type, Long clanId) { Users user = usersService.getUserByErbanNo(superErbanNo); if(user == null){ - throw new ServiceException("大鹅开黑号" + superErbanNo + "对应用户不存在"); + throw new ServiceException("平台号" + superErbanNo + "对应用户不存在"); } Long superUid = user.getUid(); String roomUids = ""; @@ -688,7 +688,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { if(roomUser != null){ // 判断新增加的是否存在 if(!CollectionUtils.isEmpty(superManageRoomList) && superManageRoomList.contains(roomUser.getUid())){ - throw new ServiceException("大鹅开黑号" + roomUser.getErbanNo() + "已经是超管,添加失败"); + throw new ServiceException("平台号" + roomUser.getErbanNo() + "已经是超管,添加失败"); } roomUids = roomUids + roomUser.getUid() + ","; } @@ -929,7 +929,7 @@ public class ClanAdminServiceImpl implements ClanAdminService { } /** - * 检查大鹅开黑号是否有被其他族长关联J + * 检查平台号是否有被其他族长关联J * @param clanElderUid * @param associateAccount * @return diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/discovery/DiscoveryAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/discovery/DiscoveryAdminService.java index 6daaac6b4..7dcf3856f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/discovery/DiscoveryAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/discovery/DiscoveryAdminService.java @@ -68,7 +68,7 @@ public class DiscoveryAdminService { List discoveryVos = discoveryMapperExpand.queryAllDiscoveries(record); if(discoveryVos!=null&&discoveryVos.size()>0){ for(int i=0;i { public BusiResult addRoomList(List erbanNos, Integer giftId, Integer adminId) { List list = Lists.newArrayList(); Map retMap = new HashMap(); - //添加失败的大鹅开黑号 + //添加失败的平台号 List failErbanNos = new ArrayList(); //添加失败的原因 List failReason = new ArrayList(); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java index ad836451e..461d754fb 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java @@ -73,7 +73,7 @@ public class RoomGiftSerialService { } List list = roomGiftSerialMapper.listV3(uidList, isPermit, startTime, endTime); - // 如果uidList为空则证明没有大鹅开黑号查询. + // 如果uidList为空则证明没有平台号查询. if (CollectionUtils.isEmpty(uidList)) { uidList = list.stream().map((serial) -> String.valueOf(serial.getRoomUid())).collect(Collectors.toList()); } @@ -153,7 +153,7 @@ public class RoomGiftSerialService { private List listSerials(List erbanNoList, Integer permit, String startTime, String endTime, Integer page, Integer size) { StopWatch stopWatch = new StopWatch(); List uidList = Collections.emptyList(); - // 根据大鹅开黑号查询出uid + // 根据平台号查询出uid if (!CollectionUtils.isEmpty(erbanNoList)) { uidList = usersBaseService.getUidByErbanNo(erbanNoList); if (CollectionUtils.isEmpty(uidList)) { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/hall/HallAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/hall/HallAdminService.java index ab9ed9578..9427dc38b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/hall/HallAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/hall/HallAdminService.java @@ -136,7 +136,7 @@ public class HallAdminService extends BaseService { */ public void addHallMember(Long memberErbanNo, Long hallId, Byte roleType, Integer adminId) { if (null == memberErbanNo) { - throw new ServiceException("传入的大鹅开黑号为空"); + throw new ServiceException("传入的平台号为空"); } if (null == hallId) { throw new ServiceException("传入的公会id为空"); @@ -146,7 +146,7 @@ public class HallAdminService extends BaseService { } Users user = usersService.getUserByErbanNo(memberErbanNo); if (user == null) { - throw new ServiceException("大鹅开黑号对应用户不存在"); + throw new ServiceException("平台号对应用户不存在"); } Hall hall = hallService.getHall(hallId); if (hall == null) { @@ -269,14 +269,14 @@ public class HallAdminService extends BaseService { */ public void delHallMember(Long memberErbanNo, Long hallId, Integer adminId) { if (null == memberErbanNo) { - throw new ServiceException("传入的大鹅开黑号为空"); + throw new ServiceException("传入的平台号为空"); } if (null == hallId) { throw new ServiceException("传入的公会id为空"); } Users user = usersService.getUserByErbanNo(memberErbanNo); if (user == null) { - throw new ServiceException("大鹅开黑号对应用户不存在"); + throw new ServiceException("平台号对应用户不存在"); } Hall hall = hallService.getHall(hallId); if (hall == null) { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/home/HomeResourceAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/home/HomeResourceAdminService.java index 227530de9..60c88e5fc 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/home/HomeResourceAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/home/HomeResourceAdminService.java @@ -287,17 +287,17 @@ public class HomeResourceAdminService extends BaseService { public void checkParam(HomeRecommenResourceParam param) { if (Constant.BigGooseResourceType.custom_room == param.getResourceA()) { - if (StringUtils.isEmpty(param.getContentA())) throw new ServiceException("自定义资源房主大鹅开黑号不能为空"); + if (StringUtils.isEmpty(param.getContentA())) throw new ServiceException("自定义资源房主平台号不能为空"); this.checkErbanNo(param.getContentA().split(StrUtil.COMMA)); } if (Constant.BigGooseResourceType.custom_room == param.getResourceB()) { - if (StringUtils.isEmpty(param.getContentB())) throw new ServiceException("自定义资源房主大鹅开黑号不能为空"); + if (StringUtils.isEmpty(param.getContentB())) throw new ServiceException("自定义资源房主平台号不能为空"); this.checkErbanNo(param.getContentB().split(StrUtil.COMMA)); } if (Constant.BigGooseResourceType.custom_room == param.getResourceC()) { - if (StringUtils.isEmpty(param.getContentC())) throw new ServiceException("自定义资源房主大鹅开黑号不能为空"); + if (StringUtils.isEmpty(param.getContentC())) throw new ServiceException("自定义资源房主平台号不能为空"); this.checkErbanNo(param.getContentC().split(StrUtil.COMMA)); } } @@ -317,7 +317,7 @@ public class HomeResourceAdminService extends BaseService { } if (!org.apache.commons.collections4.CollectionUtils.isEmpty(errErbanNoList)) { - throw new ServiceException("以下大鹅开黑号填写不正确[" + com.accompany.core.util.StringUtils.join(errErbanNoList.toArray(), StrUtil.COMMA) + "]"); + throw new ServiceException("以下平台号填写不正确[" + com.accompany.core.util.StringUtils.join(errErbanNoList.toArray(), StrUtil.COMMA) + "]"); } } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGiveKeyService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGiveKeyService.java index 359054c9c..3f908914f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGiveKeyService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGiveKeyService.java @@ -62,7 +62,7 @@ public class OfficialGiveKeyService extends BaseService { Users users = usersService.getUserByErbanNo(Long.valueOf(erNo.trim())); if (users == null) { busiResult.setCode(-1); - busiResult.setMessage("大鹅开黑号为[" + erNo + "]的用户不存在"); + busiResult.setMessage("平台号为[" + erNo + "]的用户不存在"); return busiResult; } //赠送钥匙--1.插入prize_key_record 2.增加用户钥匙数(区分钥匙类型) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RecommendRoomAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RecommendRoomAdminService.java index 555be01a1..554272e2e 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RecommendRoomAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RecommendRoomAdminService.java @@ -133,7 +133,7 @@ public class RecommendRoomAdminService extends BaseService { * 获取房间导流统计列表 * @param startDate * @param endDate - * @param checkType 搜索类型,1为根据房主大鹅开黑号,2为根据房间类型 + * @param checkType 搜索类型,1为根据房主平台号,2为根据房间类型 * @param erbanNo * @param roomType * @return @@ -141,7 +141,7 @@ public class RecommendRoomAdminService extends BaseService { public Map queryStatisList(Date startDate,Date endDate,Integer checkType,Long erbanNo,Byte roomType,Integer pageNum,Integer pageSize){ Map map = new HashMap<>(); if(checkType == 1){ - // 根据房主大鹅开黑号寻找 + // 根据房主平台号寻找 map = this.queryStatisListByErbanNo(erbanNo,startDate,endDate,pageNum,pageSize); }else{ map = this.queryStatisListByRoomType(roomType,startDate,endDate,pageNum,pageSize); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java index 36e181148..4d9827ca7 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java @@ -287,11 +287,11 @@ public class RoomAdminService extends BaseService { } if (!CollectionUtils.isEmpty(errErbanNoList)) { - throw new ServiceException("以下大鹅开黑号填写不正确[" + StringUtils.join(errErbanNoList.toArray(), StrUtil.COMMA) + "]"); + throw new ServiceException("以下平台号填写不正确[" + StringUtils.join(errErbanNoList.toArray(), StrUtil.COMMA) + "]"); } if (!CollectionUtils.isEmpty(invalidList)) { - throw new ServiceException("以下大鹅开黑号房间不是牌照房[" + StringUtils.join(invalidList.toArray(), StrUtil.COMMA) + "]"); + throw new ServiceException("以下平台号房间不是牌照房[" + StringUtils.join(invalidList.toArray(), StrUtil.COMMA) + "]"); } } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java index 805ff71e2..b3dbbfb03 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java @@ -82,7 +82,7 @@ public class OperationSmsAdminService extends BaseService { throw new ServiceException(BusiStatus.ROW_IS_EMPTY); } OperationSmsRecord record = new OperationSmsRecord(); - //第一列为大鹅开黑号,第二列为手机号码 + //第一列为平台号,第二列为手机号码 Cell firstCell = row.getCell(row.getFirstCellNum()); Cell secondCell = row.getCell(row.getFirstCellNum() + 1); if (firstCell != null) { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java index 3bfaed5ab..6f14f5650 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java @@ -134,7 +134,7 @@ public class BillRecordAdminService extends BaseService { } /** - * 根据用户大鹅开黑号查询指定日期的消费情况 + * 根据用户平台号查询指定日期的消费情况 * @param erbanNo * @param startDate * @param endDate diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java index 4c338574f..03ee687a3 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java @@ -187,7 +187,7 @@ public class ChargeRecordAdminService extends BaseService { criteria.andPingxxChargeIdIn(Arrays.asList(chargeRecordId.split(","))); } else if(Constant.ChargeRecordSearchType.PERSONAL.equals(searchType)){ - // 根据个人大鹅开黑号查询 + // 根据个人平台号查询 example.setOrderByClause("create_time desc"); criteria.andUidEqualTo(uid); if(!BlankUtil.isBlank(channel) && !channel.equals("all")){ diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java index 8a8c6abb3..18cbc4150 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java @@ -166,7 +166,7 @@ public class InviteCodeAdminService extends BaseService { @Transactional(rollbackFor = Exception.class) public void addUserSpecialInviteCode(AddInviteCodeReqParams params) { if (StringUtils.isBlank(params.getErbanNo())) { - throw new ServiceException(BusiStatus.PARAMERROR, "大鹅开黑号不能为空"); + throw new ServiceException(BusiStatus.PARAMERROR, "平台号不能为空"); } if (StringUtils.isBlank(params.getInviteCode())) { throw new ServiceException(BusiStatus.PARAMERROR, "邀请码不能为空"); @@ -181,7 +181,7 @@ public class InviteCodeAdminService extends BaseService { Users user = usersBaseService.getUsersByErBanNo(Long.valueOf(params.getErbanNo())); if (user == null) { - throw new ServiceException(BusiStatus.BUSIERROR, "大鹅开黑号不存在"); + throw new ServiceException(BusiStatus.BUSIERROR, "平台号不存在"); } Long uid = inviteCodeService.getUidByInviteCode(params.getInviteCode()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserBackpackAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserBackpackAdminService.java index b15b448f7..075fea9ab 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserBackpackAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserBackpackAdminService.java @@ -48,7 +48,7 @@ public class UserBackpackAdminService extends BaseService { if(null != erbanNo) { Users users = usersService.getUserByErbanNo(erbanNo); if(null == users) { - logger.warn("大鹅开黑号为{}的用户不存在!", erbanNo); + logger.warn("平台号为{}的用户不存在!", erbanNo); PageHelper.startPage(pageNumber, pageSize); return new PageInfo<>(Lists.newArrayList()); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java index d8eca64cf..d57272018 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java @@ -82,10 +82,10 @@ public class UserFrozenAdminService extends BaseService { //用户信息 Users users = usersBaseService.getUsersByErBanNo(Long.valueOf(erbanNoStr)); if(null == users) { - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的用户不存在!"); + throw new BusinessException("平台号为"+ erbanNo + "的用户不存在!"); } if(users.getUseStatus() == Constant.UserStatus.FROZEN){ - throw new BusinessException("大鹅开黑号为"+ erbanNo + "已被冻结!"); + throw new BusinessException("平台号为"+ erbanNo + "已被冻结!"); } users.setUseStatus(Constant.UserStatus.FROZEN); @@ -112,10 +112,10 @@ public class UserFrozenAdminService extends BaseService { //用户信息 Users users = usersBaseService.getUsersByErBanNo(Long.valueOf(erbanNoStr)); if(null == users) { - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的用户不存在!"); + throw new BusinessException("平台号为"+ erbanNo + "的用户不存在!"); } if(users.getUseStatus() == Constant.UserStatus.NORMAL){ - throw new BusinessException("大鹅开黑号为"+ erbanNo + "已是正常状态!"); + throw new BusinessException("平台号为"+ erbanNo + "已是正常状态!"); } users.setUseStatus(Constant.UserStatus.NORMAL); usersBaseService.updateUser(users); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserImpeachAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserImpeachAdminService.java index bf0c1620a..435a2e5b3 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserImpeachAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserImpeachAdminService.java @@ -252,7 +252,7 @@ public class UserImpeachAdminService extends BaseService { //被举报者消息文本 String msgTxt = "您在%s因%s被举报,因此平台将对您的账号%s。"; //举报者消息文本 - String informerMsgTxt = "您在%s向平台举报%s因%s,经平台审核验证,已对用户账号%s。欢迎共同监督,保护平台健康交友环境,大鹅开黑感谢您的支持与反馈!"; + String informerMsgTxt = "您在%s向平台举报%s因%s,经平台审核验证,已对用户账号%s。欢迎共同监督,保护平台健康交友环境,平台感谢您的支持与反馈!"; String msg = ""; String informerMsg = ""; @@ -270,7 +270,7 @@ public class UserImpeachAdminService extends BaseService { informerMsg = String.format(informerMsgTxt, DateTimeUtil.convertDate(model.getCreateTime()), targetUser.getNick(), model.getReason(), UserImpeachHandleResultEnum.WARN.getDesc()); } if (handleResult == UserImpeachHandleResultEnum.IGNORE.getValue()) { - informerMsgTxt = "您在%s向平台举报%s因%s,经平台审核验证,该举报无效。欢迎共同监督,保护平台健康交友环境,大鹅开黑感谢您的支持与反馈!"; + informerMsgTxt = "您在%s向平台举报%s因%s,经平台审核验证,该举报无效。欢迎共同监督,保护平台健康交友环境,平台感谢您的支持与反馈!"; informerMsg = String.format(informerMsgTxt, DateTimeUtil.convertDate(model.getCreateTime()), targetUser.getNick(), model.getReason()); if (!StringUtils.isEmpty(targetUser.getNick())) { sendLivePassMsg(String.valueOf(uid), informerMsg); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserMuteAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserMuteAdminService.java index 2e1ea7e46..ae0bfb0ab 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserMuteAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserMuteAdminService.java @@ -56,7 +56,7 @@ public class UserMuteAdminService extends BaseService { //用户信息 Users users = usersBaseService.getUsersByErBanNo(erbanNo); if(null == users) { - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的用户不存在!"); + throw new BusinessException("平台号为"+ erbanNo + "的用户不存在!"); } record.setErbanNo(users.getErbanNo()); record.setUid(users.getUid()); @@ -67,11 +67,11 @@ public class UserMuteAdminService extends BaseService { if(null != roomErbanNo) { Users roomUsers = usersBaseService.getUsersByErBanNo(erbanNo); if(null == roomUsers) { - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的用户不存在!"); + throw new BusinessException("平台号为"+ erbanNo + "的用户不存在!"); } Room room = roomService.getRoomCacheByUid(roomUsers.getUid()); if(null == room) { - throw new BusinessException("大鹅开黑号为"+ erbanNo + "的用户不是房主!"); + throw new BusinessException("平台号为"+ erbanNo + "的用户不是房主!"); } roomId = room.getRoomId(); roomUid = room.getUid(); @@ -98,7 +98,7 @@ public class UserMuteAdminService extends BaseService { if(ret.getCode() == 200 || ret.getCode() == 417) { return userMuteAdminMapper.insertSelective(record); } else { - logger.warn("添加禁言管理员失败,大鹅开黑号:{},房间id:{},云信返回值:{}", + logger.warn("添加禁言管理员失败,平台号:{},房间id:{},云信返回值:{}", record.getErbanNo(), record.getRoomId(), ret.getCode()); } return 0; @@ -159,7 +159,7 @@ public class UserMuteAdminService extends BaseService { updateRecord.setStatus(disabled); return userMuteAdminMapper.updateByPrimaryKeySelective(updateRecord); } else { - logger.warn("删除禁言管理员失败,大鹅开黑号:{},房间id:{},云信返回值:{}", + logger.warn("删除禁言管理员失败,平台号:{},房间id:{},云信返回值:{}", record.getErbanNo(), record.getRoomId(), ret.getCode()); } return 0; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java index 9d2f84ba3..13c04a723 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java @@ -91,7 +91,7 @@ public class DynamicDataAdminService extends BaseService { HSSFSheet sheet = workbook.createSheet("话题动态数据"); //String[] headers = { "序号", "66ID", "昵称", "性别", "话题", "动态内容", "图片/视频/语音", "发布时间", "分享人数/次数", "评论人数/次数", "点赞人数/次数", "阅读数","热度值"}; - String[] headers = { "序号", "大鹅开黑号", "昵称", "性别", "话题", "动态内容", "标签", "图片/视频/语音", "发布时间"}; + String[] headers = { "序号", "平台号", "昵称", "性别", "话题", "动态内容", "标签", "图片/视频/语音", "发布时间"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordVo.java index 6d26d1e5c..6f1bfc26a 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordVo.java @@ -15,19 +15,19 @@ import java.util.Date; @Data public class BillRecordVo extends BaseVo { - @FieldComment("查询用户大鹅开黑号") + @FieldComment("查询用户平台号") public Long erbanNo; @FieldComment("查询用户昵称") public String nick; @FieldComment("查询用户uid") public Long targetUid; - @FieldComment("对应对象大鹅开黑号") + @FieldComment("对应对象平台号") public Long targetErbanNo; @FieldComment("对应对象昵称") public String targetNick; @FieldComment("房间uid") public Long roomUid; - @FieldComment("房主大鹅开黑号") + @FieldComment("房主平台号") public Long roomErbanNo; @FieldComment("消费地点房主昵称") public String roomNick; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java index 62596a774..f20e0f962 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java @@ -10,8 +10,8 @@ public class ChargeRecordAdminVo extends BaseVo { @FieldComment("主键id") public String chargeRecordId; // 主键ID - @FieldComment("大鹅开黑号") - public Long erbanNo; // 大鹅开黑号 + @FieldComment("平台号") + public Long erbanNo; // 平台号 @FieldComment("uid") public Long uid; // uid @FieldComment("昵称") diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/UserBackpackVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/UserBackpackVo.java index dc1748bac..717952bc5 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/UserBackpackVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/UserBackpackVo.java @@ -18,7 +18,7 @@ public class UserBackpackVo { private Long uid; /** - * 用户大鹅开黑号 + * 用户平台号 */ private Long erbanNo; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/WorldMemberAdminVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/WorldMemberAdminVo.java index c2a10aa17..1111cefd3 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/WorldMemberAdminVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/WorldMemberAdminVo.java @@ -12,7 +12,7 @@ public class WorldMemberAdminVo { private Long id; /** - * 大鹅开黑号 + * 平台号 */ private Long erbanNo; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagRecordAdminVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagRecordAdminVo.java index 76274a58a..a1127c41a 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagRecordAdminVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagRecordAdminVo.java @@ -13,11 +13,11 @@ public class LuckyBagRecordAdminVo extends BaseVo { public Long id; @FieldComment("福袋id") public Long luckyBagId; - @FieldComment("送礼人大鹅开黑号") + @FieldComment("送礼人平台号") public Long erbanNo; @FieldComment("送礼人昵称") public String nick; - @FieldComment("收礼人大鹅开黑号") + @FieldComment("收礼人平台号") public Long receiveErbanNo; @FieldComment("收礼人昵称") public String receiveNick; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagStatsAdminVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagStatsAdminVo.java index bfe354868..a4b7e056c 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagStatsAdminVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/luckybag/LuckyBagStatsAdminVo.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class LuckyBagStatsAdminVo extends BaseVo { - @FieldComment("大鹅开黑号") + @FieldComment("平台号") public Long erbanNo; @FieldComment("昵称") public String nick; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/redenvelope/RedEnvelopeAdminVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/redenvelope/RedEnvelopeAdminVo.java index db39ac57c..58493ef07 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/redenvelope/RedEnvelopeAdminVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/redenvelope/RedEnvelopeAdminVo.java @@ -30,8 +30,8 @@ public class RedEnvelopeAdminVo implements Serializable { private String getNumDesc; // 领取数量比例 private Integer backAmount; // 退还钻石 private String roomTitle; // 房间标题 - private Long erbanNo; // 大鹅开黑号 + private Long erbanNo; // 平台号 private String nick; // 昵称 - private Long roomErbanNo; // 房间大鹅开黑号 + private Long roomErbanNo; // 房间平台号 } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/stats/UserDeatilVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/stats/UserDeatilVo.java index 131b66ee1..8a2529682 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/stats/UserDeatilVo.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/stats/UserDeatilVo.java @@ -19,9 +19,9 @@ public class UserDeatilVo extends BaseVo { @FieldComment("uid") public Long uid; /** - * 用户大鹅开黑号 + * 用户平台号 */ - @FieldComment("大鹅开黑号") + @FieldComment("平台号") public Long erbanNo; /** * 昵称 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java index 9fae8d632..2be8644b1 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java @@ -110,7 +110,7 @@ public class LuckySeaActAdminController extends BaseController { try { List headerList = new ArrayList<>(); headerList.add("uid"); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("昵称"); headerList.add("轮次"); headerList.add("结束时间"); @@ -166,7 +166,7 @@ public class LuckySeaActAdminController extends BaseController { try { List headerList = new ArrayList<>(); headerList.add("uid"); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("昵称"); headerList.add("投入"); headerList.add("平台价值"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarAdminController.java index 18ced5be7..c714ed258 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarAdminController.java @@ -67,7 +67,7 @@ public class CarAdminController extends BaseController { @RequestMapping(value = "/experByOfficial", method = RequestMethod.POST) public void experByOfficial(String erbanNo, Integer carId, Integer days, String desc, Integer otherDay) { - //赠送失败的大鹅开黑号 + //赠送失败的平台号 List failErban = new ArrayList(); //赠送失败原因 List failReason = new ArrayList(); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/FirstChargeRewardAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/FirstChargeRewardAdminController.java index 69bec3c01..6782b10ed 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/FirstChargeRewardAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/FirstChargeRewardAdminController.java @@ -45,7 +45,7 @@ public class FirstChargeRewardAdminController extends BaseController { List recordList = (List) data.get("rows"); try { List headerList = new LinkedList<>(); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("用户昵称"); headerList.add("邀请码"); headerList.add("注册时间"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyAdminController.java index 4265749d5..77011f096 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyAdminController.java @@ -239,7 +239,7 @@ public class FamilyAdminController extends BaseController { private HSSFWorkbook buildFamilyExcel(List list) { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("家族列表"); - String[] headers = {"编号","家族ID","家族名称","族长大鹅开黑号","族长昵称","家族币昵称","家族成员数","家族币余额","家族状态","创建时间","更新时间"}; + String[] headers = {"编号","家族ID","家族名称","族长平台号","族长昵称","家族币昵称","家族成员数","家族币余额","家族状态","创建时间","更新时间"}; HSSFRow header = sheet.createRow(0); for(int i = 0;i < headers.length;i++){ header.createCell(i).setCellValue(headers[i]); @@ -297,7 +297,7 @@ public class FamilyAdminController extends BaseController { private HSSFWorkbook buildFamilyMemberExcel(List list) { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("家族成员列表"); - String[] headers = {"编号","成员大鹅开黑号","成员昵称","所在家族ID","所在家族名称","家族币余额","家族职位","加入家族时间"}; + String[] headers = {"编号","成员平台号","成员昵称","所在家族ID","所在家族名称","家族币余额","家族职位","加入家族时间"}; HSSFRow header = sheet.createRow(0); for(int i = 0;i < headers.length;i++){ header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamemanage/GameManageWithdrawAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamemanage/GameManageWithdrawAdminController.java index f5b6f607d..52bbe980e 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamemanage/GameManageWithdrawAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamemanage/GameManageWithdrawAdminController.java @@ -164,7 +164,7 @@ public class GameManageWithdrawAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("提现申请名单"); - String[] headers = {"大鹅开黑号", "昵称", "手机号码", "账号", "账号名", "账号类型", "提现钻石", "折合人民币","税额","申请时间", "描述", "备注", "黑名单状态", "审核状态", "支付状态", "支付结果", "真实姓名", "身份证号"}; + String[] headers = {"平台号", "昵称", "手机号码", "账号", "账号名", "账号类型", "提现钻石", "折合人民币","税额","申请时间", "描述", "备注", "黑名单状态", "审核状态", "支付状态", "支付结果", "真实姓名", "身份证号"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java index f52b3ed05..d8d58e684 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java @@ -369,7 +369,7 @@ public class GiftAdminController extends BaseController { String title = "后台赠送礼物(" + gift.getGiftName() + ")"; enterpriseWeChatPushAdminService.pushMessage(erbanList, title, getAdminId(), giftNum.longValue()); - //赠送失败的大鹅开黑号 + //赠送失败的平台号 List failErban = new ArrayList(); //赠送失败原因 List failReason = new ArrayList(); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialController.java index 981a428d0..d9941dc14 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialController.java @@ -121,7 +121,7 @@ public class RoomGiftSerialController extends BaseController { List headerList = new ArrayList<>(); headerList.add("房间名称"); headerList.add("房主名称"); - headerList.add("房主大鹅开黑号"); + headerList.add("房主平台号"); headerList.add("总流水"); headerList.add("普通礼物流水"); headerList.add("背包礼物流水"); @@ -149,7 +149,7 @@ public class RoomGiftSerialController extends BaseController { } /** - * 将大鹅开黑号(多个)转换为大鹅开黑号集合 + * 将平台号(多个)转换为平台号集合 * * @param erbanNos * @return diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildRoomAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildRoomAdminController.java index e348e71d6..d1ed0f6cb 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildRoomAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildRoomAdminController.java @@ -128,7 +128,7 @@ public class GuildRoomAdminController extends BaseController { private HSSFWorkbook buildGuildRoomExcel(List list) { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("公会房间列表"); - String[] headers = {"编号","大鹅开黑号","厅类型","厅类型","厅类型","厅标题","房主手机号","房主流水比例(%)","房主支付宝账号","房主支付宝名称","介绍人","介绍人流水比例(%)","介绍人手机号码","介绍人支付宝账号","介绍人支付宝名称","创建时间","变更时间"}; + String[] headers = {"编号","平台号","厅类型","厅类型","厅类型","厅标题","房主手机号","房主流水比例(%)","房主支付宝账号","房主支付宝名称","介绍人","介绍人流水比例(%)","介绍人手机号码","介绍人支付宝账号","介绍人支付宝名称","创建时间","变更时间"}; HSSFRow header = sheet.createRow(0); for(int i = 0;i < headers.length;i++){ header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeRecommController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeRecommController.java index 95d74b56b..a8f159b33 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeRecommController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeRecommController.java @@ -54,7 +54,7 @@ public class HomeRecommController { /** * 增加Banner * - * @param erbanNo 大鹅开黑号 + * @param erbanNo 平台号 * @param seqNo 排序 * @return */ @@ -105,7 +105,7 @@ public class HomeRecommController { } /** - * 获取热门推荐列表(带有大鹅开黑号) + * 获取热门推荐列表(带有平台号) * * @return */ @@ -124,7 +124,7 @@ public class HomeRecommController { /** * 增加热门推荐 * - * @param erbanNo 大鹅开黑号 + * @param erbanNo 平台号 * @param seqNo 排序 * @return */ diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/live/LiveAttestationAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/live/LiveAttestationAdminController.java index 64ef9b5e6..1a79a866b 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/live/LiveAttestationAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/live/LiveAttestationAdminController.java @@ -61,7 +61,7 @@ public class LiveAttestationAdminController extends BaseController { * 101认证-操作记录后台--后台操作员操作记录 * * @param uid 用户id - * @param id 大鹅开黑号 + * @param id 平台号 * @param skillTagName 标签名 * @param applyStartTime 申请时间-起始 * @param applyEndTime 申请时间-结束 @@ -103,7 +103,7 @@ public class LiveAttestationAdminController extends BaseController { * 101认证-认证管理后台--已认证未删除的记录 * * @param uid 用户id - * @param id 大鹅开黑号 + * @param id 平台号 * @param skillTagName 标签名 * @param applyStartTime 申请时间-起始 * @param applyEndTime 申请时间-结束 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/match/GameMatchAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/match/GameMatchAdminController.java index 22574904f..0baef76b3 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/match/GameMatchAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/match/GameMatchAdminController.java @@ -70,7 +70,7 @@ public class GameMatchAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("报名情况"); - String[] headers = {"比赛id","uid", "大鹅开黑号","用户昵称", "绑定昵称", "绑定编号"}; + String[] headers = {"比赛id","uid", "平台号","用户昵称", "绑定昵称", "绑定编号"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserBoxPrizeRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserBoxPrizeRecordAdminController.java index 9dff7e333..753d2a4f4 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserBoxPrizeRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserBoxPrizeRecordAdminController.java @@ -95,7 +95,7 @@ public class UserBoxPrizeRecordAdminController extends BaseController { List headerList = new ArrayList<>(); headerList.add("id"); headerList.add("uid"); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("用户昵称"); headerList.add("奖品名称"); headerList.add("抽奖时间"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/radish/RadishGiftAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/radish/RadishGiftAdminController.java index c87156296..f77597dfb 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/radish/RadishGiftAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/radish/RadishGiftAdminController.java @@ -64,7 +64,7 @@ public class RadishGiftAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("萝卜礼物统计数据"); - String[] headers = {"UID", "大鹅开黑号", "用户昵称", "礼物金额(萝卜)"}; + String[] headers = {"UID", "平台号", "用户昵称", "礼物金额(萝卜)"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); @@ -81,7 +81,7 @@ public class RadishGiftAdminController extends BaseController { } /** - * 将大鹅开黑号(多个)转换为大鹅开黑号集合 + * 将平台号(多个)转换为平台号集合 * * @param erbanNos * @return diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java index 396943c33..abb684fc1 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java @@ -41,7 +41,7 @@ public class GiveKeyAdminController extends BaseController { /** * 赠送金币、萝卜 * - * @param ernos 大鹅开黑号,多个号用换行符分隔 + * @param ernos 平台号,多个号用换行符分隔 * @param type 钥匙类型 1-普通钥匙|2-至尊蛋钥匙 * @param num 赠送数量 * @param remark 备注 @@ -70,7 +70,7 @@ public class GiveKeyAdminController extends BaseController { /** * 获取用户信息 * - * @param ernos 大鹅开黑号,多个号用换行符分隔 + * @param ernos 平台号,多个号用换行符分隔 * @return */ @RequestMapping("/userinfo") diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java index 701529d59..6490cd970 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java @@ -139,7 +139,7 @@ public class GoldCoinController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("后台充值记录"); - String[] headers = {"大鹅开黑号", "uid", "赠送类型", "赠送金币数量", "赠送钻石数量", "操作人", "操作时间", "备注"}; + String[] headers = {"平台号", "uid", "赠送类型", "赠送金币数量", "赠送钻石数量", "操作人", "操作时间", "备注"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomPoolController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomPoolController.java index 9b5e997c8..02be33c09 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomPoolController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomPoolController.java @@ -41,7 +41,7 @@ public class RoomPoolController extends BaseController { /** * 增加房间到配置池 * - * @param erbanNoStr 大鹅开黑号,多个大鹅开黑号可以用逗号分隔 + * @param erbanNoStr 平台号,多个平台号可以用逗号分隔 */ @RequestMapping("/add") @ResponseBody diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomVisitorController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomVisitorController.java index 30e886e0f..52f8cd278 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomVisitorController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomVisitorController.java @@ -148,7 +148,7 @@ public class RoomVisitorController extends BaseController { if(CollectionUtils.isEmpty(chargeListVo) && CollectionUtils.isEmpty(giftSendListVo)){ return workbook; } - String[] headers = {"大鹅开黑号", "昵称", "手机号码", "性别", "注册时间", "充值次数", "充值金额", "送礼次数","送礼金额"}; + String[] headers = {"平台号", "昵称", "手机号码", "性别", "注册时间", "充值次数", "充值金额", "送礼次数","送礼金额"}; XSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/TopicRoomController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/TopicRoomController.java index 170822add..50cb4f72b 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/TopicRoomController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/TopicRoomController.java @@ -108,7 +108,7 @@ public class TopicRoomController extends BaseController { try { List headerList = new ArrayList<>(); headerList.add("排序"); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("话题标题"); headerList.add("房间标题"); headerList.add("房间创建时间"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/DrawGoldController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/DrawGoldController.java index 5ac94474b..9f3e2e842 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/DrawGoldController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/DrawGoldController.java @@ -87,7 +87,7 @@ public class DrawGoldController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("瓜分记录"); - String[] headers = { "大鹅开黑号", "用户昵称", "奖品", "奖品等级", "瓜分时间"}; + String[] headers = { "平台号", "用户昵称", "奖品", "奖品等级", "瓜分时间"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/SignAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/SignAdminController.java index af7f1aa25..f39e2122a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/SignAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sign/SignAdminController.java @@ -70,7 +70,7 @@ public class SignAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("签到记录"); - String[] headers = {"uid", "大鹅开黑号", "昵称", "奖品名称", "奖品数量", "奖品天数", "签到时间", "注册时间"}; + String[] headers = {"uid", "平台号", "昵称", "奖品名称", "奖品数量", "奖品天数", "签到时间", "注册时间"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); @@ -114,7 +114,7 @@ public class SignAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("累计奖励"); - String[] headers = {"uid", "大鹅开黑号", "昵称", "奖品名称", "奖品数量", "奖励类型", "奖励天数", "奖励时间"}; + String[] headers = {"uid", "平台号", "昵称", "奖品名称", "奖品数量", "奖励类型", "奖励天数", "奖励时间"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsInviteCodeController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsInviteCodeController.java index 9c7c07649..cf447cf16 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsInviteCodeController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsInviteCodeController.java @@ -58,7 +58,7 @@ public class StatsInviteCodeController extends BaseController { try { List headerList = new ArrayList<>(); headerList.add("邀请码"); - headerList.add("使用者大鹅开黑号"); + headerList.add("使用者平台号"); headerList.add("使用者昵称"); headerList.add("使用者手机号"); headerList.add("邀请新注册人数"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java index 9d3602921..d05e2f383 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java @@ -39,7 +39,7 @@ public class UserLevelCharmFixController extends BaseController { public BusiResult single(String erbanNo) { BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); if (StringUtils.isEmpty(erbanNo)) { - busiResult.setMessage("大鹅开黑号不能为空"); + busiResult.setMessage("平台号不能为空"); return busiResult; } String[] erbanNoList = erbanNo.split(","); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java index 28a3d8e35..a1cd808b2 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java @@ -171,7 +171,7 @@ public class ChargeRecordAdminController extends BaseController { } } else { if (erbanNo == null) { - writeJson(false, "请输入大鹅开黑号"); + writeJson(false, "请输入平台号"); } users = usersBaseService.getUsersByErBanNo(erbanNo); if (users == null) { diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserBackpackAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserBackpackAdminController.java index 3093ec8e8..b2b16e44d 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserBackpackAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserBackpackAdminController.java @@ -54,7 +54,7 @@ public class UserBackpackAdminController extends BaseController { try { List headerList = new ArrayList<>(); headerList.add("id"); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("用户昵称"); headerList.add("奖品名称"); headerList.add("奖品类型"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/voice/VoiceAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/voice/VoiceAdminController.java index 0e68ee262..3abc4f7b5 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/voice/VoiceAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/voice/VoiceAdminController.java @@ -80,7 +80,7 @@ public class VoiceAdminController extends BaseController { try { List headerList = new ArrayList<>(); headerList.add("ID"); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("用户昵称"); headerList.add("性别"); headerList.add("语音url"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/PacketWithdrawAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/PacketWithdrawAdminController.java index 49e956306..d130602d0 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/PacketWithdrawAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/PacketWithdrawAdminController.java @@ -187,7 +187,7 @@ public class PacketWithdrawAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("红包提现申请名单"); - String[] headers = {"大鹅开黑号", "手机号码", "支付宝账号", "账号名", "提现金额(元)","税额(元)", "审核状态", "支付状态", "支付结果","申请时间", "备注"}; + String[] headers = {"平台号", "手机号码", "支付宝账号", "账号名", "提现金额(元)","税额(元)", "审核状态", "支付状态", "支付结果","申请时间", "备注"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/RoomFlowPayAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/RoomFlowPayAdminController.java index acfbb5a03..33e6c35d8 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/RoomFlowPayAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/RoomFlowPayAdminController.java @@ -203,7 +203,7 @@ public class RoomFlowPayAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("公会房间流水提成列表"); - String[] headers = {"编号", "日期", "大鹅开黑号", "厅类型", "厅名称","金币流水", "房间流水比例", "应发金额(元)", "介绍人","介绍人额外流水", "额外应发金额","备注","审核状态","支付状态","支付结果","真实姓名","身份证号"}; + String[] headers = {"编号", "日期", "平台号", "厅类型", "厅名称","金币流水", "房间流水比例", "应发金额(元)", "介绍人","介绍人额外流水", "额外应发金额","备注","审核状态","支付状态","支付结果","真实姓名","身份证号"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java index ce88af5ae..24faacd13 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java @@ -161,7 +161,7 @@ public class WithdrawAdminController extends BaseController { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("提现申请名单"); - String[] headers = {"大鹅开黑号", "昵称", "手机号码", "账号", "账号名", "账号类型", "提现钻石", "折合人民币","税额","申请时间", "描述", "备注", "黑名单状态", "审核状态", "支付状态", "支付结果", "真实姓名", "身份证号"}; + String[] headers = {"平台号", "昵称", "手机号码", "账号", "账号名", "账号类型", "提现钻石", "折合人民币","税额","申请时间", "描述", "备注", "黑名单状态", "审核状态", "支付状态", "支付结果", "真实姓名", "身份证号"}; HSSFRow header = sheet.createRow(0); for (int i = 0; i < headers.length; i++) { header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java index 3ac1bfb21..c11039813 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java @@ -97,7 +97,7 @@ public class WithdrawApplyAdminController extends BaseController { try { List headerList = new ArrayList<>(); headerList.add("时间"); - headerList.add("大鹅开黑号"); + headerList.add("平台号"); headerList.add("昵称"); headerList.add("手机号"); headerList.add("提现金额"); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java index bbcec46aa..e02edf5e6 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java @@ -99,7 +99,7 @@ public class WithdrawBlockAdminController extends BaseController { private HSSFWorkbook buildWithdrawBlockExcel(List list){ HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("提现黑名单"); - String[] headers = {"uid", "大鹅开黑号", "昵称", "状态", "备注","创建时间"}; + String[] headers = {"uid", "平台号", "昵称", "状态", "备注","创建时间"}; HSSFRow header = sheet.createRow(0); for(int i = 0;i < headers.length;i++){ header.createCell(i).setCellValue(headers[i]); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldMemberAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldMemberAdminController.java index 22c85261b..eb237ec9d 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldMemberAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldMemberAdminController.java @@ -66,7 +66,7 @@ public class WorldMemberAdminController extends BaseController { erbanNoList.add(erbanNo); } if(erbanNoList.size() <= 0) { - logger.warn("批量保存失败,大鹅开黑号不正确:{}", erbanNos); + logger.warn("批量保存失败,平台号不正确:{}", erbanNos); return new BusiResult(BusiStatus.PARAMERROR); } try { diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/charge_activity_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/charge_activity_admin.html index 21fe70258..8dff0cdb6 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/charge_activity_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/charge_activity_admin.html @@ -90,7 +90,7 @@
- +
@@ -1029,7 +1029,7 @@ var val = $('#modal_skipType').val(); if(val == 1) { $('#modal_skipUrl').val(''); - $('#modal_skipUrl').attr("placeholder", "请输入房主大鹅开黑号"); + $('#modal_skipUrl').attr("placeholder", "请输入房主平台号"); $('#modal_skipUrl').removeAttr('readonly'); $('#showTypeDiv').attr('style', 'display:none;'); } else if(val == 2) { diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/family_PK_manage_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/family_PK_manage_admin.html index 111711ed8..e684d3b59 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/family_PK_manage_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/family_PK_manage_admin.html @@ -540,7 +540,7 @@ // return content; // } }}, - {field: 'roomErbanNoList', title: 'PK家族房主大鹅开黑号', align: 'center', valign: 'middle', width: '10%'}, + {field: 'roomErbanNoList', title: 'PK家族房主平台号', align: 'center', valign: 'middle', width: '10%'}, {field: 'createTime', title: '创建时间', align: 'center', valign: 'middle', width: '15%',formatter: function(val,row,index) { if(val) { var date = new Date(val); diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_record_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_record_admin.html index 0c79b651d..d5c650b5e 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_record_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_record_admin.html @@ -186,7 +186,7 @@ $('#roundDetailTable').bootstrapTable({ columns: [ {field: 'uid', title: 'uid', align: 'center', width: '5%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '5%'}, + {field: 'erbanNo', title: '平台号', align: 'center', width: '5%'}, {field: 'nick', title: '昵称', align: 'center', width: '5%'}, {field: 'costPieceNum', title: '投入', align: 'center', width: '5%',}, {field: 'prizePieceNum', title: '平台价值', align: 'center', width: '5%',} diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_userStat_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_userStat_admin.html index 7febdeec0..5598ca352 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_userStat_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/activity/lucky_sea_userStat_admin.html @@ -6,7 +6,7 @@

- 大鹅开黑号: + 平台号: 开始时间: 结束时间: - + @@ -98,7 +98,7 @@ console.log("load fail"); }, columns:[ - {field:'erbanNo',title:'大鹅开黑号',align:'center',valign:'middle'}, + {field:'erbanNo',title:'平台号',align:'center',valign:'middle'}, {field:'nick',title:'用户昵称',align:'center',valign:'middle'}, { field:'createTime', diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_info_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_info_admin.html index 870b6ab52..70a194a50 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_info_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_info_admin.html @@ -175,7 +175,7 @@
- +
@@ -516,7 +516,7 @@ return val; } }}, - {field: 'chatRoomUid', title: '聊天室大鹅开黑号', align: 'center', width: '20%', formatter: function (val, row, index) { + {field: 'chatRoomUid', title: '聊天室平台号', align: 'center', width: '20%', formatter: function (val, row, index) { if (!val) { return '未设置' } else { @@ -794,7 +794,7 @@ $('#joinedUsersTable').bootstrapTable({ columns: [ {field: 'uid', title: 'uid', align: 'center', width: '5%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '5%'}, + {field: 'erbanNo', title: '平台号', align: 'center', width: '5%'}, {field: 'nick', title: '用户昵称', align: 'center', width: '15%'}, {field: 'gameNick', title: '绑定昵称', align: 'center', width: '15%', }, {field: 'gameId', title: '绑定编号', align: 'center', width: '15%', }, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_quick_game_info_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_quick_game_info_admin.html index e8a270369..5147f33f1 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_quick_game_info_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_quick_game_info_admin.html @@ -146,7 +146,7 @@
- +
@@ -886,7 +886,7 @@ $('#joinedUsersTable').bootstrapTable({ columns: [ {field: 'uid', title: 'uid', align: 'center', width: '5%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '5%'}, + {field: 'erbanNo', title: '平台号', align: 'center', width: '5%'}, {field: 'nick', title: '用户昵称', align: 'center', width: '15%'}, {field: 'gameNick', title: '绑定昵称', align: 'center', width: '15%', }, {field: 'gameId', title: '绑定编号', align: 'center', width: '15%', }, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_withdraw_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_withdraw_admin.html index e915e6a2c..75907c91e 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_withdraw_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/gamemanage/game_manage_withdraw_admin.html @@ -10,7 +10,7 @@
- +
@@ -143,7 +143,7 @@ columns: [ //{field: 'id', title: 'id', align: 'center', width: '5%'}, {field: 'tmp', title: 'id', align: 'center', checkbox: true, width: '5%'}, - {field: 'platformNo', title: '大鹅开黑号', align: 'center', width: '5%'}, + {field: 'platformNo', title: '平台号', align: 'center', width: '5%'}, { field: 'accountType', title: '账号类型', diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/guild/guild_room_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/guild/guild_room_admin.html index 41eaeec82..b32aa0554 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/guild/guild_room_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/guild/guild_room_admin.html @@ -10,7 +10,7 @@
- +
@@ -50,7 +50,7 @@
- +
@@ -178,7 +178,7 @@ $('#table').bootstrapTable({ columns: [ {field: 'tmp', title: 'id', align: 'center', checkbox: true, width: '5%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '5%'}, + {field: 'erbanNo', title: '平台号', align: 'center', width: '5%'}, { field: 'roomType', title: '厅类型', diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_admin.html index b745b19e2..fe955c45a 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_admin.html @@ -10,9 +10,9 @@
- +
+ id="erbanNo" placeholder="请输入族长平台号,填多个用,隔开">
@@ -50,7 +50,7 @@
- +
@@ -62,7 +62,7 @@
- +
@@ -116,7 +116,7 @@
- +
@@ -128,7 +128,7 @@
- +
@@ -195,7 +195,7 @@ - + @@ -232,9 +232,9 @@ - +
- +
@@ -264,7 +264,7 @@ columns: [ {field: 'clanId', title: '家族id', align: 'center', width: '5%'}, {field: 'clanElderUid', title: '族长uid', align: 'center', width: '5%'}, - {field: 'clanElderErbanNo', title: '族长大鹅开黑号', align: 'center', width: '5%'}, + {field: 'clanElderErbanNo', title: '族长平台号', align: 'center', width: '5%'}, {field:'avatar',title:'家族封面',align:'center',valign:'middle',width:'10%', formatter: function(val,row,index) { return ""; diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_flow_statis_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_flow_statis_admin.html index 915713958..d4cc390f2 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_flow_statis_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/clan_flow_statis_admin.html @@ -28,7 +28,7 @@
- +
@@ -216,7 +216,7 @@ }, columns:[ {field: 'clanName', title: '家族名称', align: 'center', width: '5%'}, - {field: 'clanErbanNo', title: '族长大鹅开黑号', align: 'center', width: '5%'}, + {field: 'clanErbanNo', title: '族长平台号', align: 'center', width: '5%'}, {field: 'clanId', title: '家族id', align: 'center', width: '10%'}, {field: 'roomIncome', title: '房间总流水', align: 'center', width: '10%'}, {field: 'bagIncome', title: '背包礼物总流水', align: 'center', width: '10%'}, @@ -252,10 +252,10 @@ $('#table2').bootstrapTable({ columns: [ {field: 'clanName', title: '家族名称', align: 'center', width: '5%'}, - {field: 'clanErbanNo', title: '家族大鹅开黑号', align: 'center', width: '5%'}, + {field: 'clanErbanNo', title: '家族平台号', align: 'center', width: '5%'}, {field: 'clanId', title: '家族id', align: 'center', width: '5%'}, {field: 'roomTitle', title: '房间名称', align: 'center', width: '5%'}, - {field: 'roomErbanNo', title: '房主大鹅开黑号', align: 'center', width: '5%'}, + {field: 'roomErbanNo', title: '房主平台号', align: 'center', width: '5%'}, {field: 'roomIncome', title: '房间流水', align: 'center', width: '5%'}, {field: 'bagIncome', title: '背包流水', align: 'center', width: '5%'}, {field: 'normalGiftIncome', title: '普通礼物流水', align: 'center', width: '5%'}, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/hall_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/hall_admin.html index 6a9fa4b03..6d3dd61b5 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/hall_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/hall/hall_admin.html @@ -12,14 +12,14 @@ id="hallIdStr" placeholder="请输入公会id,填多个用,隔开">
- +
+ id="ownerErbanNo" placeholder="请输入会长平台号,填多个用,隔开">
- +
+ id="clanElderErbanNoStr" placeholder="请输入族长平台号,填多个用,隔开">
- +
+ id="erbanNo" placeholder="请输入成员平台号,多个用,隔开">
@@ -114,7 +114,7 @@ } } }, - {field: 'clanElderErbanNo', title: '族长大鹅开黑号', align: 'center', width: '5%', + {field: 'clanElderErbanNo', title: '族长平台号', align: 'center', width: '5%', formatter: function (val, row, index) { if (val) { return val; @@ -141,7 +141,7 @@ } } }, - {field: 'ownerErbanNo', title: '会长大鹅开黑号', align: 'center', width: '5%', + {field: 'ownerErbanNo', title: '会长平台号', align: 'center', width: '5%', formatter: function (val, row, index) { if (val) { return val; @@ -150,7 +150,7 @@ } } }, - {field: 'erbanNo', title: '成员大鹅开黑号', align: 'center', width: '5%', + {field: 'erbanNo', title: '成员平台号', align: 'center', width: '5%', formatter: function (val, row, index) { if (val) { return val; diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_admin.html index 88a8e40e3..c003f8a71 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_admin.html @@ -240,9 +240,9 @@
- +
- +
@@ -807,7 +807,7 @@ debugger; var erbanNo = $('#sendErbanNo').val().trim();//去掉首尾的空格和换行符 if(!(erbanNo.length>0)){ - $("#tipMsg").text("请输入大鹅开黑号"); + $("#tipMsg").text("请输入平台号"); $("#tipModal").modal('show'); return; } @@ -839,7 +839,7 @@ $("#tipMsg").text("全部赠送成功"); TableHelper.doRefresh("#table"); }else if(json.code == 200){ - $("#tipMsg").text("部分用户赠送失败,赠送失败大鹅开黑号:"+json.erban+",赠送失败原因:"+json.message); + $("#tipMsg").text("部分用户赠送失败,赠送失败平台号:"+json.erban+",赠送失败原因:"+json.message); }else { $("#tipMsg").text("全部赠送失败,赠送失败原因:"+json.message); } diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_record.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_record.html index 3dd9e9ec0..0f6640019 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_record.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/headwear/headwear_record.html @@ -8,7 +8,7 @@
- +
diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/home/recommand_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/home/recommand_admin.html index 6fff5e094..aafa5b469 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/home/recommand_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/home/recommand_admin.html @@ -71,7 +71,7 @@
大鹅开黑号平台号 昵称 管理房间 操作
- +
- +
@@ -151,10 +151,10 @@ }, columns: [ {field: 'id', title: 'id', align: 'center', width: '0%'}, - {field: 'inviteErbanNo', title: '发起方大鹅开黑号', align: 'center', width: '5%'}, + {field: 'inviteErbanNo', title: '发起方平台号', align: 'center', width: '5%'}, {field: 'inviteName', title: '发起方名称', align: 'center', width: '5%'}, {field: 'inviteAmount', title: '发起方PK流水', align: 'center', width: '8%'}, - {field: 'acceptErbanNo', title: '接收方大鹅开黑号', align: 'center', width: '5%'}, + {field: 'acceptErbanNo', title: '接收方平台号', align: 'center', width: '5%'}, {field: 'acceptName', title: '接收方名称', align: 'center', width: '5%'}, {field: 'acceptAmount', title: '接收方PK流水', align: 'center', width: '5%'}, { diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_permit.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_permit.html index e0d15efaa..5efd6058c 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_permit.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_permit.html @@ -5,7 +5,7 @@
- + @@ -23,7 +23,7 @@ $('#btnScan').click(function(){ console.log("star===>>" + $("#ernos").text() +", " + $("#ernos").val()); if(!$('#ernos').val()){ - $("#tipMsg").text("请输入大鹅开黑号"); + $("#tipMsg").text("请输入平台号"); $("#tipModal").modal('show'); return; } @@ -55,7 +55,7 @@ var type = $('#type').val(); var num = $('#num').val(); if(!$('#ernos').val()){ - $("#tipMsg").text("请输入大鹅开黑号"); + $("#tipMsg").text("请输入平台号"); $("#tipModal").modal('show'); return; } diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_recomm.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_recomm.html index da18d0175..fcc5b0a89 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_recomm.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_recomm.html @@ -87,7 +87,7 @@ $('#btnScan').click(function(){ console.log("star===>>" + $("#ernos").text() +", " + $("#ernos").val()); if(!$('#ernos').val()){ - $("#tipMsg").text("请输入大鹅开黑号"); + $("#tipMsg").text("请输入平台号"); $("#tipModal").modal('show'); return; } @@ -119,7 +119,7 @@ var type = $('#type').val(); var num = $('#num').val(); if(!$('#ernos').val()){ - $("#tipMsg").text("请输入大鹅开黑号"); + $("#tipMsg").text("请输入平台号"); $("#tipModal").modal('show'); return; } diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_rise_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_rise_admin.html index 1b48025d0..6b5db5145 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_rise_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/home_rise_admin.html @@ -7,7 +7,7 @@
- 大鹅开黑号: + 平台号: 开始时间: 结束时间: @@ -32,7 +32,7 @@
- +
@@ -205,7 +205,7 @@ columns: [ //{field: 'id', title: 'id', align: 'center', checkbox: true, width: '5%', valign: 'middle'}, {field:'nick',title:'用户昵称',align:'center',valign:'middle',width:'10%'}, - {field:'erbanNo',title:'用户大鹅开黑号',align:'center',valign:'middle',width:'10%'}, + {field:'erbanNo',title:'用户平台号',align:'center',valign:'middle',width:'10%'}, { field:'validTime', title:'生效时间', diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/mini_game_statis_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/mini_game_statis_admin.html index 025eb8796..1a6c68232 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/mini_game_statis_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/mini_game_statis_admin.html @@ -70,7 +70,7 @@
- 房主大鹅开黑号: + 房主平台号:
@@ -238,7 +238,7 @@ $('#table2').bootstrapTable('destroy'); $('#table2').bootstrapTable({ columns: [ - {field: 'erbanNo', title: '房主大鹅开黑号', align: 'center', width: '5%'}, + {field: 'erbanNo', title: '房主平台号', align: 'center', width: '5%'}, {field: 'title', title: '房间名称', align: 'center', width: '5%'}, {field: 'battleStartAt', title: '开启时间', align: 'center', width: '5%'}, {field: 'mgName', title: '游戏名称', align: 'center', width: '5%'}, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_diversion_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_diversion_admin.html index 0bb706247..d947645f7 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_diversion_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_diversion_admin.html @@ -20,7 +20,7 @@
日期 - - 搜索房间 + 搜索房间 @@ -57,7 +57,7 @@
- +
diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_hide_home.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_hide_home.html index 1d0cdfeef..8d3e1b50f 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_hide_home.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_hide_home.html @@ -19,7 +19,7 @@
- +
@@ -48,7 +48,7 @@
- +
- +
@@ -47,7 +47,7 @@
- +
@@ -79,7 +79,7 @@ {field: 'id', title: '编号', align: 'center', width: '5%'}, {field: 'roomInviteCode', title: '房间邀请码', align: 'center', width: '10%'}, {field: 'roomUid', title: 'uid', align: 'center', width: '10%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '10%'}, + {field: 'erbanNo', title: '平台号', align: 'center', width: '10%'}, {field: 'avatar', title: '头像', align: 'center', width: '10%'}, {field: 'title', title: '房间标题', align: 'center', width: '10%'}, {field: 'isPermitRoom', title: '房间类型', align: 'center', width: '10%'}, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_recommend_room_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_recommend_room_admin.html index c99996050..a588cfac4 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_recommend_room_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_recommend_room_admin.html @@ -24,7 +24,7 @@
- +
@@ -207,7 +207,7 @@ return pageSize * (pageNumber - 1) + index + 1; } }, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', valign: 'middle',width:'5%'}, + {field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle',width:'5%'}, {field: 'name', title: '话题标题', align: 'center', valign: 'middle',width:'15%'}, {field: 'roomTitle', title: '房间标题', align: 'center', valign: 'middle',width:'15%'}, { diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_search_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_search_admin.html index 09413cfcd..4ad5a3dbd 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_search_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_search_admin.html @@ -12,7 +12,7 @@
- + + 房主平台号(多个查询以英文逗号分隔): 选择时间: 房间类型: @@ -99,7 +99,7 @@ $('#table').bootstrapTable({ columns: [ {field: 'userNick', title: '用户名称', align: 'center', width: '20%'}, - {field: 'userErbanNo', title: '房主大鹅开黑号', align: 'center', width: '15%'}, + {field: 'userErbanNo', title: '房主平台号', align: 'center', width: '15%'}, {field: 'totalGold', title: '总流水', align: 'center', width: '10%'}, {field: 'normalTotalGold', title: '普通礼物流水', align: 'center', width: '10%'}, {field: 'backpackTotalGold', title: '背包礼物流水', align: 'center', width: '10%'}, @@ -210,7 +210,7 @@ $('#roomGiftSerialDetailTable').bootstrapTable({ columns: [ {field: 'num', title: '序号', align: 'center', width: '5%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '5%'}, + {field: 'erbanNo', title: '平台号', align: 'center', width: '5%'}, {field: 'nick', title: '昵称', align: 'center', width: '5%'}, {field: 'amount', title: '收礼总钻石', align: 'center', width: '5%'}, {field: 'cutDiamonds', title: '房间抽成钻石', align: 'center', width: '5%'}, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_home.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_home.html index b66c8c5bc..279bf9f29 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_home.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_home.html @@ -14,7 +14,7 @@
-->
- +
@@ -111,7 +111,7 @@ $('#table').bootstrapTable('destroy'); $('#table').bootstrapTable({ columns: [ - {field: 'erbanNo', title: '房主大鹅开黑号', align: 'center', width: '5%'}, + {field: 'erbanNo', title: '房主平台号', align: 'center', width: '5%'}, {field: 'roomUid', title: '房主Uid', align: 'center', width: '5%'}, {field: 'roomTitle', title: '房间标题', align: 'center', width: '8%'}, {field: 'roomTag', title: '房间标签', align: 'center', width: '5%'}, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_map.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_map.html index 54989637c..d8eba4354 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_map.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_tab_map.html @@ -17,7 +17,7 @@
- +
@@ -100,9 +100,9 @@
@@ -52,7 +52,7 @@ $("#searchBtn").click(function(){ var msNo = $("#msNo").val(); if(msNo == '') { - $('#tipMsg').text('大鹅开黑号不能为空') + $('#tipMsg').text('平台号不能为空') $('#tipModal').modal('show'); return; } @@ -69,7 +69,7 @@ $('#table').bootstrapTable({ columns: [ {field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', valign: 'middle', width: '10%'}, + {field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%'}, {field: 'nick', title: '用户昵称', align: 'center', valign: 'middle', width: '10%'}, {field: 'createTime', title: '抽牌时间', align: 'center', valign: 'middle', width: '20%',formatter: function(val,row,index) { if(val) { diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/tarot/tarot_charge_statis.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/tarot/tarot_charge_statis.html index 5195f8fb1..e720c18a6 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/tarot/tarot_charge_statis.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/tarot/tarot_charge_statis.html @@ -11,7 +11,7 @@
选择时间: - - 大鹅开黑号: + 平台号:
@@ -65,7 +65,7 @@ $('#table').bootstrapTable({ columns: [ {field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%'}, - {field: 'erbanNo', title: '大鹅开黑号', align: 'center', valign: 'middle', width: '10%'}, + {field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%'}, {field: 'nick', title: '用户昵称', align: 'center', valign: 'middle', width: '10%'}, {field: 'drawCount', title: '抽牌次数', align: 'center', valign: 'middle', width: '10%'}, {field: 'winCount', title: '中奖次数', align: 'center', valign: 'middle', width: '10%'}, diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/topline/topline_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/topline/topline_admin.html index 9479a31ef..e8c3a4f9e 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/topline/topline_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/topline/topline_admin.html @@ -177,7 +177,7 @@ columns:[ {field: 'tmp1', title: 'id', align: 'center', checkbox: true, width: '5%'}, {field: 'id', title: '编号', align: 'center', width: '5%',valign:'center'}, -// {field: 'users.erbanNo', title:'大鹅开黑号', align: 'center', width: '10%',valign:'center'}, +// {field: 'users.erbanNo', title:'平台号', align: 'center', width: '10%',valign:'center'}, {field: 'title', title:'标题', align:'center',valign:'center',width: '20%'}, {field: 'img', title: '图片', align:'center', width: '10%',valign:'center',formatter: function (val,row,index) { diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/back_list_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/back_list_admin.html index 0d2d308bc..6d3385465 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/back_list_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/back_list_admin.html @@ -14,7 +14,7 @@
- +
@@ -67,10 +67,10 @@
头像大鹅开黑号平台号 昵称