mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#135) from dev into master

Browse Source 
Reviewed-on: #135
This commit is contained in:
mkm 2024-01-26 11:40:51 +08:00
commit ecdee7b4d6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/dao/store/StoreActivityDao.php
View File

@ -95,9 +95,11 @@ class StoreActivityDao extends BaseDao
if (isset($oldProductList[$v['product']['old_product_id']])) { if (isset($oldProductList[$v['product']['old_product_id']])) {
$list[$k]['product']['stock'] = $oldProductList[$v['product']['old_product_id']]['stock']; $list[$k]['product']['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
$list[$k]['stock'] = $oldProductList[$v['product']['old_product_id']]['stock']; $list[$k]['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
if ($list[$k]['stock'] < 1) {
$list[$k]['product']['image'] = $list[$k]['product']->sellOutImage; $list[$k]['product']['image'] = $list[$k]['product']->sellOutImage;
} }
} }
}
if ($value['product_id'] == $v['product_id']) { if ($value['product_id'] == $v['product_id']) {
if ($value['mer_labels'] == ',5,') { if ($value['mer_labels'] == ',5,') {
$list[$k]['mer_labels_name'] = '五日达'; $list[$k]['mer_labels_name'] = '五日达';

2
app/common/repositories/store/order/StoreGroupOrderRepository.php
View File

@ -67,7 +67,7 @@ class StoreGroupOrderRepository extends BaseRepository
$query = StoreGroupOrder::getDB()->alias('StoreGroupOrder'); $query = StoreGroupOrder::getDB()->alias('StoreGroupOrder');
if(isset($where['source']) && $where['source'] == 103){ if(isset($where['source']) && $where['source'] == 103){
$wheres['activity_type']=[0,98]; $wheres['activity_type']=[0,98];
$wheres['source']=[0,2,103]; $wheres['source']=[0,2,103,105];
}else{ }else{
$wheres['activity_type']=0; $wheres['activity_type']=0;
} }

1
app/common/repositories/store/product/ProductRepository.php
View File

@ -1290,7 +1290,6 @@ class ProductRepository extends BaseRepository
$sku = $this->detailAttrValue($attrValue, $userInfo, $productType, $activityId); $sku = $this->detailAttrValue($attrValue, $userInfo, $productType, $activityId);
if ($activityId == 2 && isset($oldProduct['stock'])) { if ($activityId == 2 && isset($oldProduct['stock'])) {
$res['stock'] = $oldProduct['stock']; $res['stock'] = $oldProduct['stock'];
$res['slider_image'] = $res->sellOutImage;
foreach ($sku as &$skuItem) { foreach ($sku as &$skuItem) {
$skuItem['stock'] = $oldProduct['stock']; $skuItem['stock'] = $oldProduct['stock'];
} }