购物车及优惠券修改

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/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"