shish пре 3 година
родитељ
комит
18da445a40
2 измењених фајлова са 14 додато и 9 уклоњено
  1. 11 5
      app-pt/controllers/ShopController.php
  2. 3 4
      biz-hd/staff/classes/StaffClass.php

+ 11 - 5
app-pt/controllers/ShopController.php

@@ -4,7 +4,9 @@ namespace pt\controllers;
 
 use biz\admin\classes\AdminRoleClass;
 use biz\shop\classes\ShopClass;
+use bizGhs\shop\classes\ShopAdminClass;
 use bizHd\merchant\services\ShopService;
+use bizHd\staff\classes\StaffClass;
 use common\components\dict;
 use common\components\stringUtil;
 use common\components\util;
@@ -27,10 +29,6 @@ class ShopController extends BaseController
             util::fail('没有找到门店');
         }
         $ptStyle = $shop->ptStyle ?? 1;
-        if ($ptStyle != 2) {
-            util::fail('请在择批发店添加员工');
-        }
-
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
@@ -47,7 +45,15 @@ class ShopController extends BaseController
             $roleId = $role->id ?? 0;
 
             $addData = ['shopId' => $shopId, 'mobile' => $mobile, 'super' => $super, 'remind' => 1, 'roleId' => $roleId];
-            $respond = \bizGhs\shop\classes\ShopAdminClass::appGenerateStaff($addData, $admin);
+
+            $respond = [];
+            if ($ptStyle == 2) {
+                $respond = ShopAdminClass::appGenerateStaff($addData, $admin);
+            } elseif ($ptStyle == 1) {
+                $respond = StaffClass::appGenerateStaff($addData, $admin);
+            } else {
+                util::fail('不存在的平台');
+            }
 
             $transaction->commit();
             util::success($respond);

+ 3 - 4
biz-hd/staff/classes/StaffClass.php

@@ -73,12 +73,8 @@ class StaffClass extends BaseClass
         if (empty($shop)) {
             util::fail('没有找到门店');
         }
-        $sjName = $shop['merchantName'] ?? '';
-
         $avatar = $admin['avatar'] ?? '';
         $adminId = $admin['id'] ?? 0;
-
-        //sms::freeSend($mobile . ',' . $sjName, '欢迎加入{$var}大家庭');
         $mainId = $shop['mainId'] ?? 0;
         $shopAdmin = self::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
         if (!empty($shopAdmin)) {
@@ -111,6 +107,9 @@ class StaffClass extends BaseClass
             AdminRoleClass::counters(['num' => 1], ['id' => $roleId]);
         }
         $update = ['currentShopId' => $shopId];
+        $shop = ShopClass::getById($shopId, true);
+        $pfShopId = $shop->pfShopId ?? 0;
+        $update['currentGhsShopId'] = $pfShopId;
         AdminClass::updateById($adminId, $update);
         return $shopAdmin;
     }