q-koa 10.6.0 → 10.6.2

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

@@ -909,14 +909,6 @@ exports.mp_pay = async (ctx) => {
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 
-  const pay = (options) =>
-    new Promise((resolve, reject) => {
-      wxpay.getBrandWCPayRequestParams(options, (err, result) => {
-        if (err) return reject(err)
-        return resolve(result)
-      })
-    })
-
   const userDetail =
     type === 'H5-WEIXIN'
       ? ctx.request[`${appName}-user`].h5_user
@@ -931,7 +923,8 @@ exports.mp_pay = async (ctx) => {
   const notify_url = `https://${
     site_host || 'api.kuashou.com'
   }/${appName}/weixin/notify`
-  const prePayResult = await pay({
+
+  const prePayResult = await wxpay.getBrandWCPayRequestParamsSync({
     openid: userDetail.openid,
     body: name,
     detail: '公众号支付测试',
@@ -1550,115 +1543,64 @@ exports.messagePush = async (ctx) => {
 exports.profitsharing = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const {
-    transaction_id = '',
-    out_order_no = '',
-    type = 'PERSONAL_OPENID',
-    amount = 0,
-    openid = '',
-    description = '手续费',
-    config = 'weixin_mp',
-    pay_config = 'weixin_pay',
+    transaction_id,
+    out_order_no,
+    type,
+    amount,
+    openid,
+    description,
+    config,
+    pay_config,
   } = ctx.request.body
+
   if (!amount) return ctx.ERROR('?amount分')
   if (!transaction_id) return ctx.ERROR('?transaction_id')
   if (!out_order_no) return ctx.ERROR('?out_order_no')
   if (!openid) return ctx.ERROR('?openid')
 
-  const appConfig = getConfig(app)
-
-  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
-
-  const app_id = (await appConfig.getObject(config)).app_id
-
-  const wxpay = WXPay({
-    appid: app_id,
-    mch_id: mchId,
-    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
-    pfx: await fsPromise.readFile(
-      path.resolve(
-        __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
-      )
-    ),
-  })
-
-  const res = await wxpay.profitsharingSync({
+  const res = await app.service.weixin.profitsharing({
+    ctx,
     transaction_id,
     out_order_no,
-    receivers: [
-      {
-        type,
-        account: openid,
-        description,
-        amount,
-      },
-    ],
+    type,
+    openid,
+    description,
+    amount,
+    config,
+    pay_config,
   })
   return ctx.SUCCESS(res)
 }
 
 exports.addreceiver = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
-  const {
-    type = 'PERSONAL_OPENID',
-    openid = '',
-    relation_type = 'USER',
-    config = 'weixin_mp',
-    pay_config = 'weixin_pay',
-  } = ctx.request.body
+  const { type, openid, relation_type, config, pay_config } = ctx.request.body
 
   if (!openid) return ctx.ERROR('?openid')
 
-  const appConfig = getConfig(app)
-
-  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
-
-  const app_id = (await appConfig.getObject(config)).app_id
-
-  const wxpay = WXPay({
-    appid: app_id,
-    mch_id: mchId,
-    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
-  })
-
-  const res = await wxpay.addreceiverSync({
-    receiver: {
-      type,
-      account: openid,
-      relation_type,
-    },
+  const res = await app.service.weixin.addreceiver({
+    ctx,
+    type,
+    openid,
+    relation_type,
+    config,
+    pay_config,
   })
   return ctx.SUCCESS(res)
 }
 
 exports.removereceiver = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
-  const {
-    type = 'PERSONAL_OPENID',
-    openid = '',
-    config = 'weixin_mp',
-    pay_config = 'weixin_pay',
-  } = ctx.request.body
+  const { type, openid, config, pay_config } = ctx.request.body
 
   if (!openid) return ctx.ERROR('?openid')
 
-  const appConfig = getConfig(app)
-
-  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
-
-  const app_id = (await appConfig.getObject(config)).app_id
-
-  const wxpay = WXPay({
-    appid: app_id,
-    mch_id: mchId,
-    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
-  })
-
-  const res = await wxpay.removereceiverSync({
-    receiver: {
-      type,
-      account: openid,
-    },
+  const res = await app.service.weixin.removereceiver({
+    ctx,
+    type,
+    openid,
+    config,
+    pay_config,
   })
   return ctx.SUCCESS(res)
 }

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

@@ -19,6 +19,7 @@ exports.refund = async ({
   out_trade_no: _out_trade_no,
   ...rest
 }) => {
+  if (!ctx) throw new Error('?ctx')
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
   const { mchId, key, appId, partner_key } = await appConfig.getObject(
@@ -94,6 +95,7 @@ exports.refund_new = async ({
   out_trade_no: _out_trade_no,
   ...rest
 }) => {
+  if (!ctx) throw new Error('?ctx')
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
 
@@ -162,6 +164,7 @@ exports.cash = async ({
   number,
   pay_config = 'weixin_pay',
 }) => {
+  if (!ctx) throw new Error('?ctx')
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
 
@@ -455,6 +458,7 @@ exports.pc_pay = async ({
   type = 'PC-WEIXIN',
   prefix = '',
 }) => {
+  if (!ctx) throw new Error('?ctx')
   if (!order_id) throw new Error('缺order_id')
   if (!price) throw new Error('缺price')
   if (!name) throw new Error('缺name')
@@ -509,3 +513,114 @@ exports.pc_pay = async ({
     site_host || 'api.kuashou.com'
   }/${appName}/common/createQr?url=${result.code_url}`
 }
+
+exports.profitsharing = async ({
+  ctx,
+  transaction_id = '',
+  out_order_no = '',
+  type = 'PERSONAL_OPENID',
+  amount = 0,
+  openid = '',
+  description = '手续费',
+  config = 'weixin_mp',
+  pay_config = 'weixin_pay',
+}) => {
+  if (!ctx) throw new Error('?ctx')
+  const { app, appName } = getAppByCtx(ctx)
+
+  const appConfig = getConfig(app)
+
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
+
+  const app_id = (await appConfig.getObject(config)).app_id
+
+  const wxpay = WXPay({
+    appid: app_id,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+    pfx: await fsPromise.readFile(
+      path.resolve(
+        __dirname,
+        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+      )
+    ),
+  })
+
+  const res = await wxpay.profitsharingSync({
+    transaction_id,
+    out_order_no,
+    receivers: [
+      {
+        type,
+        account: openid,
+        description,
+        amount,
+      },
+    ],
+  })
+  return res
+}
+
+exports.addreceiver = async ({
+  ctx,
+  type = 'PERSONAL_OPENID',
+  openid = '',
+  relation_type = 'USER',
+  config = 'weixin_mp',
+  pay_config = 'weixin_pay',
+}) => {
+  if (!ctx) throw new Error('?ctx')
+  const { app, appName } = getAppByCtx(ctx)
+
+  const appConfig = getConfig(app)
+
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
+
+  const app_id = (await appConfig.getObject(config)).app_id
+
+  const wxpay = WXPay({
+    appid: app_id,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+  })
+
+  const res = await wxpay.addreceiverSync({
+    receiver: {
+      type,
+      account: openid,
+      relation_type,
+    },
+  })
+  return res
+}
+
+exports.removereceiver = async ({
+  ctx,
+  type = 'PERSONAL_OPENID',
+  openid = '',
+  config = 'weixin_mp',
+  pay_config = 'weixin_pay',
+}) => {
+  if (!ctx) throw new Error('?ctx')
+  const { app, appName } = getAppByCtx(ctx)
+
+  const appConfig = getConfig(app)
+
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
+
+  const app_id = (await appConfig.getObject(config)).app_id
+
+  const wxpay = WXPay({
+    appid: app_id,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+  })
+
+  const res = await wxpay.removereceiverSync({
+    receiver: {
+      type,
+      account: openid,
+    },
+  })
+  return res
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.6.0",
+  "version": "10.6.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -52,7 +52,7 @@
     "sequelize": "^5.21.3",
     "static-koa-router": "^1.0.3",
     "wechat-oauth": "^1.5.0",
-    "weixin-pay-fork": "^1.0.2",
+    "weixin-pay-fork": "^1.0.4",
     "node-uuid": "^1.4.8",
     "sha1": "^1.1.1",
     "redis": "^4.0.3",