@jayfong/x-server 2.5.0 → 2.7.0

package/lib/_cjs/services/pay.js

@@ -94,20 +94,80 @@ class PayService {
 
   verifyNotifyData(data) {
     try {
-      var _this$alipaySdk;
+      if (!data || typeof data !== 'object') {
+        return false;
+      } // 支付宝
+      // https://opendocs.alipay.com/open/270/105902
 
-      return !!data && typeof data === 'object' && ( // 支付宝
-      data.passback_params === 'alipay' ? !!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data)) : // 微信支付
-      data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach === 'wepay' : false);
+
+      if (data.passback_params === 'alipay') {
+        var _this$alipaySdk;
+
+        if (!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data))) {
+          return false;
+        }
+
+        return {
+          channelOrderNo: data.trade_no
+        };
+      } // 微信支付
+      // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_5.shtml
+
+
+      if (data.resource) {
+        const params = JSON.parse(this.wepayDecrypt(data.resource));
+
+        if (params.attach === 'wepay') {
+          return {
+            channelOrderNo: params.transaction_id
+          };
+        }
+
+        return false;
+      }
+
+      return false;
     } catch {
       return false;
     }
   }
 
   verifyNotifyDataOrFail(data, message) {
-    if (!this.verifyNotifyData(data)) {
+    const res = this.verifyNotifyData(data);
+
+    if (!res) {
       throw new _http_error.HttpError.BadRequest(message);
     }
+
+    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) {
@@ -130,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),
@@ -141,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/pay.d.ts

@@ -64,6 +64,46 @@ export interface PayServicePrepareWepayResult {
         paySign: string;
     };
 }
+export interface PayServiceVerifyNotifyDataResult {
+    /**
+     * 渠道订单号。
+     *
+     * - 支付宝最长 `64` 位；
+     * - 微信支付最长 `32` 位。
+     */
+    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;
@@ -71,8 +111,9 @@ export declare class PayService implements BaseService {
     constructor(options: PayServiceOptions);
     prepareAlipay(options: PayServicePrepareAlipayOptions): Promise<PayServicePrepareAlipayResult>;
     prepareWepay(options: PayServicePrepareWepayOptions): Promise<PayServicePrepareWepayResult>;
-    verifyNotifyData(data: any): boolean;
-    verifyNotifyDataOrFail(data: any, message?: string): void;
+    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

@@ -82,20 +82,80 @@ export class PayService {
 
   verifyNotifyData(data) {
     try {
-      var _this$alipaySdk;
+      if (!data || typeof data !== 'object') {
+        return false;
+      } // 支付宝
+      // https://opendocs.alipay.com/open/270/105902
 
-      return !!data && typeof data === 'object' && ( // 支付宝
-      data.passback_params === 'alipay' ? !!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data)) : // 微信支付
-      data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach === 'wepay' : false);
+
+      if (data.passback_params === 'alipay') {
+        var _this$alipaySdk;
+
+        if (!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data))) {
+          return false;
+        }
+
+        return {
+          channelOrderNo: data.trade_no
+        };
+      } // 微信支付
+      // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_5.shtml
+
+
+      if (data.resource) {
+        const params = JSON.parse(this.wepayDecrypt(data.resource));
+
+        if (params.attach === 'wepay') {
+          return {
+            channelOrderNo: params.transaction_id
+          };
+        }
+
+        return false;
+      }
+
+      return false;
     } catch {
       return false;
     }
   }
 
   verifyNotifyDataOrFail(data, message) {
-    if (!this.verifyNotifyData(data)) {
+    const res = this.verifyNotifyData(data);
+
+    if (!res) {
       throw new HttpError.BadRequest(message);
     }
+
+    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) {
@@ -116,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),
@@ -127,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.5.0",
+  "version": "2.7.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",