Merge branch 'hotfix/presellCart' into feature/wap/girlsday

@@ -12,6 +12,14 @@
     </div>
 {{/if}}
 
+{{#if offShelveGoods}}
+    <div class="invalid-goods">
+        {{# offShelveGoods}}
+        {{> cart/good}}
+        {{/ offShelveGoods}}
+    </div>
+{{/if}}
+
 {{#if freebieOrAdvanceBuy}}
     <ul class="freebie-and-advance-buy">
         {{#if freebie}}

+[memcached]
+master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
+session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file

 [memcached]
-master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
-slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
-session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
+session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
 
 [redis]
 servers.hosts=127.0.0.1:6379
\ No newline at end of file

@@ -78,6 +78,8 @@ class Bootstrap extends Bootstrap_Abstract
                 case 'm':  // 老版(到频道选择)
                 case 'buy': // 测试环境的域名, 以后可去掉
                 case 'login': // 登录
+                case 'm20160224': // AWS TEST
+                case 'login20160224': // AWS TEST
                     break;
                 case 'new':  // 原新版(到男生首页)
                     $controller = 'Boys';

@@ -773,7 +773,7 @@ class CartModel
 
         do {
             // 数据为空时返回空的标志
-            if (empty($data['goods_list']) && empty($data['sold_out_goods_list'])) {
+            if (empty($data['goods_list']) && empty($data['sold_out_goods_list']) && empty($data['off_shelves_goods_list'])) {
                 break;
             }
 
@@ -800,6 +800,12 @@ class CartModel
                 $result['notValidGoods'] = $notValidGoods;
             }
 
+            // 下架的商品列表
+            $offShelveGoods = Helpers::formatCartGoods($data['off_shelves_goods_list'], $isAdvanceCart, false);
+            if (!empty($offShelveGoods)) {
+                $result['offShelveGoods'] = $offShelveGoods;
+            }
+
             // 赠品和加价购商品
             if (count($data['gift_list']) || count($data['price_gift'])) {
                 $result['freebieOrAdvanceBuy'] = true;

+[memcached]
+master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
+session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file

 [memcached]
-master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
-slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
-session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
+session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
 
 [redis]
 servers.hosts=127.0.0.1:6379
\ No newline at end of file

+<?php
+
+use Yaf\Application;
+
+define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
+define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
+define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
+define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
+define('USE_CACHE', true); // 缓存的开关
+define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
+define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
+defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'production');
+
+$application = new Application(APPLICATION_PATH . '/configs/application.production.ini');
+$application->bootstrap()->run();

@@ -2,10 +2,10 @@
 
 use Yaf\Application;
 
-define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
+define('SITE_MAIN', 'http://m20160224.yohobuy.com'); // 网站主域名
 define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
-define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
+define('SUB_DOMAIN', '.m20160224.yohobuy.com'); // 子域名后缀
 define('USE_CACHE', true); // 缓存的开关
 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录

+5m7GaQanwdmT2Bw7/iBKqZlYr+yKphtGeMh7y7Oro+4=

@@ -78,6 +78,8 @@ class Bootstrap extends Bootstrap_Abstract
                 case 'new':  // 原新版
                 case 'dev':  // 开发环境
                 case 'web':
+                case 'www20160224': // AWS TEST
+                case 'new20160224': // AWS TEST
                     break;
                 case 'search': // 搜索
                     $module = 'Product';

+[memcached]
+master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
+session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file

 [memcached]
-master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
-slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
-session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
+slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
+session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
 
 [redis]
 servers.hosts=127.0.0.1:6379
\ No newline at end of file

+[memcached]
+master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
+session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file

+<?php
+use Yaf\Application;
+
+define('SITE_MAIN', 'http://www.yohobuy.com'); // 网站主域名
+define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
+define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
+define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀
+define('USE_CACHE', true); // 缓存的开关
+define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
+define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
+defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'production');
+
+$application = new Application(APPLICATION_PATH . '/configs/application.production.ini');
+$application->bootstrap()->run();
\ No newline at end of file

 <?php
 use Yaf\Application;
 
-define('SITE_MAIN', 'http://www.yohobuy.com'); // 网站主域名
+define('SITE_MAIN', 'http://www20160224.yohobuy.com'); // 网站主域名
 define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
 define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀