q-koa 12.0.9 → 12.1.1

package/core/app.js

@@ -1534,8 +1534,9 @@ 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,
@@ -2016,6 +2017,16 @@ APP.getUserByCtx = (ctx) => {
     return 0
   }
 }
+
+APP.getUserNameByCtx = (ctx) => {
+  try {
+    const appName = ctx.router.opts.prefix.substring(1)
+    return ctx.request[`${appName}-user`].name || ''
+  } catch (e) {
+    return ''
+  }
+}
+
 APP.getClientTypeByCtx = (ctx) => {
   const typeEnum = {
     1: 'admin',

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

@@ -59,7 +59,7 @@ exports.login = async (ctx) => {
       name,
     },
     attributes: {
-      exclude: ['createdid', 'updated_at', 'created_at', 'password'],
+      exclude: ['createdid', 'updated_at', 'created_at'],
     },
     include: [
       {
@@ -131,7 +131,7 @@ exports.checkLogin = async (ctx) => {
         password: ctx.request[`${appName}-user`].password || '',
       },
       attributes: {
-        exclude: ['createdid', 'updated_at', 'created_at', 'password'],
+        exclude: ['createdid', 'updated_at', 'created_at'],
       },
       include: [
         {

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

@@ -1,4 +1,10 @@
-const { getAppByCtx, getAppConfig, getConfig, lodash } = require('q-koa')
+const {
+  getAppByCtx,
+  getAppConfig,
+  getConfig,
+  lodash,
+  moment,
+} = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
 const WXPay = require('weixin-pay-fork')
 const path = require('path')
@@ -744,20 +750,37 @@ exports.downloadBill = async ({ ctx, pay_config = 'weixin_pay', ...rest }) => {
       result: list.map((item) => {
         const array = item.split(',')
         const orderdate = array[20].substring(1).slice(2, 10)
+        const orderPrefix = array[6].substring(1).split('_')[1]
+        let order_id = 0
+        let prefix = ''
+        if (orderPrefix.includes('-')) {
+          order_id = Number(orderPrefix.split('-')[1])
+          prefix = orderPrefix.split('-')[0]
+        } else {
+          order_id = Number(orderPrefix)
+        }
+        let order_date
+        if (prefix) {
+          order_date = moment(array[0].substring(1)).format('YYYY-MM-DD') + ''
+        } else {
+          order_date = moment(
+            `${orderdate.slice(0, 4)}-${orderdate.slice(
+              4,
+              6
+            )}-${orderdate.slice(6, 8)}`
+          ).format('YYYY-MM-DD')
+        }
         return {
           created_at: array[0].substring(1),
           transactionid: array[5].substring(1),
-          order_id: Number(array[6].substring(1).split('_')[1]),
+          [`${[prefix, 'order_id'].filter(Boolean).join('_')}`]: order_id,
           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)}`,
+          order_date,
         }
       }),
       totalHeader: arr[arr.length - 3],

package/package.json

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