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

Merge branch 'test' of ssh://git.qgmzbxs.com:23333/q792602257/qlg.backend into test

Browse Source
This commit is contained in:
Your Name
2020-06-10 13:27:47 +08:00
parent 3d19b6129b f48ab07f2f
commit 47ba4bb2cd
29 changed files with 990 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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'];