Merge branch 'master' into release

2018-08-26 21:37:36 +08:00 · 2018-08-26 21:37:36 +08:00 · 0c12f8abf3
commit 0c12f8abf3
parent 7b8bde6a40 098bcff5a4
1 changed files with 2 additions and 2 deletions
--- a/route/api/twitch/index.js
+++ b/route/api/twitch/index.js
@ -175,9 +175,9 @@ r.get('/channel/:chid/opay/bar', async (c, n) => {
      text, values
    })
    if (priceResult.rowCount > 0) {
-      setting.total = priceResult.rows[0].total
+      setting.total += priceResult.rows[0].total
    } else {
-      setting.total = 0
+      setting.total += 0
    }
  }