终极提交～

hyhproject/common/model/Shopping.php

@@ -45,7 +45,7 @@ class Shopping extends Base{
 		}
 		return WSTReturn('',1,$rs);
 	}
-		/**
+    /**
 	 * 获取列表
 	 */
 	public function searchHelpGoods($goodsCatIds = []){
@@ -87,6 +87,13 @@ class Shopping extends Base{
 	public function getHelpCarousel(){
         return WSTReturn('',1,listAds('ads-qlghelp',6,86400));
 	}
+	/**
+	 * 获取助购吧轮播
+	 * @return [type] [description]
+	 */
+	public function getHelpShopCarousel(){
+        return WSTReturn('',1,listAds('ads-qlghelpshop',6,86400));
+	}
 
 	/**
 	 * 获取逛商铺商铺列表
@@ -158,9 +165,11 @@ class Shopping extends Base{
 		$scale = 0;
 		if(1 == $type){
 			$scale = dataConf('discountRateGtToShopping');
-		}else{
+		}elseif(2 == $type){
 			$scale = dataConf('discountRateGtToHelp');
-		}
+		}else{
+            $scale = dataConf('discountRateGtToHelpShopping');
+        }
 		$cacheData = cache('QLG_SHOPPING_GOODS_'.$type.'_'.$page);
 		if($cacheData)return $cacheData;
 		$rs = Db::name('goods')
@@ -181,11 +190,13 @@ class Shopping extends Base{
     	$where['g.goodsStatus'] = 1;
         $where['g.isSale'] = 1;
         $scale = 0;
-		if(1 == $type){
-			$scale = dataConf('discountRateGtToShopping');
-		}else{
-			$scale = dataConf('discountRateGtToHelp');
-		}
+        if(1 == $type){
+            $scale = dataConf('discountRateGtToShopping');
+        }elseif(2 == $type){
+            $scale = dataConf('discountRateGtToHelp');
+        }else{
+            $scale = dataConf('discountRateGtToHelpShopping');
+        }
     	$rs = Db::name('shops')->alias('s')
 	    	->join('__GOODS__ g','s.shopId=g.shopId','inner')
 	    	->field($field)