diff --git a/WePayV3/Ecommerce.php b/WePayV3/Ecommerce.php index 77e00c6..e426ba3 100644 --- a/WePayV3/Ecommerce.php +++ b/WePayV3/Ecommerce.php @@ -763,10 +763,10 @@ class Ecommerce extends BasicWePay $time = strval(time()); $appid = $this->config['appid']; $nonceStr = Tools::createNoncestr(); - if ($type === 'app') { + if ($type === Order::WXPAY_APP) { $sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, $prepay_id, ''])); return ['partnerId' => $this->config['mch_id'], 'prepayId' => $prepay_id, 'package' => 'Sign=WXPay', 'nonceStr' => $nonceStr, 'timeStamp' => $time, 'sign' => $sign]; - } elseif ($type === 'jsapi') { + } elseif ($type === Order::WXPAY_JSAPI) { $sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, "prepay_id={$prepay_id}", ''])); return ['appId' => $appid, 'timestamp' => $time, 'timeStamp' => $time, 'nonceStr' => $nonceStr, 'package' => "prepay_id={$prepay_id}", 'signType' => 'RSA', 'paySign' => $sign]; } else { diff --git a/WePayV3/Order.php b/WePayV3/Order.php index 5e67423..fb83e43 100644 --- a/WePayV3/Order.php +++ b/WePayV3/Order.php @@ -64,10 +64,10 @@ class Order extends BasicWePay $time = strval(time()); $appid = $this->config['appid']; $nonceStr = Tools::createNoncestr(); - if ($type === 'app') { + if ($type === self::WXPAY_APP) { $sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, $result['prepay_id'], ''])); return ['partnerId' => $this->config['mch_id'], 'prepayId' => $result['prepay_id'], 'package' => 'Sign=WXPay', 'nonceStr' => $nonceStr, 'timeStamp' => $time, 'sign' => $sign]; - } elseif ($type === 'jsapi') { + } elseif ($type === self::WXPAY_JSAPI) { $sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, "prepay_id={$result['prepay_id']}", ''])); return ['appId' => $appid, 'timestamp' => $time, 'timeStamp' => $time, 'nonceStr' => $nonceStr, 'package' => "prepay_id={$result['prepay_id']}", 'signType' => 'RSA', 'paySign' => $sign]; } else {