shish 1 рік тому
батько
коміт
769df3fddd
45 змінених файлів з 87 додано та 87 видалено
  1. 3 3
      app-ghs/controllers/AuthController.php
  2. 3 3
      app-ghs/controllers/ShopController.php
  3. 1 1
      app-ghs/controllers/StockOutController.php
  4. 9 9
      app-ghs/controllers/TestController.php
  5. 1 1
      app-hd/controllers/AdminController.php
  6. 5 5
      app-hd/controllers/AuthController.php
  7. 4 4
      app-hd/controllers/ShopController.php
  8. 1 1
      app-hd/controllers/ShopExtController.php
  9. 1 1
      app-mall/controllers/TestController.php
  10. 1 1
      app-pt/controllers/CashController.php
  11. 2 2
      app-pt/controllers/MtController.php
  12. 3 3
      app-pt/controllers/ShopController.php
  13. 1 1
      biz-ghs/merchant/classes/ShopClass.php
  14. 8 8
      biz-ghs/order/classes/OrderClass.php
  15. 4 4
      biz-ghs/order/classes/PurchaseOrderClass.php
  16. 1 1
      biz-ghs/order/classes/RefundOrderClass.php
  17. 2 2
      biz-ghs/order/services/OrderSendService.php
  18. 3 3
      biz-ghs/order/services/OrderService.php
  19. 1 1
      biz-ghs/product/classes/ProductClass.php
  20. 1 1
      biz-ghs/recharge/classes/RechargeClass.php
  21. 1 1
      biz-ghs/shop/classes/ShopAdminClass.php
  22. 1 1
      biz-ghs/shop/services/ShopAdminService.php
  23. 1 1
      biz-hd/admin/services/ShopAdminService.php
  24. 1 1
      biz-hd/cg/classes/CgRefundClass.php
  25. 1 1
      biz-hd/cg/services/CgRefundService.php
  26. 1 1
      biz-hd/goods/classes/GoodsClass.php
  27. 2 2
      biz-hd/order/classes/OrderClass.php
  28. 1 1
      biz-hd/order/services/OrderSendService.php
  29. 4 4
      biz-hd/purchase/classes/PurchaseClass.php
  30. 1 1
      biz-hd/purchase/services/PurchaseService.php
  31. 2 2
      biz-hd/px/classes/PxApplyClass.php
  32. 1 1
      biz-hd/refund/services/HdRefundService.php
  33. 1 1
      biz-hd/shop/classes/ShopClass.php
  34. 1 1
      biz-hd/staff/classes/StaffClass.php
  35. 1 1
      biz-hd/work/classes/WorkItemClass.php
  36. 1 1
      biz-mall/admin/services/ShopAdminService.php
  37. 1 1
      biz-mall/message/classes/InformAdminClass.php
  38. 1 1
      biz-mall/order/classes/OrderClass.php
  39. 1 1
      biz-mall/order/services/OrderService.php
  40. 1 1
      biz/shop/services/ShopAdminService.php
  41. 1 1
      biz/sj/classes/CashClass.php
  42. 1 1
      common/services/xhPayToolService.php
  43. 2 2
      console/controllers/CashController.php
  44. 1 1
      console/controllers/CpController.php
  45. 2 2
      console/controllers/MtController.php

+ 3 - 3
app-ghs/controllers/AuthController.php

@@ -78,7 +78,7 @@ class AuthController extends PublicController
         }
         $currentShop = ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店69');
         }
         $mainId = $currentShop->mainId ?? 0;
         $adminId = $admin['id'] ?? 0;
@@ -220,7 +220,7 @@ class AuthController extends PublicController
         }
         $currentShop = ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店70');
         }
         $mainId = $currentShop->mainId ?? 0;
         $shopAdmin = ShopAdminClass::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
@@ -585,7 +585,7 @@ class AuthController extends PublicController
         }
         $currentShop = \bizGhs\shop\classes\ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店71');
         }
         $mainId = $currentShop->mainId ?? 0;
         $adminId = $admin->id;

+ 3 - 3
app-ghs/controllers/ShopController.php

@@ -140,7 +140,7 @@ class ShopController extends BaseController
         $id = $post['id'] ?? 0;
         $shop = ShopService::getById($id);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店65');
         }
         $staff = $this->shopAdmin;
         if (isset($staff->finance) == false || $staff->finance == 0) {
@@ -325,7 +325,7 @@ class ShopController extends BaseController
         $newShopId = Yii::$app->request->post('shopId', 0);
         $newShop = ShopClass::getById($newShopId, true);
         if (empty($newShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店66');
         }
         $res = AdminClass::toggleShop($this->admin, $newShop, $this->sjId, $this->shopAdmin);
         util::success($res);
@@ -429,7 +429,7 @@ class ShopController extends BaseController
         $shopId = Yii::$app->request->get('shopId', 0);
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店67');
         }
         $shopAdmin = $this->shopAdmin;
         $admin = $this->admin;

+ 1 - 1
app-ghs/controllers/StockOutController.php

@@ -236,7 +236,7 @@ class StockOutController extends BaseController
             }
             $inShop = ShopClass::getById($inShopId);
             if (empty($inShop)) {
-                util::fail('没有找到门店');
+                util::fail('没有找到门店68');
             }
             ShopClass::valid($inShop, $this->sjId);
             $post['inMainId'] = $inShop['mainId'] ?? 0;

+ 9 - 9
app-ghs/controllers/TestController.php

@@ -287,7 +287,7 @@ class TestController extends BaseController
         $shopId = 36524;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店15');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -530,7 +530,7 @@ class TestController extends BaseController
         $shopId = 520;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店16');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -559,7 +559,7 @@ class TestController extends BaseController
         $shopId = 1212;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店17');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -583,7 +583,7 @@ class TestController extends BaseController
 //        $shopId = 1527;
 //        $shop = ShopClass::getById($shopId, true);
 //        if (empty($shop)) {
-//            util::stop('没有找到门店');
+//            util::stop('没有找到门店18');
 //        }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -612,7 +612,7 @@ class TestController extends BaseController
         $shopId = 726;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店19');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -639,7 +639,7 @@ class TestController extends BaseController
         $shopId = 7831;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店20');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -667,7 +667,7 @@ class TestController extends BaseController
         $shopId = 3969;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店21');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -731,7 +731,7 @@ class TestController extends BaseController
         $shopId = 10649;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店22');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -796,7 +796,7 @@ class TestController extends BaseController
         $shopId = 1585;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店23');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';

+ 1 - 1
app-hd/controllers/AdminController.php

@@ -83,7 +83,7 @@ class AdminController extends BaseController
         }
         $currentShop = ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店34');
         }
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;

+ 5 - 5
app-hd/controllers/AuthController.php

@@ -82,7 +82,7 @@ class AuthController extends PublicController
         }
         $currentShop = ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店36');
         }
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;
@@ -173,7 +173,7 @@ class AuthController extends PublicController
         }
         $currentShop = \bizHd\shop\classes\ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店37');
         }
         $mainId = $currentShop->mainId ?? 0;
         $pfShopId = $currentShop->pfShopId ?? 0;
@@ -282,7 +282,7 @@ class AuthController extends PublicController
         }
         $currentShop = ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('登录失败,没有找到门店');
+            util::fail('登录失败,没有找到门店38');
         }
         $pfShopId = $currentShop->pfShopId ?? 0;
         $onlyCg = $currentShop->onlyCg ?? 1;
@@ -490,7 +490,7 @@ class AuthController extends PublicController
         }
         $currentShop = ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店39');
         }
         $pfShopId = $currentShop->pfShopId ?? 0;
         if (!empty($pfShopId)) {
@@ -640,7 +640,7 @@ class AuthController extends PublicController
         $id = Yii::$app->request->get('id', 0);
         $shop = ShopClass::getById($id, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店40');
         }
         $sjId = $shop->sjId;
         $imgUrl = ShopClass::generateGatheringCode($sjId, $id);

+ 4 - 4
app-hd/controllers/ShopController.php

@@ -161,7 +161,7 @@ class ShopController extends BaseController
         $newShopId = Yii::$app->request->post('shopId', 0);
         $newShop = ShopClass::getById($newShopId, true);
         if (empty($newShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店30');
         }
         $res = \bizHd\admin\classes\AdminClass::toggleShop($this->admin, $newShop, $this->sjId, $this->shopAdmin);
         util::success($res);
@@ -173,7 +173,7 @@ class ShopController extends BaseController
         $id = Yii::$app->request->get('id', 0);
         $shop = ShopService::getById($id, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店31');
         }
         ShopClass::valid($shop->attributes, $this->sjId);
         $imgUrl = ShopClass::generateGatheringCode($this->sjId, $id);
@@ -196,7 +196,7 @@ class ShopController extends BaseController
         $id = Yii::$app->request->get('id', 0);
         $shop = ShopService::getById($id, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店32');
         }
         ShopClass::valid($shop->attributes, $this->sjId);
         $imgUrl = Yii::$app->params['hdHost'] . '/auth/gathering-img-url?id=' . $id;
@@ -208,7 +208,7 @@ class ShopController extends BaseController
         $id = Yii::$app->request->get('id', 0);
         $shop = ShopService::getById($id, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店33');
         }
         $sjId = $shop->sjId;
         $imgUrl = ShopClass::generateGatheringCode($sjId, $id);

+ 1 - 1
app-hd/controllers/ShopExtController.php

@@ -24,7 +24,7 @@ class ShopExtController extends BaseController
         $shopId = $this->shopId;
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
         if (empty($ext)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店35');
         }
         $ext->mtAlone = $alone;
         $ext->save();

+ 1 - 1
app-mall/controllers/TestController.php

@@ -24,7 +24,7 @@ class TestController extends BaseController
         $shopId = 36524;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店80');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';

+ 1 - 1
app-pt/controllers/CashController.php

@@ -53,7 +53,7 @@ class CashController extends BaseController
             $shopId = $cash->shopId;
             $shop = ShopClass::getLockById($shopId);
             if (empty($shop)) {
-                util::fail('没有找到门店');
+                util::fail('没有找到门店46');
             }
             $mainId = $shop->mainId ?? 0;
             $main = MainClass::getLockById($mainId);

+ 2 - 2
app-pt/controllers/MtController.php

@@ -20,7 +20,7 @@ class MtController extends BaseController
 
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
         if (empty($ext)) {
-            util::fail('没有找到门店相信息');
+            util::fail('没有找到门店相信息41');
         }
         $config = dict::getDict('mtConfig');
         $app = new Application($config);
@@ -62,7 +62,7 @@ class MtController extends BaseController
         $shopId = Yii::$app->request->get('id');
         $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true);
         if (empty($shopExt)) {
-            util::fail('没有找到门店相信息');
+            util::fail('没有找到门店相信息42');
         }
         $accessToken = mtUtil::getAccessToken($shopExt);
         echo $accessToken;

+ 3 - 3
app-pt/controllers/ShopController.php

@@ -22,7 +22,7 @@ class ShopController extends BaseController
         $shopId = $get['id'] ?? 0;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店43');
         }
         $old = $shop->needRenew;
         $new = $old == 0 ? 1 : 0;
@@ -42,7 +42,7 @@ class ShopController extends BaseController
         $nickName = empty($nickName) ? substr($mobile, 7, 4) : $nickName;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店44');
         }
         $ptStyle = $shop->ptStyle ?? 1;
         $connection = Yii::$app->db;
@@ -87,7 +87,7 @@ class ShopController extends BaseController
         $id = $get['id'] ?? 0;
         $shop = ShopClass::getById($id, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店45');
         }
         if ($shop->ptStyle != 1) {
             util::fail('只能给零售店操作');

+ 1 - 1
biz-ghs/merchant/classes/ShopClass.php

@@ -46,7 +46,7 @@ class ShopClass extends BaseClass
         $defaultShopId = $sj['defaultShopId'] ?? 0;
         $defaultShop = ShopClass::getById($defaultShopId, true);
         if (empty($defaultShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店76');
         }
         $oldMainId = $defaultShop->mainId ?? 0;
         if (empty($oldMainId)) {

+ 8 - 8
biz-ghs/order/classes/OrderClass.php

@@ -555,7 +555,7 @@ class OrderClass extends BaseClass
         $shopId = $order->shopId ?? 0;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店6');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
@@ -720,7 +720,7 @@ class OrderClass extends BaseClass
         $currentShopId = $data['shopId'] ?? 0;
         $shop = ShopClass::getLockById($currentShopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店7');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
@@ -963,7 +963,7 @@ class OrderClass extends BaseClass
         //门店总订单数+1
         $shop = ShopClass::getLockById($currentShopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店8');
         }
         $shop->unPayOrder += 1;
         $shop->cancelOrder -= 1;
@@ -1412,7 +1412,7 @@ class OrderClass extends BaseClass
         $shopId = $orderInfo->shopId ?? 0;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('打印失败,没有找到门店');
+            util::fail('打印失败,没有找到门店9');
         }
         $sjId = $shop->sjId ?? 0;
         $fontSizeType = $shop->fontSize ?? 0;
@@ -1692,7 +1692,7 @@ class OrderClass extends BaseClass
         $shopId = $orderInfo['shopId'] ?? 0;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('打印失败,没有找到门店');
+            util::fail('打印失败,没有找到门店10');
         }
         $sjId = $shop->sjId ?? 0;
         $fontSizeType = $shop->fontSize ?? 0;
@@ -2071,7 +2071,7 @@ class OrderClass extends BaseClass
         $shopId = $order->shopId;
         $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店11');
         }
         $shop->unSendOrder -= 1;
         $shop->sendingOrder += 1;
@@ -2150,7 +2150,7 @@ class OrderClass extends BaseClass
         $shopId = $info->shopId;
         $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店12');
         }
         $shop->unSendOrder -= 1;
         $shop->sendingOrder += 1;
@@ -2213,7 +2213,7 @@ class OrderClass extends BaseClass
         $shopId = $order->shopId;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店13');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);

+ 4 - 4
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -512,7 +512,7 @@ class PurchaseOrderClass extends BaseClass
         $adminId = $data['adminId'] ?? 0;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店26');
         }
         $ghsName = $cg->ghsName ?? '';
         $itemList = PurchaseOrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
@@ -719,7 +719,7 @@ class PurchaseOrderClass extends BaseClass
         $ghsShopId = $ghs->shopId;
         $ghsShop = ShopClass::getLockById($ghsShopId);
         if (empty($ghsShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店27');
         }
         $ghsMainId = $ghsShop->mainId ?? 0;
         $ghsMain = \bizGhs\shop\classes\MainClass::getLockById($ghsMainId);
@@ -967,7 +967,7 @@ class PurchaseOrderClass extends BaseClass
 
             $shop = ShopClass::getLockById($shopId);
             if (empty($shop)) {
-                util::fail('没有找到门店');
+                util::fail('没有找到门店28');
             }
 
             //组装详情表数据
@@ -1177,7 +1177,7 @@ class PurchaseOrderClass extends BaseClass
                 $ghsShopId = $ghs->shopId;
                 $ghsShop = ShopClass::getLockById($ghsShopId);
                 if (empty($ghsShop)) {
-                    util::fail('没有找到门店');
+                    util::fail('没有找到门店29');
                 }
                 $ghsMainId = $ghsShop->mainId ?? 0;
                 $ghsMain = \bizGhs\shop\classes\MainClass::getLockById($ghsMainId);

+ 1 - 1
biz-ghs/order/classes/RefundOrderClass.php

@@ -198,7 +198,7 @@ class RefundOrderClass extends BaseClass
 
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店73');
         }
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {

+ 2 - 2
biz-ghs/order/services/OrderSendService.php

@@ -98,7 +98,7 @@ class OrderSendService extends BaseService
 //        $shopId = $data['shopId'];
 //        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
 //        if (empty($shop)) {
-//            util::fail('没有找到门店');
+//            util::fail('没有找到门店74');
 //        }
 //        $shop->unSendOrder -= 1;
 //        $shop->sendingOrder += 1;
@@ -131,7 +131,7 @@ class OrderSendService extends BaseService
 //        $shopId = $order['shopId'] ?? 0;
 //        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
 //        if (empty($shop)) {
-//            util::fail('没有找到门店');
+//            util::fail('没有找到门店75');
 //        }
 //        OrderClass::complete($currentOrder, $shop, OrderClass::TOTAL_FLOW);
 //    }

+ 3 - 3
biz-ghs/order/services/OrderService.php

@@ -428,7 +428,7 @@ class OrderService extends BaseService
         $shopId = $order->shopId ?? 0;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店3');
         }
         $shop->unSendOrder -= 1;
         $shop->sendingOrder += 1;
@@ -471,7 +471,7 @@ class OrderService extends BaseService
         $shopId = $order->shopId ?? 0;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店4');
         }
 
         //订单完成
@@ -749,7 +749,7 @@ class OrderService extends BaseService
         $book = $order->book ?? 0;
         $shop = ShopClass::getLockById($currentShopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店5');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);

+ 1 - 1
biz-ghs/product/classes/ProductClass.php

@@ -1092,7 +1092,7 @@ class ProductClass extends BaseClass
 
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店24');
         }
 
         if (count($productData) !== count($itemIds)) {

+ 1 - 1
biz-ghs/recharge/classes/RechargeClass.php

@@ -38,7 +38,7 @@ class RechargeClass extends BaseClass
         $shopId = $recharge->shopId;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            noticeUtil::push("充值支付回调通知,没有找到门店 orderSn:{$orderSn}");
+            noticeUtil::push("充值支付回调通知,没有找到门店79 orderSn:{$orderSn}");
             return false;
         }
         $amount = $recharge->amount;

+ 1 - 1
biz-ghs/shop/classes/ShopAdminClass.php

@@ -51,7 +51,7 @@ class ShopAdminClass extends BaseClass
         }
         $shop = ShopClass::getById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店25');
         }
         $avatar = $admin['avatar'] ?? '';
         $adminId = $admin['id'] ?? 0;

+ 1 - 1
biz-ghs/shop/services/ShopAdminService.php

@@ -65,7 +65,7 @@ class ShopAdminService extends BaseService
         }
         $shop = ShopClass::getById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店72');
         }
         $sjId = $shop['sjId'] ?? 0;
         $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId], true);

+ 1 - 1
biz-hd/admin/services/ShopAdminService.php

@@ -65,7 +65,7 @@ class ShopAdminService extends BaseService
         }
         $shop = ShopClass::getById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店52');
         }
 
         $sjId = $shop['sjId'] ?? 0;

+ 1 - 1
biz-hd/cg/classes/CgRefundClass.php

@@ -71,7 +71,7 @@ class CgRefundClass extends BaseClass
         }
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店14');
         }
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {

+ 1 - 1
biz-hd/cg/services/CgRefundService.php

@@ -138,7 +138,7 @@ class CgRefundService extends BaseService
         }
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店47');
         }
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {

+ 1 - 1
biz-hd/goods/classes/GoodsClass.php

@@ -249,7 +249,7 @@ class GoodsClass extends BaseClass
         //总支出增加
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店53');
         }
         $currentCg = bcadd($main->totalPurchase, $orderPrice, 2);
         $main->totalPurchase = $currentCg;

+ 2 - 2
biz-hd/order/classes/OrderClass.php

@@ -104,7 +104,7 @@ class OrderClass extends BaseClass
         //累计订单增加
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店信息');
+            util::fail('没有找到门店信息54');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
@@ -288,7 +288,7 @@ class OrderClass extends BaseClass
         $shopId = $order->shopId;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店55');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);

+ 1 - 1
biz-hd/order/services/OrderSendService.php

@@ -105,7 +105,7 @@ class OrderSendService extends BaseService
         $shopId = $order['shopId'] ?? 0;
         $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店56');
         }
         $shop->unSendOrder -= 1;
         $shop->sendingOrder += 1;

+ 4 - 4
biz-hd/purchase/classes/PurchaseClass.php

@@ -957,7 +957,7 @@ class PurchaseClass extends BaseClass
 
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店59');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
@@ -1101,7 +1101,7 @@ class PurchaseClass extends BaseClass
         $orderSn = $purchase->orderSn ?? '';
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店60');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
@@ -1209,7 +1209,7 @@ class PurchaseClass extends BaseClass
         $shopId = $purchase->shopId;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店61');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
@@ -1253,7 +1253,7 @@ class PurchaseClass extends BaseClass
         $shopId = $purchase->shopId;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店62');
         }
         $shop->cgUnSend -= 1;
         $shop->cgSending += 1;

+ 1 - 1
biz-hd/purchase/services/PurchaseService.php

@@ -372,7 +372,7 @@ class PurchaseService extends BaseService
         $shopId = $info['shopId'] ?? 0;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店63');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);

+ 2 - 2
biz-hd/px/classes/PxApplyClass.php

@@ -76,8 +76,8 @@ class PxApplyClass extends BaseClass
         $shopId = $order->shopId;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            Yii::info("没有找到门店 PxApplyClass::complete() orderId:{$order->id}");
-            util::fail('没有找到门店');
+            Yii::info("没有找到门店48 PxApplyClass::complete() orderId:{$order->id}");
+            util::fail('没有找到门店49');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);

+ 1 - 1
biz-hd/refund/services/HdRefundService.php

@@ -206,7 +206,7 @@ class HdRefundService extends BaseService
             util::fail('main信息缺失');
         }
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店58');
         }
         //总支出增加
         $currentTotalExpend = bcadd($main->totalExpend, $refundPrice, 2);

+ 1 - 1
biz-hd/shop/classes/ShopClass.php

@@ -128,7 +128,7 @@ class ShopClass extends BaseClass
         $defaultShopId = $sj['defaultShopId'] ?? 0;
         $defaultShop = self::getById($defaultShopId, true);
         if (empty($defaultShop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店50');
         }
         $oldMainId = $defaultShop->mainId ?? 0;
         if (empty($oldMainId)) {

+ 1 - 1
biz-hd/staff/classes/StaffClass.php

@@ -71,7 +71,7 @@ class StaffClass extends BaseClass
         }
         $shop = ShopClass::getById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店57');
         }
         $avatar = $admin['avatar'] ?? '';
         $adminId = $admin['id'] ?? 0;

+ 1 - 1
biz-hd/work/classes/WorkItemClass.php

@@ -182,7 +182,7 @@ class WorkItemClass extends BaseClass
 
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店51');
         }
         $stockModel = $shop->stockModel ?? 0;
 

+ 1 - 1
biz-mall/admin/services/ShopAdminService.php

@@ -46,7 +46,7 @@ class ShopAdminService extends BaseService
         $bindData = ShopAdminClass::getBindAdminData($shopId, $recommendAdminId);
         $shop = ShopClass::getById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店83');
         }
         $sjId = isset($shop['sjId']) ? $shop['sjId'] : 0;
         if (empty($bindData)) {

+ 1 - 1
biz-mall/message/classes/InformAdminClass.php

@@ -246,7 +246,7 @@ class InformAdminClass extends BaseClass
         $informWay = $data['informWay'];
         $shopAdminId = isset($data['shopAdminId']) ? $data['shopAdminId'] : 0;
         if (empty($shopAdminId)) {
-            echo "\n 没有找到门店管理员 \n";
+            echo "\n 没有找到门店管理员87 \n";
             util::end();
         }
         $shopAdmin = ShopAdminClass::getById($shopAdminId);

+ 1 - 1
biz-mall/order/classes/OrderClass.php

@@ -135,7 +135,7 @@ class OrderClass extends BaseClass
         $shopId = $data['shopId'] ?? 0;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店85');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);

+ 1 - 1
biz-mall/order/services/OrderService.php

@@ -34,7 +34,7 @@ class OrderService extends BaseService
         $mainId = $data['mainId'] ?? 0;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店86');
         }
         $customId = 0;
         $hdId = 0;

+ 1 - 1
biz/shop/services/ShopAdminService.php

@@ -47,7 +47,7 @@ class ShopAdminService extends BaseService
         $bindData = ShopAdminClass::getBindAdminData($shopId, $recommendAdminId);
         $shop = ShopClass::getById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店2');
         }
         $sjId = isset($shop['sjId']) ? $shop['sjId'] : 0;
         if (empty($bindData)) {

+ 1 - 1
biz/sj/classes/CashClass.php

@@ -62,7 +62,7 @@ class CashClass extends BaseClass
         $shopId = $params['shopId'] ?? 0;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shopId)) {
-            util::fail('没有找到门店');
+            util::fail('没有找到门店1');
         }
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);

+ 1 - 1
common/services/xhPayToolService.php

@@ -79,7 +79,7 @@ class xhPayToolService
         $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
 
         if (empty($shop)) {
-            Yii::warning('支付第三方回调通知,capitalType:' . $capitalType . ' orderSn:' . $orderSn . " 没有找到门店");
+            Yii::warning('支付第三方回调通知,capitalType:' . $capitalType . ' orderSn:' . $orderSn . " 没有找到门店64");
             util::end();
         }
 

+ 2 - 2
console/controllers/CashController.php

@@ -31,7 +31,7 @@ class CashController extends Controller
                 $orderSn = $cash->orderSn ?? '';
                 $shop = ShopClass::getLockById($shopId);
                 if (empty($shop)) {
-                    noticeUtil::push("提现审核失败,没有找到门店,orderSn:" . $orderSn, '15280215347');
+                    noticeUtil::push("提现审核失败,没有找到门店77,orderSn:" . $orderSn, '15280215347');
                     continue;
                 }
                 $mainId = $shop->mainId ?? 0;
@@ -100,7 +100,7 @@ class CashController extends Controller
                 $shop = ShopClass::getByCondition(['mainId' => $mainId], true);
                 if (empty($shop)) {
                     $transaction->rollBack();
-                    noticeUtil::push("提现申请失败,没有找到门店,mainId:" . $mainId, '15280215347');
+                    noticeUtil::push("提现申请失败,没有找到门店78,mainId:" . $mainId, '15280215347');
                     continue;
                 }
                 $shopAdmin = ShopAdminClass::getByCondition(['mainId' => $mainId], true);

+ 1 - 1
console/controllers/CpController.php

@@ -61,7 +61,7 @@ class CpController extends Controller
         $shopList = ShopClass::getAllByCondition(['ptStyle' => 2], null, '*', null, true);
         //$shopList = ShopClass::getAllByCondition(['id' => 36523], null, '*', null, true);
         if (empty($shopList)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店84');
         }
         foreach ($shopList as $shop) {
             $mainId = $shop->mainId;

+ 2 - 2
console/controllers/MtController.php

@@ -32,11 +32,11 @@ class MtController extends Controller
         }
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
         if (empty($ext)) {
-            util::stop('没有找到门店相信息');
+            util::stop('没有找到门店相信息81');
         }
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店');
+            util::stop('没有找到门店82');
         }
         $mainId = $shop->mainId ?? 0;
         $sjId = $shop->sjId ?? 0;