generated from root/miduo_server
修改线下返利活动
parent
91c2da533b
commit
9486175d82
|
|
@ -83,6 +83,7 @@ public class ActivityController {
|
|||
List<ARBActivityTypeVo> typeList = new ArrayList<>(ARBActivityTypeEnum.getVoMap().values());
|
||||
map.addAttribute("typeList", typeList);
|
||||
List<ServerInfo> serverInfos = serverInfoDao.getAllServerInfo();
|
||||
serverInfos.add(0,new ServerInfo(0,"全部"));
|
||||
map.addAttribute("serverInfos", serverInfos);
|
||||
return "updateARBActivity";
|
||||
}
|
||||
|
|
@ -96,8 +97,15 @@ public class ActivityController {
|
|||
@PostMapping(value = "/updateARBActivity")
|
||||
public @ResponseBody int
|
||||
updateARBActivity(@RequestBody ARBActivity activity) throws Exception {
|
||||
// 存库
|
||||
activityDao.uporsetActivity(activity);
|
||||
activityUpdateVersion();
|
||||
// 放入redis
|
||||
ARBActivity oneActivity = activityDao.findOneActivity(activity.getId());
|
||||
if (oneActivity != null){
|
||||
for (String serverId : oneActivity.getServerIds()) {
|
||||
RedisUtil.getInstence().putMapEntry(RedisUserKey.GM_ACTIVITY_INFO,serverId,activity.getId(),oneActivity,-1);
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -110,9 +118,16 @@ public class ActivityController {
|
|||
@RequestMapping(value = "/removeARBActivity", method = {RequestMethod.POST, RequestMethod.GET})
|
||||
public @ResponseBody int
|
||||
removeARBActivity(HttpServletRequest request) throws Exception {
|
||||
// mongo
|
||||
String activityId = request.getParameter("activityId");
|
||||
ARBActivity oneActivity = activityDao.findOneActivity(activityId);
|
||||
activityDao.deleteActivity(activityId);
|
||||
activityUpdateVersion();
|
||||
// redis
|
||||
if (oneActivity != null){
|
||||
for (String serverId : oneActivity.getServerIds()) {
|
||||
RedisUtil.getInstence().delMapKey(RedisUserKey.GM_ACTIVITY_INFO,serverId,activityId);
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -243,12 +258,4 @@ public class ActivityController {
|
|||
activityDao.deleteMission(missionId);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* 活动更新标识,同步redis
|
||||
*/
|
||||
private static void activityUpdateVersion(){
|
||||
RedisUtil.getInstence().set(RedisUserKey.GM_ACTIVITY_UPDATE, String.valueOf(DateUtil.nowInt()));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public class ActivityDaoImpl implements ActivityDao {
|
|||
public List<ARBActivity> findServerActivityList(String serverId) throws Exception {
|
||||
List<ARBActivity> resultList = new ArrayList<>();
|
||||
for (ARBActivity activity : findAllActivityList()) {
|
||||
if (activity.getServerIds().contains(serverId)){
|
||||
if (activity.getServerIds().contains(serverId) || activity.getServerIds().contains("0")){
|
||||
resultList.add(activity);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,6 +146,9 @@ public class ServerInfo implements Comparable,Cloneable {
|
|||
}
|
||||
|
||||
public int getStatusInt() {
|
||||
if (status == null){
|
||||
status = "0";
|
||||
}
|
||||
return Integer.parseInt(status);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -144,6 +144,10 @@ public class ARBActivity {
|
|||
Map<String, ServerInfo> infoMap = RedisUtil.getInstence().getMap(RedisUserKey.SERVER_INFO, ServerInfo.class, -1);
|
||||
StringBuilder builder = new StringBuilder();
|
||||
for (String serverId : serverIds) {
|
||||
if (serverId.equals("0")){
|
||||
builder.append("全部");
|
||||
break;
|
||||
}
|
||||
ServerInfo info = infoMap.get(serverId);
|
||||
if (info != null){
|
||||
builder.append(info.getName()).append("|");
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ public enum ARBActivityTypeEnum {
|
|||
MORE_DAY_RECHARGE(3,"多日累积充值"),
|
||||
SINGLE_RECHARGE(4,"单笔充值"),
|
||||
ALWAYS_RECHARGE(5,"永久大额累充活动"),
|
||||
FIRST_DAY_RECHARGE(6,"开服首日累充活动"),
|
||||
;
|
||||
|
||||
private int type;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@ public class RedisUserKey {
|
|||
|
||||
public static final String GAME_PAY_URL = "GAME_PAY_URL:";//游戏支付端口
|
||||
|
||||
public static final String GM_ACTIVITY_INFO = "GM_ACTIVITY_INFO";// GM活动信息
|
||||
|
||||
public static final String GM_ACTIVITY_UPDATE = "GM_ACTIVITY_UPDATE";// GM活动更新
|
||||
|
||||
public static String getKey(String type, String key, int serverId) {
|
||||
|
|
|
|||
|
|
@ -167,6 +167,32 @@
|
|||
value: 'server_id',
|
||||
},
|
||||
initValue: getServerInit(),
|
||||
on: function(data){
|
||||
//可以return一个数组, 代表想选中的数据
|
||||
|
||||
//arr: 当前多选已选中的数据
|
||||
var arr = data.arr;
|
||||
//change, 此次选择变化的数据,数组
|
||||
var change = data.change;
|
||||
//isAdd, 此次操作是新增还是删除
|
||||
var isAdd = data.isAdd;
|
||||
|
||||
if(isAdd){
|
||||
var allItem = change.find(function(item){
|
||||
return item.server_id == '0';
|
||||
})
|
||||
if(allItem){
|
||||
return [allItem];
|
||||
}
|
||||
allItem = arr.find(function(item){
|
||||
return item.server_id == '0';
|
||||
})
|
||||
if(allItem){
|
||||
return change;
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
data: function () {
|
||||
return [[${serverInfos}]];
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
## 更新日志
|
||||
|
||||
+ ### 2022-12-8
|
||||
1. 返利活动新增开服累充类型活动
|
||||
2. 活动返利添加界面:服务器类型新增”全部“类型,选中后全部服务器可用,包括之后开启得服务器
|
||||
|
||||
+ ### 2022-10-25
|
||||
1. 游戏管理主页签下添加自动返利活动功能,可以配置自动返利功能信息
|
||||
2. 发送邮件功能整合到邮件管理主页签下
|
||||
|
|
|
|||
Loading…
Reference in New Issue