q792602257/qlg.tsgz.moe
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test'

Browse Source 
# Conflicts:
#	hyhproject/admin/controller/LogSysData.php
#	hyhproject/admin/model/CashDraws.php
#	hyhproject/admin/view/log_sys_data/log_sys_data.js
#	hyhproject/admin/view/log_sys_data/log_sys_data2.js
#	hyhproject/common/model/SysSummary.php
This commit is contained in:
Jerry Yan
2020-07-04 21:37:51 +08:00
parent 8095e46c2d a700e533bc
commit 277dd708aa
479 changed files with 110 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hyhproject/admin/model/CashDraws.php
View File

@@ -186,8 +186,11 @@ class CashDraws extends Base{
// $orders['collectionGatheringSum'] += abs($v['payable']);
// }
}
$data = Db::name('cash_draws')->whereTime('createTime',[$date,date('Y-m-d',strtotime('+1 day',strtotime($date)))])
->where("cashSatus", '=', 1)->select();
$data = Db::name('cash_draws')->whereIn('cashId',
Db::name('log_moneys')
->whereTime('createTime',[$date,date('Y-m-d',strtotime('+1 day',strtotime($date)))])
->where('dataSrc', '=', 3)->column('dataId')
)->select();
foreach ($data as $item){
$m->setTable('shops');
$shopUserId = $m->getField(['shopId'=>$item['targetId']],'userId');