Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -46,17 +46,11 @@ class ConsoleController extends BaseController
         }
         $totalItemNum = floor($totalItemNum);
         $totalBalance = CustomClass::sum(['ownMainId'=>$this->mainId],'balance');
-
-        $actTotalDebt = 0;
-        if($totalDebt > $totalBalance){
-            $actTotalDebt = bcsub($totalDebt, $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' => $actTotalDebt, 'type' => 4],
+            ['name' => "总挂账", "url" => '/admin/shop/debtChange', 'value' => -$totalDebt, 'type' => 1],
+            ['name' => "实挂账", "url" => '/admin/home/member', 'value' => $totalBalance, 'type' => 4],
             ['name' => "总访客", "url" => '/admin/home/member', 'value' => 0, 'type' => 4],
             ['name' => "总订单", "url" => '/admin/home/order', 'value' => 0, 'type' => 4],
         ];

app-ghs/controllers/TestController.php

@@ -834,7 +834,7 @@ class TestController extends BaseController
 
     public function actionClearQuery()
     {
-        $shopId = 31805;
+        $shopId = 8249;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店信息呢');
@@ -850,7 +850,7 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CL29366459';
+        $orderSn = 'CL29416751';
         $queryParams = [
             'orderSn' => $orderSn,
             //'tradeNo' => '66222923861204',

app-hd/controllers/ConsoleController.php

@@ -114,8 +114,8 @@ class ConsoleController extends BaseController
         $lookMoney = \bizGhs\shop\classes\ShopAdminClass::lookMoneyPower($this->shopAdmin, $this->shop);
         $warning = '';
         $warningUrl = '';
-        $warning = '挂账和结账重大调整 查看 >';
-        $warningUrl = '/admin/notice/warning';
+        //$warning = '挂账和结账重大调整 查看 >';
+        //$warningUrl = '/admin/notice/warning';
 
         util::success([
             'asset' => $this->main,