Merge branch 'lyz_cart' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

.gitignore

+<<<<<<< HEAD
+dea
+=======
 /nbproject/
 .idea
+>>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9
 *.DS_Store
 upload
 /data/log
 /data/images
 /scripts/crontab/push/nohup.out
 /lib
+<<<<<<< HEAD
+=======
 
+>>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9

application/library/Our/ImageUtil.php

@@ -160,15 +160,9 @@ class ImageUtil {
     }
 
     public static function getCategoryHeadPic($gcId){
-        $basePath=\Bootstrap::getUrlIniConfig('source');
         $commonPath=ImageConst::defaultPath;
         $fileName= ImageConst::categoryHeadPicPrefix.$gcId.\Our\NameConst::jpgSuffix;
-        $file=$basePath.$commonPath.$fileName;
-        if(file_exists($file)){
-            return \Our\Common::getStaticFile($fileName,$commonPath);
-        }else{
-            return \Our\Common::getStaticFile(ImageConst::defaultCategoryImgName,$commonPath);
-        }
+        return \Our\Common::getStaticFile($fileName,$commonPath);
     }
 
     /**
@@ -185,8 +179,6 @@ class ImageUtil {
         return $file_name;
     }
 
-
-
     public static function saveWxImage($data)
     {
         $fileName = isset($data['image'])&&$data['image']?$data['image']:$data['memberAvatar'];
@@ -201,8 +193,6 @@ class ImageUtil {
             );
         }
         return false;
-
-
     }
 
 }

application/models/Business/Goods/GroupSaleService.php

@@ -268,14 +268,14 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                 $result[$storeId]=$tempReturnStoreCartsObj;
             }
         }
-
+        //var_dump($result);
         if($result){
             $storeIds = $cartListData['storeIds'];
             $newResult = array();
             foreach($storeIds as $key){
                 $tempReturnCart = $result[$key];
                 $tempStore = $storeDao->get($key,false,false);
-                if($tempStore) {    //如果存在店铺数据
+                if($tempStore&&$tempReturnCart) {    //如果存在店铺数据
                     $tempReturnCart['inAreaFlag'] = $storeDao->checkAddressInServiceArea($address,$tempStore);
                     $newResult[] = $tempReturnCart;
                 }

application/models/Business/Store/ClassStoreService.php

@@ -8,7 +8,7 @@ namespace Business\Store;
  */
 
 class ClassStoreServiceModel extends \Business\AbstractModel{
-    private $classStoreField = 'store_id as storeId,store_name as storeName,store_label as storeLabel,store_intro as storeIntro,store_longitude,store_latitude,gc_id as gcId,gc_name as gcName';
+    private $classStoreField = 'store_id as storeId,store_name as storeName,store_label as storeLabel,store_intro as storeIntro,store_longitude,store_latitude,gc_id as gcId,gc_name as gcName,sign_scope';
 
     public function init() {
     }
@@ -49,8 +49,10 @@ class ClassStoreServiceModel extends \Business\AbstractModel{
                 $store_lat = $store['store_latitude'];
                 $store_lnt = $store['store_longitude'];
                 $gcName = htmlspecialchars_decode($store['gcName']);
+                $storeScope = $store['sign_scope'];
                 unset($store['store_latitude']);
                 unset($store['store_longitude']);
+                unset($store['sign_scope']);
                 unset($store['gcId']);
                 unset($store['gcName']);
                 $store['storeLabel'] =\Our\ImageUtil::getStoreLabel($store['storeLabel'], \Our\ImageConst::storeLabel,213);
@@ -66,8 +68,8 @@ class ClassStoreServiceModel extends \Business\AbstractModel{
                 }
 
                 $inAreaFlag = false;
-                if(isset($store['sign_scope'])&&$store['sign_scope']){
-                    $inAreaFlag = \Our\CommonExtension::locationInArea($lat,$lng,$store['sign_scope']);
+                if($storeScope){
+                    $inAreaFlag = \Our\CommonExtension::locationInArea($lat,$lng,$storeScope);
                 }
                 if(!isset($newGcStoreList[$gcId])){
                     $newGcStoreList[$gcId]['gcName'] = $gcName;

application/models/DAO/Coupon/MemberCoupon.php

@@ -41,6 +41,7 @@ class MemberCouponModel extends \DAO\AbstractModel{
      */
     public function getListByMemberId($memberId,$couponIds){
         $whereSql = ' member_id = '.$memberId .' and coupon_id in ('.implode(',',$couponIds).')';
+        $result = $this->getList($whereSql);
         return $result;
     }
 

conf/application.ini

@@ -390,21 +390,21 @@ elastic.master.scheme="http";
 [lyztest : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "106.14.14.233"
+resources.database.params.hostname = "192.168.134.18"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "!@#$%12345werty"
+resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "106.14.14.233"
+resources.database.slave.params.hostname = "192.168.134.18"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "!@#$%12345werty"
+resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 

index.log

 Sasdasf
+<<<<<<< HEAD
+ssdfsdfdsd
+=======
 sdsd
+>>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9