Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-hd/controllers/PurchaseController.php

@@ -2,6 +2,7 @@
 
 namespace hd\controllers;
 
+use biz\admin\classes\AdminClass;
 use biz\ghs\classes\GhsClass;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\purchase\services\PurchaseService;
@@ -76,7 +77,8 @@ class PurchaseController extends BaseController
         $get = Yii::$app->request->get();
         $orderSn = $get['orderSn'] ?? 0;
         $password = $get['password'] ?? '';
-        $admin = $this->admin;
+        // 重新获取，不加密的用户数据
+        $admin = AdminClass::getById($this->adminId);
         if (password_verify($password, $admin['payPassword']) == false) {
             util::fail('密码错误');
         }

biz-ghs/shop/services/ShopAdminService.php

@@ -77,6 +77,8 @@ class ShopAdminService extends BaseService
 
                 $update = ['name' => $name, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark, 'currentShopId' => $shopId];
                 AdminClass::updateById($adminId, $update);
+                // 员工数+1
+                AdminRoleClass::counters(['num' => 1], ['id' => $roleId]);
 
                 return $shopAdmin->attributes;
             }
@@ -105,7 +107,11 @@ class ShopAdminService extends BaseService
             'name' => $name,
         ];
         ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
-        return ShopAdminClass::add($addData);
+        $result = ShopAdminClass::add($addData);
+        // 员工数+1
+        AdminRoleClass::counters(['num' => 1], ['id' => $roleId]);
+
+        return $result;
     }
 
     //获取管理员 ssh 2020.4.21

biz/shop/classes/ShopAdminClass.php

@@ -206,6 +206,9 @@ class ShopAdminClass extends BaseClass
             }
             $admin->save();
         }
+
+        // 员工数-1
+        AdminRoleClass::counters(['num' => -1], ['id' => $relation->roleId]);
     }
 
 }