wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 416dfb16e26637de7f4d4e1beb48b74f5a227e06 2 parents a8bbbe00 bd75f158

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

Inline Side-by-side
Showing 16 changed files with 89 additions and 13 deletions
@@ -12,6 +12,14 @@ @@ -12,6 +12,14 @@
12 </div> 12 </div>
13 {{/if}} 13 {{/if}}
14 14
  15 +{{#if offShelveGoods}}
  16 + <div class="invalid-goods">
  17 + {{# offShelveGoods}}
  18 + {{> cart/good}}
  19 + {{/ offShelveGoods}}
  20 + </div>
  21 +{{/if}}
  22 +
15 {{#if freebieOrAdvanceBuy}} 23 {{#if freebieOrAdvanceBuy}}
16 <ul class="freebie-and-advance-buy"> 24 <ul class="freebie-and-advance-buy">
17 {{#if freebie}} 25 {{#if freebie}}
  1 +[memcached]
  2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
1 [memcached] 1 [memcached]
2 -master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111  
3 -slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112  
4 -session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111 2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
@@ -78,6 +78,8 @@ class Bootstrap extends Bootstrap_Abstract @@ -78,6 +78,8 @@ class Bootstrap extends Bootstrap_Abstract
78 case 'm': // 老版(到频道选择) 78 case 'm': // 老版(到频道选择)
79 case 'buy': // 测试环境的域名, 以后可去掉 79 case 'buy': // 测试环境的域名, 以后可去掉
80 case 'login': // 登录 80 case 'login': // 登录
  81 + case 'm20160224': // AWS TEST
  82 + case 'login20160224': // AWS TEST
81 break; 83 break;
82 case 'new': // 原新版(到男生首页) 84 case 'new': // 原新版(到男生首页)
83 $controller = 'Boys'; 85 $controller = 'Boys';
@@ -773,7 +773,7 @@ class CartModel @@ -773,7 +773,7 @@ class CartModel
773 773
774 do { 774 do {
775 // 数据为空时返回空的标志 775 // 数据为空时返回空的标志
776 - if (empty($data['goods_list']) && empty($data['sold_out_goods_list'])) { 776 + if (empty($data['goods_list']) && empty($data['sold_out_goods_list']) && empty($data['off_shelves_goods_list'])) {
777 break; 777 break;
778 } 778 }
779 779
@@ -800,6 +800,12 @@ class CartModel @@ -800,6 +800,12 @@ class CartModel
800 $result['notValidGoods'] = $notValidGoods; 800 $result['notValidGoods'] = $notValidGoods;
801 } 801 }
802 802
  803 + // 下架的商品列表
  804 + $offShelveGoods = Helpers::formatCartGoods($data['off_shelves_goods_list'], $isAdvanceCart, false);
  805 + if (!empty($offShelveGoods)) {
  806 + $result['offShelveGoods'] = $offShelveGoods;
  807 + }
  808 +
803 // 赠品和加价购商品 809 // 赠品和加价购商品
804 if (count($data['gift_list']) || count($data['price_gift'])) { 810 if (count($data['gift_list']) || count($data['price_gift'])) {
805 $result['freebieOrAdvanceBuy'] = true; 811 $result['freebieOrAdvanceBuy'] = true;
  1 +[memcached]
  2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
1 [memcached] 1 [memcached]
2 -master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111  
3 -slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112  
4 -session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111 2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
  1 +<?php
  2 +
  3 +use Yaf\Application;
  4 +
  5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
  7 +define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
  8 +define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
  9 +define('USE_CACHE', true); // 缓存的开关
  10 +define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
  11 +define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
  12 +defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'production');
  13 +
  14 +$application = new Application(APPLICATION_PATH . '/configs/application.production.ini');
  15 +$application->bootstrap()->run();
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名 5 +define('SITE_MAIN', 'http://m20160224.yohobuy.com'); // 网站主域名
6 define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名 6 define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 -define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 +define('SUB_DOMAIN', '.m20160224.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', true); // 缓存的开关 9 define('USE_CACHE', true); // 缓存的开关
10 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录 10 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录 11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
  1 +5m7GaQanwdmT2Bw7/iBKqZlYr+yKphtGeMh7y7Oro+4=
@@ -78,6 +78,8 @@ class Bootstrap extends Bootstrap_Abstract @@ -78,6 +78,8 @@ class Bootstrap extends Bootstrap_Abstract
78 case 'new': // 原新版 78 case 'new': // 原新版
79 case 'dev': // 开发环境 79 case 'dev': // 开发环境
80 case 'web': 80 case 'web':
  81 + case 'www20160224': // AWS TEST
  82 + case 'new20160224': // AWS TEST
81 break; 83 break;
82 case 'search': // 搜索 84 case 'search': // 搜索
83 $module = 'Product'; 85 $module = 'Product';
  1 +[memcached]
  2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
1 [memcached] 1 [memcached]
2 -master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111  
3 -slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112  
4 -session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111 2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
  1 +[memcached]
  2 +master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
  3 +slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
  4 +session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
  1 +<?php
  2 +use Yaf\Application;
  3 +
  4 +define('SITE_MAIN', 'http://www.yohobuy.com'); // 网站主域名
  5 +define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
  6 +define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
  7 +define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀
  8 +define('USE_CACHE', true); // 缓存的开关
  9 +define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
  10 +define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
  11 +defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'production');
  12 +
  13 +$application = new Application(APPLICATION_PATH . '/configs/application.production.ini');
  14 +$application->bootstrap()->run();
1 <?php 1 <?php
2 use Yaf\Application; 2 use Yaf\Application;
3 3
4 -define('SITE_MAIN', 'http://www.yohobuy.com'); // 网站主域名 4 +define('SITE_MAIN', 'http://www20160224.yohobuy.com'); // 网站主域名
5 define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名 5 define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
6 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 6 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
7 define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀 7 define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀