v1.0 : 大鹅开黑文案替换

This commit is contained in:
fbc
2022-09-27 16:05:33 +08:00
parent d3ede143ee
commit 15391e5296
301 changed files with 765 additions and 765 deletions

View File

@@ -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;
/**
* 接受者昵称

View File

@@ -22,7 +22,7 @@ public class UserCoupleStatisticalParamDto implements Serializable {
*/
private Long id;
/**
* 用户大鹅开黑
* 用户平台
*/
private Long erbanNo;
/**

View File

@@ -14,7 +14,7 @@ public class UserDetailQueryDto {
private Byte flowChannelType = 0;
/**
* 大鹅开黑
* 平台
*/
private String erbanNo;
/**

View File

@@ -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

View File

@@ -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());

View File

@@ -188,7 +188,7 @@ public class PrettyNumberAdminService extends AbstractCoreService<PrettyNumber,
public void bind(Integer prettyId, Long erbanNo, String desc, Date startTime, Date endTime, String adminUserName) {
Users users = usersBaseService.getUsersByErBanNo(erbanNo);
if (users == null) {
throw new BusinessException("未找到该用户(注意: 本大鹅开黑号是否已经绑定更改成其它靓号了?)");
throw new BusinessException("未找到该用户(注意: 本平台号是否已经绑定更改成其它靓号了?)");
}
Long daysForSeconds = endTime.getTime() - startTime.getTime();
int days = DateTimeUtil.getDaysOfSeconds(daysForSeconds);

View File

@@ -82,7 +82,7 @@ public class UserCheckAdminService {
List<String> oldList = Arrays.asList(erbanNoList.split(","));
if(type == 1){
// 根据大鹅开黑号寻找
// 根据平台号寻找
return getUserListByErbanNoList(oldList);
}else if(type == 4){
return this.getUserListByUidList(oldList);

View File

@@ -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());
}

View File

@@ -96,7 +96,7 @@ public class FamilyPkConfigAdminService extends BaseService {
Map<Long,FamilyCharmRecordVo> map = familyCharmRecordVoList.stream().collect(Collectors.toMap(FamilyCharmRecordVo::getFamilyId,user -> user));
// 判断输入的大鹅开黑号是否符合条件
// 判断输入的平台号是否符合条件
List<Long> roomUids = this.queryRoomUidList(roomErbanNoListStr);
String roomUidStr = StringUtils.collectionToDelimitedString(roomUids,",");
Map<Long,Boolean> 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);
}

View File

@@ -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<AnchorWhitelist> anchorWhitelists = anchorWhitelistMapper.selectByExample(anchorWhitelistExample);
if(CollectionUtils.isEmpty(anchorWhitelists)){
throw new BusinessException("大鹅开黑号为"+ erbanNo + "的主播不存在!");
throw new BusinessException("平台号为"+ erbanNo + "的主播不存在!");
}
AdminUser adminUser = adminUserService.getAdminUserById(adminId);

View File

@@ -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);

View File

@@ -35,9 +35,9 @@ public interface ClanAdminService {
/**
* 添加家族
* @param clanElderErbanNo 族长大鹅开黑
* @param clanElderErbanNo 族长平台
* @param clanName 家族名称
* @param hallOwnerErbanNo 会长大鹅开黑
* @param hallOwnerErbanNo 会长平台
* @param level
* @param avatar
*/

View File

@@ -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<Long> erbanNoList = clanAdminMapper.listHallOwnerErbanNoByClanId(clanId);
List<Long> 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<Hall> 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<Hall> 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

View File

@@ -68,7 +68,7 @@ public class DiscoveryAdminService {
List<DiscoveryVo> discoveryVos = discoveryMapperExpand.queryAllDiscoveries(record);
if(discoveryVos!=null&&discoveryVos.size()>0){
for(int i=0;i<discoveryVos.size();i++){
//跳转房间,转化为大鹅开黑
//跳转房间,转化为平台
DiscoveryVo ds = discoveryVos.get(i);
if(ds.getJumpType()==2){
Long uid =ds.getRoomUid()==null?0L:ds.getRoomUid();
@@ -100,7 +100,7 @@ public class DiscoveryAdminService {
throw new ServiceException(BusiStatus.ALREADY_HAS_CONFIG);
}
}
//传进来的是大鹅开黑
//传进来的是平台
if(discovery.getRoomUid()!=null){
Users user= usersService.getUserByErbanNo(discovery.getRoomUid());
if(user==null){

View File

@@ -161,7 +161,7 @@ public class FamilyAdminService extends BaseService {
if (family.getOpenMoney() != null && !family.getOpenMoney()) {
family.setOpenGame(false);
}
//将大鹅开黑号转化为uid
//将平台号转化为uid
if (StringUtils.isNotBlank(family.getLeader())) {
Users user = usersService.getUserByErbanNo(Long.valueOf(family.getLeader()));
if (user != null) {
@@ -724,7 +724,7 @@ public class FamilyAdminService extends BaseService {
}
}
//大鹅开黑号校验,只能加入一个家族
//平台号校验,只能加入一个家族
if (StringUtils.isNotBlank(family.getLeader())) {
Users user = usersService.getUserByErbanNo(Long.valueOf(family.getLeader()));
if (user != null) {

View File

@@ -508,7 +508,7 @@ public class GiftAdminService extends RedisSupportService<Gift, GiftExample> {
public BusiResult addRoomList(List<String> erbanNos, Integer giftId, Integer adminId) {
List<RoomExclusiveGift> list = Lists.newArrayList();
Map retMap = new HashMap();
//添加失败的大鹅开黑
//添加失败的平台
List<String> failErbanNos = new ArrayList<String>();
//添加失败的原因
List<String> failReason = new ArrayList<String>();

View File

@@ -73,7 +73,7 @@ public class RoomGiftSerialService {
}
List<RoomGiftSerial> 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<RoomGiftSerial> listSerials(List<String> erbanNoList, Integer permit, String startTime, String endTime, Integer page, Integer size) {
StopWatch stopWatch = new StopWatch();
List<String> uidList = Collections.emptyList();
// 根据大鹅开黑号查询出uid
// 根据平台号查询出uid
if (!CollectionUtils.isEmpty(erbanNoList)) {
uidList = usersBaseService.getUidByErbanNo(erbanNoList);
if (CollectionUtils.isEmpty(uidList)) {

View File

@@ -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) {

View File

@@ -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) + "]");
}
}

View File

@@ -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.增加用户钥匙数(区分钥匙类型)

View File

@@ -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<String,Object> queryStatisList(Date startDate,Date endDate,Integer checkType,Long erbanNo,Byte roomType,Integer pageNum,Integer pageSize){
Map<String,Object> map = new HashMap<>();
if(checkType == 1){
// 根据房主大鹅开黑号寻找
// 根据房主平台号寻找
map = this.queryStatisListByErbanNo(erbanNo,startDate,endDate,pageNum,pageSize);
}else{
map = this.queryStatisListByRoomType(roomType,startDate,endDate,pageNum,pageSize);

View File

@@ -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) + "]");
}
}

View File

@@ -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) {

View File

@@ -134,7 +134,7 @@ public class BillRecordAdminService extends BaseService {
}
/**
* 根据用户大鹅开黑号查询指定日期的消费情况
* 根据用户平台号查询指定日期的消费情况
* @param erbanNo
* @param startDate
* @param endDate

View File

@@ -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")){

View File

@@ -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());

View File

@@ -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());
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -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;

View File

@@ -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]);

View File

@@ -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;

View File

@@ -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("昵称")

View File

@@ -18,7 +18,7 @@ public class UserBackpackVo {
private Long uid;
/**
* 用户大鹅开黑
* 用户平台
*/
private Long erbanNo;

View File

@@ -12,7 +12,7 @@ public class WorldMemberAdminVo {
private Long id;
/**
* 大鹅开黑
* 平台
*/
private Long erbanNo;

View File

@@ -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;

View File

@@ -7,7 +7,7 @@ import lombok.Data;
@Data
public class LuckyBagStatsAdminVo extends BaseVo {
@FieldComment("大鹅开黑")
@FieldComment("平台")
public Long erbanNo;
@FieldComment("昵称")
public String nick;

View File

@@ -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; // 房间平台
}

View File

@@ -19,9 +19,9 @@ public class UserDeatilVo extends BaseVo {
@FieldComment("uid")
public Long uid;
/**
* 用户大鹅开黑
* 用户平台
*/
@FieldComment("大鹅开黑")
@FieldComment("平台")
public Long erbanNo;
/**
* 昵称

View File

@@ -110,7 +110,7 @@ public class LuckySeaActAdminController extends BaseController {
try {
List<String> 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<String> headerList = new ArrayList<>();
headerList.add("uid");
headerList.add("大鹅开黑");
headerList.add("平台");
headerList.add("昵称");
headerList.add("投入");
headerList.add("平台价值");

View File

@@ -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<String> failErban = new ArrayList<String>();
//赠送失败原因
List<String> failReason = new ArrayList<String>();

View File

@@ -45,7 +45,7 @@ public class FirstChargeRewardAdminController extends BaseController {
List<FirstChargeRewardRecordAdminVo> recordList = (List<FirstChargeRewardRecordAdminVo>) data.get("rows");
try {
List<String> headerList = new LinkedList<>();
headerList.add("大鹅开黑");
headerList.add("平台");
headerList.add("用户昵称");
headerList.add("邀请码");
headerList.add("注册时间");

View File

@@ -239,7 +239,7 @@ public class FamilyAdminController extends BaseController {
private HSSFWorkbook buildFamilyExcel(List<FamilyAdminVo> 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<FamilyMemberVo> 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]);

View File

@@ -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]);

View File

@@ -369,7 +369,7 @@ public class GiftAdminController extends BaseController {
String title = "后台赠送礼物(" + gift.getGiftName() + ")";
enterpriseWeChatPushAdminService.pushMessage(erbanList, title, getAdminId(), giftNum.longValue());
//赠送失败的大鹅开黑
//赠送失败的平台
List<String> failErban = new ArrayList<String>();
//赠送失败原因
List<String> failReason = new ArrayList<String>();

View File

@@ -121,7 +121,7 @@ public class RoomGiftSerialController extends BaseController {
List<String> 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

View File

@@ -128,7 +128,7 @@ public class GuildRoomAdminController extends BaseController {
private HSSFWorkbook buildGuildRoomExcel(List<GuildRoomVo> 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]);

View File

@@ -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
*/

View File

@@ -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 申请时间-结束

View File

@@ -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]);

View File

@@ -95,7 +95,7 @@ public class UserBoxPrizeRecordAdminController extends BaseController {
List<String> headerList = new ArrayList<>();
headerList.add("id");
headerList.add("uid");
headerList.add("大鹅开黑");
headerList.add("平台");
headerList.add("用户昵称");
headerList.add("奖品名称");
headerList.add("抽奖时间");

View File

@@ -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

View File

@@ -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")

View File

@@ -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]);

View File

@@ -41,7 +41,7 @@ public class RoomPoolController extends BaseController {
/**
* 增加房间到配置池
*
* @param erbanNoStr 大鹅开黑号,多个大鹅开黑号可以用逗号分隔
* @param erbanNoStr 平台号,多个平台号可以用逗号分隔
*/
@RequestMapping("/add")
@ResponseBody

View File

@@ -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]);

View File

@@ -108,7 +108,7 @@ public class TopicRoomController extends BaseController {
try {
List<String> headerList = new ArrayList<>();
headerList.add("排序");
headerList.add("大鹅开黑");
headerList.add("平台");
headerList.add("话题标题");
headerList.add("房间标题");
headerList.add("房间创建时间");

View File

@@ -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]);

View File

@@ -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]);

View File

@@ -58,7 +58,7 @@ public class StatsInviteCodeController extends BaseController {
try {
List<String> headerList = new ArrayList<>();
headerList.add("邀请码");
headerList.add("使用者大鹅开黑");
headerList.add("使用者平台");
headerList.add("使用者昵称");
headerList.add("使用者手机号");
headerList.add("邀请新注册人数");

View File

@@ -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(",");

View File

@@ -171,7 +171,7 @@ public class ChargeRecordAdminController extends BaseController {
}
} else {
if (erbanNo == null) {
writeJson(false, "请输入大鹅开黑");
writeJson(false, "请输入平台");
}
users = usersBaseService.getUsersByErBanNo(erbanNo);
if (users == null) {

View File

@@ -54,7 +54,7 @@ public class UserBackpackAdminController extends BaseController {
try {
List<String> headerList = new ArrayList<>();
headerList.add("id");
headerList.add("大鹅开黑");
headerList.add("平台");
headerList.add("用户昵称");
headerList.add("奖品名称");
headerList.add("奖品类型");

View File

@@ -80,7 +80,7 @@ public class VoiceAdminController extends BaseController {
try {
List<String> headerList = new ArrayList<>();
headerList.add("ID");
headerList.add("大鹅开黑");
headerList.add("平台");
headerList.add("用户昵称");
headerList.add("性别");
headerList.add("语音url");

View File

@@ -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]);

View File

@@ -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]);

View File

@@ -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]);

View File

@@ -97,7 +97,7 @@ public class WithdrawApplyAdminController extends BaseController {
try {
List<String> headerList = new ArrayList<>();
headerList.add("时间");
headerList.add("大鹅开黑");
headerList.add("平台");
headerList.add("昵称");
headerList.add("手机号");
headerList.add("提现金额");

View File

@@ -99,7 +99,7 @@ public class WithdrawBlockAdminController extends BaseController {
private HSSFWorkbook buildWithdrawBlockExcel(List<WithdrawBlockVo> 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]);

View File

@@ -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 {

View File

@@ -90,7 +90,7 @@
<div id="div_room_assign" class="col-sm-12">
<label for="" class="col-sm-3 control-label"></label>
<div class="col-sm-8">
<textarea id="module_roomRule" rows="3" cols="50" class="form-control validate[required]" placeholder="填写房主大鹅开黑号(多个大鹅开黑号请用英文逗号隔开)"></textarea>
<textarea id="module_roomRule" rows="3" cols="50" class="form-control validate[required]" placeholder="填写房主平台号(多个平台号请用英文逗号隔开)"></textarea>
</div>
</div>
</div>
@@ -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) {

View File

@@ -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);

View File

@@ -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%',}

View File

@@ -6,7 +6,7 @@
<h1 id="itemTitle"></h1>
</section>
<div id="toolbar">
大鹅开黑号: <input type="text" class="input-medium" name="erbanNoStr" id="erbanNoStr" placeholder="填多个用,隔开">
平台号: <input type="text" class="input-medium" name="erbanNoStr" id="erbanNoStr" placeholder="填多个用,隔开">
开始时间:<input type="text" name="startTime" id="startTime" class="input-sm" >
结束时间:<input type="text" name="endTime" id="endTime" class="input-sm" >
<button id="btnSearch" class="btn btn-default">
@@ -28,7 +28,7 @@
$('#table').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: 'roundId', title: '轮次', align: 'center', width: '5%'},
{field: 'endTime', title: '结束时间', align: 'center', width: '5%',

View File

@@ -31,7 +31,7 @@
<section class="content">
<div id="toolbar">
大鹅开黑号: <input type="text" id='erbanNo' placeholder='必填'>
平台号: <input type="text" id='erbanNo' placeholder='必填'>
抽奖类型: <select name="lottoType" id="lottoType">
<option value="0">全部</option>
<option value="1">充值抽奖</option>
@@ -91,7 +91,7 @@
$user.css('display','flex');
$user.find('.avatar img').attr('src',res.users.avatar)
$user.find('.nick').html('昵称:' + res.users.nick);
$user.find('.erbanNo').html('大鹅开黑号:' + res.users.erbanNo);
$user.find('.erbanNo').html('平台号:' + res.users.erbanNo);
}
},
onLoadError: function() {

View File

@@ -29,7 +29,7 @@
</div>
<div class="modal-body">
<div class="form-group">
<label for="erbanNoInput" class="col-sm-2 control-label">大鹅开黑号:</label>
<label for="erbanNoInput" class="col-sm-2 control-label">平台号:</label>
<div class="col-sm-10">
<input type="text" id="erbanNoInput" name="erbanNo" class="form-control validate[required]">
</div>
@@ -96,7 +96,7 @@
$("#saveSuperAdmin").click(function(){
var erbanNo = $("#erbanNoInput").val();
if(erbanNo == '' || erbanNo == undefined || erbanNo == null){
alert("请输入大鹅开黑号!")
alert("请输入平台号!")
}else{
showLoading()
$.ajax({
@@ -125,7 +125,7 @@
columns: [
{field: 'tmp', title: 'ID', align: 'center', width: '10%', checkbox: true},
{field: 'uid', title: 'uid', align: 'center', width: '10%'},
{field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '10%'},
{field: 'erbanNo', title: '平台号', align: 'center', width: '10%'},
{field: 'nick', title: '昵称', align: 'center', width: '10%'},
{field: 'uid', title: '创建时间', align: 'center', width: '12%', formatter: function(val, row, index) {
var ret = '<span id="createTimeSpan_' + val + '" >-</span>';

View File

@@ -39,7 +39,7 @@
<section class="content">
<div id="table"></div>
<div id="toolbar">
大鹅开黑号:<input type="text" class="input-sm validate[required]" name="erbanNo" id="erbanNum">
平台号:<input type="text" class="input-sm validate[required]" name="erbanNo" id="erbanNum">
<button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
<button id="add" class="btn btn-default">
<i class="glyphicon glyphicon-plus"></i>增加
@@ -60,10 +60,10 @@
<div class="modal-body">
<form id="addAnchorForm" class="form-horizontal">
<div class="form-group">
<label for="erbanNo" class="col-sm-3 control-label"><span style="color: red; ">*</span>大鹅开黑号:</label>
<label for="erbanNo" class="col-sm-3 control-label"><span style="color: red; ">*</span>平台号:</label>
<div class="col-sm-8">
<input type="text" class="form-control validate[required]" name="erbanNo" id="erbanNo"
placeholder='多个大鹅开黑号请用-隔开'
placeholder='多个平台号请用-隔开'
>
</div>
</div>
@@ -92,7 +92,7 @@
$('#table').bootstrapTable({
columns: [
{field: 'uid', title: 'UID', align: 'center', valign: 'middle', visible: false, width: '20%'},
{field: 'erbanNo', title: '大鹅开黑号', align: 'center', valign: 'middle', width: '5%'},
{field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '5%'},
{field: 'nick', title: '昵称', align: 'center', valign: 'middle', width: '5%'},
{
field: 'status',
@@ -215,7 +215,7 @@
$('#table').on('click','.opt-release',function () {
var key = parseInt($(this).data('id'));
console.log(key,typeof key);
if(confirm("确定要取消大鹅开黑号:"+key+"的白名单资格吗?")){
if(confirm("确定要取消平台号:"+key+"的白名单资格吗?")){
$.ajax({
type: 'post',
url: '/admin/anchor/whitelist/update',

View File

@@ -39,8 +39,8 @@
<label class="col-sm-3 control-label">注意:</label>
<div class="col-sm-9">
<span><font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
2.文件内容第一行为标题(例:大鹅开黑号,金币,钻石)<br>
3.第一列为用户大鹅开黑号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
</font>
</span>
</div>

View File

@@ -8,7 +8,7 @@
<!-- .content -->
<div id="toolbar">
<div class="col-sm-12">
<label for="erbanNo" class="col-sm-1 control-label">大鹅开黑号:</label>
<label for="erbanNo" class="col-sm-1 control-label">平台号:</label>
<div class="col-sm-2"><input type="text" class="form-control" name="erbanNo" id="erbanNo"/></div>
<label for="remark" class="col-sm-1 control-label">备注:</label>
@@ -62,8 +62,8 @@
<label class="col-sm-3 control-label">注意:</label>
<div class="col-sm-9">
<span><font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
2.文件内容第一行为标题(例:大鹅开黑号,金币,钻石)<br>
3.第一列为用户大鹅开黑号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
</font>
</span>
</div>
@@ -86,7 +86,7 @@
$('#table').bootstrapTable({
columns: [
// {field: 'temp', title: 'id', align: 'center', checkbox: true, width: '5%'},
{field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '5%'},
{field: 'erbanNo', title: '平台号', align: 'center', width: '5%'},
{field: 'nick', title: '昵称', align: 'center', width: '5%'},
{field: 'goldNum', title: '金币数量', align: 'center', width: '5%'},
{field: 'diamondNum', title: '钻石数量', align: 'center', width: '5%'},

View File

@@ -55,7 +55,7 @@
<div class="modal-body">
<form class="form-horizontal" id="carAddForm">
<div class="form-group">
<label for="addErbanNo" class="col-sm-3 control-label">大鹅开黑</label>
<label for="addErbanNo" class="col-sm-3 control-label">平台</label>
<div class="col-sm-9">
<input type="text" name="erbanNo" id="addErbanNo" class="form-control validate[required]" />
</div>
@@ -109,7 +109,7 @@
$('#table').bootstrapTable({
columns:[
{field: 'uid', title: 'uid', 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: 'carId', title:'拥有座驾', align:'center',valign:'center',formatter:function (val,row,index) {
if(val){
return carGoodsObj[val];
@@ -171,7 +171,7 @@
var $user = $('#userMessage');
$user.find('.avatar img').attr('src',data.users.avatar);
$user.find('.nick').html('昵称:'+data.users.nick);
$user.find('.erbanNo').html('大鹅开黑号:'+data.users.erbanNo);
$user.find('.erbanNo').html('平台号:'+data.users.erbanNo);
}
console.log("load success");
},

View File

@@ -284,9 +284,9 @@
<form class="form-horizontal" id="carSendForm">
<input type="hidden" name="sendCarId" id="sendCarId"/>
<div class="form-group">
<label for="sendErbanNo" class="col-sm-3 control-label">大鹅开黑</label>
<label for="sendErbanNo" class="col-sm-3 control-label">平台</label>
<div class="col-sm-9">
<textarea name="sendErbanNo" id="sendErbanNo" class="form-control validate[required]" placeholder="多个大鹅开黑号使用换行符分隔" ></textarea>
<textarea name="sendErbanNo" id="sendErbanNo" class="form-control validate[required]" placeholder="多个平台号使用换行符分隔" ></textarea>
</div>
</div>
<div class="form-group">
@@ -937,7 +937,7 @@
}
var erbanNo = $('#sendErbanNo').val().trim();//去掉首尾的空格和换行符
if(!(erbanNo.length>0)){
$("#tipMsg").text("请输入大鹅开黑号");
$("#tipMsg").text("请输入平台号");
$("#tipModal").modal('show');
return;
}
@@ -963,7 +963,7 @@
$("#tipMsg").text("全部赠送成功");
TableHelper.doRefresh("#table");
}else if(res.code == 200){
$("#tipMsg").text("部分赠送成功,赠送失败大鹅开黑号:" + res.erban+",赠送失败原因:"+res.message);
$("#tipMsg").text("部分赠送成功,赠送失败平台号:" + res.erban+",赠送失败原因:"+res.message);
}else {
$("#tipMsg").text("全部赠送失败,赠送失败原因:"+res.message);
}

View File

@@ -8,7 +8,7 @@
</section>
<div id="toolbar">
<div class="col-sm-12">
<label for="qErbanNo" class="col-sm-4 control-label">大鹅开黑号:</label>
<label for="qErbanNo" class="col-sm-4 control-label">平台号:</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="qErbanNo" id="qErbanNo" placeholder="">
</div>

View File

@@ -135,7 +135,7 @@
$('#roundDetailTable').bootstrapTable('destroy');
$('#roundDetailTable').bootstrapTable({
columns: [
{field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '5%'},
{field: 'erbanNo', title: '平台号', align: 'center', width: '5%'},
{field: 'nick', title: '昵称', align: 'center', width: '5%'},
{field: 'inviteCode', title: '邀请码', align: 'center', width: '5%'},
{field: 'signTime', title: '注册日期', align: 'center', width: '5%',

View File

@@ -30,7 +30,7 @@
tab名称:<input type="text" name="tabName" id="name"
placeholder="请输入tab名称">
&nbsp;&nbsp;&nbsp;
大鹅开黑号:
平台号:
<input type="text" name="erbanNo" id="erbanNo"
placeholder="请输入用户ID">
</div>
@@ -244,7 +244,7 @@
{field: 'id', title: '序号', align: 'center', valign: 'middle', width: '1%', visible: false},
{field: 'tabId', title: '', align: 'center', valign: 'middle', width: '1%' , visible: false},
{field: 'tabName', title: 'tab名称', align: 'center', valign: 'middle', width: '10%'},
{field: 'erbanNo', title: '大鹅开黑号', align: 'center', valign: 'middle', width: '5%'},
{field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '5%'},
{field: 'roomTitle', title: '房间标题', align: 'center', valign: 'middle', width: '15%'},
{
field: 'status',

View File

@@ -126,7 +126,7 @@
</div>
</div>
<div class="form-group" id="boxC">
<label for="contentC" class="col-sm-3 control-label" id="contentLabC">房主大鹅开黑<font color="red">*</font>:</label>
<label for="contentC" class="col-sm-3 control-label" id="contentLabC">房主平台<font color="red">*</font>:</label>
<div class="col-sm-9">
<input type="text" class="form-control validate[required]" name="name" id="contentC">
</div>
@@ -588,7 +588,7 @@
$("#boxA").show();
}else if(optVal != undefined && optVal == 6) {
$('#contentA').val('');
$('#contentLabA').html('房主大鹅开黑号<font color="red">*</font>:');
$('#contentLabA').html('房主平台号<font color="red">*</font>:');
$("#boxA").show();
}else {
$('#contentA').val('');
@@ -606,7 +606,7 @@
$("#boxB").show();
}else if(optVal != undefined && optVal == 6) {
$('#contentB').val('');
$('#contentLabB').html('房主大鹅开黑号<font color="red">*</font>:');
$('#contentLabB').html('房主平台号<font color="red">*</font>:');
$("#boxB").show();
}else {
$('#contentB').val('');
@@ -624,7 +624,7 @@
$("#boxC").show();
}else if(optVal != undefined && optVal == 6) {
$('#contentC').val('');
$('#contentLabC').html('房主大鹅开黑号<font color="red">*</font>:');
$('#contentLabC').html('房主平台号<font color="red">*</font>:');
$("#boxC").show();
}else {
$('#contentC').val('');

View File

@@ -12,7 +12,7 @@
</section>
<div id="toolbar">
<div class="col-sm-12">
<label for="erban_no" class="qry_col control-label">大鹅开黑号:</label>
<label for="erban_no" class="qry_col control-label">平台号:</label>
<div class="col-sm-2"><input type="text" class="form-control" name="erbanNo"
id="erban_no"></div>
@@ -61,7 +61,7 @@
<div class="modal-body">
<form class="form-horizontal" id="addForm">
<div class="form-group">
<label for="erbanNo" class="col-sm-2 control-label">大鹅开黑号:</label>
<label for="erbanNo" class="col-sm-2 control-label">平台号:</label>
<div class="col-sm-10">
<input type="text" class="form-control validate[required]" name="erbanNo" id="erbanNo">
</div>
@@ -114,7 +114,7 @@
$('#table').bootstrapTable({
columns: [
{field: 'roomUid', title: '房主uid', align: 'center', width: '10%'},
{field: 'erbanNo', title: '大鹅开黑号', align: 'center', width: '10%'},
{field: 'erbanNo', title: '平台号', align: 'center', width: '10%'},
{field: 'roomTitle', title: '房间标题', align: 'center', width: '15%'},
{
field: 'labelType', title: '标签分类', align: 'center', valign: 'middle', width: '10%',

View File

@@ -26,7 +26,7 @@
<button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
<!-- 搜索根源:-->
<!-- <select name="checkType" id="checkType">-->
<!-- <option value="1">大鹅开黑号</option>-->
<!-- <option value="1">平台号</option>-->
<!-- <option value="2">手机号</option>-->
<!-- <option value="4">uid</option>-->
<!-- </select>-->
@@ -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',

View File

@@ -175,7 +175,7 @@
<div class="form-group">
<label for="chatRoomUid" class="col-sm-3 control-label">聊天室房间号:</label>
<div class="col-sm-9">
<input type="text" class="form-control" name="chatRoomUid" id="chatRoomUid" placeholder="房间大鹅开黑号">
<input type="text" class="form-control" name="chatRoomUid" id="chatRoomUid" placeholder="房间平台号">
</div>
</div>
<div class="form-group">
@@ -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%', },

View File

@@ -146,7 +146,7 @@
<div class="form-group">
<label for="chatRoomUid" class="col-sm-3 control-label">聊天室房间号:</label>
<div class="col-sm-9">
<input type="text" class="form-control" name="chatRoomUid" id="chatRoomUid" placeholder="房间大鹅开黑号">
<input type="text" class="form-control" name="chatRoomUid" id="chatRoomUid" placeholder="房间平台号">
</div>
</div>
<div class="form-group">
@@ -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%', },

View File

@@ -10,7 +10,7 @@
<div id="toolbar">
<form id="searchForm" action="/admin/withdraw/export" method="get" target="_blank">
<div class="col-sm-12">
<label for="erbanNo" class="col-sm-1 control-label">大鹅开黑号:</label>
<label for="erbanNo" class="col-sm-1 control-label">平台号:</label>
<div class="col-sm-2"><input type="text" class="form-control" name="erbanNo" id="erbanNo"></div>
<label for="erbanNo" class="col-sm-1 control-label">手机号码:</label>
@@ -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: '账号类型',

View File

@@ -10,7 +10,7 @@
<div id="toolbar">
<form id="searchForm" action="/admin/guild/room/export" method="post" target="_blank">
<div class="col-sm-12">
<label for="sErbanNo" class="col-sm-2 control-label">大鹅开黑号:</label>
<label for="sErbanNo" class="col-sm-2 control-label">平台号:</label>
<div class="col-sm-3"><input type="text" class="form-control" name="erbanNo" id="sErbanNo"></div>
<label for="sAccount" class="col-sm-2 control-label">房主支付宝账号:</label>
@@ -50,7 +50,7 @@
<form class="form-horizontal" id="guildForm">
<input type="hidden" name="id" id="id"/>
<div class="form-group">
<label for="erbanNo" class="col-sm-3 control-label">大鹅开黑号:</label>
<label for="erbanNo" class="col-sm-3 control-label">平台号:</label>
<div class="col-sm-9">
<input type="text" class="form-control validate[required]" name="erbanNo" id="erbanNo">
</div>
@@ -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: '厅类型',

View File

@@ -10,9 +10,9 @@
<label for="clanId" class="col-sm-2 control-label">家族id:</label>
<div class="col-sm-4"><input type="text" class="form-control" name="name"
id="clanId" placeholder="请输入家族id填多个用,隔开"></div>
<label for="erbanNo" class="col-sm-2 control-label">族长大鹅开黑号:</label>
<label for="erbanNo" class="col-sm-2 control-label">族长平台号:</label>
<div class="col-sm-4"><input type="text" class="form-control" name="name"
id="erbanNo" placeholder="请输入族长大鹅开黑号,填多个用,隔开"></div>
id="erbanNo" placeholder="请输入族长平台号,填多个用,隔开"></div>
</div>
<div class="col-sm-12">
<label for="queryClanLevel" class="col-sm-2 control-label">家族等级</label>
@@ -50,7 +50,7 @@
<form class="form-horizontal" id="addForm">
<input type="hidden" name="id" id="id"/>
<div class="form-group">
<label for="modal_elderErbanNo" class="col-sm-3 control-label">族长大鹅开黑<font color="red">*</font>:</label>
<label for="modal_elderErbanNo" class="col-sm-3 control-label">族长平台<font color="red">*</font>:</label>
<div class="col-sm-9">
<input type="text" class="form-control validate[required]" name="modal_elderErbanNo" id="modal_elderErbanNo">
</div>
@@ -62,7 +62,7 @@
</div>
</div>
<div class="form-group">
<label for="module_hallOwnerErbanNoStr" class="col-sm-3 control-label">会长大鹅开黑<font color="red">*</font>:</label>
<label for="module_hallOwnerErbanNoStr" class="col-sm-3 control-label">会长平台<font color="red">*</font>:</label>
<div class="col-sm-9">
<input type="text" class="input-sm form-control datetime validate[required]" name="module_hallOwnerErbanNoStr" id="module_hallOwnerErbanNoStr" placeholder="用,隔开填多个">
</div>
@@ -116,7 +116,7 @@
<form class="form-horizontal" id="updateForm">
<input type="hidden" name="id" id="updateId"/>
<div class="form-group">
<label for="updatemodal_elderErbanNo" class="col-sm-3 control-label">族长大鹅开黑<font color="red">*</font>:</label>
<label for="updatemodal_elderErbanNo" class="col-sm-3 control-label">族长平台<font color="red">*</font>:</label>
<div class="col-sm-9">
<input type="text" class="form-control validate[required]" name="modal_elderErbanNo" id="updatemodal_elderErbanNo">
</div>
@@ -128,7 +128,7 @@
</div>
</div>
<div class="form-group">
<label for="updatemodule_hallOwnerErbanNoStr" class="col-sm-3 control-label">会长大鹅开黑<font color="red">*</font>:</label>
<label for="updatemodule_hallOwnerErbanNoStr" class="col-sm-3 control-label">会长平台<font color="red">*</font>:</label>
<div class="col-sm-9">
<input type="text" class="input-sm form-control datetime validate[required]" name="module_hallOwnerErbanNoStr" id="updatemodule_hallOwnerErbanNoStr" placeholder="用,隔开填多个">
</div>
@@ -195,7 +195,7 @@
<table border="1">
<tr>
<th hidden="hidden" style="width: 100px;text-align: center;">uid</th>
<th style="width: 100px;text-align: center;">大鹅开黑</th>
<th style="width: 100px;text-align: center;">平台</th>
<th style="width: 100px;text-align: center;">昵称</th>
<th style="width: 100px;text-align: center;">管理房间</th>
<th style="width: 100px;text-align: center;">操作</th>
@@ -232,9 +232,9 @@
<div hidden="hidden" class="col-sm-8">
<input hidden="hidden" type="text" class="form-control validate[required,custom[integer]]" name="type" id="modal_type">
</div>
<label for="modal_superErbanNo" class="col-sm-3 control-label">大鹅开黑号:</label>
<label for="modal_superErbanNo" class="col-sm-3 control-label">平台号:</label>
<div class="col-sm-8">
<input type="text" class="form-control validate[required,custom[integer]]" name="superErbanNo" id="modal_superErbanNo" placeholder="请输入大鹅开黑号">
<input type="text" class="form-control validate[required,custom[integer]]" name="superErbanNo" id="modal_superErbanNo" placeholder="请输入平台号">
</div>
</div>
<div class="form-group">
@@ -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 "<img src='"+val+"' width='40' height='40'>";

View File

@@ -28,7 +28,7 @@
<div class="col-lg-12">
<div class="col-sm-3">
<label htmlFor="erbanNo" class="col-sm-4 control-label">族长大鹅开黑号:</label>
<label htmlFor="erbanNo" class="col-sm-4 control-label">族长平台号:</label>
<div class="col-sm-8">
<input type="text" class="input-sm form-control" name="erbanNo" id="erbanNo" placeholder="多个之间用,隔开">
</div>
@@ -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%'},

View File

@@ -12,14 +12,14 @@
id="hallIdStr" placeholder="请输入公会id,填多个用,隔开"></div>
</div>
<div class="col-sm-12">
<label for="ownerErbanNo" class="col-sm-4 control-label">会长大鹅开黑号:</label>
<label for="ownerErbanNo" class="col-sm-4 control-label">会长平台号:</label>
<div class="col-sm-8"><input type="text" class="form-control" name="name"
id="ownerErbanNo" placeholder="请输入会长大鹅开黑号,填多个用,隔开"></div>
id="ownerErbanNo" placeholder="请输入会长平台号,填多个用,隔开"></div>
</div>
<div class="col-sm-12">
<label for="clanElderErbanNoStr" class="col-sm-4 control-label">族长大鹅开黑号:</label>
<label for="clanElderErbanNoStr" class="col-sm-4 control-label">族长平台号:</label>
<div class="col-sm-8"><input type="text" class="form-control" name="name"
id="clanElderErbanNoStr" placeholder="请输入族长大鹅开黑号,填多个用,隔开"></div>
id="clanElderErbanNoStr" placeholder="请输入族长平台号,填多个用,隔开"></div>
</div>
<div class="col-sm-12">
<button id="btnSearch" class="btn btn-default">
@@ -60,7 +60,7 @@
}
}
},
{field: 'clanElderErbanNo', title: '族长大鹅开黑号', align: 'center', width: '5%',
{field: 'clanElderErbanNo', title: '族长平台号', align: 'center', width: '5%',
formatter: function (val, row, index) {
if (val) {
return val;
@@ -71,7 +71,7 @@
},
{field: 'hallId', title: '公会id', align: 'center', width: '5%'},
{field: 'ownerUid', title: '会长uid', align: 'center', width: '5%'},
{field: 'ownerErbanNo', title: '会长大鹅开黑号', align: 'center', width: '5%'},
{field: 'ownerErbanNo', title: '会长平台号', align: 'center', width: '5%'},
{field: 'memberCount', title: '公会成员人数', align: 'center', width: '5%'},
{field: 'managerCount', title: '公会高管人数', align: 'center', width: '5%'},
{field: 'publicChatCount', title: '公开群数', align: 'center', width: '5%'},

View File

@@ -7,17 +7,17 @@
</section>
<div id="toolbar">
<div class="col-sm-12">
<label for="clanElderErbanNo" class="col-sm-2 control-label">族长大鹅开黑号:</label>
<label for="clanElderErbanNo" class="col-sm-2 control-label">族长平台号:</label>
<div class="col-sm-4"><input type="text" class="form-control" name="name"
id="clanElderErbanNo" placeholder="请输入族长大鹅开黑号,多个用,隔开"></div>
<label for="ownerErbanNo" class="col-sm-2 control-label">会长大鹅开黑号:</label>
id="clanElderErbanNo" placeholder="请输入族长平台号,多个用,隔开"></div>
<label for="ownerErbanNo" class="col-sm-2 control-label">会长平台号:</label>
<div class="col-sm-4"><input type="text" class="form-control" name="name"
id="ownerErbanNo" placeholder="请输入会长大鹅开黑号,多个用,隔开"></div>
id="ownerErbanNo" placeholder="请输入会长平台号,多个用,隔开"></div>
</div>
<div class="col-sm-12">
<label for="erbanNo" class="col-sm-2 control-label">成员大鹅开黑号:</label>
<label for="erbanNo" class="col-sm-2 control-label">成员平台号:</label>
<div class="col-sm-4"><input type="text" class="form-control" name="name"
id="erbanNo" placeholder="请输入成员大鹅开黑号,多个用,隔开"></div>
id="erbanNo" placeholder="请输入成员平台号,多个用,隔开"></div>
<label for="erbanNo" class="col-sm-2 control-label">成员身份:</label>
<div class="col-sm-4">
<select id="allRoleType" name="allRoleType" class="input-sm">
@@ -65,7 +65,7 @@
</div>
</div>
<div class="form-group">
<label for="modal_memberErbanNo" class="col-sm-3 control-label">用户大鹅开黑<font color="red">*</font>:</label>
<label for="modal_memberErbanNo" class="col-sm-3 control-label">用户平台<font color="red">*</font>:</label>
<div class="col-sm-9">
<input type="text" class="form-control" name="modal_memberErbanNo" id="modal_memberErbanNo">
</div>
@@ -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;

View File

@@ -240,9 +240,9 @@
<form class="form-horizontal" id="headwearSendForm">
<input type="hidden" name="sendHeadwearId" id="sendHeadwearId"/>
<div class="form-group">
<label for="sendErbanNo" class="col-sm-3 control-label">大鹅开黑</label>
<label for="sendErbanNo" class="col-sm-3 control-label">平台</label>
<div class="col-sm-9">
<textarea name="sendErbanNo" id="sendErbanNo" class="form-control validate[required]" placeholder="多个大鹅开黑号使用换行符分隔" ></textarea>
<textarea name="sendErbanNo" id="sendErbanNo" class="form-control validate[required]" placeholder="多个平台号使用换行符分隔" ></textarea>
</div>
</div>
<div class="form-group">
@@ -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);
}

View File

@@ -8,7 +8,7 @@
</section>
<div id="toolbar">
<div class="col-sm-12">
<label for="qErbanNo" class="col-sm-4 control-label">大鹅开黑号:</label>
<label for="qErbanNo" class="col-sm-4 control-label">平台号:</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="qErbanNo" id="qErbanNo" placeholder="">
</div>

View File

@@ -71,7 +71,7 @@
<div class="modal-body">
<form class="form-horizontal" id="addRecomForm">
<div class="form-group">
<label for="addUid" class="col-sm-3 control-label">大鹅开黑号:</label>
<label for="addUid" class="col-sm-3 control-label">平台号:</label>
<div class="col-sm-8">
<input type="text" name="addUid" id="addUid" class="validate[required] form-control">
</div>
@@ -109,7 +109,7 @@
$('#table').bootstrapTable({
columns:[
{field:'recommId',title:'推荐ID',align:'center',valign:'middle',width:'5%'},
{field:'userVo.erbanNo',title:'大鹅开黑号',align:'center',valign:'middle',width:'10%'},
{field:'userVo.erbanNo',title:'平台号',align:'center',valign:'middle',width:'10%'},
{field:'seqNo',title:'排序',align:'center',valign:'middle',width:'10%'},
{field:'startValidTime',title:'开始时间',align:'center',valign:'middle',width:'20%',
formatter: function (val,row,index) {

View File

@@ -43,7 +43,7 @@
<section class="content">
<div id="table"></div>
<div id="toolbar">
大鹅开黑号:<select name="skipType" id="skipType" class="input-m">
平台号:<select name="skipType" id="skipType" class="input-m">
<option value="0">--全部--</option>
<!--<option value="1">APP页面</option>-->
<option value="2">聊天室</option>

View File

@@ -12,7 +12,7 @@
<div class="col-sm-10">
福袋:<select name="luckyBagId" id="qLuckyBagId">
</select>
购买人大鹅开黑号:<input type="text" name="erbanNo" id="qErbanNo" class="input-sm" placeholder=""/>
购买人平台号:<input type="text" name="erbanNo" id="qErbanNo" class="input-sm" placeholder=""/>
开出礼物名称:<input type="text" name="giftName" id="qGiftName" class="input-sm" placeholder=""/>
日期:<input type="text" name="startDate" id="qStartDate" class="input-sm datetime" placeholder="">
- <input type="text" name="endDate" id="qEndDate" class="input-sm datetime" placeholder="">
@@ -47,9 +47,9 @@
columns: [
{field: 'id', title: 'ID', align: 'center', width: '5%'},
{field: 'luckyBagId', title: '福袋ID', 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: 'receiveErbanNo', title: '收礼人大鹅开黑号', align: 'center', width: '5%'},
{field: 'receiveErbanNo', title: '收礼人平台号', align: 'center', width: '5%'},
{field: 'receiveNick', title: '收礼人昵称', align: 'center', width: '5%'},
{field: 'totalGoldNum', title: '福袋时价', align: 'center', width: '5%'},
{field: 'giftName', title: '礼物名称', align: 'center', width: '5%'},

Some files were not shown because too many files have changed in this diff Show More