diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index fc47c97c7..a2e744b49 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -19,7 +19,7 @@ public interface ActivityType { int OnlineReward = 1; //在线奖励 int SevenLogin = 2; //七日登陆 int ChapterReward = 3; //章节奖励 - int FirstRecharge = 5; //首充 + int RechargeTotal = 5; //首充 // int RechargeTotal = 5; //累计充值 int GrowthFund = 6; //成长基金 int BLESSACTIVITY = 7;//云梦祈福 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 7c9381e43..203e784f3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -11,7 +11,7 @@ public enum ActivityTypeEnum { ONLINEREWARD(ActivityType.OnlineReward, OnlineRewardActivity::new), SEVENLOGIN(ActivityType.SevenLogin, SevenLoginActivity::new), CHAPTERREWARD(ActivityType.ChapterReward, ChapterRewardActivity::new), - FIRSTRECHARGE(ActivityType.FirstRecharge, FirstRechargeActivity::new), + FIRSTRECHARGE(ActivityType.RechargeTotal, FirstRechargeActivity::new), // RECHARGETOTAL(ActivityType.RechargeTotal, RechargeTotalActivity::new), GROWTHFUND(ActivityType.GrowthFund, GrowthFundActivity::new), BLESSACTIVITY(ActivityType.BLESSACTIVITY, BlessActivity::new), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 21e79bd05..d2da3b66f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -213,7 +213,7 @@ public class BuyGoodsLogic { int firstInvest = sRechargeCommodityConfig.getFirstInvest(); int[][] reward=null; // if(rechargeInfo.getIsFirst()==0 && firstInvest == 1){ -// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,1); +// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,sRechargeCommodityConfig.getPrice()); // SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(4).get(0); // rechargeInfo.setFirst(1); // String title = SErrorCodeEerverConfig.getI18NMessage("recharge_first_title"); @@ -261,7 +261,7 @@ public class BuyGoodsLogic { rechargeInfo.setSmonthSaveAmt(price+rechargeInfo.getSmonthSaveAmt()); //TODO 用事件分发 -// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,price); + ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,price);