q-koa 8.8.7 → 8.9.2

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

@@ -26,6 +26,31 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             excludeInclude,
             autoInclude = true,
           } = route
+
+          if (url.includes('http')) {
+            return axios
+              .post(url, {
+                ...data,
+                limit,
+                order,
+              })
+              .then((res) => {
+                if (res.data.code !== 200) {
+                  console.log(`${item}请求失败,${res.data.message}`)
+                } else {
+                  return {
+                    [item]: res.data.data,
+                  }
+                }
+              })
+              .catch((e) => {
+                console.log(`${item}请求失败,${e.message}`)
+                return {
+                  [item]: [],
+                }
+              })
+          }
+
           const [model, fn] = url.split('/')
 
           let myInclude

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

@@ -907,6 +907,66 @@ exports.mp_pay = async (ctx) => {
   })
 }
 
+exports.mp_pay_new = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const {
+    name,
+    order_id,
+    price,
+    return_url,
+    prefix = '',
+    type,
+    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 (
+    !ctx.request[`${appName}-user`] ||
+    !ctx.request[`${appName}-user`].mp_user
+  ) {
+    throw new Error('请先小程序登录')
+  }
+
+  const appConfig = getConfig(app)
+
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const { mchId } = await appConfig.getObject(pay_config)
+  const { is_dev, site_host } = await appConfig.getObject('base')
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const userDetail = ctx.request[`${appName}-user`].mp_user
+
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${appName}_${prefix}-${order_id}`
+    : `${appName}_${order_id}`
+
+  const prePayResult = await weixinMp.createOrder({
+    openid: userDetail.openid,
+    combine_trade_no: out_trade_no,
+    sub_orders: [
+      {
+        mchid: mchId,
+        amount: is_admin || is_dev ? 1 : Math.round(price * 100),
+        trade_no: out_trade_no,
+        description: `订单【${out_trade_no}】`,
+      },
+    ],
+  })
+
+  return ctx.SUCCESS(prePayResult)
+}
+
 exports.notify = async (ctx) => {
   const { app } = getAppByCtx(ctx)
   const result = ctx.request.xmlBody
@@ -1034,13 +1094,22 @@ exports.sendMessage = async (ctx) => {
 exports.refund = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { id, prefix = '', price, pay_config = 'weixin_pay' } = ctx.request.body
+  const {
+    id,
+    prefix = '',
+    price,
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+    is_new_pay = false,
+  } = ctx.request.body
 
-  await app.service.weixin.refund({
+  const fn = is_new_pay ? 'refund_new' : 'refund'
+  await app.service.weixin[fn]({
     ctx,
     id,
     prefix,
     price,
+    config,
     pay_config,
   })
   ctx.SUCCESS('ok')
@@ -1188,7 +1257,57 @@ exports.checkPay = async (ctx) => {
       order: orderModel,
       order_id: id,
       order_price,
-      transaction_id: payResult.transaction_id,
+      transactionid: payResult.transaction_id,
+    })
+  }
+
+  ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
+}
+
+exports.checkPayNew = async (ctx) => {
+  const { app, appName, controller } = getAppByCtx(ctx)
+
+  const {
+    id,
+    prefix,
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+  } = 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 } = 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 = `${appName}_${orderPrefix}${id}`
+
+  const payResult = await weixinMp.getOrder({
+    trade_no: out_trade_no,
+  })
+
+  if (payResult) {
+    console.log('payResult', payResult)
+    const order_price = Number(payResult.amount) / 100
+    await app.service[orderModel].notify({
+      app,
+      order: orderModel,
+      order_id: id,
+      order_price,
+      transactionid: payResult.transaction_id,
     })
   }
 

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

@@ -13,6 +13,7 @@ exports.refund = async ({
   refund_fee,
   price,
   type = '',
+  config = 'weixin_mp',
   pay_config = 'weixin_pay',
   ...rest
 }) => {
@@ -65,6 +66,78 @@ exports.refund = async ({
   }
 }
 
+exports.refund_new = async ({
+  ctx,
+  id,
+  prefix = '',
+  total_fee,
+  refund_fee,
+  price,
+  transaction_id = '',
+  type = '',
+  config = 'weixin_mp',
+  pay_config = 'weixin_pay',
+  ...rest
+}) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const { mchId } = await appConfig.getObject(pay_config)
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const out_trade_no = prefix
+    ? `${appName}_${prefix}-${id}`
+    : `${appName}_${id}`
+
+  const orderDetail = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+    include: [
+      {
+        model: app.model.user,
+      },
+    ],
+  })
+
+  if (!orderDetail) throw new Error('不存在该订单')
+  if (!orderDetail.user || (orderDetail.user && !orderDetail.user.mp_openid)) {
+    throw new Error('找不到退款用户')
+  }
+  try {
+    const payResult = await weixinMp.getOrder({
+      trade_no: out_trade_no,
+    })
+
+    const { transaction_id } = payResult
+
+    const result = await weixinMp.refundOrder({
+      openid: orderDetail.user.mp_openid,
+      trade_no: out_trade_no,
+      mchid: mchId,
+      transaction_id,
+      refund_no: out_trade_no + (type ? `_${type}` : ''),
+      total_amount: Math.round((total_fee || refund_fee || price) * 100),
+      refund_amount: Math.round((refund_fee || price) * 100),
+    })
+    return result
+    // if (result_code === 'SUCCESS') {
+    //   return true
+    // } else {
+    //   throw new Error(err_code_des)
+    // }
+  } catch (e) {
+    throw new Error(e)
+  }
+}
+
 exports.cash = async ({
   ctx,
   id,
@@ -222,3 +295,132 @@ exports.url_link = async ({ app, page, scene, config = 'weixin_mp' }) => {
   })
   return result
 }
+
+exports.user_enter_tempsession = async ({ app, result }) => {
+  console.log('user_enter_tempsession', result)
+}
+
+exports.handleUserMessage = async ({ app, result }) => {
+  const appConfig = getConfig(app)
+
+  if (result.ToUserName) {
+    const { app_id, app_secrect } = await appConfig.getObject(result.ToUserName)
+    const weixinMp = new WeixinMp({
+      appid: app_id,
+      secrect: app_secrect,
+    })
+    weixinMp.init()
+    await weixinMp.handleMessage({
+      touser: result.FromUserName,
+      msgtype: 'text',
+      text: {
+        content: `你说${result.Content},是吗？`,
+      },
+    })
+  }
+}
+
+exports.funds_order_pay = async ({ app, result }) => {
+  const appConfig = getConfig(app)
+
+  if (result.ToUserName) {
+    const { app_id, app_secrect, mchId } = await appConfig.getObject(
+      result.ToUserName
+    )
+
+    const weixinMp = new WeixinMp({
+      appid: app_id,
+      secrect: app_secrect,
+    })
+    weixinMp.init()
+
+    if (result.order_info) {
+      let prefix = ''
+      let order_id = result.order_info.trade_no.split('_')[1]
+      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'
+      let transactionid = ''
+      try {
+        transactionid = result.order_info.transaction_id
+      } catch (e) {}
+
+      const payResult = await weixinMp.getOrder({
+        trade_no: result.order_info.trade_no,
+      })
+
+      const { amount } = payResult
+
+      if (app.service[model] && app.service[model].notify) {
+        await app.service[model].notify({
+          app,
+          order_id,
+          order: model,
+          order_price: amount / 100,
+          transactionid,
+        })
+      }
+    }
+  }
+}
+
+exports.funds_order_refund = async ({ app, result }) => {
+  const appConfig = getConfig(app)
+
+  if (result.ToUserName) {
+    const { app_id, app_secrect, mchId } = await appConfig.getObject(
+      result.ToUserName
+    )
+
+    const weixinMp = new WeixinMp({
+      appid: app_id,
+      secrect: app_secrect,
+    })
+    weixinMp.init()
+
+    if (result.order_info) {
+      let prefix = ''
+      let order_id = result.order_info.refund_no.split('_')[1]
+      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'
+
+      const trade_no = result.order_info.refund_no
+        .split('_')
+        .slice(0, 2)
+        .join('_')
+
+      const type = trade_no.includes('_') ? trade_no.split('_')[1] : ''
+
+      const payResult = await weixinMp.getOrder({
+        trade_no,
+      })
+
+      const refundTarget = payResult.refund_list.find(
+        (t) => t.refund_no === result.order_info.refund_no
+      )
+
+      if (!refundTarget || refundTarget.result !== 'SUCCESS')
+        throw new Error('还没退成功')
+      if (app.service[model] && app.service[model].refund_notify) {
+        await app.service[model].refund_notify({
+          app,
+          order_id,
+          order: model,
+          refund_price: refundTarget.amount / 100,
+          type,
+        })
+      }
+    }
+  }
+}

package/core/file/services/weixinMP.js

@@ -34,6 +34,12 @@ const getExpressUrl =
   'https://api.weixin.qq.com/cgi-bin/express/business/delivery/getall?access_token=%s'
 const addOrderUrl =
   'https://api.weixin.qq.com/cgi-bin/express/business/order/add?access_token=%s'
+const createOrderUrl =
+  'https://api.weixin.qq.com/shop/pay/createorder?access_token=%s'
+const getOrderUrl =
+  'https://api.weixin.qq.com/shop/pay/getorder?access_token=%s'
+const refundOrderUrl =
+  'https://api.weixin.qq.com/shop/pay/refundorder?access_token=%s'
 
 const path = require('path')
 const fs = require('fs')
@@ -501,6 +507,63 @@ module.exports = class Singleton {
     return result.data
   }
 
+  async createOrder(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(createOrderUrl, access_token)
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.createOrder(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.payment_params
+  }
+
+  async getOrder(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getOrderUrl, access_token)
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getOrder(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.order
+  }
+
+  async refundOrder(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(refundOrderUrl, access_token)
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.refundOrder(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.data
+  }
+
   getConfig() {
     return this.config
   }

package/core/file/utils/index.js

@@ -34,7 +34,10 @@ exports.getObject = (config, app) => async (type) => {
     flag = true
   }
 
-  const findConfig = (item) => item.config === type || item.pay_config === type
+  const findConfig = (item) =>
+    item.config === type ||
+    item.pay_config === type ||
+    (item.ToUserName && item.ToUserName === type)
   if (app) {
     const applicationList = app.cache.get('application')
     if (

package/package.json

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