|
|
@@ -66,9 +66,10 @@ class TestController extends PublicController
|
|
|
$lsServiceFee = bcadd($lsServiceFee, $serviceFee, 2);
|
|
|
}
|
|
|
}
|
|
|
- echo " <br />零售收入:".$lsIncome."<br />";
|
|
|
+ echo " <br />零售收入:" . $lsIncome . "<br />";
|
|
|
|
|
|
$incomeList = [];
|
|
|
+ $an = 0;
|
|
|
//零售开单
|
|
|
$hdWhere = ['mainId' => $mainId, 'status' => ['in', [HdOrderClass::ORDER_STATUS_UN_SEND, HdOrderClass::ORDER_STATUS_SENDING, HdOrderClass::ORDER_STATUS_COMPLETE]]];
|
|
|
$hdWhere['payTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
@@ -84,9 +85,7 @@ class TestController extends PublicController
|
|
|
$onlinePay = $hdOrder['onlinePay'] ?? 0;
|
|
|
$fromType = $hdOrder['fromType'] ?? 0;
|
|
|
|
|
|
- if(floatval($actPrice) == 611){
|
|
|
- print_r($hdOrder);
|
|
|
- }
|
|
|
+ $an = bcadd($an, $mainPay, 2);
|
|
|
|
|
|
if ($onlinePay == dict::getDict('onlinePay', 'yes')) {
|
|
|
//使用在线支付
|
|
|
@@ -182,7 +181,7 @@ class TestController extends PublicController
|
|
|
$current = $i['amount'] ?? 0;
|
|
|
$total = bcadd($current, $total, 2);
|
|
|
}
|
|
|
- echo '<br />零售收入:'.$total.' <br />';
|
|
|
+ echo '<br />零售收入:' . $total . ' ' . $an . ' <br />';
|
|
|
print_r($incomeList);
|
|
|
die;
|
|
|
}
|