提交

陆恒
1 parent c9476da8
Showing 5 changed files with 297 additions and 157 deletions Show diff stats
src/HttpServer/jsonconf/ActiveWithdrawConfig.json
src/HttpServer/jsonconf/LevelConfig.json
src/HttpServer/jsonconf/WithdrawConfig.json
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
@@ -4,7 +4,7 @@
     "money": 66,
     "coin": 660000,
     "task": 0,
-    "level": 100,
+    "level": 18,
     "new": 0,
     "day": 30
   }
@@ -2,63 +2,63 @@
   {
     "id": 1,
     "level": 1,
-    "exp": 100,
+    "exp": 300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 2,
     "level": 2,
-    "exp": 100,
+    "exp": 350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 3,
     "level": 3,
-    "exp": 150,
+    "exp": 400,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 4,
     "level": 4,
-    "exp": 250,
+    "exp": 1200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 5,
     "level": 5,
-    "exp": 300,
+    "exp": 1800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 6,
     "level": 6,
-    "exp": 300,
+    "exp": 2000,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 7,
     "level": 7,
-    "exp": 1500,
+    "exp": 2200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 8,
     "level": 8,
-    "exp": 1900,
+    "exp": 2500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 9,
     "level": 9,
-    "exp": 1900,
+    "exp": 2800,
     "cash": 100,
     "extracash": 150
   },
@@ -72,14 +72,14 @@
   {
     "id": 11,
     "level": 11,
-    "exp": 3240,
+    "exp": 3150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 12,
     "level": 12,
-    "exp": 3500,
+    "exp": 3300,
     "cash": 100,
     "extracash": 150
   },
@@ -100,952 +100,952 @@
   {
     "id": 15,
     "level": 15,
-    "exp": 5320,
+    "exp": 5150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 16,
     "level": 16,
-    "exp": 5660,
+    "exp": 5300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 17,
     "level": 17,
-    "exp": 6020,
+    "exp": 5450,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 18,
     "level": 18,
-    "exp": 6400,
+    "exp": 5600,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 19,
     "level": 19,
-    "exp": 6800,
+    "exp": 5750,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 20,
     "level": 20,
-    "exp": 7220,
+    "exp": 5900,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 21,
     "level": 21,
-    "exp": 7660,
+    "exp": 6050,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 22,
     "level": 22,
-    "exp": 8120,
+    "exp": 6200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 23,
     "level": 23,
-    "exp": 8600,
+    "exp": 6350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 24,
     "level": 24,
-    "exp": 9100,
+    "exp": 6500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 25,
     "level": 25,
-    "exp": 9620,
+    "exp": 6650,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 26,
     "level": 26,
-    "exp": 10160,
+    "exp": 6800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 27,
     "level": 27,
-    "exp": 10720,
+    "exp": 6950,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 28,
     "level": 28,
-    "exp": 11300,
+    "exp": 7100,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 29,
     "level": 29,
-    "exp": 11900,
+    "exp": 7250,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 30,
     "level": 30,
-    "exp": 12520,
+    "exp": 7400,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 31,
     "level": 31,
-    "exp": 13160,
+    "exp": 7550,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 32,
     "level": 32,
-    "exp": 13820,
+    "exp": 7700,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 33,
     "level": 33,
-    "exp": 14500,
+    "exp": 7850,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 34,
     "level": 34,
-    "exp": 15200,
+    "exp": 8000,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 35,
     "level": 35,
-    "exp": 15920,
+    "exp": 8150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 36,
     "level": 36,
-    "exp": 16660,
+    "exp": 8300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 37,
     "level": 37,
-    "exp": 17420,
+    "exp": 8450,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 38,
     "level": 38,
-    "exp": 18200,
+    "exp": 8600,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 39,
     "level": 39,
-    "exp": 19000,
+    "exp": 8750,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 40,
     "level": 40,
-    "exp": 19820,
+    "exp": 8900,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 41,
     "level": 41,
-    "exp": 20660,
+    "exp": 9050,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 42,
     "level": 42,
-    "exp": 21520,
+    "exp": 9200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 43,
     "level": 43,
-    "exp": 22400,
+    "exp": 9350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 44,
     "level": 44,
-    "exp": 23300,
+    "exp": 9500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 45,
     "level": 45,
-    "exp": 24220,
+    "exp": 9650,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 46,
     "level": 46,
-    "exp": 25160,
+    "exp": 9800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 47,
     "level": 47,
-    "exp": 26120,
+    "exp": 9950,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 48,
     "level": 48,
-    "exp": 27100,
+    "exp": 10100,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 49,
     "level": 49,
-    "exp": 28100,
+    "exp": 10250,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 50,
     "level": 50,
-    "exp": 29120,
+    "exp": 10400,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 51,
     "level": 51,
-    "exp": 30160,
+    "exp": 10550,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 52,
     "level": 52,
-    "exp": 31220,
+    "exp": 10700,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 53,
     "level": 53,
-    "exp": 32300,
+    "exp": 10850,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 54,
     "level": 54,
-    "exp": 33400,
+    "exp": 11000,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 55,
     "level": 55,
-    "exp": 34520,
+    "exp": 11150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 56,
     "level": 56,
-    "exp": 35660,
+    "exp": 11300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 57,
     "level": 57,
-    "exp": 36820,
+    "exp": 11450,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 58,
     "level": 58,
-    "exp": 38000,
+    "exp": 11600,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 59,
     "level": 59,
-    "exp": 39200,
+    "exp": 11750,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 60,
     "level": 60,
-    "exp": 40420,
+    "exp": 11900,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 61,
     "level": 61,
-    "exp": 41660,
+    "exp": 12050,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 62,
     "level": 62,
-    "exp": 42920,
+    "exp": 12200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 63,
     "level": 63,
-    "exp": 44200,
+    "exp": 12350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 64,
     "level": 64,
-    "exp": 45500,
+    "exp": 12500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 65,
     "level": 65,
-    "exp": 46820,
+    "exp": 12650,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 66,
     "level": 66,
-    "exp": 48160,
+    "exp": 12800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 67,
     "level": 67,
-    "exp": 49520,
+    "exp": 12950,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 68,
     "level": 68,
-    "exp": 50900,
+    "exp": 13100,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 69,
     "level": 69,
-    "exp": 52300,
+    "exp": 13250,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 70,
     "level": 70,
-    "exp": 53720,
+    "exp": 13400,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 71,
     "level": 71,
-    "exp": 55160,
+    "exp": 13550,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 72,
     "level": 72,
-    "exp": 56620,
+    "exp": 13700,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 73,
     "level": 73,
-    "exp": 58100,
+    "exp": 13850,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 74,
     "level": 74,
-    "exp": 59600,
+    "exp": 14000,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 75,
     "level": 75,
-    "exp": 61120,
+    "exp": 14150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 76,
     "level": 76,
-    "exp": 62660,
+    "exp": 14300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 77,
     "level": 77,
-    "exp": 64220,
+    "exp": 14450,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 78,
     "level": 78,
-    "exp": 65800,
+    "exp": 14600,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 79,
     "level": 79,
-    "exp": 67400,
+    "exp": 14750,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 80,
     "level": 80,
-    "exp": 69020,
+    "exp": 14900,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 81,
     "level": 81,
-    "exp": 70660,
+    "exp": 15050,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 82,
     "level": 82,
-    "exp": 72320,
+    "exp": 15200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 83,
     "level": 83,
-    "exp": 74000,
+    "exp": 15350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 84,
     "level": 84,
-    "exp": 75700,
+    "exp": 15500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 85,
     "level": 85,
-    "exp": 77420,
+    "exp": 15650,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 86,
     "level": 86,
-    "exp": 79160,
+    "exp": 15800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 87,
     "level": 87,
-    "exp": 80920,
+    "exp": 15950,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 88,
     "level": 88,
-    "exp": 82700,
+    "exp": 16100,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 89,
     "level": 89,
-    "exp": 84500,
+    "exp": 16250,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 90,
     "level": 90,
-    "exp": 86320,
+    "exp": 16400,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 91,
     "level": 91,
-    "exp": 88160,
+    "exp": 16550,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 92,
     "level": 92,
-    "exp": 90020,
+    "exp": 16700,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 93,
     "level": 93,
-    "exp": 91900,
+    "exp": 16850,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 94,
     "level": 94,
-    "exp": 93800,
+    "exp": 17000,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 95,
     "level": 95,
-    "exp": 95720,
+    "exp": 17150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 96,
     "level": 96,
-    "exp": 97660,
+    "exp": 17300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 97,
     "level": 97,
-    "exp": 99620,
+    "exp": 17450,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 98,
     "level": 98,
-    "exp": 101600,
+    "exp": 17600,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 99,
     "level": 99,
-    "exp": 103600,
+    "exp": 17750,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 100,
     "level": 100,
-    "exp": 105620,
+    "exp": 17900,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 101,
     "level": 101,
-    "exp": 107660,
+    "exp": 18050,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 102,
     "level": 102,
-    "exp": 109720,
+    "exp": 18200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 103,
     "level": 103,
-    "exp": 111800,
+    "exp": 18350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 104,
     "level": 104,
-    "exp": 113900,
+    "exp": 18500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 105,
     "level": 105,
-    "exp": 116020,
+    "exp": 18650,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 106,
     "level": 106,
-    "exp": 118160,
+    "exp": 18800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 107,
     "level": 107,
-    "exp": 120320,
+    "exp": 18950,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 108,
     "level": 108,
-    "exp": 122500,
+    "exp": 19100,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 109,
     "level": 109,
-    "exp": 124700,
+    "exp": 19250,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 110,
     "level": 110,
-    "exp": 126920,
+    "exp": 19400,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 111,
     "level": 111,
-    "exp": 129160,
+    "exp": 19550,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 112,
     "level": 112,
-    "exp": 131420,
+    "exp": 19700,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 113,
     "level": 113,
-    "exp": 133700,
+    "exp": 19850,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 114,
     "level": 114,
-    "exp": 136000,
+    "exp": 20000,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 115,
     "level": 115,
-    "exp": 138320,
+    "exp": 20150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 116,
     "level": 116,
-    "exp": 140660,
+    "exp": 20300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 117,
     "level": 117,
-    "exp": 143020,
+    "exp": 20450,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 118,
     "level": 118,
-    "exp": 145400,
+    "exp": 20600,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 119,
     "level": 119,
-    "exp": 147800,
+    "exp": 20750,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 120,
     "level": 120,
-    "exp": 150220,
+    "exp": 20900,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 121,
     "level": 121,
-    "exp": 152660,
+    "exp": 21050,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 122,
     "level": 122,
-    "exp": 155120,
+    "exp": 21200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 123,
     "level": 123,
-    "exp": 157600,
+    "exp": 21350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 124,
     "level": 124,
-    "exp": 160100,
+    "exp": 21500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 125,
     "level": 125,
-    "exp": 162620,
+    "exp": 21650,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 126,
     "level": 126,
-    "exp": 165160,
+    "exp": 21800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 127,
     "level": 127,
-    "exp": 167720,
+    "exp": 21950,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 128,
     "level": 128,
-    "exp": 170300,
+    "exp": 22100,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 129,
     "level": 129,
-    "exp": 172900,
+    "exp": 22250,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 130,
     "level": 130,
-    "exp": 175520,
+    "exp": 22400,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 131,
     "level": 131,
-    "exp": 178160,
+    "exp": 22550,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 132,
     "level": 132,
-    "exp": 180820,
+    "exp": 22700,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 133,
     "level": 133,
-    "exp": 183500,
+    "exp": 22850,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 134,
     "level": 134,
-    "exp": 186200,
+    "exp": 23000,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 135,
     "level": 135,
-    "exp": 188920,
+    "exp": 23150,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 136,
     "level": 136,
-    "exp": 191660,
+    "exp": 23300,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 137,
     "level": 137,
-    "exp": 194420,
+    "exp": 23450,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 138,
     "level": 138,
-    "exp": 197200,
+    "exp": 23600,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 139,
     "level": 139,
-    "exp": 200000,
+    "exp": 23750,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 140,
     "level": 140,
-    "exp": 202820,
+    "exp": 23900,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 141,
     "level": 141,
-    "exp": 205660,
+    "exp": 24050,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 142,
     "level": 142,
-    "exp": 208520,
+    "exp": 24200,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 143,
     "level": 143,
-    "exp": 211400,
+    "exp": 24350,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 144,
     "level": 144,
-    "exp": 214300,
+    "exp": 24500,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 145,
     "level": 145,
-    "exp": 217220,
+    "exp": 24650,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 146,
     "level": 146,
-    "exp": 220160,
+    "exp": 24800,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 147,
     "level": 147,
-    "exp": 223120,
+    "exp": 24950,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 148,
     "level": 148,
-    "exp": 226100,
+    "exp": 25100,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 149,
     "level": 149,
-    "exp": 229100,
+    "exp": 25250,
     "cash": 100,
     "extracash": 150
   },
   {
     "id": 150,
     "level": 150,
-    "exp": 232120,
+    "exp": 25400,
     "cash": 100,
     "extracash": 150
   }
@@ -4,7 +4,7 @@
     "money": 0.3,
     "coin": 3000,
     "task": 0,
-    "level": 4,
+    "level": 2,
     "new": 0,
     "day": 1
   },
@@ -13,7 +13,7 @@
     "money": 0.5,
     "coin": 5000,
     "task": 1,
-    "level": 7,
+    "level": 4,
     "new": 0,
     "day": 2
   },
@@ -22,7 +22,7 @@
     "money": 1,
     "coin": 10000,
     "task": 2,
-    "level": 10,
+    "level": 7,
     "new": 0,
     "day": 5
   },
@@ -31,7 +31,7 @@
     "money": 1.5,
     "coin": 15000,
     "task": 3,
-    "level": 12,
+    "level": 9,
     "new": 0,
     "day": 8
   },
@@ -40,7 +40,7 @@
     "money": 2,
     "coin": 20000,
     "task": 4,
-    "level": 15,
+    "level": 12,
     "new": 0,
     "day": 15
   },
@@ -49,7 +49,7 @@
     "money": 3,
     "coin": 30000,
     "task": 5,
-    "level": 18,
+    "level": 15,
     "new": 0,
     "day": 20
   },
@@ -58,7 +58,7 @@
     "money": 100,
     "coin": 10000000,
     "task": 6,
-    "level": 28,
+    "level": 25,
     "new": 0,
     "day": 0
   }
@@ -329,9 +329,24 @@ type WithDrawRecord struct {
 	Typ         int    `json:"typ"`
 }
+type WithDrawDescs []WithDrawDesc
+
+func (v WithDrawDescs) Len() int {
+	return len(v)
+}
+
+func (v WithDrawDescs) Swap(i, j int) {
+	v[i], v[j] = v[j], v[i]
+}
+
+func (v WithDrawDescs) Less(i, j int) bool {
+
+	return v[i].Cid < v[j].Cid
+}
+
 type WithDrawInfo struct {
-	Cashdata        []WithDrawDesc `json:"cashdata"`
-	SpecialCashdata []WithDrawDesc `json:"specialcashdata"`
+	Cashdata        WithDrawDescs `json:"cashdata"`
+	SpecialCashdata WithDrawDescs `json:"specialcashdata"`
 }
 type WithDrawDesc struct {
@@ -745,6 +745,125 @@ func (u *UserData) HandlePassDay(uuid int, channel string) {
 	SaveUserInfo(u, uniqueid)
 }
+func (u *UserData) IsInWithList(num float32) (bool, int) {
+	for k, val := range u.WithDraw.Cashdata {
+		if val.Cnum == num {
+			return true, k
+		}
+	}
+	return false, -1
+}
+
+func (u *UserData) IsInSpeaialWithList(num float32) (bool, int) {
+	for k, val := range u.WithDraw.SpecialCashdata {
+		if val.Cnum == num {
+			return true, k
+		}
+	}
+	return false, -1
+}
+
+func (u *UserData) ReInitWithDraw(uniqueuid string) error {
+	//u.WithDraw.Cashdata = u.WithDraw.Cashdata[:0]
+	//重新读取配置
+	for _, val := range jsonconf.GetJsonConf().WithDrawConfig {
+
+		isin, idx := u.IsInWithList(val.Money)
+		if isin && idx >= 0 && idx < len(u.WithDraw.Cashdata) {
+			//已经有了的话更新一下配置
+			u.WithDraw.Cashdata[idx].Day = val.Day
+			u.WithDraw.Cashdata[idx].Limitlv = val.Level
+			u.WithDraw.Cashdata[idx].Cnum = val.Money
+			u.WithDraw.Cashdata[idx].Cid = val.Id
+		} else {
+			//还没有 新加入
+			var tmp WithDrawDesc
+			tmp.Cid = val.Id
+			tmp.Cnum = val.Money
+			if val.Isnew == 1 {
+				tmp.Isnew = 1
+			} else {
+				tmp.Isnew = 2
+			}
+			tmp.Limitlv = val.Level
+			if val.Id == 1 {
+				tmp.Preisfind = 1
+			} else {
+				tmp.Preisfind = 0
+			}
+			tmp.Day = val.Day
+			u.WithDraw.Cashdata = append(u.WithDraw.Cashdata, tmp)
+		}
+
+	}
+
+	//需要反过来判断一下 如果此时提现档位在表里面不存在 则删除
+	for i := 0; i < len(u.WithDraw.Cashdata); {
+		exist := false
+		for _, val := range jsonconf.GetJsonConf().WithDrawConfig {
+			if val.Money == u.WithDraw.Cashdata[i].Cnum {
+				exist = true
+			}
+		}
+
+		if !exist {
+			u.WithDraw.Cashdata = append(u.WithDraw.Cashdata[:i], u.WithDraw.Cashdata[i+1:]...)
+		} else {
+			i++
+		}
+	}
+
+	//需要统一处理一下前置条件
+	for i := 0; i < len(u.WithDraw.Cashdata); i++ {
+		if i > 0 {
+			//需要判断下前面的前置条件
+			if u.WithDraw.Cashdata[i-1].Preisfind == 1 {
+				//前面已完成，拿自己也变成完成状态
+				u.WithDraw.Cashdata[i].Preisfind = 1
+			}
+		}
+	}
+
+	for _, val := range jsonconf.GetJsonConf().ActiveWithdrawConfig {
+
+		isin, idx := u.IsInSpeaialWithList(val.Money)
+		if isin && idx >= 0 && idx < len(u.WithDraw.SpecialCashdata) {
+			//已经有了的话更新一下配置
+			u.WithDraw.SpecialCashdata[idx].Day = val.Day
+			u.WithDraw.SpecialCashdata[idx].Limitlv = val.Level
+			u.WithDraw.SpecialCashdata[idx].Cnum = val.Money
+		} else {
+			//还没有 新加入
+			var tmp WithDrawDesc
+			tmp.Cid = val.Id
+			tmp.Cnum = val.Money
+			if val.Isnew == 1 {
+				tmp.Isnew = 1
+			} else {
+				tmp.Isnew = 2
+			}
+			tmp.Limitlv = val.Level
+			//没有前置条件
+			tmp.Preisfind = 1
+
+			tmp.Day = val.Day
+			u.WithDraw.SpecialCashdata = append(u.WithDraw.SpecialCashdata, tmp)
+		}
+
+	}
+
+	//做一个排序
+	sort.Sort(u.WithDraw.Cashdata)
+	sort.Sort(u.WithDraw.SpecialCashdata)
+
+	err := SaveUserInfo(u, uniqueuid)
+	if err != nil {
+		logger.Error("ReInitWithDraw failed")
+	}
+
+	return err
+}
+
 func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginResp) error {
 	data, err := GetUserInfo(uniqueuid)
 	if err != nil || data == nil {
@@ -756,6 +875,12 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR
 	//此处要处理一下跨天逻辑
 	data.HandlePassDay(uuid, req.Channel)
+	//需要处理下提现表信息
+	err = data.ReInitWithDraw(uniqueuid)
+	if err != nil {
+		logger.Error("GetUserData err=%v", err)
+	}
+
 	//此处处理一下从sdk拉取钱包金币数量
 	gold, err := GetCoinFromSdk(uuid, req.Gameid, req.Channel)
 	if err == nil {
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	"money": 66,	4	"money": 66,
5	"coin": 660000,	5	"coin": 660000,
6	"task": 0,	6	"task": 0,
7	- "level": 100,	7	+ "level": 18,
8	"new": 0,	8	"new": 0,
9	"day": 30	9	"day": 30
10	}	10	}
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	"money": 0.3,	4	"money": 0.3,
5	"coin": 3000,	5	"coin": 3000,
6	"task": 0,	6	"task": 0,
7	- "level": 4,	7	+ "level": 2,
8	"new": 0,	8	"new": 0,
9	"day": 1	9	"day": 1
10	},	10	},
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	"money": 0.5,	13	"money": 0.5,
14	"coin": 5000,	14	"coin": 5000,
15	"task": 1,	15	"task": 1,
16	- "level": 7,	16	+ "level": 4,
17	"new": 0,	17	"new": 0,
18	"day": 2	18	"day": 2
19	},	19	},
	@@ -22,7 +22,7 @@		@@ -22,7 +22,7 @@
22	"money": 1,	22	"money": 1,
23	"coin": 10000,	23	"coin": 10000,
24	"task": 2,	24	"task": 2,
25	- "level": 10,	25	+ "level": 7,
26	"new": 0,	26	"new": 0,
27	"day": 5	27	"day": 5
28	},	28	},
	@@ -31,7 +31,7 @@		@@ -31,7 +31,7 @@
31	"money": 1.5,	31	"money": 1.5,
32	"coin": 15000,	32	"coin": 15000,
33	"task": 3,	33	"task": 3,
34	- "level": 12,	34	+ "level": 9,
35	"new": 0,	35	"new": 0,
36	"day": 8	36	"day": 8
37	},	37	},
	@@ -40,7 +40,7 @@		@@ -40,7 +40,7 @@
40	"money": 2,	40	"money": 2,
41	"coin": 20000,	41	"coin": 20000,
42	"task": 4,	42	"task": 4,
43	- "level": 15,	43	+ "level": 12,
44	"new": 0,	44	"new": 0,
45	"day": 15	45	"day": 15
46	},	46	},
	@@ -49,7 +49,7 @@		@@ -49,7 +49,7 @@
49	"money": 3,	49	"money": 3,
50	"coin": 30000,	50	"coin": 30000,
51	"task": 5,	51	"task": 5,
52	- "level": 18,	52	+ "level": 15,
53	"new": 0,	53	"new": 0,
54	"day": 20	54	"day": 20
55	},	55	},
	@@ -58,7 +58,7 @@		@@ -58,7 +58,7 @@
58	"money": 100,	58	"money": 100,
59	"coin": 10000000,	59	"coin": 10000000,
60	"task": 6,	60	"task": 6,
61	- "level": 28,	61	+ "level": 25,
62	"new": 0,	62	"new": 0,
63	"day": 0	63	"day": 0
64	}	64	}
	@@ -329,9 +329,24 @@ type WithDrawRecord struct {		@@ -329,9 +329,24 @@ type WithDrawRecord struct {
329	Typ int `json:"typ"`	329	Typ int `json:"typ"`
330	}	330	}
331		331
		332	+type WithDrawDescs []WithDrawDesc
		333	+
		334	+func (v WithDrawDescs) Len() int {
		335	+ return len(v)
		336	+}
		337	+
		338	+func (v WithDrawDescs) Swap(i, j int) {
		339	+ v[i], v[j] = v[j], v[i]
		340	+}
		341	+
		342	+func (v WithDrawDescs) Less(i, j int) bool {
		343	+
		344	+ return v[i].Cid < v[j].Cid
		345	+}
		346	+
332	type WithDrawInfo struct {	347	type WithDrawInfo struct {
333	- Cashdata []WithDrawDesc `json:"cashdata"`
334	- SpecialCashdata []WithDrawDesc `json:"specialcashdata"`	348	+ Cashdata WithDrawDescs `json:"cashdata"`
		349	+ SpecialCashdata WithDrawDescs `json:"specialcashdata"`
335	}	350	}
336		351
337	type WithDrawDesc struct {	352	type WithDrawDesc struct {
	@@ -745,6 +745,125 @@ func (u *UserData) HandlePassDay(uuid int, channel string) {		@@ -745,6 +745,125 @@ func (u *UserData) HandlePassDay(uuid int, channel string) {
745	SaveUserInfo(u, uniqueid)	745	SaveUserInfo(u, uniqueid)
746	}	746	}
747		747
		748	+func (u *UserData) IsInWithList(num float32) (bool, int) {
		749	+ for k, val := range u.WithDraw.Cashdata {
		750	+ if val.Cnum == num {
		751	+ return true, k
		752	+ }
		753	+ }
		754	+ return false, -1
		755	+}
		756	+
		757	+func (u *UserData) IsInSpeaialWithList(num float32) (bool, int) {
		758	+ for k, val := range u.WithDraw.SpecialCashdata {
		759	+ if val.Cnum == num {
		760	+ return true, k
		761	+ }
		762	+ }
		763	+ return false, -1
		764	+}
		765	+
		766	+func (u *UserData) ReInitWithDraw(uniqueuid string) error {
		767	+ //u.WithDraw.Cashdata = u.WithDraw.Cashdata[:0]
		768	+ //重新读取配置
		769	+ for _, val := range jsonconf.GetJsonConf().WithDrawConfig {
		770	+
		771	+ isin, idx := u.IsInWithList(val.Money)
		772	+ if isin && idx >= 0 && idx < len(u.WithDraw.Cashdata) {
		773	+ //已经有了的话更新一下配置
		774	+ u.WithDraw.Cashdata[idx].Day = val.Day
		775	+ u.WithDraw.Cashdata[idx].Limitlv = val.Level
		776	+ u.WithDraw.Cashdata[idx].Cnum = val.Money
		777	+ u.WithDraw.Cashdata[idx].Cid = val.Id
		778	+ } else {
		779	+ //还没有新加入
		780	+ var tmp WithDrawDesc
		781	+ tmp.Cid = val.Id
		782	+ tmp.Cnum = val.Money
		783	+ if val.Isnew == 1 {
		784	+ tmp.Isnew = 1
		785	+ } else {
		786	+ tmp.Isnew = 2
		787	+ }
		788	+ tmp.Limitlv = val.Level
		789	+ if val.Id == 1 {
		790	+ tmp.Preisfind = 1
		791	+ } else {
		792	+ tmp.Preisfind = 0
		793	+ }
		794	+ tmp.Day = val.Day
		795	+ u.WithDraw.Cashdata = append(u.WithDraw.Cashdata, tmp)
		796	+ }
		797	+
		798	+ }
		799	+
		800	+ //需要反过来判断一下如果此时提现档位在表里面不存在则删除
		801	+ for i := 0; i < len(u.WithDraw.Cashdata); {
		802	+ exist := false
		803	+ for _, val := range jsonconf.GetJsonConf().WithDrawConfig {
		804	+ if val.Money == u.WithDraw.Cashdata[i].Cnum {
		805	+ exist = true
		806	+ }
		807	+ }
		808	+
		809	+ if !exist {
		810	+ u.WithDraw.Cashdata = append(u.WithDraw.Cashdata[:i], u.WithDraw.Cashdata[i+1:]...)
		811	+ } else {
		812	+ i++
		813	+ }
		814	+ }
		815	+
		816	+ //需要统一处理一下前置条件
		817	+ for i := 0; i < len(u.WithDraw.Cashdata); i++ {
		818	+ if i > 0 {
		819	+ //需要判断下前面的前置条件
		820	+ if u.WithDraw.Cashdata[i-1].Preisfind == 1 {
		821	+ //前面已完成，拿自己也变成完成状态
		822	+ u.WithDraw.Cashdata[i].Preisfind = 1
		823	+ }
		824	+ }
		825	+ }
		826	+
		827	+ for _, val := range jsonconf.GetJsonConf().ActiveWithdrawConfig {
		828	+
		829	+ isin, idx := u.IsInSpeaialWithList(val.Money)
		830	+ if isin && idx >= 0 && idx < len(u.WithDraw.SpecialCashdata) {
		831	+ //已经有了的话更新一下配置
		832	+ u.WithDraw.SpecialCashdata[idx].Day = val.Day
		833	+ u.WithDraw.SpecialCashdata[idx].Limitlv = val.Level
		834	+ u.WithDraw.SpecialCashdata[idx].Cnum = val.Money
		835	+ } else {
		836	+ //还没有新加入
		837	+ var tmp WithDrawDesc
		838	+ tmp.Cid = val.Id
		839	+ tmp.Cnum = val.Money
		840	+ if val.Isnew == 1 {
		841	+ tmp.Isnew = 1
		842	+ } else {
		843	+ tmp.Isnew = 2
		844	+ }
		845	+ tmp.Limitlv = val.Level
		846	+ //没有前置条件
		847	+ tmp.Preisfind = 1
		848	+
		849	+ tmp.Day = val.Day
		850	+ u.WithDraw.SpecialCashdata = append(u.WithDraw.SpecialCashdata, tmp)
		851	+ }
		852	+
		853	+ }
		854	+
		855	+ //做一个排序
		856	+ sort.Sort(u.WithDraw.Cashdata)
		857	+ sort.Sort(u.WithDraw.SpecialCashdata)
		858	+
		859	+ err := SaveUserInfo(u, uniqueuid)
		860	+ if err != nil {
		861	+ logger.Error("ReInitWithDraw failed")
		862	+ }
		863	+
		864	+ return err
		865	+}
		866	+
748	func GetUserData(uuid int, uniqueuid string, req UserLoginReq, resp UserLoginResp) error {	867	func GetUserData(uuid int, uniqueuid string, req UserLoginReq, resp UserLoginResp) error {
749	data, err := GetUserInfo(uniqueuid)	868	data, err := GetUserInfo(uniqueuid)
750	if err != nil \|\| data == nil {	869	if err != nil \|\| data == nil {
	@@ -756,6 +875,12 @@ func GetUserData(uuid int, uniqueuid string, req UserLoginReq, resp UserLoginR		@@ -756,6 +875,12 @@ func GetUserData(uuid int, uniqueuid string, req UserLoginReq, resp UserLoginR
756	//此处要处理一下跨天逻辑	875	//此处要处理一下跨天逻辑
757	data.HandlePassDay(uuid, req.Channel)	876	data.HandlePassDay(uuid, req.Channel)
758		877
		878	+ //需要处理下提现表信息
		879	+ err = data.ReInitWithDraw(uniqueuid)
		880	+ if err != nil {
		881	+ logger.Error("GetUserData err=%v", err)
		882	+ }
		883	+
759	//此处处理一下从sdk拉取钱包金币数量	884	//此处处理一下从sdk拉取钱包金币数量
760	gold, err := GetCoinFromSdk(uuid, req.Gameid, req.Channel)	885	gold, err := GetCoinFromSdk(uuid, req.Gameid, req.Channel)
761	if err == nil {	886	if err == nil {