From 59aacbb71baaac18647e70499978439b11095970 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Sat, 29 Aug 2020 23:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=B1=95=E7=A4=BA=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/app/controller/Qlgpay.php | 7 +++++++
 hyhproject/common/model/Orders.php   | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/hyhproject/app/controller/Qlgpay.php b/hyhproject/app/controller/Qlgpay.php
index 1fd808f..dc8d35c 100755
--- a/hyhproject/app/controller/Qlgpay.php
+++ b/hyhproject/app/controller/Qlgpay.php
@@ -1,5 +1,6 @@
 <?php
 namespace wstmart\app\controller;
+use think\Db;
 use wstmart\common\model\Orders as OM;
 /**
  * ============================================================================
@@ -30,8 +31,14 @@ class Qlgpay extends Base{
 			
 	    }
 	    $userId = $this->getUserId();
+		$shopId = isset($rs['shopId'])?$rs['shopId']:0;
 	    $m = new OM();
 	  	$pay  = array_merge($pay,$m->getPayMoney($userId,$pay['needPay']));
+	  	$pay['shopId'] = $shopId;
+	  	$shopUserId = Db::name('shops')->where('shopId', '=', $shopId)->value('userId');
+	  	if ($shopUserId) $pay['shopPaymentInfo'] = Db::name('user_recive')
+            ->where('userId', '=', $shopUserId)
+            ->find();
 	    exit(jsonReturn('',1,$pay));
 	   
 	}
diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index 8937f5e..9a882f5 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -3087,7 +3087,7 @@ class Orders extends Base{
 		}else{
 			$where['orderNo'] = $orderNo;
 		}
-		$orders = model('orders')->where($where)->field('needPay,payRand')->select();
+		$orders = model('orders')->where($where)->field('needPay,payRand,shopId')->select();
 		if(empty($orders))return [];
 		$needPay = 0;
 		$payRand = 0;
@@ -3098,6 +3098,13 @@ class Orders extends Base{
 		$data = array();
 		$data["needPay"] = $needPay;
 		$data["payRand"] = $payRand;
+        $shopId = $orders[0]['shopId'];
+        foreach ($orders as $_) {
+            if ($shopId != $_['shopId']) {
+                $shopId = -1;
+            }
+        }
+        if ($shopId>0) $data["shopId"] = $shopId;
 		return $data;
 	}