q-koa 12.0.2 → 12.0.4

package/core/app.js

@@ -1877,9 +1877,13 @@ class APP {
           )
 
           const flag = await app[appName].model[controller][fn]({
-            createdid: ctx.request[`${appName}-user`]
-              ? ctx.request[`${appName}-user`].id
-              : 0,
+            ...(ctx.request.clientType === 1
+              ? {}
+              : {
+                  createdid: ctx.request[`${appName}-user`]
+                    ? ctx.request[`${appName}-user`].id
+                    : 0,
+                }),
             ...newData,
           })
           if (fn === 'create') {

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

@@ -52,23 +52,36 @@ exports.refund = async ({
     include: app.model.order_refund_record,
   })
   if (!orderDetail) throw new Error('不存在该订单')
+  const wxpay = WXPay({
+    appid: appId,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+  })
+  const payResult = await wxpay.queryOrderSync({
+    out_trade_no,
+  })
+
   try {
     const refundRecords = lodash.get(orderDetail, 'order_refund_records', [])
     const refundNumber = refundRecords.length + 1
-
+    console.log(refundNumber, `${prefix}-${id}_${type}-${refundNumber}`)
     const data = {
       ...rest,
       out_trade_no,
-      out_refund_no: `${prefix}-${id}_${type ? type + '-' + refundNumber : ''}`,
-      total_fee: Math.round((total_fee || refund_fee || price) * 100),
+      out_refund_no: `${prefix}-${id}_${type}-${refundNumber}`,
+      total_fee: Number(payResult.total_fee),
       refund_fee: Math.round((refund_fee || price) * 100),
       notify_url: `https://${
         site_host || 'api.kuashou.com'
       }/${appName}/weixin/refund_notify/${pay_config}`,
     }
-    const { result_code, err_code_des, out_refund_no } = await payObj.refund(
-      data
-    )
+
+    const {
+      result_code,
+      err_code_des,
+      out_refund_no,
+      ...restData
+    } = await payObj.refund(data)
     if (result_code === 'SUCCESS') {
       const hasResult = await app.model.order_refund_record.findOne({
         where: {
@@ -84,7 +97,7 @@ exports.refund = async ({
       throw new Error(err_code_des)
     }
   } catch (e) {
-    throw new Error(e)
+    throw new Error(e.message)
   }
 }
 

package/package.json

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