From 0eb0a4df985ba9872caec673ade3a51e3fc3e827 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 29 Oct 2019 15:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E6=9D=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/ToutiaoService.php               | 12 +++++++-----
 extend/base/Toutiao.php                              |  2 +-
 .../old/toutiao/pages/user-order/user-order.js       |  3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/application/service/ToutiaoService.php b/application/service/ToutiaoService.php
index 668b638d6..dd6472120 100644
--- a/application/service/ToutiaoService.php
+++ b/application/service/ToutiaoService.php
@@ -57,22 +57,21 @@ class ToutiaoService
             'merchant_id'       => $merchant_id,
             'app_id'            => $app_id,
             'sign_type'         => 'MD5',
-            'timestamp'         => (string) time(),
+            'timestamp'         => time(),
             'version'           => '2.0',
             'trade_type'        => 'H5',
             'product_code'      => 'pay',
             'payment_type'      => 'direct',
             'outorderno'        => $order['order_no'],
             'uid'               => md5($params['user']['id']),
-            'total_amount'      => (string) $order['total_price']*100,
+            'total_amount'      => $order['total_price']*100,
             'currency'          => 'CNY',
             'subject'           => '订单支付',
             'body'              => $order['order_no'],
-            'trade_time'        => (string) $order['add_time'],
-            'valid_time'        => (string) MyC('common_order_close_limit_time', 30, true)*60,
+            'trade_time'        => $order['add_time'],
+            'valid_time'        => intval(MyC('common_order_close_limit_time', 30, true))*60,
             'notify_url'        => __MY_URL__,
         ];
-        $order_info['sign'] = (new \base\Toutiao())->PaySignCreated($order_info, $secret);
 
         // 支付方式
         $service = 1;
@@ -92,6 +91,9 @@ class ToutiaoService
                 break;
         }
 
+        // 签名
+        $order_info['sign'] = (new \base\Toutiao())->PaySignCreated($order_info, $secret);
+
         // 返回数据
         $result = [
             'order_info'    => $order_info,
diff --git a/extend/base/Toutiao.php b/extend/base/Toutiao.php
index dac1ef06a..a11fbc114 100644
--- a/extend/base/Toutiao.php
+++ b/extend/base/Toutiao.php
@@ -68,7 +68,7 @@ class Toutiao
         $sign = '';
         foreach($data AS $key=>$val)
         {
-            if($key != 'sign' && $key != 'risk_info' && $val != '' && $val != null)
+            if($key != 'sign' && $key != 'risk_info' && $val != '')
             {
                 $sign .= "$key=$val&";
             }
diff --git a/public/appmini/old/toutiao/pages/user-order/user-order.js b/public/appmini/old/toutiao/pages/user-order/user-order.js
index 23c8e2d0a..41341a504 100755
--- a/public/appmini/old/toutiao/pages/user-order/user-order.js
+++ b/public/appmini/old/toutiao/pages/user-order/user-order.js
@@ -237,7 +237,8 @@ Page({
             console.log(res.data.data.order_info)
             tt.pay({
               orderInfo: res.data.data.order_info,
-              service: res.data.data.service,
+              //service: res.data.data.service,
+              service: 1,
               _debug: 1,
               getOrderStatus(res) {
                 let { out_order_no } = res;
-- 
GitLab