moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0 : 调整贵族升级保级值类型

Browse Source
This commit is contained in:
fbc
2022-10-10 16:07:47 +08:00
parent 79fc72bf1c
commit 8a143eea33
16 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/channel/ChannelContentPartitionAdminService.java
View File

@@ -111,25 +111,25 @@ public class ChannelContentPartitionAdminService extends BaseService {
//检查房主大鹅号
String roomErbanNo = channelContentPartitionDto.getRoomErbanNo();
if (StringUtils.isBlank(roomErbanNo)) throw new BusinessException("房主大鹅号不能为空");
if (StringUtils.isBlank(roomErbanNo)) throw new BusinessException("房主平台号不能为空");
List<String> roomErbanList =Arrays.stream(roomErbanNo.split(StrUtil.COMMA)).collect(Collectors.toList());
List<String> roomUidList = usersBaseService.getUidByErbanNo(roomErbanList);
String errRoomErban = checkErban(roomErbanList, roomUidList);
if (!StringUtils.isEmpty(errRoomErban)) {
throw new BusinessException("以下房主大鹅号：" + errRoomErban + "不正确!");
throw new BusinessException("以下房主平台号：" + errRoomErban + "不正确!");
}
//检查用户大鹅号
//检查用户平台号
if (Constant.ChannelUserType.point_user.equals(channelContentPartitionDto.getUserType())) {
String userErbanNo = channelContentPartitionDto.getUserErbanNo();
if (StringUtils.isBlank(userErbanNo)) throw new BusinessException("用户大鹅号不能为空");
//校验输入的用户大鹅号
if (StringUtils.isBlank(userErbanNo)) throw new BusinessException("用户平台号不能为空");
//校验输入的用户平台号
List<String> erbanList = Arrays.stream(userErbanNo.split(StrUtil.COMMA)).collect(Collectors.toList());
List<String> uidStrList = usersBaseService.getUidByErbanNo(erbanList);
String errUserErban = checkErban(erbanList, uidStrList);
if (!StringUtils.isEmpty(errUserErban)) {
throw new BusinessException("以下用户大鹅号：" + errUserErban + "不正确!");
throw new BusinessException("以下用户平台号：" + errUserErban + "不正确!");
}
}
@@ -187,7 +187,7 @@ public class ChannelContentPartitionAdminService extends BaseService {
list = list.stream().filter(channel -> !channel.getId().equals(channelDto.getId())).collect(Collectors.toList());
}
if (Constant.ChannelUserType.point_user.equals(channelDto.getUserType())) {
//对于指定用户，检查每一个大鹅号是否有时段冲突
//对于指定用户，检查每一个平台号是否有时段冲突
for (String erban : erbanList) {
verfyPointUserTimeSection(channelDto, erban, list);
}
@@ -218,7 +218,7 @@ public class ChannelContentPartitionAdminService extends BaseService {
if (channelContent.getChannel().indexOf(erban) != -1) {
Boolean isCross = DateTimeUtil.IsInterSection(channelDto.getStartTime(), channelDto.getEndTime(), channelContent.getStartTime(), channelContent.getEndTime());
if (isCross) {
String clashMsg = "当前组合类型存在时段冲突：冲突序号:%s,冲突大鹅号：%s,时段：[%s-%s]";
String clashMsg = "当前组合类型存在时段冲突：冲突序号:%s,冲突平台号：%s,时段：[%s-%s]";
logger.info(String.format(clashMsg, channelContent.getId(), erban, DateTimeUtil.convertDate(channelContent.getStartTime())), DateTimeUtil.convertDate(channelContent.getStartTime()));
throw new BusinessException(String.format(clashMsg, channelContent.getId(), erban, DateTimeUtil.convertDate(channelContent.getStartTime()), DateTimeUtil.convertDate(channelContent.getStartTime())));
}

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/channel/ChannelContentPartitionAdminController.java
View File

@@ -86,8 +86,8 @@ public class ChannelContentPartitionAdminController extends BaseController {
List<String> headerList = new LinkedList<>();
headerList.add("渠道");
headerList.add("用户类型");
headerList.add("用户大鹅号");
headerList.add("房主大鹅号");
headerList.add("用户平台号");
headerList.add("房主平台号");
headerList.add("生效时段");
headerList.add("生效状态");
headerList.add("创建时间");

2
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java
View File

@@ -101,7 +101,7 @@ public class SeekElfinAdminController extends BaseController {
List<String> headerList = new ArrayList<>();
headerList.add("id");
headerList.add("uid");
headerList.add("大鹅号");
headerList.add("平台号");
headerList.add("昵称");
headerList.add("购买头饰");
headerList.add("平台价值");

8
accompany-admin/accompany-admin-web/src/main/resources/static/html/channel/channel_content_partition_admin.html
View File

@@ -34,7 +34,7 @@
</div>
<div class="col-sm-3">
<label htmlFor="startTime" class="col-sm-4 control-label">用户大鹅号:</label>
<label htmlFor="startTime" class="col-sm-4 control-label">用户平台号:</label>
<div class="col-sm-8">
<input type="text" class="input-sm form-control" name="userErbanNo" id="userErbanNo">
</div>
@@ -42,7 +42,7 @@
<div class="col-sm-3">
<label htmlFor="endTime" class="col-sm-4 control-label">房主大鹅号:</label>
<label htmlFor="endTime" class="col-sm-4 control-label">房主平台号:</label>
<div class="col-sm-8">
<input type="text" class="input-sm form-control" name="roomErbanNo" id="roomErbanNo">
</div>
@@ -108,7 +108,7 @@
<div class="col-sm-8">
<textarea name="userErbanNoAdd" id="userErbanNoAdd"
class="form-control validate[required]" rows="5"
placeholder="请输入用户大鹅号用,隔开输入多个"></textarea>
placeholder="请输入用户平台号用,隔开输入多个"></textarea>
</div>
</div>
@@ -117,7 +117,7 @@
<div class="col-sm-8">
<textarea name="roomErbanNoAdd" id="roomErbanNoAdd"
class="form-control validate[required]" rows="5"
placeholder="请输入房主大鹅号用,隔开输入多个"></textarea>
placeholder="请输入房主平台号用,隔开输入多个"></textarea>
</div>
</div>

8
accompany-admin/accompany-admin-web/src/main/resources/static/html/room/room_inside_recommend.html
View File

@@ -7,8 +7,8 @@
</section>
<div id="toolbar">
<div class="col-sm-12">
<label for="erbanNo" class="col-sm-5 control-label">房主大鹅号:</label>
<input type="text" class="form-control" name="erbanNo" id="erbanNo" placeholder="请输入房主大鹅号">
<label for="erbanNo" class="col-sm-5 control-label">房主平台号:</label>
<input type="text" class="form-control" name="erbanNo" id="erbanNo" placeholder="请输入房主平台号">
</div>
<div class="col-sm-12">
<button id="btnSearch" class="btn btn-default">
@@ -81,7 +81,7 @@
<div class="modal-body">
<form class="form-horizontal" id="erbanNoForm">
<div class="form-group">
<label for="erbanNoStr" class="col-sm-2 control-label">大鹅号（多个大鹅号用逗号隔开）:</label>
<label for="erbanNoStr" class="col-sm-2 control-label">平台号（多个平台号用逗号隔开）:</label>
<div class="col-sm-10">
<textarea class="form-control" name="erbanNoStr" id="erbanNoStr" style="height:250px;"></textarea>
</div>
@@ -104,7 +104,7 @@
$('#table').bootstrapTable({
columns: [
{field: 'roomUid', title: '房主UID', align: 'center', width: '5%'},
{field: 'roomErbanNo', title: '房主大鹅号', align: 'center', width: '10%'},
{field: 'roomErbanNo', title: '房主平台号', align: 'center', width: '10%'},
{field: 'roomTitle', title: '房间标题', align: 'center', width: '10%'},
{field: 'roomTag', title: '房间的标签', align: 'center', width: '10%'},
{

2
accompany-admin/accompany-admin-web/src/main/resources/static/html/seekelfin/seek_elfin_user_record_admin.html
View File

@@ -75,7 +75,7 @@
columns: [
{field: 'id', title: 'id', align: 'center', width: '5%'},
{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: 'costGoldNum', title: '购买头饰', align: 'center', width: '5%'},
{field: 'receiveGoldNum', title: '平台价值', align: 'center', width: '5%'},

4
accompany-admin/accompany-admin-web/src/main/resources/static/html/users/user_real_name_admin.html
View File

@@ -37,7 +37,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="3">uid</option>
</select>
@@ -85,7 +85,7 @@
},
columns:[
{field:'uid',title:'uid',align:'center',valign:'middle'},
{field:'erbanNo',title:'大鹅号',align:'center',valign:'middle'},
{field:'erbanNo',title:'平台号',align:'center',valign:'middle'},
{field:'nick',title:'用户昵称',align:'center',valign:'middle'},
{field:'realName',title:'真实姓名',align:'center',valign:'middle',
formatter:function (val,row,index) {

2
accompany-admin/accompany-admin-web/src/main/resources/templates/login.html
View File

@@ -48,7 +48,7 @@
<div class="login_box">
<div class="login_logo">
<span style="font-size:24px;color:#222;font-weight:bold;">&nbsp;&nbsp;大&nbsp;鹅&nbsp;开&nbsp;黑&nbsp;管&nbsp;理&nbsp;系&nbsp;统</span>
<span style="font-size:24px;color:#222;font-weight:bold;">&nbsp;&nbsp;peko&nbsp;管&nbsp;理&nbsp;系&nbsp;统</span>
</div>
<!--<br>-->
<div class="login_form">

2
accompany-base/accompany-common/src/main/java/com/accompany/common/redis/RedisKey.java
View File

@@ -1747,7 +1747,7 @@ public enum RedisKey {
/*渠道内容*/
channel_content_record,//渠道内容：Hash
current_day_new_user,//指定时段注册的用户大鹅号缓存Set
current_day_new_user,//指定时段注册的用户平台号缓存Set
current_day_new_user_lock,//渠道调整和用户注册缓存添加锁
/** 2022魔法学院活动 start **/

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/vip/VipInfo.java
View File

@@ -48,10 +48,10 @@ public class VipInfo {
private String floatPic;
@TableField(value = "level_keep_score")
@ApiModelProperty(value = "贵族保级值")
private Integer levelKeepScore;
private Long levelKeepScore;
@TableField(value = "leve_up_score")
@ApiModelProperty(value = "贵族升级值")
private Integer levelUpScore;
private Long levelUpScore;
@TableField(value = "coming_soon")
@ApiModelProperty(value = "是否敬请期待：1. 否 2.是")
private Byte comingSoon;

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java
View File

@@ -135,11 +135,11 @@ public class LinearlyPoolPrizeMessageService {
// 发送小秘书通知
String content;
if(msg.getPrizeNum() > 1) {
content = String.format("恭喜用户 大鹅号:%s 在 %s 房间 %s 获得了 %s*%d 价值 %d*%d 钻石", users.getErbanNo(),
content = String.format("恭喜用户 peko号:%s 在 %s 房间 %s 获得了 %s*%d 价值 %d*%d 钻石", users.getErbanNo(),
room.getTitle(), msg.getBoxTypeStr(), msg.getPrizeName(), msg.getPrizeNum(),
entity.getPlatformValue(), msg.getPrizeNum());
}else {
content = String.format("恭喜用户 大鹅号:%s 在 %s 房间 %s 获得了 %s 价值 %d 钻石", users.getErbanNo(),
content = String.format("恭喜用户 peko号:%s 在 %s 房间 %s 获得了 %s 价值 %d 钻石", users.getErbanNo(),
room.getTitle(), msg.getBoxTypeStr(), msg.getPrizeName(), entity.getPlatformValue());
}
sendBroadMsgToAll(content, "", (byte) 0, "");
@@ -151,11 +151,11 @@ public class LinearlyPoolPrizeMessageService {
// 发送小秘书通知
String content;
if(msg.getPrizeNum() > 1) {
content = String.format("恭喜用户 大鹅号:%s 在 %s 房间 %s 获得了 %s*%d 价值 %d*%d 钻石", users.getErbanNo(),
content = String.format("恭喜用户 peko号:%s 在 %s 房间 %s 获得了 %s*%d 价值 %d*%d 钻石", users.getErbanNo(),
room.getTitle(), msg.getBoxTypeStr(), msg.getPrizeName(), msg.getPrizeNum(),
entity.getPlatformValue(), msg.getPrizeNum());
}else {
content = String.format("恭喜用户 大鹅号:%s 在 %s 房间 %s 获得了 %s 价值 %d 钻石", users.getErbanNo(),
content = String.format("恭喜用户 peko号:%s 在 %s 房间 %s 获得了 %s 价值 %d 钻石", users.getErbanNo(),
room.getTitle(), msg.getBoxTypeStr(), msg.getPrizeName(), entity.getPlatformValue());
}
sendBroadMsgToAll(content, "", (byte) 0, "");

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueExcelService.java
View File

@@ -246,7 +246,7 @@ public class RoomRevenueExcelService extends BaseService {
row.setRowStyle(sheet.getRow(5).getRowStyle());
// 序号
row.createCell(0).setCellValue(i + 1);
// 大鹅号
// peko号
row.createCell(1).setCellValue(item.getErbanNo());
// 用户昵称
row.createCell(2).setCellValue(item.getNick());

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipLevelBizService.java
View File

@@ -186,7 +186,7 @@ public class VipLevelBizService {
* @param currScore 当前权力值
*/
@Transactional(rollbackFor = Exception.class, transactionManager = "mybatisplusTransactionManager")
public void handleVipScoreNotEnough(UserVipInfo userVipInfo, Integer currScore) {
public void handleVipScoreNotEnough(UserVipInfo userVipInfo, Long currScore) {
log.info("处理用户贵族降级（撤销贵族）, uid {}, 当前权力值 {}" , userVipInfo.getUid(), currScore);
List<VipInfo> vipInfos = VipUtil.listVipInfo();
VipInfo vipInfo = vipInfos.stream().filter(vip -> vip.getLevelKeepScore() <= currScore)

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipMessageService.java
View File

@@ -68,7 +68,7 @@ public class VipMessageService {
/**
* 开通贵族小秘书消息
*/
private final static String OPEN_VIP_SECRETARY_MESSAGE_CONTENT = "恭喜你成功开通大鹅贵族，当前等级为%s，点击查看%s升级要求>>>";
private final static String OPEN_VIP_SECRETARY_MESSAGE_CONTENT = "恭喜你成功开通peko贵族，当前等级为%s，点击查看%s升级要求>>>";
/**
* 升级贵族小秘书消息

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipTaskService.java
View File

@@ -152,12 +152,12 @@ public class VipTaskService {
}
String scoreField = VipUtil.getUserVipScoreCacheFieldName(userVipInfo.getUid(), userVipInfo.getExpireTime().getTime());
String scoreStr = jedisService.hget(RedisKey.user_vip_curr_score.getKey(), scoreField);
int score = 0;
long score = 0;
if (StringUtils.isNotBlank(scoreStr)) {
score = Integer.parseInt(scoreStr);
score = Long.parseLong(scoreStr);
}
Integer levelKeepScore = vipInfo.getLevelKeepScore();
Integer levelUpScore = vipInfo.getLevelUpScore();
Long levelKeepScore = vipInfo.getLevelKeepScore();
Long levelUpScore = vipInfo.getLevelUpScore();
log.info("用户当前权力值 {}， 用户当前贵族等级 {}， 当前等级保级值 {}", score, userVipInfo.getVipLevel(), levelKeepScore);
VipInfo nextVipLevel = VipUtil.getNextVipLevel(vipLevel);
// 存在下一级，且下一级不是敬请期待，当前权力值大于当前等级的升级值

7
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientController.java
View File

@@ -83,11 +83,6 @@ public class ClientController extends BaseController {
FaceJson faceJson = faceJsonService.getValidFaceJson(appVersion);
// 闪屏数据
SplashVo splashVo = sysConfService.getSplashConf();
// 贵族特权列表
// List<NobleRight> rights = nobleRightService.getNobleRightList();
// 贵族
// NobleZip nobleZip = nobleZipService.getValidNobleZip();
// ReplaceDomainUtil.handlerForObject(nobleZip);
Integer roomRefresh = Integer.parseInt(
sysConfService.getDefaultSysConfValueById(Constant.SysConfId.HOME_ROOM_REFRESH_TIME,"10"));
Integer dynamicRefresh = Integer.parseInt(
@@ -141,8 +136,6 @@ public class ClientController extends BaseController {
AppInitVo appInitVo = new AppInitVo();
appInitVo.setFaceJson(faceJson);
appInitVo.setSplashVo(splashVo);
// appInitVo.setNobleZip(coverNobleZip(nobleZip));
// appInitVo.setRights(rights);
appInitVo.setRoomRefresh(roomRefresh);
appInitVo.setDynamicRefresh(dynamicRefresh);
appInitVo.setOpenBoxSwitch(openBoxSwitch);