q-koa 12.0.7 → 12.0.9

package/core/app.js

@@ -1534,9 +1534,8 @@ class APP {
                         app[appName].attributes[modelName] &&
                         app[appName].attributes[modelName][controller + '_id']
                       ) {
-                        const { required, include, where, ...rest } = myInclude[
-                          j
-                        ]
+                        const { required, include, where, ...rest } =
+                          myInclude[j]
                         const list = await model.findAll({
                           where: {
                             [controller + '_id']: target.id,

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

@@ -1463,6 +1463,39 @@ exports.checkPay = async (ctx) => {
   ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
 }
 
+exports.checkPayOnly = async (ctx) => {
+  const { app, appName, controller } = getAppByCtx(ctx)
+
+  const {
+    id,
+    prefix,
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+    type = 'MP-WEIXIN',
+    out_trade_no: _out_trade_no,
+  } = ctx.request.body
+
+  const appConfig = getConfig(app)
+  const app_id = (await appConfig.getObject(config)).app_id
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
+
+  const wxpay = WXPay({
+    appid: app_id,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+  })
+
+  const orderPrefix = prefix ? `${prefix}-` : ''
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : `${key}_${orderPrefix}${id}_${type}`
+  const payResult = await wxpay.queryOrderSync({
+    out_trade_no,
+  })
+
+  ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
+}
+
 exports.checkRefund = async (ctx) => {
   const { app, appName, controller } = getAppByCtx(ctx)
 

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

@@ -18,6 +18,7 @@ exports.refund = async ({
   config = 'weixin_mp',
   pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
+  out_refund_no: _out_refund_no,
   ...rest
 }) => {
   if (!ctx) throw new Error('?ctx')
@@ -64,11 +65,13 @@ exports.refund = async ({
   try {
     const refundRecords = lodash.get(orderDetail, 'order_refund_records', [])
     const refundNumber = refundRecords.length + 1
-    console.log(refundNumber, `${prefix}-${id}_${type}-${refundNumber}`)
+    const out_refund_no =
+      _out_refund_no || [`${prefix}-${id}`, type, refundNumber].join('_')
+
     const data = {
       ...rest,
       out_trade_no,
-      out_refund_no: `${prefix}-${id}_${type}-${refundNumber}`,
+      out_refund_no,
       total_fee: Number(payResult.total_fee),
       refund_fee: Math.round((refund_fee || price) * 100),
       notify_url: `https://${
@@ -76,16 +79,12 @@ exports.refund = async ({
       }/${appName}/weixin/refund_notify/${pay_config}`,
     }
 
-    const {
-      result_code,
-      err_code_des,
-      out_refund_no,
-      ...restData
-    } = await payObj.refund(data)
+    console.log(data)
+    const { result_code, err_code_des, ...restData } = await payObj.refund(data)
     if (result_code === 'SUCCESS') {
       const hasResult = await app.model.order_refund_record.findOne({
         where: {
-          out_refund_no,
+          out_refund_no: restData.out_refund_no,
         },
       })
       if (hasResult) {
@@ -101,6 +100,73 @@ exports.refund = async ({
   }
 }
 
+exports.refundOnly = async ({
+  ctx,
+  id,
+  prefix = '',
+  total_fee,
+  refund_fee,
+  price,
+  pay_type = 'MP-WEIXIN',
+  type = '',
+  config = 'weixin_mp',
+  pay_config = 'weixin_pay',
+  out_trade_no: _out_trade_no,
+  out_refund_no: _out_refund_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(
+    pay_config
+  )
+  const { site_host } = await appConfig.getObject('base')
+
+  const payObj = new Pay({
+    appId: appId,
+    mchId: mchId,
+    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 out_trade_no =
+    _out_trade_no ||
+    (prefix ? `${key}_${prefix}-${id}_${pay_type}` : `${key}_${id}_${pay_type}`)
+
+  const wxpay = WXPay({
+    appid: appId,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+  })
+
+  try {
+    const out_refund_no = _out_refund_no || [`${prefix}-${id}`, type].join('_')
+    const data = {
+      ...rest,
+      out_trade_no,
+      total_fee: Math.round((refund_fee || price) * 100),
+      refund_fee: Math.round((refund_fee || price) * 100),
+      out_refund_no,
+    }
+
+    console.log(data)
+    const { result_code, err_code_des, ...restData } = await payObj.refund(data)
+    if (result_code === 'SUCCESS') {
+      return restData
+    } else {
+      console.error(data)
+      throw new Error(err_code_des)
+    }
+  } catch (e) {
+    throw new Error(e.message)
+  }
+}
+
 exports.refund_new = async ({
   ctx,
   id,
@@ -647,3 +713,64 @@ exports.removereceiver = async ({
   })
   return res
 }
+
+exports.downloadBill = async ({ ctx, pay_config = 'weixin_pay', ...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(
+    pay_config
+  )
+  const payObj = new Pay({
+    appId: appId,
+    mchId: mchId,
+    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`
+      )
+    ), // 微信商户平台证书
+  })
+
+  try {
+    const result = await payObj.downloadBill(rest)
+
+    const arr = result.split('\r\n')
+    const list = arr.slice(1, arr.length - 3)
+    return {
+      header: arr[0],
+      list,
+      result: list.map((item) => {
+        const array = item.split(',')
+        const orderdate = array[20].substring(1).slice(2, 10)
+        return {
+          created_at: array[0].substring(1),
+          transactionid: array[5].substring(1),
+          order_id: Number(array[6].substring(1).split('_')[1]),
+          openid: array[7].substring(1),
+          price: Number(array[12].substring(1)),
+          refund_price: Number(array[16].substring(1)),
+          remark: array[20].substring(1),
+          rate_price: Number(array[22].substring(1)),
+          type: array[9].substring(1),
+          order_date: `${orderdate.slice(0, 4)}-${orderdate.slice(
+            4,
+            6
+          )}-${orderdate.slice(6, 8)}`,
+        }
+      }),
+      totalHeader: arr[arr.length - 3],
+      total: arr[arr.length - 2],
+      totalResult: {
+        number: Number(arr[arr.length - 2].split(',')[0].substring(1)),
+        total_price: Number(arr[arr.length - 2].split(',')[1].substring(1)),
+        refund_price: Number(arr[arr.length - 2].split(',')[2].substring(1)),
+        rate_price: Number(arr[arr.length - 2].split(',')[4].substring(1)),
+        price: Number(arr[arr.length - 2].split(',')[5].substring(1)),
+      },
+    }
+  } catch {
+    return []
+  }
+}

package/package.json

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