Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -46,11 +46,15 @@ class ConsoleController extends BaseController
         }
         $totalItemNum = floor($totalItemNum);
         $totalBalance = CustomClass::sum(['ownMainId'=>$this->mainId],'balance');
+        $balance = 0;
+        if($totalDebt>abs($totalBalance)) {
+            $balance = bcsub($totalDebt, abs($totalBalance), 2);
+        }
         $overview = [
             ['name' => "库存数", "url" => '/admin/stat/stock', 'value' => $totalItemNum, 'type' => 1],
             ['name' => "库存值", "url" => '/admin/stat/stock', 'value' => $totalCost, 'type' => 1],
-            ['name' => "总挂账", "url" => '/admin/shop/debtChange', 'value' => -$totalDebt, 'type' => 1],
-            ['name' => "实挂账", "url" => '/admin/home/member', 'value' => $totalBalance, 'type' => 4],
+            ['name' => "应收款", "url" => '/admin/shop/debtChange', 'value' => $totalDebt, 'type' => 1],
+            ['name' => "客户存款", "url" => '/admin/home/member', 'value' => $balance, 'type' => 4],
             ['name' => "总访客", "url" => '/admin/home/member', 'value' => 0, 'type' => 4],
             ['name' => "总订单", "url" => '/admin/home/order', 'value' => 0, 'type' => 4],
         ];

biz-ghs/order/classes/OrderClass.php

@@ -1559,7 +1559,7 @@ class OrderClass extends BaseClass
 
             $customId = $val['customId'] ?? '';
             $balance = $customInfoList[$customId]['balance'] ?? 0.00;
-            $debtAmount = $balance<0 ? abs($balance) : 0;
+            $debtAmount = $balance < 0 ? abs($balance) : 0;
 
             //打印数据组合
             $printData = self::getPrintData($val, $debtAmount, $showItemData);
@@ -1599,9 +1599,9 @@ class OrderClass extends BaseClass
         $lastNum = bcsub($itemNum, $refundNum);
 
         if (!empty($remark)) {
-            $show = $name . ' ' . $lastNum . $unitName . "【" . $remark . "】";
+            $show = $lastNum . $unitName . ' ' . $name . "【" . $remark . "】";
         } else {
-            $show = $name . ' ' . $lastNum . $unitName;
+            $show = $lastNum . $unitName . ' ' . $name;
         }
 
         $content .= '<B>' . $show . '</B><BR>';
@@ -1979,7 +1979,7 @@ class OrderClass extends BaseClass
         $customId = $orderInfo['customId'] ?? 0;
         $c = CustomClass::getById($customId);
         $balance = $c['balance'] ?? 0.00;
-        $debtAmount = $balance<0 ? abs($balance) : 0;
+        $debtAmount = $balance < 0 ? abs($balance) : 0;
         $orderSn = $orderInfo['orderSn'] ?? '';
         $shopId = $orderInfo['shopId'] ?? 0;
         $shop = ShopClass::getById($shopId, true);