From d39a7d2fb1ed7420d9be40b470c2373372c00f0e Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 25 May 2017 11:01:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E5=8F=B7=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/service/PayService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extend/service/PayService.php b/extend/service/PayService.php index 8491505fc..991c2d234 100644 --- a/extend/service/PayService.php +++ b/extend/service/PayService.php @@ -117,8 +117,8 @@ class PayService { * @return bool|string */ public static function createWechatPrepayid(WechatPay $pay, $openid, $order_no, $fee, $title, $trade_type = 'JSAPI', $from = 'wechat') { - $map = ['order_no' => $order_no, 'is_pay' => '1', 'expires_in' => time(), 'appid' => $pay->appid]; - $where = 'appid=:appid and order_no=:order_no and (is_pay=:is_pay or expires_in>:expires_in)'; + $map = ['order_no' => $order_no, 'is_pay' => '1', 'expires_in' => time(), 'appid' => $pay->appid, 'trade_type' => $trade_type]; + $where = 'appid=:appid and order_no=:order_no and (is_pay=:is_pay or expires_in>:expires_in) and trade_type=:trade_type'; $prepayinfo = Db::name('WechatPayPrepayid')->where($where, $map)->find(); if (empty($prepayinfo) || empty($prepayinfo['prepayid'])) { $out_trade_no = DataService::createSequence(18, 'WXPAY-OUTER-NO');