q-koa 10.2.2 → 10.3.0

package/core/app.js

@@ -266,7 +266,10 @@ class APP {
 
     starter.on('loadAll', async () => {
       const appName = this.config.includes[0]
-      if (!this.app[appName]) throw new Error(`没有生成应用${this.config.includes[0]}，请检查config includes`)
+      if (!this.app[appName])
+        throw new Error(
+          `没有生成应用${this.config.includes[0]}，请检查config includes`
+        )
       this.server = this.app.listen(this.port, () => {
         console.log(
           `${moment().format(
@@ -1048,6 +1051,18 @@ class APP {
             Array.isArray(excludeInclude) &&
             excludeInclude.length > 0
           ) {
+            // const attributes = _.omit(app[appName].attributes[controller].filter(
+            //   (i) => {
+            //     return i.type !== Sequelize.VIRTUAL
+            //   }
+            // )
+            // const currentAttribute = allAttributes.filter((item) => {
+            //   if (Array.isArray(attributes)) {
+            //     return attributes.includes(item)
+            //   } else {
+            //     return attributes.exclude.includes(item)
+            //   }
+            // })
             myInclude = myInclude.filter((i) => {
               return excludeInclude.every((m) => {
                 return app[appName].model[m] !== i.model

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

@@ -831,6 +831,105 @@ exports.h5_pay = async (ctx) => {
   )
 }
 
+exports.pc_pay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const {
+    name,
+    order_id,
+    price,
+    prefix = '',
+    type = 'PC-WEIXIN',
+    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')
+
+  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,
+    name,
+    order_id,
+    price,
+    config,
+    pay_config,
+    is_admin,
+    out_trade_no: _out_trade_no,
+    prefix,
+  })
+
+  return ctx.SUCCESS(result)
+}
+
 exports.mp_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const {
@@ -1078,6 +1177,7 @@ exports.url_link = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
   const { page, scene, config = 'weixin_mp' } = ctx.request.body
+  if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
   const result = await app.service.weixin.url_link({
     app,
     page,
@@ -1116,6 +1216,7 @@ exports.qr_code = async (ctx) => {
     config = 'weixin_mp',
   } = ctx.request.body
 
+  if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
   const result = await app.service.weixin.qr_code({
     app,
     page,
@@ -1171,6 +1272,8 @@ exports.refund = async (ctx) => {
   } = ctx.request.body
 
   const fn = is_new_pay ? 'refund_new' : 'refund'
+
+  if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
   await app.service.weixin[fn]({
     ctx,
     id,
@@ -1440,6 +1543,7 @@ exports.messagePush = async (ctx) => {
     const result = ctx.request.body
     if (!lodash.isEmpty(result)) {
       const event = result.Event
+      if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
       if (event) {
         if (app.service.weixin[event]) {
           await app.service.weixin[event]({

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

@@ -1,5 +1,6 @@
 const { getAppByCtx, getAppConfig, getConfig, lodash } = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
+const WXPay = require('weixin-pay-fork')
 const path = require('path')
 const fsPromise = require('fs/promises')
 const WeixinMp = require('../../services/weixinMP')
@@ -441,3 +442,67 @@ exports.funds_order_refund = async ({ app, result }) => {
     }
   }
 }
+
+exports.pc_pay = async ({
+  app,
+  appName,
+  name,
+  order_id,
+  price,
+  config,
+  pay_config,
+  out_trade_no: _out_trade_no,
+  is_admin,
+  type = 'PC-WEIXIN',
+  prefix,
+}) => {
+  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.return_code === 'FAIL') {
+    throw new Error(result.return_msg)
+  }
+
+  return `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/common/createQr?url=${result.code_url}`
+}

package/core/file/services/weixinMP.js

@@ -49,7 +49,7 @@ const getBrandListUrl =
   'https://api.weixin.qq.com/shop/account/get_brand_list?access_token=%s'
 
 const uploadImageUrl =
-  'https://api.weixin.qq.com/shop/img/upload?access_token=%s'
+  'https://api.weixin.qq.com/channels/ec/basics/img/upload?access_token=%s'
 
 const fsPromise = require('fs/promises')
 const LRU = require('lru-cache')

package/package.json

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