Merge branch 'hotfix/wechatOrder' into release/flaw

@@ -301,7 +301,7 @@ class PaymentModel
      * @param string $orderCode 订单号
      * @param string $orderCode 订单号
      * @return array
      * @return array
      */
      */
-    public static function weixinQrcode($orderCode)
+    public static function weixinQrcode($uid, $orderCode)
     {
     {
 
 
         do {
         do {
@@ -309,7 +309,6 @@ class PaymentModel
                 self::$code['message'] = '订单号不能为空';
                 self::$code['message'] = '订单号不能为空';
                 break;
                 break;
             }
             }
-            $uid = self::getUid($orderCode);
             /* 判断订单信息是否存在 */
             /* 判断订单信息是否存在 */
             $orderDetail = OrderData::getOrderDetail($uid, $orderCode);
             $orderDetail = OrderData::getOrderDetail($uid, $orderCode);
 
 

@@ -16,7 +16,8 @@ class WechatqrcodeController extends WebAction
         $this->autoLogin();
         $this->autoLogin();
 
 
         $orderCode = $this->get('order_code', $this->get('ordercode'));
         $orderCode = $this->get('order_code', $this->get('ordercode'));
-        $data = PaymentModel::weixinQrcode($orderCode);
+        $uid = $this->getUid();
+        $data = PaymentModel::weixinQrcode($uid, $orderCode);
         if (empty($data['code']) || $data['code'] !== 200) {
         if (empty($data['code']) || $data['code'] !== 200) {
             $this->helpJsRedirect($data['message']);
             $this->helpJsRedirect($data['message']);
         }
         }