q-koa 13.8.43 → 13.8.44

package/core/file/plugins/system/service.js

@@ -269,9 +269,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
   if (obj.setting && apiVersion && cacheVersion) {
     let target = null
     if (config) {
-      const application_key = `${app.appConfig.appName}-application`
-
-      const application = app.cache.get(application_key)
+      const application = app.cache.get('application')
       if (application) {
         target = application.find((a) => a.config === config)
       }

package/core/file/plugins/weixin/controller.js

@@ -2361,6 +2361,39 @@ exports.union_checkPay = async (ctx) => {
   ctx.SUCCESS({ prefix, ...payResult })
 }
 
+exports.union_check_balance = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const {
+    pay_config = 'weixin_pay',
+    accttype = '01', // 01:余额户 02:冻结户
+    mch_id = '',
+  } = ctx.request.body
+
+  const appConfig = getConfig(app)
+  const {
+    union_mchId,
+    union_appid,
+    union_privateKey,
+    union_publicKey,
+  } = await appConfig.getObject(pay_config)
+
+  const allinpay = new AllinPay({
+    cusid: mch_id || union_mchId,
+    appid: union_appid,
+    isTest: false,
+    privateKey: union_privateKey,
+    publicKey: union_publicKey,
+  })
+
+  const result = await allinpay.checkBalance(accttype)
+
+  // amount 单位为分，转换为元便于前端展示
+  const balance = result.amount ? Number(result.amount) / 100 : 0
+
+  ctx.SUCCESS({ ...result, balance })
+}
+
 exports.b2b_checkPay = async (ctx) => {
   const { app, appName, controller } = getAppByCtx(ctx)
 

package/core/file/services/allinpay.js

@@ -286,6 +286,37 @@ class AllinPay {
     throw new Error(result.retmsg || 'Unknown error')
   }
 
+  async checkBalance(accttype = '01') {
+    const params = {
+      cusid: this.cusid,
+      appid: this.appid,
+      version: '12',
+      randomstr: this.generateRandomStr(),
+      accttype, // 01:余额户查询 02:冻结户查询
+      signtype: this.signType,
+    }
+    if (this.orgid) params.orgid = this.orgid
+
+    params.sign = this.sign(params)
+
+    const url = this.isTest
+      ? 'https://syb-test.allinpay.com/vsppcusapi/cusacct/querybalance'
+      : 'https://cus.allinpay.com/cusapi/cusacct/querybalance'
+    const result = await this.request(url, params)
+
+    if (result && result.retcode === 'SUCCESS') {
+      if (result.sign && this.verifySign(result)) {
+        return result
+      } else {
+        console.warn(
+          'Sign verification failed, but retcode is SUCCESS. Returning result anyway.'
+        )
+        return result
+      }
+    }
+    throw new Error(result.retmsg || 'Unknown error')
+  }
+
   async refundOrder(orderData) {
     const { reqsn, trxamt, oldreqsn, remark = '', acct = '' } = orderData
 

package/core/file/utils/index.js

@@ -60,8 +60,7 @@ exports.getObject = (config, app) => async (type) => {
   }
 
   if (app) {
-    const application_key = `${app.appConfig.appName}-application`
-    const applicationList = app.cache.get(application_key)
+    const applicationList = app.cache.get('application')
     const target = applicationList && applicationList.find(findConfig(type))
     if (target) {
       flag = true
@@ -77,7 +76,7 @@ exports.getObject = (config, app) => async (type) => {
 
         if (result.length > 0) {
           const formatData = JSON.parse(JSON.stringify(result))
-          app.cache.set(application_key, formatData)
+          app.cache.set('application', formatData)
 
           const target = formatData.find(findConfig(type))
           if (target) {
@@ -189,11 +188,8 @@ exports.getImageType = (fileBuffer) => {
 
 exports.getAppConfig = async ({ app, config, key, app_id, id }) => {
   if (!(app && (config || key || app_id || id))) return null
-
-  const application_key = `${app.appConfig.appName}-application`
-
   const application =
-    app.cache.get(application_key) || (await app.model.application.findAll())
+    app.cache.get('application') || (await app.model.application.findAll())
   const target = application.find(findConfig(config || key || app_id || id))
 
   return target || null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.43",
+  "version": "13.8.44",
   "description": "",
   "main": "index.js",
   "scripts": {