q-koa 10.4.2 → 10.5.1

package/core/app.js

@@ -956,6 +956,7 @@ class APP {
             excludeInclude,
             raw = false,
             is_split = false,
+            autoInclude = true,
             omit = [],
             ...other
           } = ctx.request.body
@@ -1008,7 +1009,10 @@ class APP {
                 ? _.uniqWith(
                     [
                       ...strInclude,
-                      ...app[appName].include[controller].filter((item) => {
+                      ...(autoInclude
+                        ? app[appName].include[controller]
+                        : []
+                      ).filter((item) => {
                         return !strInclude.some(
                           (i) =>
                             (i.model && i.model.getName()) ===
@@ -1023,7 +1027,9 @@ class APP {
             myInclude = null
           } else {
             myInclude = app[appName].include
-              ? app[appName].include[controller]
+              ? autoInclude
+                ? app[appName].include[controller]
+                : []
               : null
           }
 

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

@@ -1371,6 +1371,56 @@ exports.checkPay = async (ctx) => {
   ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
 }
 
+exports.checkRefund = async (ctx) => {
+  const { app, appName, controller } = getAppByCtx(ctx)
+
+  const {
+    id,
+    prefix,
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+    out_trade_no: _out_trade_no,
+  } = ctx.request.body
+
+  const appConfig = getConfig(app)
+  const { appId, mchId, key, partner_key } = await appConfig.getObject(
+    pay_config
+  )
+
+  const payObj = new WeixinPay({
+    appId,
+    mchId,
+    key: key.length > 10 ? key : partner_key,
+  })
+
+  if (_out_trade_no) {
+    const result = await payObj.checkRefund({
+      out_trade_no: _out_trade_no,
+    })
+    return ctx.SUCCESS(result)
+  }
+
+  if (!id) return ctx.ERROR('?id')
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const orderDetail = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+  })
+
+  if (!orderDetail) return ctx.SUCCESS('找不到')
+  const orderPrefix = prefix ? `${prefix}-` : ''
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : `${key}_${orderPrefix}${id}_MP-WEIXIN`
+
+  const result = await payObj.checkRefund({
+    out_trade_no,
+  })
+
+  ctx.SUCCESS(result)
+}
+
 exports.checkPayNew = async (ctx) => {
   const { app, appName, controller } = getAppByCtx(ctx)
 

package/core/file/services/weixinMP.js

@@ -41,15 +41,20 @@ const getOrderUrl =
 const refundOrderUrl =
   'https://api.weixin.qq.com/shop/pay/refundorder?access_token=%s'
 
-const addGoodUrl = 'https://api.weixin.qq.com/shop/spu/add?access_token=%s'
+const addGoodUrl =
+  'https://api.weixin.qq.com/channels/ec/product/add?access_token=%s'
 
-const getCategoryUrl = 'https://api.weixin.qq.com/shop/cat/get?access_token=%s'
+const getCategoryUrl =
+  'https://api.weixin.qq.com/channels/ec/category/all?access_token=%s'
 
 const getBrandListUrl =
   'https://api.weixin.qq.com/shop/account/get_brand_list?access_token=%s'
 
 const uploadImageUrl =
-  'https://api.weixin.qq.com/channels/ec/basics/img/upload?access_token=%s'
+  'https://api.weixin.qq.com/channels/ec/basics/img/upload?access_token=%s&upload_type=%s&resp_type=%s'
+
+const getShipTemplateUrl =
+  'https://api.weixin.qq.com/channels/ec/merchant/getfreighttemplatelist?access_token=%s'
 
 const fsPromise = require('fs/promises')
 const LRU = require('lru-cache')
@@ -581,6 +586,7 @@ module.exports = class Singleton {
   async addGood(payLoad) {
     const access_token = await this.getAccessToken()
     const url = util.format(addGoodUrl, access_token)
+    console.log('payLoad', payLoad)
     const result = await axios
       .post(url, {
         ...payLoad,
@@ -613,7 +619,7 @@ module.exports = class Singleton {
       }
       throw new Error(`${result.errcode};${result.errmsg}`)
     }
-    return result.third_cat_list
+    return result
   }
 
   async getBrandList(payLoad) {
@@ -635,14 +641,42 @@ module.exports = class Singleton {
     return result.data
   }
 
+  async getShipTemplate(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getShipTemplateUrl, 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.getShipTemplate(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
   async uploadImage(payLoad) {
     const access_token = await this.getAccessToken()
-    const url = util.format(uploadImageUrl, access_token)
+    const { upload_type, resp_type, ...rest } = payLoad
+
+    const url = util.format(
+      uploadImageUrl,
+      access_token,
+      upload_type,
+      resp_type
+    )
+
+    const result = await axios
+      .post(url, {
+        ...rest,
+      })
+      .then((res) => res.data)
 
-    const result = await uploadPromise({
-      url,
-      formData: payLoad,
-    })
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.reset()
@@ -650,7 +684,7 @@ module.exports = class Singleton {
       }
       throw new Error(`${result.errcode};${result.errmsg}`)
     }
-    return result.img_info
+    return result.pic_file
   }
 
   getConfig() {

package/core/file/services/weixinPay.js

@@ -26,6 +26,10 @@ module.exports = class WeixinPay {
     return await this.pay.unifiedOrder(config)
   }
 
+  async checkRefund(payLoad) {
+    return await this.pay.refundQuery(payLoad)
+  }
+
   async getXMLBody(data) {
     return await getXMLBody(data, {
       limit: '1mb',

package/package.json

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