|
@@ -125,7 +125,7 @@ class StatKdClass extends BaseClass
|
|
|
foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
|
|
foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
|
|
|
$payWay = $ghsOrder['payWay'] ?? 0;
|
|
$payWay = $ghsOrder['payWay'] ?? 0;
|
|
|
$actPrice = $ghsOrder['actPrice'] ?? 0;
|
|
$actPrice = $ghsOrder['actPrice'] ?? 0;
|
|
|
- $shopAdminId = $ghsOrder['shopAdminId'] ?? 0;
|
|
|
|
|
|
|
+ $shopAdminId = $ghsOrder['getStaffId'] ?? 0;
|
|
|
$debtPrice = $ghsOrder['debtPrice'] ?? 0;
|
|
$debtPrice = $ghsOrder['debtPrice'] ?? 0;
|
|
|
$onlinePay = $ghsOrder['onlinePay'] ?? dict::getDict('onlinePay', 'not');
|
|
$onlinePay = $ghsOrder['onlinePay'] ?? dict::getDict('onlinePay', 'not');
|
|
|
if ($debtPrice > 0) {
|
|
if ($debtPrice > 0) {
|
|
@@ -197,7 +197,7 @@ class StatKdClass extends BaseClass
|
|
|
$mainPay = $hdOrder['mainPay'] ?? 0;
|
|
$mainPay = $hdOrder['mainPay'] ?? 0;
|
|
|
$cash = $hdOrder['cash'] ?? 0;
|
|
$cash = $hdOrder['cash'] ?? 0;
|
|
|
$actPrice = $hdOrder['actPrice'] ?? 0;
|
|
$actPrice = $hdOrder['actPrice'] ?? 0;
|
|
|
- $shopAdminId = $hdOrder['shopAdminId'] ?? 0;
|
|
|
|
|
|
|
+ $shopAdminId = $hdOrder['getStaffId'] ?? 0;
|
|
|
$debtPrice = $hdOrder['debtPrice'] ?? 0;
|
|
$debtPrice = $hdOrder['debtPrice'] ?? 0;
|
|
|
$onlinePay = $hdOrder['onlinePay'] ?? 0;
|
|
$onlinePay = $hdOrder['onlinePay'] ?? 0;
|
|
|
if ($debtPrice > 0) {
|
|
if ($debtPrice > 0) {
|
shish