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

Merge branch 'feature/purchase_record' into dev

Browse Source
This commit is contained in:
luofei 2023-07-18 09:50:09 +08:00
commit 1e5fd979b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ class StoreOrderDao extends BaseDao
$query->where('paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY); $query->where('paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
break; break;
case 20 : case 20 :
$query->where('paid', 1)->where('StoreOrder.status', 2); $query->where('paid', 1)->whereIn('StoreOrder.status', [2, 3]);
break; break;
default: default:
$query->where('paid', 1)->where('StoreOrder.status', $where['status']); $query->where('paid', 1)->where('StoreOrder.status', $where['status']);

2
app/common/repositories/community/CommunityRepository.php
View File

@ -96,7 +96,7 @@ class CommunityRepository extends BaseRepository
public function getApiList(array $where, int $page, int $limit, $userInfo) public function getApiList(array $where, int $page, int $limit, $userInfo)
{ {
$config = systemConfig("community_app_switch"); $config = systemConfig("community_app_switch");
if (!isset($where['is_type']) && $config) $where['is_type'] = $config; if (!isset($where['is_type']) && $config) $where['is_type'] = is_array($config) ? implode(',', $config) : $config;
$where['is_del'] = 0; $where['is_del'] = 0;
$query = $this->dao->search($where)->when(in_array(self::COMMUNITY_TYPE_RESALE, explode(',', $where['is_type'])), function ($query) { $query = $this->dao->search($where)->when(in_array(self::COMMUNITY_TYPE_RESALE, explode(',', $where['is_type'])), function ($query) {