tj

center-app/app/base/api/impl/payment/aliPayment.js

@@ -41,7 +41,7 @@ class AliPayment extends APIBase {
         //     "sign_type": "RSA",
         //     "sign_type": "RSA",
         //     "sign": "fa3cGcw+Y5VoIruvWtwN3/XPScPbaeXJI9v+p3I82z3Im0PloxZ/wVallZPJnFGqSIbhp6L3Czajbrz2dzdDPiWCpatH7j7CCTYaIxPXBKAcYuBINfQN3UqHLY2Nq1LS1jfCKwMeufGOUqW1+2yDbQB8TFAAApbvHf63l2Cfgc4="
         //     "sign": "fa3cGcw+Y5VoIruvWtwN3/XPScPbaeXJI9v+p3I82z3Im0PloxZ/wVallZPJnFGqSIbhp6L3Czajbrz2dzdDPiWCpatH7j7CCTYaIxPXBKAcYuBINfQN3UqHLY2Nq1LS1jfCKwMeufGOUqW1+2yDbQB8TFAAApbvHf63l2Cfgc4="
         // };
         // };
-        // var result = await this.utilsAlibankSve.verifyPayReturnSign(pobj, actionBody);
+        // var result = await this.utilsAlibankSve.verifyAliPayReturnSign(pobj, actionBody);
         // // var result = await this.utilsAlibankSve.getH5AliDingPayInfo(pobj, pobj.actionBody);
         // // var result = await this.utilsAlibankSve.getH5AliDingPayInfo(pobj, pobj.actionBody);
         // return result;
         // return result;
     }
     }

center-app/app/base/service/impl/utilsSve/utilsAlibankSve.js

@@ -26,8 +26,8 @@ class utilsTlBankSve extends AppServiceBase {
       partner: payParam.partner,
       partner: payParam.partner,
       _input_charset: "UTF-8",
       _input_charset: "UTF-8",
       notify_url: payParam.notify_url,
       notify_url: payParam.notify_url,
-      app_id: pobj.appInfo.uapp_id.toString() + "-" + actionBody.product_id.toString(),//可为空
-      out_trade_no: actionBody.order_num,
+      app_id: pobj.appInfo.uapp_id.toString(),//可为空
+      out_trade_no: actionBody.order_num + "-" + pobj.appInfo.uapp_id.toString() + "-" + actionBody.product_id.toString(),
       subject: actionBody.body_desc,
       subject: actionBody.body_desc,
       body: actionBody.body_desc,
       body: actionBody.body_desc,
       payment_type: "1",
       payment_type: "1",
@@ -89,18 +89,29 @@ class utilsTlBankSve extends AppServiceBase {
     return prestr;
     return prestr;
   }
   }
 
 
-  async verifyPayReturnSign(pobj, actionBody) {
+  async verifyAliPayReturnSign(pobj, actionBody) {
+    if (!actionBody.out_trade_no) {
+      return { status: -305, msg: "out_trade_no param can not be empty" };
+    }
+    var outTradeInfo = actionBody.out_trade_no.split('-');
+    if (outTradeInfo.length < 2) {
+      return { status: -307, msg: "out_trade_no into is error" };
+    }
     var getSignStrResult = await this.getSortSignStr(actionBody);
     var getSignStrResult = await this.getSortSignStr(actionBody);
     if (getSignStrResult.status != 0) {
     if (getSignStrResult.status != 0) {
       return getSignStrResult;
       return getSignStrResult;
     }
     }
-    var payParam = await this.apppaliparamDao.getItemByUAppId(pobj.appInfo.uapp_id);
+    var payParam = await this.apppaliparamDao.getItemByUAppId(outTradeInfo[1]);
     if (!payParam) {
     if (!payParam) {
       return { status: -310, msg: "应用没有对应的支付凭证,verifyPayReturnSign" };
       return { status: -310, msg: "应用没有对应的支付凭证,verifyPayReturnSign" };
     }
     }
     var verifyResult = await this.getVerifyPaySignStr(pobj, getSignStrResult.data, actionBody.sign, payParam.ali_publickey, "buffer", "base64", "sha1")
     var verifyResult = await this.getVerifyPaySignStr(pobj, getSignStrResult.data, actionBody.sign, payParam.ali_publickey, "buffer", "base64", "sha1")
     if (verifyResult) {
     if (verifyResult) {
-      return system.getResultSuccess();
+      return system.getResultSuccess({
+        orderNo: outTradeInfo[0],
+        uappId: outTradeInfo[1],
+        productId: outTradeInfo.length == 3 ? outTradeInfo[2] : 0
+      });
     }
     }
     return system.getResult(null, "验签失败，verifyPayReturnSign");
     return system.getResult(null, "验签失败，verifyPayReturnSign");
   }
   }
@@ -112,13 +123,13 @@ class utilsTlBankSve extends AppServiceBase {
     key.importKey(publicKey, 'pkcs8-public-pem');//导入密钥并设定格式
     key.importKey(publicKey, 'pkcs8-public-pem');//导入密钥并设定格式
     // const publicDer = key.exportKey('pkcs8-private');
     // const publicDer = key.exportKey('pkcs8-private');
     let signature = key.verify(Buffer.from(signParamStr), verifySignStr, sourceEncoding, signatureEncoding);
     let signature = key.verify(Buffer.from(signParamStr), verifySignStr, sourceEncoding, signatureEncoding);
-    // this.logCtl.info({
-    //   appid: pobj.appInfo ? pobj.appInfo.uapp_id : "",
-    //   appkey: pobj.appInfo ? pobj.appInfo.uapp_key : "",
-    //   op: "center-app/app/base/service/impl/utilsSve/utilsAlibankSve.js/getCreateAliSignStr",
-    //   content: "参数：" + paramStr + "返回结果signStr：" + signature,
-    //   optitle: "获取钉钉支付签名信息返回",
-    // });
+    this.logCtl.info({
+      appid: pobj.appInfo ? pobj.appInfo.uapp_id : "",
+      appkey: pobj.appInfo ? pobj.appInfo.uapp_key : "",
+      op: "center-app/app/base/service/impl/utilsSve/utilsAlibankSve.js/getCreateAliSignStr",
+      content: "参数：" + paramStr + "返回结果signStr：" + signature,
+      optitle: "获取钉钉支付签名信息返回",
+    });
     return signature;
     return signature;
 
 
   }
   }