q-koa 10.3.0 → 10.4.2

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

@@ -838,7 +838,6 @@ exports.pc_pay = async (ctx) => {
     order_id,
     price,
     prefix = '',
-    type = 'PC-WEIXIN',
     out_trade_no: _out_trade_no,
     is_admin = false,
     config = 'weixin_mp',
@@ -846,77 +845,8 @@ exports.pc_pay = async (ctx) => {
   } = ctx.request.body
 
   if (price === 0) throw new Error('价格不能为0')
-
-  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密钥
-  })
-
-  const pay = (options) =>
-    new Promise((resolve, reject) => {
-      wxpay.createUnifiedOrder(options, (err, result) => {
-        if (err) return reject(err)
-        return resolve(result)
-      })
-    })
-
-  const out_trade_no = _out_trade_no
-    ? _out_trade_no
-    : prefix
-    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
-    : `${key.length > 10 ? appName : key}_${order_id}_${type}`
-
-  const notify_url = `https://${
-    site_host || 'api.kuashou.com'
-  }/${appName}/weixin/notify`
-
-  const result = await pay({
-    body: name,
-    detail: '公众号支付测试',
-    out_trade_no,
-    trade_type: 'NATIVE',
-    total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
-    spbill_create_ip: '192.168.2.210',
-    notify_url,
-  })
-
-  if (result.result_code === 'FAIL') throw new Error(result.err_code_des)
-
-  return ctx.SUCCESS(
-    `https://${site_host || 'api.kuashou.com'}/${appName}/common/createQr?url=${
-      result.code_url
-    }`
-  )
-}
-
-exports.pc_pay = async (ctx) => {
-  const { app, appName } = getAppByCtx(ctx)
-  const {
-    name,
-    order_id,
-    price,
-    prefix = '',
-    out_trade_no: _out_trade_no,
-    is_admin = false,
-    config = 'weixin_mp',
-    pay_config = 'weixin_pay',
-  } = ctx.request.body
-
-  if (price === 0) throw new Error('价格不能为0')
-
-  if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
   const result = await app.service.weixin.pc_pay({
-    app,
-    appName,
+    ctx,
     name,
     order_id,
     price,
@@ -1147,7 +1077,9 @@ exports.notify = async (ctx) => {
   }
   const model = prefix ? `${prefix}_order` : 'order'
   let transactionid = ''
+  let openid = ''
   try {
+    openid = result.xml.openid
     transactionid = result.xml.transaction_id
   } catch (e) {}
 
@@ -1160,6 +1092,7 @@ exports.notify = async (ctx) => {
       order_price,
       transactionid,
       out_trade_no: result.xml.out_trade_no,
+      openid,
     })
   }
 

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

@@ -444,25 +444,26 @@ exports.funds_order_refund = async ({ app, result }) => {
 }
 
 exports.pc_pay = async ({
-  app,
-  appName,
+  ctx,
   name,
   order_id,
   price,
-  config,
-  pay_config,
+  config = 'weixin_mp',
+  pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
-  is_admin,
+  is_admin = false,
   type = 'PC-WEIXIN',
-  prefix,
+  prefix = '',
 }) => {
+  if (!order_id) throw new Error('缺order_id')
+  if (!price) throw new Error('缺price')
+  if (!name) throw new Error('缺name')
+  const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-
+  const app_id = (await appConfig.getObject(config)).app_id
   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,
@@ -497,10 +498,12 @@ exports.pc_pay = async ({
     spbill_create_ip: '192.168.2.210',
     notify_url,
   })
-
   if (result.return_code === 'FAIL') {
     throw new Error(result.return_msg)
   }
+  if (result.result_code === 'FAIL') {
+    throw new Error(result.err_code_des)
+  }
 
   return `https://${
     site_host || 'api.kuashou.com'

package/package.json

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