wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：持有积分统计错误

This commit is contained in:
wuhui_zzw 2023-11-18 14:40:26 +08:00
parent ccc85713f2
commit 1fa3ddbd09
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/common/repositories/user/IntegralRepository.php
View File

@ -167,13 +167,10 @@ class IntegralRepository extends BaseRepository
* @return array|array[] * @return array|array[]
*/ */
public function getStat(array $params){ public function getStat(array $params){
$query = $this->dao->getSearch([]) $where = [];
->when((int)$params['uid'] > 0,function($query) use ($params){ if((int)$params['uid'] > 0) $where['uid'] = (int)$params['uid'];
$query->where('uid', (int)$params['uid']); if((int)$params['mer_id'] > 0) $where['mer_id'] = (int)$params['mer_id'];
})
->when((int)$params['mer_id'] > 0,function($query) use ($params){
$query->where('mer_id', (int)$params['mer_id']);
});
$orderQuery = app()->make(StoreOrder::class) $orderQuery = app()->make(StoreOrder::class)
->when((int)$params['uid'] > 0,function($query) use ($params){ ->when((int)$params['uid'] > 0,function($query) use ($params){
$query->where('uid', (int)$params['uid']); $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'); $useMerIntegral = (float)$orderQuery->sum('use_mer_integral');
if((int)$params['mer_id'] > 0){ if((int)$params['mer_id'] > 0){
return [ 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'); $usePlatformIntegral = (float)$orderQuery->sum('use_platform_integral');
return [ return [