q-koa 13.6.0 → 13.6.2

package/core/file/services/allinpay.js

@@ -0,0 +1,389 @@
+const axios = require('axios')
+const crypto = require('crypto')
+
+const is_dev = process.env.NODE_ENV !== 'production'
+
+const config = {
+  allinpay: {
+    orgid: '',
+    cusid: '56458105193URP4',
+    appid: '00412889',
+    subAppid: '',
+    frontUrl: 'https://your-domain.com/pay/result',
+    isTest: true,
+    signType: 'RSA',
+    md5Key: '123456',
+    privateKey:
+      'MIIEowIBAAKCAQEAnNkSdA2SelrReNOdNgto5OnkLKvntzzX47pvO1byIj7ewfNlEZtKpzn9b8khyKrAPdQe5O0jTzx3W7wuUnExeCgfB5FjpZP5oSrvaEP0jJq/rYtF84k6zpc/aL+9dXaqN+k5atv1OliJRMovOCsWjWpG2+TuNXeB649mp297hLJfdBp8Fm0SZE6O8SOxLAhOkB4fk+kNWQW0puquxydSqS9gJQ/cFlHYaTa4HJ53TgISj+OEycbyOXBwMR9iz7MvLiueDI1fNEA1LcyXP4hvsBxciJe4wMLrlUlY0OvHbRoF/EmJmb0yTPwUREjcPVFrQwBX0J2Xflm6A/tFAhZQvwIDAQABAoIBAA3xdiR++GCMJkb5eOZPCVogOLqH5adybza9YhoCVrAYqrDPNFLmXTKUgyUm2iv+kextKPns4tCubWXoSq3lhiJKXsfLcvJLP0vGh1XbhKfjMdr5oJRPxLyM0YQ8V1lT3TnvL72CJEC1ki5dUulJW03i/r2ZkluKbjBEpTmJPY/EL/jSQ6eG6JJfYIf8Ew4SfW1Tr+1JVunvhH6hymR4mdcepKKpd9HkC/I/7HkyTftlJsZl3iyLBNMO9w5xoKGEhwIQShJfDZNe6cev0FyOtVwsoXjki13sGNM6xBCDf8rSZo0IksIIHj8k/uNkI/I0MfPpaUY+5pxTR5Mv4UmVOAECgYEAzWPQhhiioHUWAFcN+avxHvW1S6/QR9U7HlZ+B4QjuNYGJneKfj/LsBd/MRUbbNiPm9GJvxeHTvIaPtrGvHzDl8KkJzKxcYh9cko6AsCcvYaf0tVDi5Dyir+syk5qR7qbw1jQyaiuo55+PARDj7vvFTV4aqcyafufx6HT3DducgECgYEAw38vfM+3SE9dsP3kXo6y70gaYccKQyFBvHLGEndZGKaVay+U5oXENZOL0YEEs+iFylbMK1uLa3hiULyy23E0SsLTpuS0/8GItWqqN9oYV/TYeleUUaMje1EEBlMRnJilvzEtATYX8s++hj1AS/aGReC9N/bg/WKnfvlVs8dLQr8CgYBrsfbZGXnMoRhUPVF6pQndrgDOGvYfdFN3aOrUjhkdBjxbVzsrT9BCGU/8MJEc1cEXdxu/M1sjrhbM9nJWyyTUIp9oXlBks6jzkLAyWUTWrAyJxIGSYQKMdkzoF43q5pJeL+fqlaRc7vJKDgJPD8AhYtQtOFZa9DGnv9cTFY24AQKBgQCZFysfySWU+Zm79UZ1ibezy7nlIdH2eb+ZjCNx6IYb2K+frTYkQ1JARleyax88p3TF26yss1Z9hVswMGS7lW3GscS+p9DZizu8HVhIvoBbuIAhZh3exCsP8YR+U2SyRZNeImtEzJB6c5aWVrbYBahmZjSm86yCoFPcCfLEAuf7zwKBgFktK+pUMv+UTLNXvM7j6EcdYKwno5Emg1aU7s9YYh4Hi6exmYVoqnZMhXDvvX2zjUDl2MiLTbs2B4wKSycVOOQ18bN+aqlxcM9UPyUxx93gAKCOeddabjgarxlu7koyDS1MjvjNq8YQakOv3201z85kkf+eIVVgC3C/8aNBgrhx',
+    apiUrl: {
+      test: 'https://syb-test.allinpay.com/apiweb/unitorder',
+      production: 'https://vsp.allinpay.com/apiweb/unitorder',
+    },
+    publicKey: {
+      test: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYXfu4b7xgDSmEGQpQ8Sn3RzFgl5CE4gL4TbYrND4FtCYOrvbgLijkdFgIrVVWi2hUW4K0PwBsmlYhXcbR+JSmqv9zviVXZiym0lK3glJGVCN86r9EPvNTusZZPm40TOEKMVENSYaUjCxZ7JzeZDfQ4WCeQQr2xirqn6LdJjpZ5wIDAQAB',
+      production:
+        'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCm9OV6zH5DYH/ZnAVYHscEELdCNfNTHGuBv1nYYEY9FrOzE0/4kLl9f7Y9dkWHlc2ocDwbrFSm0Vqz0q2rJPxXUYBCQl5yW3jzuKSXif7q1yOwkFVtJXvuhf5WRy+1X5FOFoMvS7538No0RpnLzmNi3ktmiqmhpcY/1pmt20FHQQIDAQAB',
+    },
+  },
+}
+
+class AllinPay {
+  constructor(options = {}) {
+    this.orgid = options.orgid || config.allinpay.orgid
+    this.cusid = options.cusid || config.allinpay.cusid
+    this.appid = options.appid || config.allinpay.appid
+    this.subAppid = options.subAppid || config.allinpay.subAppid
+    this.notifyUrl = options.notifyUrl || config.allinpay.notifyUrl
+    this.frontUrl = options.frontUrl || config.allinpay.frontUrl
+    this.isTest =
+      options.isTest !== undefined ? options.isTest : config.allinpay.isTest
+    this.signType = options.signType || config.allinpay.signType
+    this.privateKey = options.privateKey || config.allinpay.privateKey
+    this.publicKey = this.isTest
+      ? config.allinpay.publicKey.test
+      : config.allinpay.publicKey.production
+    this.baseUrl = this.isTest
+      ? config.allinpay.apiUrl.test
+      : config.allinpay.apiUrl.production
+  }
+
+  buildSignStr(params) {
+    const sortedKeys = Object.keys(params).sort()
+    let signStr = ''
+    for (const key of sortedKeys) {
+      if (
+        params[key] !== undefined &&
+        params[key] !== null &&
+        params[key] !== ''
+      ) {
+        if (signStr) signStr += '&'
+        signStr += `${key}=${params[key]}`
+      }
+    }
+    return signStr
+  }
+
+  sign(params) {
+    const signStr = this.buildSignStr(params)
+
+    if (this.signType === 'RSA') {
+      const privateKey = `-----BEGIN RSA PRIVATE KEY-----\n${this.privateKey}\n-----END RSA PRIVATE KEY-----`
+      const sign = crypto.createSign('RSA-SHA1')
+      sign.update(signStr, 'utf8')
+      const signature = sign.sign(privateKey, 'base64')
+
+      // crypto.createHash('md5').update(originStr).digest('hex')
+      return signature
+    } else if (this.signType === 'SM2') {
+      throw new Error('SM2 signing not implemented')
+    }
+
+    throw new Error(`Unsupported signType: ${this.signType}`)
+  }
+
+  verifySign(params) {
+    const sign = params.sign
+    if (!sign) {
+      console.log('No sign found in response')
+      return false
+    }
+
+    const paramsCopy = { ...params }
+    delete paramsCopy.sign
+
+    const signStr = this.buildSignStr(paramsCopy)
+
+    const publicKey = `-----BEGIN PUBLIC KEY-----\n${this.publicKey}\n-----END PUBLIC KEY-----`
+    const verify = crypto.createVerify('RSA-SHA1')
+    verify.update(signStr, 'utf8')
+    const result = verify.verify(publicKey, sign, 'base64')
+
+    return result
+  }
+
+  async request(url, params) {
+    const _params = new URLSearchParams()
+    Object.keys(params).forEach((key, value) => {
+      _params.append(key, params[key])
+    })
+    try {
+      if (is_dev) {
+        console.log('Request URL:', url)
+        console.log('Request params:', _params)
+      }
+
+      const response = await axios.post(url, _params, {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'User-Agent': 'AllinPay Node.js SDK',
+        },
+      })
+      if (response.data.errmsg) {
+        throw new Error(response.data.errmsg)
+      }
+      if (is_dev) {
+        console.log('Response data:', JSON.stringify(response.data))
+      }
+      return response.data
+    } catch (error) {
+      if (is_dev) {
+        console.error('Request error:', error.message)
+      }
+      if (is_dev && error.response) {
+        console.error('Response status:', error.response.status)
+        console.error('Response data:', JSON.stringify(error.response.data))
+      }
+      throw new Error(`AllinPay request error: ${error.message}`)
+    }
+  }
+
+  async createOrder(orderData) {
+    const {
+      reqsn,
+      trxamt,
+      body,
+      acct,
+      remark = '',
+      validtime = '',
+      limitPay = '',
+      goodsTag = '',
+      benefitdetail = '',
+      chnlstoreid = '',
+      subbranch = '',
+      extendparams = '',
+      cusip = '',
+      idno = '',
+      truename = '',
+      asinfo = '',
+      fqnum = '',
+    } = orderData
+
+    const params = {}
+
+    if (this.orgid) params.orgid = this.orgid
+    params.cusid = this.cusid
+    params.appid = this.appid
+    params.version = '11'
+    params.trxamt = trxamt
+    params.reqsn = reqsn
+    params.paytype = 'W06'
+    params.randomstr = this.generateRandomStr()
+
+    if (body) params.body = body.substring(0, 100)
+    if (remark) params.remark = remark
+    if (validtime) params.validtime = validtime
+    if (acct) params.acct = acct
+    if (this.notifyUrl) params.notify_url = this.notifyUrl
+    if (limitPay) params.limit_pay = limitPay
+    if (this.subAppid) params.sub_appid = this.subAppid
+    if (goodsTag) params.goods_tag = goodsTag
+    if (benefitdetail) params.benefitdetail = benefitdetail
+    if (chnlstoreid) params.chnlstoreid = chnlstoreid
+    if (subbranch) params.subbranch = subbranch
+    if (extendparams) params.extendparams = extendparams
+    if (cusip) params.cusip = cusip
+    if (idno) params.idno = idno
+    if (truename) params.truename = truename
+    if (asinfo) params.asinfo = asinfo
+    if (fqnum) params.fqnum = fqnum
+
+    params.signtype = this.signType
+    params.sign = this.sign(params)
+
+    const url = `${this.baseUrl}/pay`
+    const result = await this.request(url, params)
+
+    if (result && result.retcode === 'SUCCESS') {
+      if (result.sign && this.verifySign(result)) {
+        return result
+      } else {
+        console.warn(
+          'Sign verification failed, but retcode is SUCCESS. Returning result anyway.'
+        )
+        return result
+      }
+    }
+    throw new Error(`AllinPay error: ${result.retmsg || 'Unknown error'}`)
+  }
+
+  async queryOrder(reqsn) {
+    const params = {
+      cusid: this.cusid,
+      appid: this.appid,
+      version: '11',
+      reqsn,
+      signtype: this.signType,
+    }
+
+    params.sign = this.sign(params)
+
+    const url = `${this.baseUrl}/query`
+    const result = await this.request(url, params)
+
+    if (result && result.retcode === 'SUCCESS') {
+      if (result.sign && this.verifySign(result)) {
+        return result
+      } else {
+        console.warn(
+          'Sign verification failed, but retcode is SUCCESS. Returning result anyway.'
+        )
+        return result
+      }
+    }
+    throw new Error(`AllinPay error: ${result.retmsg || 'Unknown error'}`)
+  }
+
+  async checkOrder(reqsn) {
+    const params = {
+      cusid: this.cusid,
+      appid: this.appid,
+      version: '11',
+      reqsn,
+      signtype: this.signType,
+    }
+    if (this.notifyUrl) params.notify_url = this.notifyUrl
+
+    params.sign = this.sign(params)
+
+    const url = this.isTest
+      ? 'https://syb-test.allinpay.com/apiweb/tranx/query'
+      : 'https://vsp.allinpay.com/apiweb/tranx/query'
+    const result = await this.request(url, params)
+
+    if (result && result.retcode === 'SUCCESS') {
+      if (result.sign && this.verifySign(result)) {
+        return result
+      } else {
+        console.warn(
+          'Sign verification failed, but retcode is SUCCESS. Returning result anyway.'
+        )
+        return result
+      }
+    }
+    throw new Error(`AllinPay error: ${result.retmsg || 'Unknown error'}`)
+  }
+
+  async refundOrder(orderData) {
+    const { reqsn, trxamt, oldreqsn, remark = '', acct = '' } = orderData
+
+    const params = {
+      cusid: this.cusid,
+      appid: this.appid,
+      version: '11',
+      trxamt,
+      reqsn,
+      oldreqsn,
+      signtype: this.signType,
+    }
+    if (remark) params.remark = remark
+    if (acct) params.acct = acct
+    params.signtype = this.signType
+    if (this.notifyUrl) params.notify_url = this.notifyUrl
+
+    params.sign = this.sign(params)
+
+    const url = this.isTest
+      ? 'https://syb-test.allinpay.com/apiweb/tranx/refund'
+      : 'https://vsp.allinpay.com/apiweb/tranx/refund'
+    const result = await this.request(url, params)
+
+    if (result && result.retcode === 'SUCCESS') {
+      if (result.sign && this.verifySign(result)) {
+        return result
+      } else {
+        console.warn(
+          'Sign verification failed, but retcode is SUCCESS. Returning result anyway.'
+        )
+        return result
+      }
+    }
+    throw new Error(`AllinPay error: ${result.retmsg || 'Unknown error'}`)
+  }
+
+  async cancelOrder(reqsn) {
+    const params = {
+      cusid: this.cusid,
+      appid: this.appid,
+      version: '11',
+      reqsn,
+      signtype: this.signType,
+    }
+
+    params.sign = this.sign(params)
+
+    const url = `${this.baseUrl}/cancel`
+    const result = await this.request(url, params)
+
+    if (result && result.retcode === 'SUCCESS') {
+      if (result.sign && this.verifySign(result)) {
+        return result
+      } else {
+        console.warn(
+          'Sign verification failed, but retcode is SUCCESS. Returning result anyway.'
+        )
+        return result
+      }
+    }
+    throw new Error(`AllinPay error: ${result.retmsg || 'Unknown error'}`)
+  }
+
+  async downloadBill({ date }) {
+    const params = {
+      cusid: this.cusid,
+      appid: this.appid,
+      date,
+      randomstr: this.generateRandomStr(),
+      filetype: '1',
+      signtype: this.signType,
+    }
+    params.signtype = this.signType
+
+    params.sign = this.sign(params)
+
+    const url = this.isTest
+      ? 'https://syb-test.allinpay.com/vsppcusapi/trxfile/get'
+      : 'https://cus.allinpay.com/cusapi/trxfile/get'
+    const result = await this.request(url, params)
+
+    if (result && result.retcode === 'SUCCESS') {
+      if (result.sign && this.verifySign(result)) {
+        return result
+      } else {
+        console.warn(
+          'Sign verification failed, but retcode is SUCCESS. Returning result anyway.'
+        )
+        return result
+      }
+    }
+    throw new Error(`AllinPay error: ${result.retmsg || 'Unknown error'}`)
+  }
+
+  generateRandomStr(length = 32) {
+    const chars =
+      'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+    let result = ''
+    for (let i = 0; i < length; i++) {
+      result += chars.charAt(Math.floor(Math.random() * chars.length))
+    }
+    return result
+  }
+
+  generateOrderNum() {
+    const timestamp = Date.now().toString()
+    const random = Math.random().toString(36).substr(2, 6).toUpperCase()
+    return `ORD${timestamp}${random}`
+  }
+
+  formatDateTime() {
+    const now = new Date()
+    const year = now.getFullYear()
+    const month = String(now.getMonth() + 1).padStart(2, '0')
+    const day = String(now.getDate()).padStart(2, '0')
+    const hour = String(now.getHours()).padStart(2, '0')
+    const minute = String(now.getMinutes()).padStart(2, '0')
+    const second = String(now.getSeconds()).padStart(2, '0')
+    return `${year}${month}${day}${hour}${minute}${second}`
+  }
+}
+
+module.exports = AllinPay

package/core/file/services/weixinMP.js

@@ -96,6 +96,13 @@ const b2bCheckRefundUrl =
 
 const b2bCheckOrderUrl =
   'https://api.weixin.qq.com/retail/B2b/getorder?access_token=%s&pay_sig=%s'
+
+const b2bPreStoreUrl =
+  'https://api.weixin.qq.com/wxa/business/batchcreateretail?access_token=%s'
+
+const b2bFinishUrl =
+  'https://api.weixin.qq.com/retail/B2b/finishprofitsharingorder?access_token=%s&pay_sig=%s'
+
 const fsPromise = require('fs/promises')
 const LRU = require('lru-cache')
 const request = require('request')
@@ -1123,7 +1130,7 @@ module.exports = class Singleton {
     return result
   }
 
-  async b2bCheckRefund({ mchid, app_key, data }) {
+  async b2bCheckRefund({ mchid, app_key, out_refund_no }) {
     const requestUrl = b2bCheckRefundUrl
 
     const access_token = await this.getAccessToken()
@@ -1132,7 +1139,7 @@ module.exports = class Singleton {
 
     const signData = {
       mchid,
-      ...data,
+      out_refund_no,
     }
 
     const pay_sig = hmacSha256(`${uri}&${JSON.stringify(signData)}`, app_key)
@@ -1142,14 +1149,14 @@ module.exports = class Singleton {
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.reset()
-        return await this.b2bCheckRefund({ mchid, app_key, data })
+        return await this.b2bCheckRefund({ mchid, app_key, out_refund_no })
       }
       throw new Error(`${result.errcode};${result.errmsg}`)
     }
     return result
   }
 
-  async b2bCheckOrder({ mchid, app_key, data }) {
+  async b2bCheckOrder({ mchid, app_key, out_trade_no }) {
     const requestUrl = b2bCheckOrderUrl
 
     const access_token = await this.getAccessToken()
@@ -1158,7 +1165,69 @@ module.exports = class Singleton {
 
     const signData = {
       mchid,
-      ...data,
+      out_trade_no,
+    }
+
+    const pay_sig = hmacSha256(`${uri}&${JSON.stringify(signData)}`, app_key)
+
+    const url = util.format(requestUrl, access_token, pay_sig)
+    const result = await axios.post(url, signData).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.b2bCheckOrder({ mchid, app_key, out_trade_no })
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  async b2bPreStore(list) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(b2bPreStoreUrl, access_token)
+
+    const result = await axios
+      .post(url, {
+        retail_info_list: list,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.b2bPreStore({
+          retail_info_list: list,
+        })
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  // async b2bFinish(payLoad) {
+  //   const access_token = await this.getAccessToken()
+  //   const url = util.format(b2bFinishUrl, 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.b2bFinish(payLoad)
+  //     }
+  //     throw new Error(`${result.errcode};${result.errmsg}`)
+  //   }
+  //   return result
+  // }
+
+  async b2bFinish({ mchid, app_key, out_trade_no }) {
+    const requestUrl = b2bFinishUrl
+
+    const access_token = await this.getAccessToken()
+
+    const uri = requestUrl.split('api.weixin.qq.com')[1].split('?')[0]
+
+    const signData = {
+      mchid,
+      out_trade_no,
     }
 
     const pay_sig = hmacSha256(`${uri}&${JSON.stringify(signData)}`, app_key)
@@ -1168,7 +1237,7 @@ module.exports = class Singleton {
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.reset()
-        return await this.b2bCheckOrder({ mchid, app_key, data })
+        return await this.b2bFinish({ mchid, app_key, out_trade_no })
       }
       throw new Error(`${result.errcode};${result.errmsg}`)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.6.0",
+  "version": "13.6.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,9 @@
     "yly-nodejs-sdk": "^1.0.2",
     "vm2": "^3.9.19",
     "xlsx": "^0.18.5",
-    "pm2": "^7.0.1"
+    "pm2": "^7.0.1",
+    "dayjs": "^1.11.13",
+    "request": "^2.88.2"
   },
   "devDependencies": {
     "eslint": "^4.19.1",