q-koa 10.5.3 → 10.5.5

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

@@ -1203,6 +1203,7 @@ exports.refund = async (ctx) => {
     pay_config = 'weixin_pay',
     is_new_pay = false,
     out_trade_no,
+    type,
   } = ctx.request.body
 
   const fn = is_new_pay ? 'refund_new' : 'refund'
@@ -1216,6 +1217,7 @@ exports.refund = async (ctx) => {
     config,
     pay_config,
     out_trade_no,
+    type,
   })
   ctx.SUCCESS('ok')
 }
@@ -1322,6 +1324,7 @@ exports.checkPay = async (ctx) => {
     prefix,
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
+    type = 'MP-WEIXIN',
     out_trade_no: _out_trade_no,
   } = ctx.request.body
 
@@ -1343,19 +1346,11 @@ exports.checkPay = async (ctx) => {
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 
-  const checkOrder = (obj) => {
-    return new Promise((resolve, reject) => {
-      wxpay.queryOrder(obj, function (err, order) {
-        if (err) throw new Error(err)
-        resolve(order)
-      })
-    })
-  }
   const orderPrefix = prefix ? `${prefix}-` : ''
   const out_trade_no = _out_trade_no
     ? _out_trade_no
-    : `${key}_${orderPrefix}${id}_MP-WEIXIN`
-  const payResult = await checkOrder({
+    : `${key}_${orderPrefix}${id}_${type}`
+  const payResult = await wxpay.queryOrderSync({
     out_trade_no,
   })
   if (payResult.trade_state_desc === '支付成功') {
@@ -1379,6 +1374,7 @@ exports.checkRefund = async (ctx) => {
   const {
     id,
     prefix,
+    type = 'MP-WEIXIN',
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
     out_trade_no: _out_trade_no,
@@ -1414,7 +1410,7 @@ exports.checkRefund = async (ctx) => {
   const orderPrefix = prefix ? `${prefix}-` : ''
   const out_trade_no = _out_trade_no
     ? _out_trade_no
-    : `${key}_${orderPrefix}${id}_MP-WEIXIN`
+    : `${key}_${orderPrefix}${id}_${type}`
 
   const result = await payObj.checkRefund({
     out_trade_no,
@@ -1548,3 +1544,133 @@ exports.messagePush = async (ctx) => {
     ctx.body = 'success'
   }
 }
+
+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',
+  } = 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 { is_dev, site_host } = await appConfig.getObject('base')
+  // 公众号支付用 服务号 appid，其他用小程序 appid
+  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 fs.readFileSync(
+      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 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
+
+  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 fs.readFileSync(
+      path.resolve(
+        __dirname,
+        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+      )
+    ),
+  })
+
+  const res = await wxpay.addreceiverSync({
+    receiver: {
+      type,
+      account: openid,
+      relation_type,
+    },
+  })
+  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
+
+  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 fs.readFileSync(
+      path.resolve(
+        __dirname,
+        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+      )
+    ),
+  })
+
+  const res = await wxpay.removereceiverSync({
+    receiver: {
+      type,
+      account: openid,
+    },
+  })
+  return ctx.SUCCESS(res)
+}

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

@@ -13,7 +13,7 @@ exports.refund = async ({
   total_fee,
   refund_fee,
   price,
-  type = '',
+  type = 'MP-WEIXIN',
   config = 'weixin_mp',
   pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
@@ -41,8 +41,8 @@ exports.refund = async ({
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${key}_${prefix}-${id}_MP-WEIXIN`
-    : `${key}_${id}_MP-WEIXIN`
+    ? `${key}_${prefix}-${id}_${type}`
+    : `${key}_${id}_${type}`
   const orderDetail = await app.model[orderModel].findOne({
     where: {
       id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.5.3",
+  "version": "10.5.5",
   "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.0",
+    "weixin-pay-fork": "^1.0.2",
     "node-uuid": "^1.4.8",
     "sha1": "^1.1.1",
     "redis": "^4.0.3",