fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit 2a4db9360b8765fa7476f3d0edd24724226f93b2 1 parent f8b3a5e2

code review by fei.hong: do modify skn limit codes

Inline Side-by-side
Showing 2 changed files with 1 additions and 14 deletions
@@ -341,12 +341,6 @@ class DetailModel @@ -341,12 +341,6 @@ class DetailModel
341 $result['cartInfo']['soldOut'] = true; 341 $result['cartInfo']['soldOut'] = true;
342 } 342 }
343 343
344 - $skns = array(51116461,51215621,51215620,51215622,51216345,51216346,51215618,51215619);  
345 - //暂时处理  
346 - if(in_array($baseInfo['erpProductId'], $skns)) {  
347 - $result['cartInfo']['soldOut'] = true;  
348 - }  
349 -  
350 // 是否收藏 344 // 是否收藏
351 $result['isCollect'] = false; 345 $result['isCollect'] = false;
352 if (isset($baseInfo['isCollect']) && $baseInfo['isCollect'] === 'Y') { 346 if (isset($baseInfo['isCollect']) && $baseInfo['isCollect'] === 'Y') {
@@ -34,7 +34,6 @@ class ItemModel @@ -34,7 +34,6 @@ class ItemModel
34 $statGoodsInfo = array(); 34 $statGoodsInfo = array();
35 $banner = array(); 35 $banner = array();
36 $baseInfo = ItemData::baseInfo($productId, $uid, $productSkn); 36 $baseInfo = ItemData::baseInfo($productId, $uid, $productSkn);
37 -  
38 if(empty($baseInfo['productName']) && empty($baseInfo['erpProductId']) && empty($baseInfo['productPriceBo'])) { 37 if(empty($baseInfo['productName']) && empty($baseInfo['erpProductId']) && empty($baseInfo['productPriceBo'])) {
39 return array(); 38 return array();
40 } 39 }
@@ -136,12 +135,7 @@ class ItemModel @@ -136,12 +135,7 @@ class ItemModel
136 $goodsInfo['buyNow'] = $fashTopGoods['buyNow'];//是否立即购买 135 $goodsInfo['buyNow'] = $fashTopGoods['buyNow'];//是否立即购买
137 } 136 }
138 } 137 }
139 - $skns = array(51116461,51215621,51215620,51215622,51216345,51216346,51215618,51215619);  
140 - //暂时处理  
141 - if(in_array($baseInfo['erpProductId'], $skns)) {  
142 - $goodsInfo['soldOut'] = true;  
143 - $totalStorageNum = 0;  
144 - } 138 +
145 $soldOut = $baseInfo['status'] == 0 || $totalStorageNum === 0; 139 $soldOut = $baseInfo['status'] == 0 || $totalStorageNum === 0;
146 $notForSale = $baseInfo['attribute'] == 2;//非卖品 140 $notForSale = $baseInfo['attribute'] == 2;//非卖品
147 $virtualGoods = $baseInfo['attribute'] == 3;//虚拟商品 141 $virtualGoods = $baseInfo['attribute'] == 3;//虚拟商品
@@ -1183,7 +1177,6 @@ class ItemModel @@ -1183,7 +1177,6 @@ class ItemModel
1183 $result['hasLimitedCode'] = true; 1177 $result['hasLimitedCode'] = true;
1184 $result['limitedCodeSoldOut'] = true; 1178 $result['limitedCodeSoldOut'] = true;
1185 $result['getLimitedCode'] = false; 1179 $result['getLimitedCode'] = false;
1186 -  
1187 break; 1180 break;
1188 case 6: // 开售前，即将开售（用户已领取限购码） 1181 case 6: // 开售前，即将开售（用户已领取限购码）
1189 $result['openSoon'] = true; 1182 $result['openSoon'] = true;