现金卡计入累充

back_recharge
duhui 2022-11-08 14:12:46 +08:00
parent 8c10cde626
commit 711778ec98
4 changed files with 10 additions and 18 deletions

View File

@ -8,8 +8,6 @@ import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.network.session.ISession;
import config.SActivityRewardConfig;
import java.util.Map;
/**
*
*/
@ -22,16 +20,6 @@ class DailyRechargeActivity extends AbstractActivity {
@Override
public void onResume(User user) throws Exception {
//每日充值 补发前日未领取的奖
// Map<Integer, ActivityMission> activityMissionMap = user.getActivityManager().getActivityMissionMap();
// //每日充值隐含开启条件是 首冲完成 策划说首冲的活动id 5绝对不会变
// ActivityMission activityMission = activityMissionMap.get(5);
// if (null != activityMission && activityMission.getActivityState() == ActivityType.FINISH_STATE) {
// ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
// takeAllReward(sessionByUid);
// }
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
takeAllReward(sessionByUid);
super.onResume(user);
@ -52,6 +40,6 @@ class DailyRechargeActivity extends AbstractActivity {
}
@Override
public void onActivityEndDealReward(User user) throws Exception {
public void onActivityEndDealReward(User user) {
}
}

View File

@ -231,9 +231,10 @@ public class GmActivityLogic implements IEventHandler {
List<ARBActivity> list = findServerActivityList(String.valueOf(GameApplication.serverId));
HashMap<String, GmActivity> activityMap = gmActivityManager.getActivityMap();
// 删除不存在得活动
Set<String> set = list.stream().map(ARBActivity::getId).collect(Collectors.toSet());
for (String key : activityMap.keySet()) {
if (!set.contains(key)){
Set<String> gmKeys = list.stream().map(ARBActivity::getId).collect(Collectors.toSet());
Set<String> gameKeys = new HashSet<>(activityMap.keySet());
for (String key : gameKeys) {
if (!gmKeys.contains(key)){
gmActivityManager.removeActivity(key);
}
}

View File

@ -1494,7 +1494,7 @@ public class ItemUtil {
* bt
* :
* :
* :
* : (gm)
* @param user
* @return
*/
@ -1505,6 +1505,9 @@ public class ItemUtil {
switch (sItem.getItemType()){
case GlobalItemType.RMB_CARD:
case GlobalItemType.DAY_RMB_CARD:
info.addRmb(num);
BuyGoodsNewLogic.changeActivity(user,num,info);
break;
case GlobalItemType.XIAN_RECHARGE_CARD:
case GlobalItemType.DAY_XIAN_RECHARGE_CARD:
info.addRmb(num);