From a34da39f73061f9e4a6f58bb9fedaec232af1640 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 24 Nov 2022 19:55:39 +0800
Subject: [PATCH 01/14] 1

---
 webapp/controller/BaseAuthedController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php
index 8f373f4e..7becadd7 100644
--- a/webapp/controller/BaseAuthedController.class.php
+++ b/webapp/controller/BaseAuthedController.class.php
@@ -72,14 +72,14 @@ class BaseAuthedController extends BaseController {
                 die();
             }
         }
-        if (SERVER_ENV == _ONLINE) {
+        /*if (SERVER_ENV == _ONLINE) {
             if (phpcommon\cmpVersion(getReqVal('_version', ''), '0.2.0') > 0) {
                 if (!$this->isWhiteList() || myself()->_getChannel() != BC_CHANNEL) {
                     phpcommon\sendError(1002, '');
                     die();
                 }
             }
-        }
+            }*/
     }
 
     protected function updateSession($accountId, $sessionId)

From 05112f21d0e918da0e680ba6593a01fae2666dc4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 10:16:46 +0800
Subject: [PATCH 02/14] 1

---
 server/game2006service/tasks/factory.js |  1 +
 server/game2006service/tasks/feeback.js | 41 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 server/game2006service/tasks/feeback.js

diff --git a/server/game2006service/tasks/factory.js b/server/game2006service/tasks/factory.js
index 8345ea4d..de8ac510 100644
--- a/server/game2006service/tasks/factory.js
+++ b/server/game2006service/tasks/factory.js
@@ -9,6 +9,7 @@ function init() {
   add('fragment');
   add('damping');
   add('season');
+  add('feeback');
 }
 
 exports.init = init;
diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
new file mode 100644
index 00000000..747f7137
--- /dev/null
+++ b/server/game2006service/tasks/feeback.js
@@ -0,0 +1,41 @@
+const app = require('j7/app');
+const utils = require('j7/utils');
+
+const constant = require('../constant');
+
+class FeeBack {
+
+  async start() {
+    console.log('feeback start');
+    while (true) {
+      await this.alloc(utils.getUtcTime());
+
+      const nowTime = utils.getUtcTime();
+      const daySeconds = utils.getDaySeconds(nowTime, constant.TIME_ZONE);
+      const hourSeconds = utils.getHourSeconds(nowTime, constant.TIME_ZONE);
+      const sleepTime = (3600 - (nowTime - daySeconds - hourSeconds)) + 10;
+      console.log('feeback sleepTime:' + sleepTime, new Date(), sleepTime /60);
+      await utils.sleep(sleepTime * 1000);
+    }
+  }
+
+  async backUser(nowTime) {
+    try {
+      const daySeconds = utils.getDaySeconds(nowTime, constant.TIME_ZONE);
+      const hourSeconds = utils.getHourSeconds(nowTime, constant.TIME_ZONE);
+      const {err, conn} = await app.getDbConn("GameDb20060");
+      if (err) {
+        throw err;
+      }
+    } catch (err) {
+      console.log(err);
+    }
+  }
+
+}
+
+function init() {
+  (new FeeBack()).start();
+}
+
+exports.init = init;

From 4dc4dfb55f0ce2fcbce90346f36505c24b1cb930 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 10:32:43 +0800
Subject: [PATCH 03/14] 1

---
 server/game2006service/tasks/feeback.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 747f7137..2a4412ff 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -8,21 +8,18 @@ class FeeBack {
   async start() {
     console.log('feeback start');
     while (true) {
-      await this.alloc(utils.getUtcTime());
+      await this.backUser(utils.getUtcTime());
 
       const nowTime = utils.getUtcTime();
       const daySeconds = utils.getDaySeconds(nowTime, constant.TIME_ZONE);
-      const hourSeconds = utils.getHourSeconds(nowTime, constant.TIME_ZONE);
-      const sleepTime = (3600 - (nowTime - daySeconds - hourSeconds)) + 10;
-      console.log('feeback sleepTime:' + sleepTime, new Date(), sleepTime /60);
+      const sleepTime = daySeconds + 3600 * 24 - nowTime;
+      console.log('FeeBack.sleepTime:' + sleepTime, new Date(), sleepTime / 60);
       await utils.sleep(sleepTime * 1000);
     }
   }
 
   async backUser(nowTime) {
     try {
-      const daySeconds = utils.getDaySeconds(nowTime, constant.TIME_ZONE);
-      const hourSeconds = utils.getHourSeconds(nowTime, constant.TIME_ZONE);
       const {err, conn} = await app.getDbConn("GameDb20060");
       if (err) {
         throw err;

From e6325d171b5c6d0a74442a95d748e28ffd70eba2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 10:45:19 +0800
Subject: [PATCH 04/14] 1

---
 server/game2006service/tasks/feeback.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 2a4412ff..f5db94e6 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -6,7 +6,7 @@ const constant = require('../constant');
 class FeeBack {
 
   async start() {
-    console.log('feeback start');
+    console.log('FeeBack.start');
     while (true) {
       await this.backUser(utils.getUtcTime());
 

From 9047597111abc231c48a6544e2607c2e739ad603 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 13:19:47 +0800
Subject: [PATCH 05/14] 1

---
 server/game2006service/tasks/feeback.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index f5db94e6..cb0bab2f 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -24,6 +24,15 @@ class FeeBack {
       if (err) {
         throw err;
       }
+      {
+        const {err, rows} = await conn.execQuery(
+          'SELECT * FROM t_transaction_prefee WHERE createtime < ?',
+          [
+            nowTime - 3600 * 24 - 3600 * 12
+          ]
+        );
+        console.log(rows);
+      }
     } catch (err) {
       console.log(err);
     }

From a54a7184df251ffb90e54b5fe2f1e93db4f9b177 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 13:53:36 +0800
Subject: [PATCH 06/14] 1

---
 server/game2006service/tasks/feeback.js | 75 ++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index cb0bab2f..84d6f2ba 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -26,18 +26,87 @@ class FeeBack {
       }
       {
         const {err, rows} = await conn.execQuery(
-          'SELECT * FROM t_transaction_prefee WHERE createtime < ?',
+          'SELECT * FROM t_transaction_prefee WHERE done = 0 AND createtime < ?',
           [
-            nowTime - 3600 * 24 - 3600 * 12
+            nowTime - 3600 * 24 - 3600 * 6
           ]
         );
-        console.log(rows);
+        await utils.serial(
+          rows,
+          async (element) {
+            await this.procBack(conn, element);
+          }
+        );
       }
     } catch (err) {
       console.log(err);
     }
   }
 
+  async procBack(conn, row) {
+    if (row['item_uniid']) {
+      conn.update(
+        't_bag',
+        [
+          ['account_id', row['account_id']],
+          ['idx', row['item_uniid']],
+        ],
+        [
+          ['!item_num',
+           () => {
+             return 'item_num + ' + row['item_num']
+           }],
+        ]
+      );
+    } else {
+      switch (Number(row['item_id'])) {
+      case 666:
+        {
+
+        }
+        break;
+      case 10001:
+        {
+          //gold
+          conn.update(
+            't_user',
+            [
+              ['account_id', row['account_id']],
+            ],
+            [
+              ['!gold',
+               () => {
+                 return 'gold + ' + row['item_num']
+               }],
+            ]
+          );
+        }
+        break;
+      case 10002:
+        {
+          //diamond
+          conn.update(
+            't_user',
+            [
+              ['account_id', row['account_id']],
+            ],
+            [
+              ['!diamond',
+               () => {
+                 return 'diamond + ' + row['diamond']
+               }],
+            ]
+          );
+        }
+        break;
+      default:
+        {
+
+        }
+      }
+    }
+  }
+
 }
 
 function init() {

From bac36536d645566ead935042f371551aa452cd70 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 13:55:41 +0800
Subject: [PATCH 07/14] 1

---
 server/game2006service/tasks/feeback.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 84d6f2ba..7cea4b5e 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -101,7 +101,8 @@ class FeeBack {
         break;
       default:
         {
-
+          console.log('error fee', row);
+          return;
         }
       }
     }

From d9420e9f620eb28e0bd7430c348f09628e65f4f1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 13:57:53 +0800
Subject: [PATCH 08/14] 1

---
 server/game2006service/tasks/feeback.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 7cea4b5e..9ec59658 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -62,7 +62,18 @@ class FeeBack {
       switch (Number(row['item_id'])) {
       case 666:
         {
-
+          conn.update(
+            't_chip',
+            [
+              ['token_id', row['token_id']],
+            ],
+            [
+              ['!strength',
+               () => {
+                 return 'strength + ' + row['item_num']
+               }],
+            ]
+          );
         }
         break;
       case 10001:

From 03ae2745459cf09f86c67121f782f3b45b43bdc1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 13:58:59 +0800
Subject: [PATCH 09/14] 1

---
 server/game2006service/tasks/feeback.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 9ec59658..55c81a4a 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -34,6 +34,7 @@ class FeeBack {
         await utils.serial(
           rows,
           async (element) {
+            console.log('backUser', element);
             await this.procBack(conn, element);
           }
         );

From 2cc03662081ce0c83928d1250b161fc308479168 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 14:16:10 +0800
Subject: [PATCH 10/14] 1

---
 server/game2006service/tasks/factory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/game2006service/tasks/factory.js b/server/game2006service/tasks/factory.js
index de8ac510..688f1f0f 100644
--- a/server/game2006service/tasks/factory.js
+++ b/server/game2006service/tasks/factory.js
@@ -8,7 +8,7 @@ function add(name) {
 function init() {
   add('fragment');
   add('damping');
-  add('season');
+  //add('season');
   add('feeback');
 }
 

From 3c348f20feda0318227c81ed60853eff6aaaaacb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 14:26:47 +0800
Subject: [PATCH 11/14] 1

---
 server/game2006service/tasks/feeback.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 55c81a4a..0342fcea 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -71,7 +71,7 @@ class FeeBack {
             [
               ['!strength',
                () => {
-                 return 'strength + ' + row['item_num']
+                 return 'GREATEST(0, strength - ' + row['item_num'] + ')'
                }],
             ]
           );

From a1a4f075756f4018908f420045db856165c55163 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 14:30:26 +0800
Subject: [PATCH 12/14] 1

---
 server/game2006service/tasks/feeback.js | 22 +++++++++++++++++-----
 sql/gamedb.sql                          |  1 +
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 0342fcea..3f6d1760 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -26,7 +26,7 @@ class FeeBack {
       }
       {
         const {err, rows} = await conn.execQuery(
-          'SELECT * FROM t_transaction_prefee WHERE done = 0 AND createtime < ?',
+          'SELECT * FROM t_transaction_prefee WHERE done = 0 AND state = 0 AND createtime < ?',
           [
             nowTime - 3600 * 24 - 3600 * 6
           ]
@@ -46,7 +46,7 @@ class FeeBack {
 
   async procBack(conn, row) {
     if (row['item_uniid']) {
-      conn.update(
+      await conn.update(
         't_bag',
         [
           ['account_id', row['account_id']],
@@ -63,7 +63,7 @@ class FeeBack {
       switch (Number(row['item_id'])) {
       case 666:
         {
-          conn.update(
+          await conn.update(
             't_chip',
             [
               ['token_id', row['token_id']],
@@ -80,7 +80,7 @@ class FeeBack {
       case 10001:
         {
           //gold
-          conn.update(
+          await conn.update(
             't_user',
             [
               ['account_id', row['account_id']],
@@ -97,7 +97,7 @@ class FeeBack {
       case 10002:
         {
           //diamond
-          conn.update(
+          await conn.update(
             't_user',
             [
               ['account_id', row['account_id']],
@@ -120,6 +120,18 @@ class FeeBack {
     }
   }
 
+  async setState(conn, transId, state) {
+    await conn.update(
+      't_transaction_prefee',
+      [
+        ['trans_id', transId],
+      ],
+      [
+        ['state', state]
+      ]
+    );
+  }
+
 }
 
 function init() {
diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index 567a1064..8209a8c9 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -828,6 +828,7 @@ CREATE TABLE `t_transaction_prefee` (
   `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id',
   `item_num` double NOT NULL DEFAULT '0' COMMENT '道具数量',
   `done` int(11) NOT NULL DEFAULT '0' COMMENT 'done',
+  `state` int(11) NOT NULL DEFAULT '0' COMMENT 'state',
   `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
   `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
   PRIMARY KEY (`idx`),

From f8cdafabcb8ed3c13905f75491000cf94a3368af Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 14:37:40 +0800
Subject: [PATCH 13/14] 1

---
 server/game2006service/tasks/feeback.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index 3f6d1760..ec4e9362 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -45,6 +45,7 @@ class FeeBack {
   }
 
   async procBack(conn, row) {
+    await this.setState(conn, row['trans_id'], 1);
     if (row['item_uniid']) {
       await conn.update(
         't_bag',
@@ -118,6 +119,7 @@ class FeeBack {
         }
       }
     }
+    await this.setState(conn, row['trans_id'], 2);
   }
 
   async setState(conn, transId, state) {

From f02bd8f4fddd83663fcf146de969bfa3d3d66769 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Nov 2022 14:41:00 +0800
Subject: [PATCH 14/14] 1

---
 server/game2006service/tasks/feeback.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/game2006service/tasks/feeback.js b/server/game2006service/tasks/feeback.js
index ec4e9362..14244401 100644
--- a/server/game2006service/tasks/feeback.js
+++ b/server/game2006service/tasks/feeback.js
@@ -33,7 +33,7 @@ class FeeBack {
         );
         await utils.serial(
           rows,
-          async (element) {
+          async (element) => {
             console.log('backUser', element);
             await this.procBack(conn, element);
           }
@@ -106,7 +106,7 @@ class FeeBack {
             [
               ['!diamond',
                () => {
-                 return 'diamond + ' + row['diamond']
+                 return 'diamond + ' + row['item_num']
                }],
             ]
           );