X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/45284d7e924b1ac340ba527301e90e1199af3011..f88b8e1e0e34f1e25e86468ca271a89af4872eab:/include/stg/user_stat.h diff --git a/include/stg/user_stat.h b/include/stg/user_stat.h index 7775c3b5..4cedb591 100644 --- a/include/stg/user_stat.h +++ b/include/stg/user_stat.h @@ -28,9 +28,11 @@ #define USER_STAT_H #include +#include #include +#include +#include -#include "os_int.h" #include "resetable.h" #include "user_traff.h" //----------------------------------------------------------------------------- @@ -114,8 +116,10 @@ struct STAT_NODE struct USER_STAT { USER_STAT() - : up(), - down(), + : sessionUp(), + sessionDown(), + monthUp(), + monthDown(), cash(0), freeMb(0), lastCashAdd(0), @@ -124,8 +128,10 @@ struct USER_STAT lastActivityTime(0) {} - DIR_TRAFF up; - DIR_TRAFF down; + DIR_TRAFF sessionUp; + DIR_TRAFF sessionDown; + DIR_TRAFF monthUp; + DIR_TRAFF monthDown; double cash; double freeMb; double lastCashAdd; @@ -136,6 +142,8 @@ struct USER_STAT //----------------------------------------------------------------------------- typedef std::map TRAFF_STAT; //----------------------------------------------------------------------------- +typedef std::pair CASH_INFO; +//----------------------------------------------------------------------------- struct USER_STAT_RES { USER_STAT_RES() @@ -145,8 +153,10 @@ struct USER_STAT_RES lastCashAddTime(), passiveTime(), lastActivityTime(), - up(), - down() + sessionUp(), + sessionDown(), + monthUp(), + monthDown() {} USER_STAT_RES & operator= (const USER_STAT & us) @@ -157,9 +167,11 @@ struct USER_STAT_RES lastCashAddTime = us.lastCashAddTime; passiveTime = us.passiveTime; lastActivityTime = us.lastActivityTime; - up = us.up; - down = us.down; - return * this; + sessionUp = us.sessionUp; + sessionDown = us.sessionDown; + monthUp = us.monthUp; + monthDown = us.monthDown; + return *this; } USER_STAT GetData() const { @@ -170,19 +182,25 @@ struct USER_STAT_RES us.lastCashAddTime = lastCashAddTime.data(); us.passiveTime = passiveTime.data(); us.lastActivityTime = lastActivityTime.data(); - us.up = up.data(); - us.down = down.data(); + us.sessionUp = sessionUp.GetData(); + us.sessionDown = sessionDown.GetData(); + us.monthUp = monthUp.GetData(); + us.monthDown = monthDown.GetData(); return us; } RESETABLE cash; + RESETABLE cashAdd; + RESETABLE cashSet; RESETABLE freeMb; RESETABLE lastCashAdd; RESETABLE lastCashAddTime; RESETABLE passiveTime; RESETABLE lastActivityTime; - RESETABLE up; - RESETABLE down; + DIR_TRAFF_RES sessionUp; + DIR_TRAFF_RES sessionDown; + DIR_TRAFF_RES monthUp; + DIR_TRAFF_RES monthDown; }; //----------------------------------------------------------------------------- #endif