From 107f7eb458980108510ce2bef1cda6d8519fd7a7 Mon Sep 17 00:00:00 2001
From: yuanshuai <243578945@qq.com>
Date: Tue, 12 Oct 2021 10:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=87=91=E9=A2=9D=E7=A4=BC?=
 =?UTF-8?q?=E5=8C=85=E6=8E=A8=E9=80=81=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jieling/logic/store/BuyGoodsNewLogic.java |  8 +++--
 .../newRechargeInfo/NewRechargeInfo.java      | 30 +++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
index 31a546ebe..dfb940c7a 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
@@ -859,12 +859,16 @@ public class BuyGoodsNewLogic {
                 return -1;
             }
         }else if(scope[0] == 7){
-            double mxr = user.getPlayerInfoManager().getNewRechargeInfo().getMaxSingleR();
+            //此处根据需求改成指定天数内最大充值订单，之前的条件是历史充值最大订单
+            //double mxr = user.getPlayerInfoManager().getNewRechargeInfo().getMaxSingleR();
+            double mxr = user.getPlayerInfoManager().getNewRechargeInfo().GetSingleMaxRechargeNum(30);
             if(mxr < scope[1]){
                 return -1;
             }
         }
-        double rr = user.getPlayerInfoManager().getNewRechargeInfo().getRr();
+        //double rr = user.getPlayerInfoManager().getNewRechargeInfo().getRr();
+        //此处根据需求改成指定天数累计充值，之前的条件是历史累计充值
+        double rr = user.getPlayerInfoManager().getNewRechargeInfo().GetAllRechargeNum(30);
         int index = 0;
         for(int i = 1;i<con.getPersonas().length;i++){
             if(con.getPersonas()[i] > rr){
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
index 192ce9e09..1f15c7df7 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
@@ -1,7 +1,10 @@
 package com.ljsd.jieling.logic.store.newRechargeInfo;
 
 import com.ljsd.common.mogodb.MongoBase;
+import com.ljsd.jieling.logic.fight.eventhandler.IFightEventProcesor;
 import com.ljsd.jieling.logic.store.newRechargeInfo.bean.*;
+import com.ljsd.jieling.util.ItemUtil;
+import util.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -289,6 +292,32 @@ public class NewRechargeInfo extends MongoBase {
         updateString("rechargeList",this.rechargeList);
     }
 
+    ///获取指定天数内累计充值金额
+    public double GetAllRechargeNum(int _deyNum){
+        double rechargeNum=0;
+        long limitTime= TimeUtils.now()-TimeUtils.ONE_DAY*_deyNum;
+        for (Map.Entry<Long, Double> entry : rechargeList.entrySet()) {
+            if (entry.getKey()>limitTime) {
+                rechargeNum+=entry.getValue();
+            }
+        }
+        return rechargeNum;
+    }
+
+    ///获取指定天数内单笔最大充值金额
+    public double GetSingleMaxRechargeNum(int _deyNum){
+        double rechargeNum=0;
+        long limitTime= TimeUtils.now()-TimeUtils.ONE_DAY*_deyNum;
+        for (Map.Entry<Long, Double> entry : rechargeList.entrySet()) {
+            if (entry.getKey()>limitTime) {
+                if (entry.getValue()>rechargeNum){
+                    rechargeNum=entry.getValue();
+                }
+            }
+        }
+        return rechargeNum;
+    }
+
     public Map<Integer, Integer> getTempLimitMap() {
         return tempLimitMap;
     }
@@ -296,4 +325,5 @@ public class NewRechargeInfo extends MongoBase {
     public void setTempLimitMap(Map<Integer, Integer> tempLimitMap) {
         this.tempLimitMap = tempLimitMap;
     }
+
 }