修改支付

webServer/src/controller/ApiController.ts

@@ -390,7 +390,7 @@ const appleCallPay = async (ctx) => {
 
 //qucik发货
 //扩展参数格式为${serverId};${productId}
-const CallPayQucik = async (ctx) => {
+const CallPayQuick = async (ctx) => {
     let ret = {
         code: 0,
         msg: '发货失败'
@@ -400,23 +400,23 @@ const CallPayQucik = async (ctx) => {
     let callbackKey = "19404462610366331550315911887318"
 
     let data = ctx.request.body
-    logger.info("qucik 回调参数",{"data":data})
+    logger.info("qucik 回调参数", { "data": data })
     let md5Sign = data.md5Sign
     let ntData = data.nt_data
-    let verifySignData = QuickAsy.getSign(data,md5Key)
-    if(verifySignData != md5Sign){
-        logger.error("quick 调用md5Sign错误",{'$verifySignData':verifySignData,'md5Sign':md5Sign})
+    let verifySignData = QuickAsy.getSign(data, md5Key)
+    if (verifySignData != md5Sign) {
+        logger.error("quick 调用md5Sign错误", { '$verifySignData': verifySignData, 'md5Sign': md5Sign })
         return ret
     }
-    let xmlData = QuickAsy.decode(ntData,callbackKey)
+    let xmlData = QuickAsy.decode(ntData, callbackKey)
     const result = await new Promise((resolve, reject) => {
-          parseString(xmlData, (err, result) => {
+        parseString(xmlData, (err, result) => {
             if (err) {
-              return reject(err);
+                return reject(err);
             }
             resolve(result);
-          });
         });
+    });
     const message = result.quicksdk_message.message[0];
     const channel = message.channel[0];
     const orgMemId = message.channel_uid[0];
@@ -427,14 +427,13 @@ const CallPayQucik = async (ctx) => {
     const orgProductPrice = message.amount[0]; //充值成功的金额
     const status = message.status[0];//0成功
     const extrasParams = message.extras_params[0];
-    if(status == 1){
+    if (status == 1) {
         return
     }
     let extrasArr = extrasParams.split(";")
     let serverId = extrasArr[0] //区服id
     let orgProductId = extrasArr[1]//商品id
 
-
     const orderInfo = (await Order.getOrder(orderId))[0]
 
     if (!orderInfo) {
@@ -455,14 +454,12 @@ const CallPayQucik = async (ctx) => {
         ret.msg = `区服id错误: serverId ${serverId}`
         return ret
     }
-    return ///=========
-   //发货
     // 使用 Msg 类的 connect 方法连接到 WebSocket 服务器
     let sendMsg = new Msg()
     sendMsg.connect(url, Account);
     logger.info(`订单${orderId} ${url}`)
     // 在适当的时机，调用 CG_ASK_LOGIN 方法
-    let params = `{"account":"${orgMemId}","order":"${orgOderId}","id":${orgProductId},"cnt":100,"money":${orgProductPrice}}`
+    let params = `{"account":"${orgMemId}","order":"${orderId}","id":${orgProductId},"cnt":100,"money":${orgProductPrice}}`
     return new Promise((resolve) => {
         setTimeout(async () => {
             console.log("这个消息将在3秒后打印出来");
@@ -476,7 +473,7 @@ const CallPayQucik = async (ctx) => {
             const res = await Order.updateOrderStats(
                 orderId,
                 2,
-                out_trade_no,
+                orderNo,
                 update_time
             );
 
@@ -793,27 +790,27 @@ class ApiController {
     }
 
     //quick登陆
-    async quickUserLogin(ctx){
+    async quickUserLogin(ctx) {
         //sdk参数
         let productCode = "68402796563185068148745974229755"
 
         let data = ctx.request.body
         let uid = data.uid
         let token = data.token
-        let reqUrl = "http://checkuser.quickapi.net/v2/checkUserInfo?token="+token+"&uid="+uid+"product_code="+productCode
-        logger.info("quick登陆验证请求",{'params':data,'url':reqUrl})
+        let reqUrl = "http://checkuser.quickapi.net/v2/checkUserInfo?token=" + token + "&uid=" + uid + "product_code=" + productCode
+        logger.info("quick登陆验证请求", { 'params': data, 'url': reqUrl })
         const res = await axios.get(reqUrl)
-        logger.info("quick req",{"res":res.data})
-        if(res.data == '1'){
+        logger.info("quick req", { "res": res.data })
+        if (res.data == '1') {
             ctx.body = {
-                    code: 200,
-                    msg: 'success'
-                }
-        }else{
-             ctx.body = {
-                    code: 0,
-                    msg: 'fail'
-                }
+                code: 200,
+                msg: 'success'
+            }
+        } else {
+            ctx.body = {
+                code: 0,
+                msg: 'fail'
+            }
         }
     }
 
@@ -822,14 +819,14 @@ class ApiController {
         let data = ctx.request.body
         let platform = '360'  // 默认360
 
-        if(ctx.query.platform){
+        if (ctx.query.platform) {
             platform = ctx.query.platform
         }
 
-        if(data.platform){
+        if (data.platform) {
             platform = data.platform
         }
-        
+
         switch (platform) {
             case 'google':
                 var result = await googleCallPay(ctx)
@@ -852,7 +849,7 @@ class ApiController {
             // ctx.body = result
             // break;
             case 'quick':
-                var result = await CallPayQucik(ctx)
+                var result = await CallPayQuick(ctx)
                 console.log('发货结果', result)
                 ctx.body = result
                 break;