diff --git a/app/common/repositories/user/IntegralRepository.php b/app/common/repositories/user/IntegralRepository.php index affe148..9cc76af 100644 --- a/app/common/repositories/user/IntegralRepository.php +++ b/app/common/repositories/user/IntegralRepository.php @@ -167,13 +167,10 @@ class IntegralRepository extends BaseRepository * @return array|array[] */ public function getStat(array $params){ - $query = $this->dao->getSearch([]) - ->when((int)$params['uid'] > 0,function($query) use ($params){ - $query->where('uid', (int)$params['uid']); - }) - ->when((int)$params['mer_id'] > 0,function($query) use ($params){ - $query->where('mer_id', (int)$params['mer_id']); - }); + $where = []; + if((int)$params['uid'] > 0) $where['uid'] = (int)$params['uid']; + if((int)$params['mer_id'] > 0) $where['mer_id'] = (int)$params['mer_id']; + $orderQuery = app()->make(StoreOrder::class) ->when((int)$params['uid'] > 0,function($query) use ($params){ $query->where('uid', (int)$params['uid']); @@ -183,7 +180,7 @@ class IntegralRepository extends BaseRepository }); // 商户信息统计 - $holdMerIntegral = (float)$query->where('mer_id','>',0)->sum('number'); + $holdMerIntegral = (float)$this->dao->getSearch([])->where($where)->where('mer_id','>',0)->sum('number'); $useMerIntegral = (float)$orderQuery->sum('use_mer_integral'); if((int)$params['mer_id'] > 0){ return [ @@ -192,7 +189,7 @@ class IntegralRepository extends BaseRepository ]; } // 平台信息统计 - $holdPlatformIntegral = (float)$query->where('mer_id','=',0)->sum('number'); + $holdPlatformIntegral = (float)$this->dao->getSearch([])->where($where)->where('mer_id','=',0)->sum('number'); $usePlatformIntegral = (float)$orderQuery->sum('use_platform_integral'); return [