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

更新

Browse Source
This commit is contained in:
mkm 2024-01-13 11:50:51 +08:00
parent 135912b9a1
commit 16d3fd73b3
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/common/dao/store/order/StoreOrderDao.php
View File

@ -74,7 +74,16 @@ class StoreOrderDao extends BaseDao
}
$query->where('is_del', 0);
});
if (isset($where['source']) && $where['source'] == 103) {
$wheres['activity_type'] = [0,98];
$wheres['source'] = [0,2,103];
$query->where($wheres);
unset($where['source']);
} else {
if(isset($where['product_type']) && $where['product_type'] !== ''){
$query->where('activity_type', $where['product_type']);
}
}
$query->when(($sysDel !== null), function ($query) use ($sysDel) {
$query->where('is_system_del', $sysDel);
})
@ -220,15 +229,6 @@ class StoreOrderDao extends BaseDao
$query->where('reconciliation_id', 0);
});
})->order('StoreOrder.create_time DESC');
if (isset($where['source']) && $where['source'] == 103) {
$wheres['activity_type'] = [0, 98];
$wheres['source'] = [2, 103];
$query->where($wheres);
} else {
if(isset($where['product_type']) && $where['product_type'] !== ''){
$query->where('activity_type', $where['product_type']);
}
}
return $query;
}

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

@ -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']=[2,103];
$wheres['source']=[0,2,103];
}else{
$wheres['activity_type']=0;
}

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

@ -639,7 +639,7 @@ class StoreOrderRepository extends BaseRepository
$where['activity_type']=$product_type;
if($source==103){
$where['activity_type']=[0,98];
$where['source']=[2,103];
$where['source']=[0,2,103];
}
$noComment = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(4))->where($where)->where('StoreOrder.is_del', 0)->count();
$noPay = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(1))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where($where)->where('StoreOrder.is_del', 0)->count();