This commit is contained in:
Jerry Yan 2020-06-05 23:41:40 +08:00
parent 255e66d5c5
commit 63a988c828

View File

@ -170,34 +170,51 @@ class CashDraws extends Base{
$m->setTable('shops');
$shopUserId = $m->getField(['shopId'=>$v['shopId']],'userId');
$m->setTable('users');
$v['loginName'] = $m->getField(['userId'=>$v['userId']],'loginName');
$v['loginName'] = $m->getField(['userId'=>$v['userId']],'loginName');
$v['shopLoginName'] = $m->getField(['userId'=>$shopUserId],'loginName');
if(!isset($orders['collection'][$shopUserId]['gathering'])) $orders['collection'][$shopUserId]['gathering']=0;
if(!isset($orders['collection'][$shopUserId]['pay'])) $orders['collection'][$shopUserId]['pay']=0;
$orders['collection'][$shopUserId]['shopLoginName'] = $v['shopLoginName'];
if($v['payable']>0){
//公司需付商家,即提现
$orders['collection'][$shopUserId]['pay']+=$v['payable'];//代付款
$orders['collectionPaySum'] += $v['payable'];
}else{
//商家需付公司
$orders['collection'][$shopUserId]['gathering'] += abs($v['payable']);//代收款
$orders['collectionGatheringSum'] += abs($v['payable']);
}
// if(!isset($orders['collection'][$shopUserId]['gathering'])) $orders['collection'][$shopUserId]['gathering']=0;
// if(!isset($orders['collection'][$shopUserId]['pay'])) $orders['collection'][$shopUserId]['pay']=0;
// $orders['collection'][$shopUserId]['shopLoginName'] = $v['shopLoginName'];
//
// if($v['payable']>0){
// //公司需付商家,即提现
// $orders['collection'][$shopUserId]['pay']+=$v['payable'];//代付款
// $orders['collectionPaySum'] += $v['payable'];
// }else{
// //商家需付公司
// $orders['collection'][$shopUserId]['gathering'] += abs($v['payable']);//代收款
// $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();
// foreach ($data as $item){
// $m->setTable('users');
// $name = $m->getField(['userId'=>$item['targetId']],'loginName');
// if(!isset($orders['collection'][$item['targetId']])) $orders['collection'][$item['targetId']]=[];
// $orders['collection'][$item['targetId']]['shopLoginName'] = $name;
// if(!isset($orders['collection'][$item['targetId']]['gathering'])) $orders['collection'][$shopUserId]['gathering']=0;
// if(!isset($orders['collection'][$item['targetId']]['pay'])) $orders['collection'][$shopUserId]['pay']=0;
// $orders['collection'][$item['targetId']]['pay']+=$item['money'];//代付款
// $orders['collectionPaySum'] += $item['money'];
// }
$data = Db::name('cash_draws')->whereTime('createTime',[$date,date('Y-m-d',strtotime('+1 day',strtotime($date)))])
->where("cashSatus", '=', 1)->select();
foreach ($data as $item){
$m->setTable('shops');
$shopUserId = $m->getField(['shopId'=>$item['targetId']],'userId');
$m->setTable('users');
$name = $m->getField(['userId'=>$shopUserId],'loginName');
if(!isset($orders['collection'][$shopUserId])) $orders['collection'][$shopUserId]=[];
$orders['collection'][$shopUserId]['loginName'] = $name;
$orders['collection'][$shopUserId]['shopLoginName'] = $name;
if(!isset($orders['collection'][$shopUserId]['gathering'])) $orders['collection'][$shopUserId]['gathering']=0;
if(!isset($orders['collection'][$shopUserId]['pay'])) $orders['collection'][$shopUserId]['pay']=0;
$orders['collection'][$shopUserId]['pay']+=$item['money'];//代付款
$orders['collectionPaySum'] += $item['money'];
}
$data = Db::name('order_shop_certificate')->whereTime('createTime',[$date,date('Y-m-d',strtotime('+1 day',strtotime($date)))])
->select();
foreach ($data as $item) {
$m->setTable('users');
$name = $m->getField(['userId'=>$item['userId']],'loginName');
if(!isset($orders['collection'][$item['userId']])) $orders['collection'][$item['userId']]=[];
$orders['collection'][$item['userId']]['loginName'] = $name;
$orders['collection'][$item['userId']]['shopLoginName'] = $name;
if(!isset($orders['collection'][$item['userId']]['gathering'])) $orders['collection'][$item['userId']]['gathering']=0;
if(!isset($orders['collection'][$item['userId']]['pay'])) $orders['collection'][$item['userId']]['pay']=0;
$sum = Db::name('orders')->whereIn('orderId', $item['orderIds'])->sum('abs(`payable`)');
$orders['collection'][$item['userId']]['gathering'] += $sum;//代收款
$orders['collectionGatheringSum'] += $sum;
}
$allMoney = $orders['collectionGatheringSum']-($orders['coupousEarningsSum']+$orders['hasVouchersEearningsSum']+$orders['taxFeeSum']+$orders['collectionPaySum']);
$orders['todayMoney'] = $orders['yesterdayMoney'] + $allMoney;
if(1 == $isSave && $allMoney != 0){