Merge branch 'dev_dh_bt' into dev_bt
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.javaback_recharge
commit
a1fc1e1683
|
@ -1,5 +1,8 @@
|
||||||
package com.ljsd.jieling.kefu;
|
package com.ljsd.jieling.kefu;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||||
|
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||||
import com.ljsd.jieling.globals.BIReason;
|
import com.ljsd.jieling.globals.BIReason;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityType;
|
import com.ljsd.jieling.logic.activity.ActivityType;
|
||||||
|
@ -49,12 +52,11 @@ public class Cmd_general extends GmAbstract {
|
||||||
try {
|
try {
|
||||||
int uid = Integer.parseInt(args[1]);
|
int uid = Integer.parseInt(args[1]);
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
|
|
||||||
String[] items = args[2].split("\\|");
|
|
||||||
HashMap<Integer, Long> map = new HashMap<>();
|
HashMap<Integer, Long> map = new HashMap<>();
|
||||||
for (String item : items) {
|
String[] split = args[2].split("\\|");
|
||||||
String[] split = item.split("#");
|
for (String s : split) {
|
||||||
map.put(Integer.parseInt(split[0]),Long.parseLong(split[1]));
|
String[] strings = s.split("#");
|
||||||
|
map.put(Integer.parseInt(strings[0]),Long.parseLong(strings[0]));
|
||||||
}
|
}
|
||||||
ItemUtil.useItemLong(user,map, BIReason.GM_ROOT_REMOVE_ITEM,-999);
|
ItemUtil.useItemLong(user,map, BIReason.GM_ROOT_REMOVE_ITEM,-999);
|
||||||
LOGGER.info("通过gm后台删除玩家道具,uid:{},item:{}",uid, map);
|
LOGGER.info("通过gm后台删除玩家道具,uid:{},item:{}",uid, map);
|
||||||
|
@ -63,6 +65,36 @@ public class Cmd_general extends GmAbstract {
|
||||||
}
|
}
|
||||||
LOGGER.info("删除玩家道具......{}",args[1]);
|
LOGGER.info("删除玩家道具......{}",args[1]);
|
||||||
break;
|
break;
|
||||||
|
case "userstr":
|
||||||
|
try {
|
||||||
|
int uid = Integer.parseInt(args[1]);
|
||||||
|
User user = UserManager.getUser(uid);
|
||||||
|
if (user == null){
|
||||||
|
LOGGER.error("用户找不到");
|
||||||
|
}else {
|
||||||
|
Gson gson = RedisUtil.getInstence().getGson();
|
||||||
|
String userStr = gson.toJson(user);
|
||||||
|
LOGGER.info("userstr============:{}",userStr);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
LOGGER.info("查询用户字符串......{}",args[1]);
|
||||||
|
break;
|
||||||
|
case "saveuser":
|
||||||
|
try {
|
||||||
|
int uid = Integer.parseInt(args[1]);
|
||||||
|
User user = UserManager.getUser(uid);
|
||||||
|
if (user == null){
|
||||||
|
LOGGER.error("用户找不到");
|
||||||
|
}else {
|
||||||
|
MongoUtil.getInstence().getMyMongoTemplate().save(user.getId(),user);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
LOGGER.info("查询用户字符串......{}",args[1]);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,15 +77,20 @@ public class GmActivityLogic implements IEventHandler {
|
||||||
// 活动信息获取
|
// 活动信息获取
|
||||||
GmActivityManager manager = user.getGmActivityManager();
|
GmActivityManager manager = user.getGmActivityManager();
|
||||||
Map<String, ARBActivity> arbActivityMap = getArbActivity();
|
Map<String, ARBActivity> arbActivityMap = getArbActivity();
|
||||||
|
LOGGER.info("返利活动信息长度:uid:{},num:{}",user.getId(),arbActivityMap.size());
|
||||||
|
int i = 1;
|
||||||
for (Map.Entry<String, ARBActivity> entry : arbActivityMap.entrySet()) {
|
for (Map.Entry<String, ARBActivity> entry : arbActivityMap.entrySet()) {
|
||||||
|
LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{}",i,user.getId(),entry.getKey());
|
||||||
ARBActivity arbActivity = entry.getValue();
|
ARBActivity arbActivity = entry.getValue();
|
||||||
|
LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},type:{}",i,user.getId(),arbActivity.getId(),arbActivity.getType());
|
||||||
// 时间校验
|
// 时间校验
|
||||||
long start = getStartTime(arbActivity);
|
long start = getStartTime(arbActivity);
|
||||||
|
LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},start:{}",i,user.getId(),arbActivity.getId(),start);
|
||||||
long end = getEndTime(arbActivity);
|
long end = getEndTime(arbActivity);
|
||||||
|
LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},end:{}",i,user.getId(),arbActivity.getId(),end);
|
||||||
long now = TimeUtils.now();
|
long now = TimeUtils.now();
|
||||||
if (start > now || end <= now){
|
LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},type:{}, now:{}",i,user.getId(),arbActivity.getId(),arbActivity.getType(),now);
|
||||||
continue;
|
if (now >= start && now < end){
|
||||||
}
|
|
||||||
// 获取全部活动信息
|
// 获取全部活动信息
|
||||||
GmActivity gmActivity = manager.getActivityMap().getOrDefault(entry.getKey(), new GmActivity(arbActivity));
|
GmActivity gmActivity = manager.getActivityMap().getOrDefault(entry.getKey(), new GmActivity(arbActivity));
|
||||||
switch (gmActivity.getType()){
|
switch (gmActivity.getType()){
|
||||||
|
@ -104,6 +109,8 @@ public class GmActivityLogic implements IEventHandler {
|
||||||
}
|
}
|
||||||
manager.putActivityMap(gmActivity.getId(),gmActivity);
|
manager.putActivityMap(gmActivity.getId(),gmActivity);
|
||||||
}
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -377,22 +384,29 @@ public class GmActivityLogic implements IEventHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, ARBActivity> arbActivityMap = getArbActivity();
|
Map<String, ARBActivity> arbActivityMap = getArbActivity();
|
||||||
for (GmActivity gmActivity : manager.getActivityMap().values()) {
|
for (ARBActivity value : arbActivityMap.values()) {
|
||||||
ARBActivity arbActivity = arbActivityMap.get(gmActivity.getId());
|
if (value.getType() == 1 || value.getType() == 2 || value.getType() == 4){
|
||||||
// 活动已经从gm上删除了,在这里删除数据库中的
|
manager.removeActivity(value.getId());
|
||||||
if (arbActivity == null){
|
LOGGER.info("返利活动重置,uid:{},活动id:{}, type:{}",user.getId(),value.getId(), value.getType());
|
||||||
manager.removeActivity(gmActivity.getId());
|
|
||||||
LOGGER.info("返利活动删除,uid:{},活动id:{}",user.getId(),gmActivity.getId());
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// 单日累充和妖晶返利每日清零
|
|
||||||
if (gmActivity.getType() == 1 || gmActivity.getType() == 2 || gmActivity.getType() == 4){
|
|
||||||
gmActivity.setValue(0);
|
|
||||||
gmActivity.setMissionMap(new HashMap<>());
|
|
||||||
LOGGER.info("返利活动重置,uid:{},活动id:{}",user.getId(),gmActivity.getId());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// for (GmActivity gmActivity : manager.getActivityMap().values()) {
|
||||||
|
// ARBActivity arbActivity = arbActivityMap.get(gmActivity.getId());
|
||||||
|
// // 活动已经从gm上删除了,在这里删除数据库中的
|
||||||
|
// if (arbActivity == null){
|
||||||
|
// manager.removeActivity(gmActivity.getId());
|
||||||
|
// LOGGER.info("返利活动删除,uid:{},活动id:{}",user.getId(),gmActivity.getId());
|
||||||
|
// continue;
|
||||||
|
// }
|
||||||
|
// // 单日累充和妖晶返利每日清零
|
||||||
|
// if (gmActivity.getType() == 1 || gmActivity.getType() == 2 || gmActivity.getType() == 4){
|
||||||
|
// gmActivity.setValue(0);
|
||||||
|
// gmActivity.setMissionMap(new HashMap<>());
|
||||||
|
// LOGGER.info("返利活动重置,uid:{},活动id:{}",user.getId(),gmActivity.getId());
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
manager.setUpdateTime(nowTime);
|
manager.setUpdateTime(nowTime);
|
||||||
LOGGER.info("返利活动重置结束,uid:{},刷新时间:{}",user.getId(),manager.getUpdateTime());
|
LOGGER.info("返利活动重置结束,uid:{},刷新时间:{}",user.getId(),manager.getUpdateTime());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue