Merge branch 'lyz_recommond_store' of git.shenbd.com:qm-develop/shenbd

application/models/Business/Store/StoreService.php

@@ -586,9 +586,11 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $purchasedStore = array();
                 if($signStores&&in_array($goodsClass['gcId'],array_keys($signStores))){//如果当前分类存在对应签约店铺
                     $exitStore = $allStores[$signStores[$goodsClass['gcId']]];
-                }else if($serviceStores&&in_array($goodsClass['gcId'],array_keys($serviceStores))){
+                }
+                if(empty($exitStore)&&$serviceStores&&in_array($goodsClass['gcId'],array_keys($serviceStores))){
                     $exitStore = $allStores[$serviceStores[$goodsClass['gcId']]];
-                }else if($expressStores&&in_array($goodsClass['gcId'],array_keys($expressStores))){
+                }
+                if(empty($exitStore)&&$expressStores&&in_array($goodsClass['gcId'],array_keys($expressStores))){
                     $exitStore = $allStores[$expressStores[$goodsClass['gcId']]];
                 }
                 if($memberStores){

conf/application.ini

@@ -344,7 +344,7 @@ elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 
-[lyz : common]
+[lyztest : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"
@@ -391,7 +391,7 @@ elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 
-[lyztest : common]
+[lyz : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"