Merge branch 'master' into debt

app-ghs/controllers/ConsoleController.php

@@ -232,6 +232,25 @@ class ConsoleController extends BaseController
                 ["name" => "拆散", "img" => "ghs/home/kcyjs.png", "url" => "/admin/part/list"],
             ];
         }
+        //用于审核，不展示全部完整的功能，批发的功能不展示出来，否则要申请B2B类目！！！！！！！！
+        if ($this->adminId == 17) {
+            $menu = [
+                ["name" => "商城", "img" => "ghs/home/shop3.png", "url" => "/admin/home/mall"],
+                ["name" => "改库存", "img" => "ghs/home/kcyjs.png", "url" => "/admin/changePrice/changeStock2"],
+                ["name" => "采购记录", "img" => "ghs/home/icon_caigou.png", "url" => "/pagesPurchase/order"],
+                ["name" => "调拨入库", "img" => "ghs/home/dbrk.png", "url" => "/pagesStorehouse/allot/allotPut"],
+                ["name" => "调拨出库", "img" => "ghs/home/dbck.png", "url" => "/pagesStorehouse/allot/allotEx"],
+                ["name" => "买花", "img" => "ghs/home/icon_buy_item.png", "url" => "buyGhs"],
+                ["name" => "买花记录", "img" => "ghs/home/icon_buy_record.png", "url" => "buyRecord", 'remindNum' => $cgNum],
+                ["name" => "库存总览", "img" => "ghs/home/kcyjs.png", "url" => "/admin/stat/stock"],
+                ["name" => "支出", "img" => "ghs/home/kcyjs.png", "url" => "/admin/expend/list"],
+                ["name" => "员工", "img" => "ghs/home/yggl.png", "url" => "/admin/staff/list"],
+                ["name" => "库存预警", "img" => "ghs/home/kcyjs.png", "url" => "/admin/item/list?warning=1"],
+                ["name" => "盘点", "img" => "ghs/home/pandian.png", "url" => "/pagesStorehouse/inventory/list"],
+                ["name" => "损耗", "img" => "ghs/home/kcyjs.png", "url" => "/admin/breakage/list"],
+                ["name" => "拆散", "img" => "ghs/home/kcyjs.png", "url" => "/admin/part/list"],
+            ];
+        }
 
         //查看财务的权限
         $lookMoney = ShopAdminClass::lookMoneyPower($this->shopAdmin, $this->shop);

app-ghs/controllers/TestController.php

@@ -727,7 +727,7 @@ class TestController extends BaseController
     //零售订单查询 ssh 20231031
     public function actionLsTradeQuery()
     {
-        $shopId = 1490;
+        $shopId = 17117;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店21');
@@ -744,7 +744,7 @@ class TestController extends BaseController
         ];
         $laResource = new Lakala($params);
         $queryParams = [
-            'orderSn' => 'KD26618561',
+            'orderSn' => 'KD26619443',
             //'tradeNo' => '66222010853306',
         ];
         $response = $laResource->query($queryParams, 0);