diff --git a/app/common/dao/store/StoreActivityDao.php b/app/common/dao/store/StoreActivityDao.php index 7e269c1b..4f007afb 100755 --- a/app/common/dao/store/StoreActivityDao.php +++ b/app/common/dao/store/StoreActivityDao.php @@ -95,7 +95,9 @@ class StoreActivityDao extends BaseDao if (isset($oldProductList[$v['product']['old_product_id']])) { $list[$k]['product']['stock'] = $oldProductList[$v['product']['old_product_id']]['stock']; $list[$k]['stock'] = $oldProductList[$v['product']['old_product_id']]['stock']; - $list[$k]['product']['image'] = $list[$k]['product']->sellOutImage; + if ($list[$k]['stock'] < 1) { + $list[$k]['product']['image'] = $list[$k]['product']->sellOutImage; + } } } if ($value['product_id'] == $v['product_id']) { diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php index 4f285909..4e0997b2 100755 --- a/app/common/repositories/store/order/StoreGroupOrderRepository.php +++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php @@ -67,7 +67,7 @@ class StoreGroupOrderRepository extends BaseRepository $query = StoreGroupOrder::getDB()->alias('StoreGroupOrder'); if(isset($where['source']) && $where['source'] == 103){ $wheres['activity_type']=[0,98]; - $wheres['source']=[0,2,103]; + $wheres['source']=[0,2,103,105]; }else{ $wheres['activity_type']=0; } diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index e3fa3f76..6302f1f2 100755 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -1290,7 +1290,6 @@ class ProductRepository extends BaseRepository $sku = $this->detailAttrValue($attrValue, $userInfo, $productType, $activityId); if ($activityId == 2 && isset($oldProduct['stock'])) { $res['stock'] = $oldProduct['stock']; - $res['slider_image'] = $res->sellOutImage; foreach ($sku as &$skuItem) { $skuItem['stock'] = $oldProduct['stock']; }