q-koa 13.6.0 → 13.6.2

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

@@ -8,7 +8,7 @@ exports.push = async ({ app, appName = '通知', url, message }) => {
   const log_push_url = lodash.get(
     app,
     'appConfig.log.url',
-    'https://api.day.app/xJXYwBCgBvxTjCdEC4CYf5'
+    'https://api.day.app/4qcuxMTvSeTKWfy5tEQsf6'
   )
 
   const log_push_excludes = lodash.get(app, 'appConfig.log.excludes', {

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

@@ -85,32 +85,33 @@ exports.loadModel = async ({ app, appName }) => {
         model: result[i],
         name: config.name,
         belongs: config.belongs || 'page',
-        order: config.order,
-        multiple: config.multiple,
-        availableSort: config.availableSort,
+        order: config.order || [],
+        multiple: config.multiple || false,
+        availableSort: config.availableSort || false,
         limit: config.limit || 20,
-        select: config.select,
-        excludes: config.excludes,
-        initList: config.initList,
-        initTableList: config.initTableList,
-        defaultOrder: config.defaultOrder,
-        excludeAuth: config.excludeAuth,
-        comment: config.comment,
-        reference: config.reference,
-        include: config.include,
-        sortOrder: config.sortOrder,
-        personal: config.personal,
-        autoData: config.autoData,
-        is_split: config.is_split,
-        is_split_count: config.is_split_count,
-        show_virtual: config.show_virtual,
-        modelQuery: config.modelQuery,
-        modelUpsert: config.modelUpsert,
-        modelDelete: config.modelDelete,
-        editInline: config.editInline,
-        deleteCheckList: config.deleteCheckList,
-        bulkCreateList: config.bulkCreateList,
-        indexList: config.indexList,
+        referenceSelect: config.referenceSelect || [],
+        select: config.select || [],
+        excludes: config.excludes || [],
+        initList: config.initList || [],
+        initTableList: config.initTableList || [],
+        defaultOrder: config.defaultOrder || [],
+        excludeAuth: config.excludeAuth || [],
+        comment: config.comment || {},
+        reference: config.reference || [],
+        include: config.include || '',
+        sortOrder: config.sortOrder || 1,
+        personal: config.personal || {},
+        autoData: config.autoData || {},
+        is_split: config.is_split || false,
+        is_split_count: config.is_split_count || false,
+        show_virtual: config.show_virtual || false,
+        modelQuery: config.modelQuery || {},
+        modelUpsert: config.modelUpsert || {},
+        modelDelete: config.modelDelete || {},
+        editInline: config.editInline || {},
+        deleteCheckList: config.deleteCheckList || [],
+        bulkCreateList: config.bulkCreateList || [],
+        indexList: config.indexList || [],
         hookList: config.hookList,
         list: attributes.map((attr, index) => {
           const name = attr.match(/exports.(.*)=/)[1].trim()

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

@@ -22,6 +22,8 @@ const path = require('path')
 const fsPromise = require('fs/promises')
 const { getAppConfig } = require('../../utils')
 
+const AllinPay = require('../../services/allinpay')
+
 const check = ({ timestamp, nonce, signature, token }) => {
   const tmp = [token, timestamp, nonce].sort().join('')
   const currSign = crypto.createHash('sha1').update(tmp).digest('hex')
@@ -1106,16 +1108,27 @@ exports.mp_pay = async (ctx) => {
   const notify_url = `https://${
     site_host || 'api.kuashou.com'
   }/${appName}/weixin/notify`
-  const prePayResult = await wxpay.getBrandWCPayRequestParamsSync({
-    openid: userDetail.openid,
-    body: name,
-    detail: '公众号支付测试',
-    out_trade_no,
-    total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
-    spbill_create_ip: '192.168.2.210',
-    notify_url,
-    profit_sharing,
-  })
+  let prePayResult
+  try {
+    prePayResult = await wxpay.getBrandWCPayRequestParamsSync({
+      openid: userDetail.openid,
+      body: name,
+      detail: '公众号支付测试',
+      out_trade_no,
+      total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
+      spbill_create_ip: '192.168.2.210',
+      notify_url,
+      profit_sharing,
+    })
+  } catch (e) {
+    if (e.message.includes('此商家的收款功能已被限制')) {
+      app.controller.weixin.changeMch &&
+        app.controller.weixin.changeMch(ctx, {
+          mchId: mchId || mch_id,
+        })
+    }
+    return ctx.ERROR(e.message)
+  }
 
   const checkOrder = (obj) => {
     return new Promise((resolve, reject) => {
@@ -1159,12 +1172,6 @@ exports.mp_pay = async (ctx) => {
       return ctx.SUCCESS('ok')
     }
     if (payResult.return_msg) {
-      console.error({
-        mchId,
-        key,
-        pay_key: _pay_key,
-        partner_key,
-      })
       throw new Error(
         payResult.return_msg === '签名错误，请检查后再试'
           ? payResult.return_msg + '（商户号/APIv2/关联）'
@@ -1190,16 +1197,30 @@ exports.b2b_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
   const { is_dev } = await appConfig.getObject('base')
-  const { name, _out_trade_no, order_id, price, prefix, code, type, is_admin } =
-    ctx.request.body
+  const {
+    name,
+    _out_trade_no,
+    order_id,
+    price,
+    prefix,
+    code,
+    type,
+    is_admin,
+    mch_id = '',
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+  } = ctx.request.body
 
-  const { app_id, app_secrect } = await appConfig.getObject('weixin_mp')
+  const { app_id, app_secrect } = await appConfig.getObject(config)
   const {
-    mchId: mchid,
+    mchId,
+    b2b_mchId,
     app_key,
     key,
     pay_key: _pay_key,
-  } = await appConfig.getObject('weixin_pay')
+  } = await appConfig.getObject(pay_config)
+
+  const mchid = mch_id || b2b_mchId || mchId
 
   if (!app_key) {
     throw new Error('缺少app_key')
@@ -1234,6 +1255,95 @@ exports.b2b_pay = async (ctx) => {
   ctx.SUCCESS(res)
 }
 
+exports.union_pay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { is_dev } = await appConfig.getObject('base')
+  const {
+    name,
+    _out_trade_no,
+    order_id,
+    price,
+    prefix,
+    code,
+    type,
+    is_admin,
+    mch_id = '',
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+  } = ctx.request.body
+
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+
+  const { site_host } = await appConfig.getObject('base')
+  const {
+    mchId,
+    b2b_mchId,
+    app_key,
+    key,
+    pay_key: _pay_key,
+    union_mchId,
+    union_appid,
+    union_privateKey,
+    union_publicKey,
+  } = await appConfig.getObject(pay_config)
+
+  const mchid = mch_id || b2b_mchId || mchId
+  const userDetail = ctx.request[`${appName}-user`].mp_user
+  const pay_key = _pay_key || key || appName
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${pay_key}_${prefix}-${order_id}_${type}`
+    : `${pay_key}_${order_id}_${type}`
+
+  const order_amount = is_admin || is_dev ? 1 : Math.round(price * 100)
+
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/weixin/union_notify`
+  const allinpay = new AllinPay({
+    cusid: union_mchId,
+    appid: union_appid,
+    isTest: false,
+    subAppid: app_id,
+    privateKey: union_privateKey,
+    publicKey: union_publicKey,
+    notifyUrl: notify_url,
+  })
+
+  const res = await allinpay.createOrder({
+    reqsn: out_trade_no,
+    trxamt: order_amount + '',
+    body: name,
+    paytype: 'W06',
+    acct: userDetail.openid,
+  })
+
+  const obj = {
+    signData: JSON.stringify({
+      requestPaymentInfo: {
+        timeStamp: JSON.parse(res.payinfo).timeStamp,
+        package: JSON.parse(res.payinfo).package,
+        signType: JSON.parse(res.payinfo).signType,
+        paySign: JSON.parse(res.payinfo).paySign,
+        nonceStr: JSON.parse(res.payinfo).nonceStr,
+      },
+    }),
+    mode: 'retail_pay_indirect_goods',
+  }
+
+  //   notify_url: `https://${site_host}/${appName}/weixin/uninon_notify`,
+
+  ctx.SUCCESS(obj)
+}
+
 exports.mp_pay_new = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const {
@@ -1294,9 +1404,108 @@ exports.mp_pay_new = async (ctx) => {
   return ctx.SUCCESS(prePayResult)
 }
 
+exports.union_notify = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  try {
+    const notifyData = ctx.request.body
+
+    app.service.log.push({
+      app,
+      message: JSON.stringify(notifyData),
+    })
+
+    const {
+      trxcode,
+      trxstatus,
+      cusorderid,
+      cusid,
+      acct,
+      trxid,
+      trxamt,
+      srctrxid,
+      trxreserved,
+    } = notifyData
+
+    if (trxstatus === '0000') {
+      if (trxcode === 'VSP501') {
+        let prefix = ''
+        const out_trade_no = cusorderid
+        let order_id = out_trade_no.split('_')[1]
+        let pay_type_key = out_trade_no.split('_')[2]
+        const order_price = Number(trxamt) / 100
+        if (order_id.includes('-')) {
+          const arr = order_id.split('-')
+          order_id = Number(arr[1])
+          ;[prefix] = arr
+        } else {
+          order_id = Number(order_id)
+        }
+        const model = prefix ? `${prefix}_order` : 'order'
+
+        if (app.service[model] && app.service[model].notify) {
+          await app.service[model].notify({
+            ctx,
+            app,
+            order_id,
+            order: model,
+            order_price,
+            transactionid: trxid,
+            out_trade_no,
+            openid: acct,
+            pay_type_key,
+            mch_id: cusid,
+            refund_type: 'union_refund',
+          })
+        }
+      } else if (trxcode === 'VSP503') {
+        const payRecordTarget = await app.model.pay_record.findOne({
+          where: {
+            transactionid: srctrxid,
+          },
+        })
+        const model =
+          payRecordTarget && payRecordTarget.prefix
+            ? `${payRecordTarget.prefix}_order`
+            : 'order'
+        const refund_price = Number(trxamt) / 100
+        const out_refund_no = cusorderid
+        const type = out_refund_no.includes('_')
+          ? out_refund_no.split('_')[1]
+          : ''
+
+        if (app.service[model] && app.service[model].refund_notify) {
+          await app.service[model].refund_notify({
+            app,
+            order_id: payRecordTarget.order_id,
+            order: model,
+            refund_price,
+            type,
+            out_refund_no,
+            remark: trxreserved,
+            transactionid: srctrxid,
+            refundid: trxid,
+          })
+        }
+      }
+    } else {
+      app.service.log.push({
+        app,
+        message: `Order ${cusorderid} payment failed, status: ${trxstatus}`,
+      })
+    }
+
+    ctx.body = 'success'
+  } catch (error) {
+    console.error('Notify error:', error)
+    ctx.body = 'FAIL'
+  }
+}
+
 exports.notify = async (ctx) => {
   const { app } = getAppByCtx(ctx)
   const result = ctx.request.xmlBody
+
   let prefix = ''
   let order_id = result.xml.out_trade_no.split('_')[1]
   let pay_type_key = result.xml.out_trade_no.split('_')[2]
@@ -1705,6 +1914,7 @@ exports.checkRefund = async (ctx, _data) => {
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
     out_trade_no: _out_trade_no,
+    mch_id = '',
   } = _data || ctx.request.body
 
   const appConfig = getConfig(app)
@@ -1714,7 +1924,7 @@ exports.checkRefund = async (ctx, _data) => {
 
   const payObj = new WeixinPay({
     appId,
-    mchId,
+    mchId: mch_id || mchId,
     key: key.length > 10 ? key : partner_key,
   })
 
@@ -1800,6 +2010,201 @@ exports.checkPayNew = async (ctx) => {
   ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
 }
 
+exports.union_checkPay = async (ctx) => {
+  const { app, appName, controller } = getAppByCtx(ctx)
+
+  const {
+    id,
+    prefix,
+    config = 'weixin_mp',
+    type = 'MP-WEIXIN',
+    pay_config = 'weixin_pay',
+    out_trade_no: _out_trade_no,
+    mch_id = '',
+  } = ctx.request.body
+
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const result = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+  })
+  if (!result) return ctx.SUCCESS('找不到')
+
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const {
+    mchId,
+    union_mchId,
+    union_appid,
+    union_privateKey,
+    union_publicKey,
+    key,
+    app_key,
+  } = await appConfig.getObject(pay_config)
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const orderPrefix = prefix ? `${prefix}-` : ''
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : `${key.length > 10 ? appName : key}_${orderPrefix}${id}_${type}`
+
+  const allinpay = new AllinPay({
+    cusid: mch_id || union_mchId,
+    appid: union_appid,
+    isTest: false,
+    subAppid: app_id,
+    privateKey: union_privateKey,
+    publicKey: union_publicKey,
+  })
+  const payResult = await allinpay.checkOrder(out_trade_no)
+
+  if (payResult) {
+    if (payResult.trxstatus === '0000' && payResult.trxcode === 'VSP501') {
+      const order_price = Number(payResult.trxamt) / 100
+
+      console.log({
+        order: orderModel,
+        order_id: id,
+        order_price,
+        transactionid: payResult.trxid,
+        openid: payResult.acct,
+        mch_id: payResult.cusid,
+        out_trade_no: payResult.reqsn,
+      })
+      await app.service[orderModel].notify({
+        app,
+        order: orderModel,
+        order_id: id,
+        order_price,
+        transactionid: payResult.trxid,
+        openid: payResult.acct,
+        mch_id: payResult.cusid,
+        out_trade_no: payResult.reqsn,
+      })
+    }
+  }
+
+  ctx.SUCCESS({ prefix, ...payResult })
+}
+
+exports.b2b_checkPay = async (ctx) => {
+  const { app, appName, controller } = getAppByCtx(ctx)
+
+  const {
+    id,
+    prefix,
+    config = 'weixin_mp',
+    type = 'MP-WEIXIN',
+    pay_config = 'weixin_pay',
+    out_trade_no: _out_trade_no,
+    mch_id = '',
+  } = ctx.request.body
+
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const result = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+  })
+  if (!result) return ctx.SUCCESS('找不到')
+
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const { mchId, b2b_mchId, key, app_key } = await appConfig.getObject(
+    pay_config
+  )
+
+  const mchid = mch_id || b2b_mchId || mchId
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const orderPrefix = prefix ? `${prefix}-` : ''
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : `${key.length > 10 ? appName : key}_${orderPrefix}${id}_${type}`
+
+  const payResult = await weixinMp.b2bCheckOrder({
+    out_trade_no: out_trade_no,
+    mchid,
+    app_key,
+  })
+
+  if (payResult) {
+    console.log('payResult', payResult)
+    const order_price = Number(payResult.amount.order_amount) / 100
+    // await app.service[orderModel].notify({
+    //   app,
+    //   order: orderModel,
+    //   order_id: id,
+    //   order_price,
+    //   transactionid: payResult.wxpay_transaction_id,
+    //   openid:payResult.payer_openid,
+    //   mch_id: payResult.mchid,
+    //   out_trade_no: payResult.out_trade_no,
+    // })
+  }
+
+  ctx.SUCCESS({ prefix, ...payResult })
+}
+
+exports.b2b_checkRefund = async (ctx, _data) => {
+  const { app, appName, controller } = getAppByCtx(ctx)
+
+  const {
+    id,
+    prefix,
+    type = 'MP-WEIXIN',
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+    out_refund_no,
+    mch_id = '',
+  } = _data || ctx.request.body
+
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const { mchId, b2b_mchId, key, app_key } = await appConfig.getObject(
+    pay_config
+  )
+
+  const mchid = mch_id || b2b_mchId || mchId
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+
+  weixinMp.init()
+
+  if (!id) return ctx.ERROR('?id')
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const orderDetail = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+  })
+
+  if (!orderDetail) return ctx.SUCCESS('找不到')
+
+  const result = await weixinMp.b2bCheckRefund({
+    mchid,
+    app_key,
+    out_refund_no,
+  })
+
+  ctx.SUCCESS(result)
+  return result
+}
+
 exports.init_mp_openid = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)