@jayfong/x-server 2.6.0 → 2.8.0

package/lib/_cjs/services/cache.js

@@ -99,6 +99,18 @@ class CacheService {
       }
     });
   }
+  /**
+   * 获取距离过期时间的毫秒数（未设置过期时间返回-1，键不存在返回-2）。
+   *
+   * @param key 键
+   * @returns 返回距离过期时间的毫秒数
+   */
+
+
+  async ttl(key) {
+    const redisKey = this.toRedisKey(key);
+    return _x.x.redis.pttl(redisKey);
+  }
   /**
    * 缓存内容。
    *

package/lib/_cjs/services/pay.js

@@ -142,6 +142,34 @@ class PayService {
     return res;
   }
 
+  async getOrderInfo(payload) {
+    // 微信支付
+    // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_2.shtml
+    if (payload.channel === 'wepay') {
+      const res = await this.wepayRequest(payload.orderNo ? `https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/${payload.orderNo}?mchid=${this.options.wepay.merchantId}` : `https://api.mch.weixin.qq.com/v3/pay/transactions/id/${payload.channelOrderNo}?mchid=${this.options.wepay.merchantId}`);
+      return {
+        channelOrderNo: res.transaction_id,
+        orderNo: res.out_trade_no,
+        status: res.trade_state === 'SUCCESS' ? 'success' : 'fail'
+      };
+    } // 支付宝
+    // https://opendocs.alipay.com/open/028woa?scene=common&pathHash=dbf247eb
+
+
+    const res = await this.alipaySdk.exec('alipay.trade.query', {
+      biz_content: payload.orderNo ? {
+        out_trade_no: payload.orderNo
+      } : {
+        trade_no: payload.channelOrderNo
+      }
+    });
+    return {
+      channelOrderNo: res.trade_no,
+      orderNo: res.out_trade_no,
+      status: res.trade_status === 'TRADE_SUCCESS' || res.trade_status === 'TRADE_FINISHED' ? 'success' : 'fail'
+    };
+  }
+
   wepaySign(data) {
     return _crypto.default.createSign('RSA-SHA256').update(data.map(v => `${v}\n`).join('')).sign(this.options.wepay.privateKey, 'base64');
   }
@@ -162,9 +190,10 @@ class PayService {
 
   async wepayRequest(url, data) {
     const path = url.replace(/^https?:\/\/[^/]+/, '');
-    const body = JSON.stringify(data);
+    const method = data == null ? 'GET' : 'POST';
+    const body = method === 'POST' ? JSON.stringify(data) : '';
     const params = {
-      method: 'POST',
+      method: method,
       url: path,
       time: String(Math.round(Date.now() / 1000)),
       rand: Math.random().toString().substr(2, 12),
@@ -173,13 +202,19 @@ class PayService {
     };
     params.signature = this.wepaySign([params.method, params.url, params.time, params.rand, params.body]);
     const Authorization = [`WECHATPAY2-SHA256-RSA2048 `, `mchid="${this.options.wepay.merchantId}",`, `nonce_str="${params.rand}",`, `signature="${params.signature}",`, `timestamp="${params.time}",`, `serial_no="${this.options.wepay.certificateSerialNumber}"`].join('');
-    const res = await _got.default.post(url, {
+    const res = method === 'POST' ? await _got.default.post(url, {
       json: data,
       headers: {
         Authorization
       },
       responseType: 'json',
       resolveBodyOnly: true
+    }) : await _got.default.get(url, {
+      headers: {
+        Authorization
+      },
+      responseType: 'json',
+      resolveBodyOnly: true
     });
     return res;
   }

package/lib/services/cache.d.ts

@@ -52,6 +52,13 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
      * @returns 返回获取到的缓存内容
      */
     getMany<K extends TKeyPath, V extends Value<TData, K>>(...keys: K[]): Promise<Array<V | null>>;
+    /**
+     * 获取距离过期时间的毫秒数（未设置过期时间返回-1，键不存在返回-2）。
+     *
+     * @param key 键
+     * @returns 返回距离过期时间的毫秒数
+     */
+    ttl<K extends TKeyPath>(key: K): Promise<number>;
     /**
      * 缓存内容。
      *

package/lib/services/cache.js

@@ -89,6 +89,18 @@ export class CacheService {
       }
     });
   }
+  /**
+   * 获取距离过期时间的毫秒数（未设置过期时间返回-1，键不存在返回-2）。
+   *
+   * @param key 键
+   * @returns 返回距离过期时间的毫秒数
+   */
+
+
+  async ttl(key) {
+    const redisKey = this.toRedisKey(key);
+    return x.redis.pttl(redisKey);
+  }
   /**
    * 缓存内容。
    *

package/lib/services/pay.d.ts

@@ -73,6 +73,37 @@ export interface PayServiceVerifyNotifyDataResult {
      */
     channelOrderNo: string;
 }
+export interface PayServiceGetOrderInfoPayload {
+    /**
+     * 渠道。
+     */
+    channel: 'alipay' | 'wepay';
+    /**
+     * 商家订单号。
+     */
+    orderNo?: string;
+    /**
+     * 渠道订单号。
+     */
+    channelOrderNo?: string;
+}
+export interface PayServiceGetOrderInfoResult {
+    /**
+     * 商家订单号。
+     */
+    orderNo: string;
+    /**
+     * 渠道订单号。
+     *
+     * - 支付宝最长 `64` 位；
+     * - 微信支付最长 `32` 位。
+     */
+    channelOrderNo: string;
+    /**
+     * 订单状态。
+     */
+    status: 'success' | 'fail';
+}
 export declare class PayService implements BaseService {
     private options;
     serviceName: string;
@@ -82,6 +113,7 @@ export declare class PayService implements BaseService {
     prepareWepay(options: PayServicePrepareWepayOptions): Promise<PayServicePrepareWepayResult>;
     verifyNotifyData(data: any): false | PayServiceVerifyNotifyDataResult;
     verifyNotifyDataOrFail(data: any, message?: string): PayServiceVerifyNotifyDataResult;
+    getOrderInfo(payload: PayServiceGetOrderInfoPayload): Promise<PayServiceGetOrderInfoResult>;
     private wepaySign;
     private wepayDecrypt;
     private wepayRequest;

package/lib/services/pay.js

@@ -130,6 +130,34 @@ export class PayService {
     return res;
   }
 
+  async getOrderInfo(payload) {
+    // 微信支付
+    // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_2.shtml
+    if (payload.channel === 'wepay') {
+      const res = await this.wepayRequest(payload.orderNo ? `https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/${payload.orderNo}?mchid=${this.options.wepay.merchantId}` : `https://api.mch.weixin.qq.com/v3/pay/transactions/id/${payload.channelOrderNo}?mchid=${this.options.wepay.merchantId}`);
+      return {
+        channelOrderNo: res.transaction_id,
+        orderNo: res.out_trade_no,
+        status: res.trade_state === 'SUCCESS' ? 'success' : 'fail'
+      };
+    } // 支付宝
+    // https://opendocs.alipay.com/open/028woa?scene=common&pathHash=dbf247eb
+
+
+    const res = await this.alipaySdk.exec('alipay.trade.query', {
+      biz_content: payload.orderNo ? {
+        out_trade_no: payload.orderNo
+      } : {
+        trade_no: payload.channelOrderNo
+      }
+    });
+    return {
+      channelOrderNo: res.trade_no,
+      orderNo: res.out_trade_no,
+      status: res.trade_status === 'TRADE_SUCCESS' || res.trade_status === 'TRADE_FINISHED' ? 'success' : 'fail'
+    };
+  }
+
   wepaySign(data) {
     return crypto.createSign('RSA-SHA256').update(data.map(v => `${v}\n`).join('')).sign(this.options.wepay.privateKey, 'base64');
   }
@@ -148,9 +176,10 @@ export class PayService {
 
   async wepayRequest(url, data) {
     const path = url.replace(/^https?:\/\/[^/]+/, '');
-    const body = JSON.stringify(data);
+    const method = data == null ? 'GET' : 'POST';
+    const body = method === 'POST' ? JSON.stringify(data) : '';
     const params = {
-      method: 'POST',
+      method: method,
       url: path,
       time: String(Math.round(Date.now() / 1000)),
       rand: Math.random().toString().substr(2, 12),
@@ -159,13 +188,19 @@ export class PayService {
     };
     params.signature = this.wepaySign([params.method, params.url, params.time, params.rand, params.body]);
     const Authorization = [`WECHATPAY2-SHA256-RSA2048 `, `mchid="${this.options.wepay.merchantId}",`, `nonce_str="${params.rand}",`, `signature="${params.signature}",`, `timestamp="${params.time}",`, `serial_no="${this.options.wepay.certificateSerialNumber}"`].join('');
-    const res = await got.post(url, {
+    const res = method === 'POST' ? await got.post(url, {
       json: data,
       headers: {
         Authorization
       },
       responseType: 'json',
       resolveBodyOnly: true
+    }) : await got.get(url, {
+      headers: {
+        Authorization
+      },
+      responseType: 'json',
+      resolveBodyOnly: true
     });
     return res;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.6.0",
+  "version": "2.8.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",