fix 每日累充活动，变为积分

serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java

@@ -44,6 +44,9 @@ public class DefaultEmptyActivity extends AbstractActivity{
             if (goods != null && goods.length != 0) {
                 for (int i = 0; i < goods.length; i++) {
                     int gid = goods[i];
+                    if (gid == 0) {
+                        continue;
+                    }
                     user.getPlayerInfoManager().getRechargeInfo().updateBuyGoodsTimes(gid,0);
                 }
             }

serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java

@@ -25,7 +25,7 @@ class RechargeSumDayActivity extends AbstractActivity {
             return;
         }
         int missionId = STableManager.getFigureConfig(ActivityStaticConfig.class).getRechargeDaySum().get(activityMission.getV() + 1);
-        if (user.getPlayerInfoManager().getRechargedaily() >= SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[1][1]) {
+        if (user.getPlayerInfoManager().getRechargedaily()*10 >= SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[1][1]) {
             activityMission.setV(activityMission.getV() + 1);
         }
     }

serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java

@@ -1713,7 +1713,8 @@ public class UserMissionManager extends MongoBase {
     private int[] resetJadeDynastyTaskInfo(int type, int activityId, Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap, CumulationData jadeDynastyCumulationData) {
         //周刷新检测
         if (type == 2) {
-            if (jadeDynastyMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(jadeDynastyMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
+//            if (jadeDynastyMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(jadeDynastyMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
+            if (jadeDynastyMissionType.getWeekRefresh() != 0 && TimeUtils.getSoFarWentDays(jadeDynastyMissionType.getWeekRefresh(), TimeUtils.now()) < 7) {
                 return null;
             }
             jadeDynastyMissionType.setWeekRefresh(TimeUtils.now());
@@ -1753,7 +1754,8 @@ public class UserMissionManager extends MongoBase {
     private int[] resetMysticalInstructTaskInfo(int type, int activityId, Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap, CumulationData mysticalInstructCumulationData) {
         //周刷新检测
         if (type == 2) {
-            if (mysticalInstructMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(mysticalInstructMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
+            if (mysticalInstructMissionType.getWeekRefresh() != 0 && TimeUtils.getSoFarWentDays(mysticalInstructMissionType.getWeekRefresh(), TimeUtils.now()) < 7) {
+//            if (mysticalInstructMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(mysticalInstructMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
                 return null;
             }
             mysticalInstructMissionType.setWeekRefresh(TimeUtils.now());
@@ -1833,7 +1835,8 @@ public class UserMissionManager extends MongoBase {
     private int[] cardSubjectTaskInfo(int type, int activityId, Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap, CumulationData cardSubjectCumulationData) {
         //周刷新检测
         if (type == 2) {
-            if (cardSubjectMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(cardSubjectMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
+            if (cardSubjectMissionType.getWeekRefresh() != 0 && TimeUtils.getSoFarWentDays(cardSubjectMissionType.getWeekRefresh(), TimeUtils.now()) < 7) {
+//            if (cardSubjectMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(cardSubjectMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
                 return null;
             }
             cardSubjectMissionType.setWeekRefresh(TimeUtils.now());
@@ -1872,7 +1875,8 @@ public class UserMissionManager extends MongoBase {
     private int[] shengDanTaskInfo(int type, int activityId, Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap, CumulationData shengDanCumulationData) {
         //周刷新检测
         if (type == 2) {
-            if (shengDanMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(shengDanMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
+            if (shengDanMissionType.getWeekRefresh() != 0 && TimeUtils.getSoFarWentDays(shengDanMissionType.getWeekRefresh(), TimeUtils.now()) < 7) {
+//            if (shengDanMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(shengDanMissionType.getWeekRefresh(), TimeUtils.now(), 1, 0)) {
                 return null;
             }
             shengDanMissionType.setWeekRefresh(TimeUtils.now());

serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java

@@ -1522,7 +1522,7 @@ public class BuyGoodsLogic {
         ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE_2, (int) (price * 1000));
         ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM, (int) (price * 1000));
         ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.JADE_DYNASTY_RECHARGE_SUM, (int) (price * 1000));
-        ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, (int) (user.getPlayerInfoManager().getRechargedaily()));
+        ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, (int) (user.getPlayerInfoManager().getRechargedaily() * 10));
         ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FIND_FAIRY_FESTIVAL, (int) (price * 1000));
 
         AyyncWorker ayyncWorker = new AyyncWorker(user, true, new AynMissionWorker(GameEvent.RECHARGE_TOTAL, (int) (price * 1000)));

serverlogic/src/main/java/com/ljsd/jieling/logic/thousandDraw/ThousandDrawLogic.java

@@ -67,6 +67,7 @@ public class ThousandDrawLogic {
                     .setNumber(entry.getKey()).addAllCards(entry.getValue()).build();
             list.add(build);
         }
+        LOGGER.info("getThousandDrawInfo uid:{},round:{},thousandDrawInfo.getCanTake():{}",user.getId(),thousandDrawInfo.getRound(),thousandDrawInfo.getCanTake());
         PlayerInfoProto.ThousandDrawInfoResponse build = PlayerInfoProto.ThousandDrawInfoResponse.newBuilder()
                 .setRound(thousandDrawInfo.getRound()).addAllThousandDrawCards(list).setCanTake(thousandDrawInfo.getCanTake()).build();
         MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.ThousandDrawInfoResponse.getNumber(), build, true);