q-koa 9.3.3 → 9.4.0

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

@@ -15,7 +15,7 @@ exports.h5_pay = async (ctx) => {
   } = ctx.request.body
 
   const appConfig = getConfig(app)
-  const { alipay_key, partner } = await appConfig.getObject('alipay')
+  const { alipay_key, key, partner } = await appConfig.getObject('alipay')
   const { is_dev } = await appConfig.getObject('base')
 
   const alipay = new Alipay({
@@ -25,8 +25,8 @@ exports.h5_pay = async (ctx) => {
     out_trade_no: out_trade_no
       ? out_trade_no
       : prefix
-      ? `${appName}_${prefix}-${order_id}_${type}`
-      : `${appName}_${order_id}_${type}`,
+      ? `${key}_${prefix}-${order_id}_${type}`
+      : `${key}_${order_id}_${type}`,
     total_fee: is_dev ? 0.01 : price,
     notify_url: `https://api.kuashou.com/${appName}/alipay/notify`,
     return_url,

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

@@ -14,7 +14,9 @@ exports.copyOther = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
   const { type, source } = ctx.request.body
-  const url = `http://localhost:3001/${source}/setting/findAll`
+  const url = source.startsWith('http')
+    ? source
+    : `http://localhost:3001/${source}/setting/findAll`
   const result = await axios.post(url).then((res) => res.data)
   if (result.code !== 200) {
     throw new Error(result.message + url)
@@ -24,11 +26,21 @@ exports.copyOther = async (ctx) => {
 
   if (!copyType) throw new Error('克隆方找不到')
 
-  const copyList = data.filter((item) => item.parent_id === copyType.id)
-
   const list = await app.model.setting.findAll()
 
   const findType = list.find((item) => item.code === type)
+  if (findType && findType.parent_id) {
+    if (!findType) {
+      throw new Error(`当前找不到${type}`)
+    }
+    await app.model.setting.upsert({
+      id: findType.id,
+      value: copyType.value,
+    })
+    return ctx.SUCCESS('ok')
+  }
+  const copyList = data.filter((item) => item.parent_id === copyType.id)
+
   if (!findType) {
     const { id, ...rest } = copyType
     const newParent = await app.model.setting.create({

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

@@ -765,7 +765,7 @@ exports.h5_pay = async (ctx) => {
   }/${appName}/weixin/notify`
   const result = await payObj.run({
     body: name,
-    out_trade_no: `${appName}_${order_id}_${type}`,
+    out_trade_no: `${key}_${order_id}_${type}`,
     total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
     notify_url,
     scene_info: `{"h5_info": {"type":"Wap","wap_url": ${
@@ -814,6 +814,7 @@ exports.mp_pay = async (ctx) => {
   const appConfig = getConfig(app)
 
   const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
+
   const { is_dev, site_host } = await appConfig.getObject('base')
   // 公众号支付用 服务号 appid，其他用小程序 appid
   const app_id =
@@ -843,8 +844,8 @@ exports.mp_pay = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${appName}_${prefix}-${order_id}_${type}`
-    : `${appName}_${order_id}_${type}`
+    ? `${key}_${prefix}-${order_id}_${type}`
+    : `${key}_${order_id}_${type}`
 
   const notify_url = `https://${
     site_host || 'api.kuashou.com'
@@ -944,7 +945,7 @@ exports.mp_pay_new = async (ctx) => {
   const appConfig = getConfig(app)
 
   const { app_id, app_secrect } = await appConfig.getObject(config)
-  const { mchId } = await appConfig.getObject(pay_config)
+  const { mchId, key } = await appConfig.getObject(pay_config)
   const { is_dev, site_host } = await appConfig.getObject('base')
 
   const weixinMp = new WeixinMp({
@@ -958,8 +959,8 @@ exports.mp_pay_new = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${appName}_${prefix}-${order_id}`
-    : `${appName}_${order_id}`
+    ? `${key}_${prefix}-${order_id}`
+    : `${key}_${order_id}`
 
   const prePayResult = await weixinMp.createOrder({
     openid: userDetail.openid,
@@ -1227,6 +1228,7 @@ exports.checkPay = async (ctx) => {
     prefix,
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
+    out_trade_no: _out_trade_no,
   } = ctx.request.body
 
   const orderModel = prefix ? `${prefix}_order` : 'order'
@@ -1256,7 +1258,9 @@ exports.checkPay = async (ctx) => {
     })
   }
   const orderPrefix = prefix ? `${prefix}-` : ''
-  const out_trade_no = `${appName}_${orderPrefix}${id}_MP-WEIXIN`
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : `${key}_${orderPrefix}${id}_MP-WEIXIN`
   const payResult = await checkOrder({
     out_trade_no,
   })
@@ -1282,6 +1286,7 @@ exports.checkPayNew = async (ctx) => {
     prefix,
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
+    out_trade_no: _out_trade_no,
   } = ctx.request.body
 
   const orderModel = prefix ? `${prefix}_order` : 'order'
@@ -1294,7 +1299,7 @@ exports.checkPayNew = async (ctx) => {
 
   const appConfig = getConfig(app)
   const { app_id, app_secrect } = await appConfig.getObject(config)
-  const { mchId } = await appConfig.getObject(pay_config)
+  const { mchId, key } = await appConfig.getObject(pay_config)
 
   const weixinMp = new WeixinMp({
     appid: app_id,
@@ -1303,7 +1308,9 @@ exports.checkPayNew = async (ctx) => {
   weixinMp.init()
 
   const orderPrefix = prefix ? `${prefix}-` : ''
-  const out_trade_no = `${appName}_${orderPrefix}${id}`
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : `${key}_${orderPrefix}${id}`
 
   const payResult = await weixinMp.getOrder({
     trade_no: out_trade_no,

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

@@ -15,6 +15,7 @@ exports.refund = async ({
   type = '',
   config = 'weixin_mp',
   pay_config = 'weixin_pay',
+  out_trade_no: _out_trade_no,
   ...rest
 }) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -36,9 +37,11 @@ exports.refund = async ({
     ), // 微信商户平台证书
   })
   const orderModel = prefix ? `${prefix}_order` : 'order'
-  const out_trade_no = prefix
-    ? `${appName}_${prefix}-${id}_MP-WEIXIN`
-    : `${appName}_${id}_MP-WEIXIN`
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${key}_${prefix}-${id}_MP-WEIXIN`
+    : `${key}_${id}_MP-WEIXIN`
   const orderDetail = await app.model[orderModel].findOne({
     where: {
       id,
@@ -77,13 +80,14 @@ exports.refund_new = async ({
   type = '',
   config = 'weixin_mp',
   pay_config = 'weixin_pay',
+  out_trade_no: _out_trade_no,
   ...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 { mchId, key } = await appConfig.getObject(pay_config)
 
   const weixinMp = new WeixinMp({
     appid: app_id,
@@ -92,9 +96,11 @@ exports.refund_new = async ({
   weixinMp.init()
 
   const orderModel = prefix ? `${prefix}_order` : 'order'
-  const out_trade_no = prefix
-    ? `${appName}_${prefix}-${id}`
-    : `${appName}_${id}`
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${key}_${prefix}-${id}`
+    : `${key}_${id}`
 
   const orderDetail = await app.model[orderModel].findOne({
     where: {

package/package.json

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