Merge branch 'zhongqi-chat'

app-hd/controllers/ChatController.php

@@ -213,7 +213,7 @@ class ChatController extends BaseController
             util::error(-1, '校验失败');
         }
 
-        $key = ChatClass::QUOTED_PRICE_PRE_KEY . $key;
+        $key = ChatClass::getQuotedPriceKey($keyArr[0], $keyArr[1], $keyArr[2]);
         $val = Yii::$app->redis->executeCommand('GET', [$key]);
         if (empty($val)) {
             util::success(['price' => -1]);

app-mall/controllers/ChatController.php

@@ -88,7 +88,7 @@ class ChatController extends BaseController
             util::error(-1, '校验失败');
         }
 
-        $key = ChatClass::QUOTED_PRICE_PRE_KEY . $key;
+        $key = ChatClass::getQuotedPriceKey($keyArr[0], $keyArr[1], $keyArr[2]);
         $val = Yii::$app->redis->executeCommand('GET', [$key]);
         if (empty($val)) {
             util::success(['price' => -1]);

biz-mall/message/classes/ChatClass.php

@@ -48,5 +48,11 @@ class ChatClass extends BaseClass
     {
         return "customer_chats:" . $userId;
     }
+
+	//无价格报价的键
+    public static function getQuotedPriceKey($shopId, $userId, $goodsId)
+    {
+        return  self::QUOTED_PRICE_PRE_KEY . $shopId . '_' . $userId . '_' . $goodsId;
+    }
 	
 }