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

解决部分问题

Browse Source
This commit is contained in:
Jerry Yan
2020-06-02 22:30:23 +08:00
parent 85df5bcc9d
commit 255e66d5c5
8 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,6 +186,18 @@ 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();
// 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'];
// }
$allMoney = $orders['collectionGatheringSum']-($orders['coupousEarningsSum']+$orders['hasVouchersEearningsSum']+$orders['taxFeeSum']+$orders['collectionPaySum']);
$orders['todayMoney'] = $orders['yesterdayMoney'] + $allMoney;
if(1 == $isSave && $allMoney != 0){

3
hyhproject/admin/model/Orders.php
View File

@@ -92,6 +92,9 @@ class Orders extends Base
$page['Rows'][$key]['payable'] = '0.00';
}
$page['Rows'][$key]['loginName'] = $v['loginName'];
$page['Rows'][$key]['accidentGet'] = number_format($page['Rows'][$key]['productNum'] + $page['Rows'][$key]['couponsNum'],2,'.','');
$page['Rows'][$key]['accidentTaxGet'] = number_format($page['Rows'][$key]['productTaxFee'] + $page['Rows'][$key]['couponsTaxFee'],2,'.','');
$page['Rows'][$key]['accidentHandlingGet'] = number_format($page['Rows'][$key]['productHandlingFee'] + $page['Rows'][$key]['couponsHandlingFee'],2,'.','');
$page['Rows'][$key]['userName'] = $v['userName'];
$shopUserInfo = getUserInfo(['userId' => $v['shopUserId']], 'loginName');
$page['Rows'][$key]['shopLoginName'] = $shopUserInfo['loginName'];