From 806dd0d33303e8d9e28087e35580c6abbec2c96d Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 9 Feb 2023 20:51:23 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/activityLogic/GmActivityLogic.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java index b1884c035..3975d8062 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java @@ -192,18 +192,19 @@ public class GmActivityLogic implements IEventHandler { int num = gmActivity.getValue() + (int) price; // do-while循环,重置奖励后再次验证 boolean verify; + LOGGER.info("单日累充,第一步,userid:{}, 活动id:{}, 金额:{}", user.getId(),gmActivity.getId(),num); do { verify = false; for (ARBMission arbMission : gmMissionList) { GmMission gmMission = gmActivity.getMissionMap().getOrDefault(arbMission.getId(), new GmMission()); // 已领取 if (gmMission.getState() == 1){ - LOGGER.error("单日累充,档位已领取,userid:{}, 活动id:{}, 档位id:{}", user.getId(),gmActivity.getId(),gmMission.getId()); + LOGGER.info("单日累充,档位已领取,userid:{}, 活动id:{}, 档位id:{}", user.getId(),gmActivity.getId(),gmMission.getId()); continue; } // 不能领 if (num < arbMission.getRechargeNum()){ - LOGGER.error("单日累充,金额不足,userid:{}, 活动id:{}, 金额:{}-{}", user.getId(),gmActivity.getId(),num,arbMission.getRechargeNum()); + LOGGER.info("单日累充,金额不足,userid:{}, 活动id:{}, 金额:{}-{}", user.getId(),gmActivity.getId(),num,arbMission.getRechargeNum()); continue; } // 发邮件 @@ -219,12 +220,14 @@ public class GmActivityLogic implements IEventHandler { // 领取完全部奖励后重置活动 long count = gmActivity.getMissionMap().values().stream().filter(v -> v.getState() == 1).count(); + LOGGER.info("单日累充,第二步,userid:{}, 活动id:{}, 完成度对比:{}-{}", user.getId(),gmActivity.getId(),gmMissionList.size(),count); if (gmMissionList.size() == count){ // 重置活动对象 gmActivity.setMissionMap(new HashMap<>()); // 减去满级金额 num-=gmMissionList.get(gmMissionList.size()-1).getRechargeNum(); verify = true; + LOGGER.info("单日累充,自动重置,userid:{}, 活动id:{}, 剩余金额:{}", user.getId(),gmActivity.getId(),num); } } while (verify); @@ -242,12 +245,12 @@ public class GmActivityLogic implements IEventHandler { GmMission gmMission = gmActivity.getMissionMap().getOrDefault(arbMission.getId(), new GmMission()); // 已领取 if (gmMission.getState() == 1){ - LOGGER.error("单笔充值奖励,档位已领取,userid:{}, 活动id:{}, 档位id:{}", user.getId(),gmActivity.getId(),gmMission.getId()); + LOGGER.info("单笔充值奖励,档位已领取,userid:{}, 活动id:{}, 档位id:{}", user.getId(),gmActivity.getId(),gmMission.getId()); continue; } // 不能领 if (price != arbMission.getRechargeNum()){ - LOGGER.error("单笔充值奖励,金额对比失败,userid:{}, 活动id:{}, 金额:{}-{}", user.getId(),gmActivity.getId(),price,arbMission.getRechargeNum()); + LOGGER.info("单笔充值奖励,金额对比失败,userid:{}, 活动id:{}, 金额:{}-{}", user.getId(),gmActivity.getId(),price,arbMission.getRechargeNum()); continue; } // 发邮件 @@ -270,7 +273,7 @@ public class GmActivityLogic implements IEventHandler { private void getRewardToMonsterCurrencyBack(User user, GmActivity gmActivity, double price) throws Exception { Map missionMap = findAllGmMissionMap(gmActivity.getId()); if (missionMap == null || missionMap.isEmpty()) { - LOGGER.error("妖晶返利活动,详细档位信息未配置,userid:{}, 活动id:{}", user.getId(), gmActivity.getId()); + LOGGER.info("妖晶返利活动,详细档位信息未配置,userid:{}, 活动id:{}", user.getId(), gmActivity.getId()); return; } // 档位排序 @@ -284,7 +287,7 @@ public class GmActivityLogic implements IEventHandler { // 最低要求 int limit = arbMissions.get(0).getBeforeNum(); if (sumMoney < limit || sumMoney <= 0) { - LOGGER.error("妖晶返利活动,充值金额不足最低领取调解,userid:{},活动id:{},当前累充金额:{},最低条件:{}", user.getId(), gmActivity.getId(), sumMoney, limit); + LOGGER.info("妖晶返利活动,充值金额不足最低领取调解,userid:{},活动id:{},当前累充金额:{},最低条件:{}", user.getId(), gmActivity.getId(), sumMoney, limit); return; } // 首次计算标记 From 80b7cfa46442b8fc7e283be7faf2c3ff6950e345 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 9 Feb 2023 21:04:50 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/activityLogic/GmActivityLogic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java index 3975d8062..ba39a1184 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java @@ -83,6 +83,7 @@ public class GmActivityLogic implements IEventHandler { long start = getStartTime(arbActivity); long end = getEndTime(arbActivity); long now = TimeUtils.now(); + LOGGER.info("返利活动信息:uid:{},aid:{},type:{},start:{},end:{},now:{}",user.getId(),arbActivity.getId(),arbActivity.getType(),start,end,now); if (start > now || end <= now){ continue; } From 94f406f9408830a527394ee8b239d2d7205b7361 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 9 Feb 2023 21:35:28 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E8=B7=A8=E5=A4=A9=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activityLogic/GmActivityLogic.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java index ba39a1184..27abdbe32 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java @@ -378,22 +378,29 @@ public class GmActivityLogic implements IEventHandler { } Map arbActivityMap = getArbActivity(); - 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()); + for (ARBActivity value : arbActivityMap.values()) { + if (value.getType() == 1 || value.getType() == 2 || value.getType() == 4){ + manager.removeActivity(value.getId()); + LOGGER.info("返利活动重置,uid:{},活动id:{}, type:{}",user.getId(),value.getId(), value.getType()); } } +// 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); LOGGER.info("返利活动重置结束,uid:{},刷新时间:{}",user.getId(),manager.getUpdateTime()); } From 2e407ffd9269ba410d13ce15ec27247a073d5535 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 27 Feb 2023 17:08:47 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/activityLogic/GmActivityLogic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java index 27abdbe32..f37319471 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java @@ -77,6 +77,7 @@ public class GmActivityLogic implements IEventHandler { // 活动信息获取 GmActivityManager manager = user.getGmActivityManager(); Map arbActivityMap = getArbActivity(); + LOGGER.info("返利活动信息长度:uid:{},num:{}",user.getId(),arbActivityMap.size()); for (Map.Entry entry : arbActivityMap.entrySet()) { ARBActivity arbActivity = entry.getValue(); // 时间校验 From 8ee880c58ebc4f8cca8170031d530f8236228024 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 27 Feb 2023 17:38:31 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activityLogic/GmActivityLogic.java | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java index f37319471..d08e0a54b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java @@ -78,33 +78,38 @@ public class GmActivityLogic implements IEventHandler { GmActivityManager manager = user.getGmActivityManager(); Map arbActivityMap = getArbActivity(); LOGGER.info("返利活动信息长度:uid:{},num:{}",user.getId(),arbActivityMap.size()); + int i = 1; for (Map.Entry entry : arbActivityMap.entrySet()) { + LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{}",i,user.getId(),entry.getKey()); ARBActivity arbActivity = entry.getValue(); + LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},type:{}",i,user.getId(),arbActivity.getId(),arbActivity.getType()); // 时间校验 long start = getStartTime(arbActivity); + LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},start:{}",i,user.getId(),arbActivity.getId(),start); long end = getEndTime(arbActivity); + LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},end:{}",i,user.getId(),arbActivity.getId(),end); long now = TimeUtils.now(); - LOGGER.info("返利活动信息:uid:{},aid:{},type:{},start:{},end:{},now:{}",user.getId(),arbActivity.getId(),arbActivity.getType(),start,end,now); - if (start > now || end <= now){ - continue; + LOGGER.info("返利活动信息,第{}次循环:uid:{},aid:{},type:{}, now:{}",i,user.getId(),arbActivity.getId(),arbActivity.getType(),now); + if (now >= start && now < end){ + // 获取全部活动信息 + GmActivity gmActivity = manager.getActivityMap().getOrDefault(entry.getKey(), new GmActivity(arbActivity)); + switch (gmActivity.getType()){ + case 1://单日累充 + getRewardToSingleTotalRecharge(user, gmActivity, price); + break; + case 2://妖晶返利 + getRewardToMonsterCurrencyBack(user, gmActivity, price); + break; + case 4://单笔充值 + getRewardToSingleRecharge(user, gmActivity, price); + break; + default://3、5、6(多日累充,永久大充,开服首日累充) + getDefaultReward(user, gmActivity, price); + break; + } + manager.putActivityMap(gmActivity.getId(),gmActivity); } - // 获取全部活动信息 - GmActivity gmActivity = manager.getActivityMap().getOrDefault(entry.getKey(), new GmActivity(arbActivity)); - switch (gmActivity.getType()){ - case 1://单日累充 - getRewardToSingleTotalRecharge(user, gmActivity, price); - break; - case 2://妖晶返利 - getRewardToMonsterCurrencyBack(user, gmActivity, price); - break; - case 4://单笔充值 - getRewardToSingleRecharge(user, gmActivity, price); - break; - default://3、5、6(多日累充,永久大充,开服首日累充) - getDefaultReward(user, gmActivity, price); - break; - } - manager.putActivityMap(gmActivity.getId(),gmActivity); + i++; } } From 7cda848b0bff0859fcd9f9a487fa8027e60e35d3 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 10 Feb 2023 17:19:48 +0800 Subject: [PATCH 6/9] gm --- .../com/ljsd/jieling/kefu/Cmd_general.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java index 9f1908919..81752cc06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.kefu; +import com.google.gson.Gson; +import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.ActivityType; @@ -59,6 +61,22 @@ public class Cmd_general extends GmAbstract { } LOGGER.info("删除玩家道具......{}",args[1]); 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; default: break; } From 81e72ba2288097333ab879eccfd341810d3d9e17 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 10 Feb 2023 17:57:45 +0800 Subject: [PATCH 7/9] gm --- .../java/com/ljsd/jieling/kefu/Cmd_general.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java index 81752cc06..3743f7cda 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java @@ -1,6 +1,7 @@ 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.logic.activity.ActivityLogic; @@ -77,6 +78,20 @@ public class Cmd_general extends GmAbstract { } 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: break; } From 3d1681bfadb6650974ecc594d6d6baecea450c1b Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 10 Feb 2023 18:34:48 +0800 Subject: [PATCH 8/9] =?UTF-8?q?gm=E5=88=A0=E9=99=A4=E9=81=93=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/kefu/Cmd_general.java | 10 ++++++---- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java index 3743f7cda..871104b2d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java @@ -52,11 +52,13 @@ public class Cmd_general extends GmAbstract { try { int uid = Integer.parseInt(args[1]); User user = UserManager.getUser(uid); - int itemId = Integer.parseInt(args[2]); - long itemNum = Long.parseLong(args[3]); HashMap map = new HashMap<>(); - map.put(itemId,itemNum); - ItemUtil.itemCostLong(user,map, BIReason.GM_ROOT_REMOVE_ITEM,-999); + String[] split = args[2].split("\\|"); + for (String s : split) { + String[] strings = s.split("#"); + map.put(Integer.parseInt(strings[0]),Long.parseLong(strings[0])); + } + ItemUtil.useItemLong(user,map, BIReason.GM_ROOT_REMOVE_ITEM,-999); } catch (Exception e) { e.printStackTrace(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 6cc9f62e0..fb25b2926 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1072,7 +1072,7 @@ public class ItemUtil { useItemLong(user,longMap,reason,subReason); } - private static void useItemLong(User user,Map useItemMap,int reason,int subReason) throws Exception{ + public static void useItemLong(User user,Map useItemMap,int reason,int subReason) throws Exception{ if(useItemMap.isEmpty()){ return; } From 08042195cb42cceb7d856e53db522a04f733cc1d Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 10 Feb 2023 18:42:37 +0800 Subject: [PATCH 9/9] =?UTF-8?q?gm=E5=88=A0=E9=99=A4=E9=81=93=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java index 871104b2d..8f630845a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java @@ -59,6 +59,7 @@ public class Cmd_general extends GmAbstract { map.put(Integer.parseInt(strings[0]),Long.parseLong(strings[0])); } ItemUtil.useItemLong(user,map, BIReason.GM_ROOT_REMOVE_ITEM,-999); + LOGGER.info("通过gm后台删除玩家道具,uid:{},item:{}",uid, map); } catch (Exception e) { e.printStackTrace(); }