员工身份

app-ghs/controllers/AuthController.php

@@ -203,7 +203,7 @@ class AuthController extends PublicController
         $userSource = UserClass::$userSourceId['mini']['name'];
         $admin = AdminService::getByMiniOpenId($openid);
         if (empty($admin)) {
-            $adminInfo = ['miniOpenId' => $openid];
+            $adminInfo = ['miniOpenId' => $openid, 'style' => 2];
             $admin = AdminService::replaceAdmin($adminInfo, $userSource);
         }
         $adminId = $admin['id'];

app-hd/controllers/AuthController.php

@@ -201,7 +201,7 @@ class AuthController extends PublicController
         $userSource = UserClass::$userSourceId['mini']['name'];
         $admin = AdminService::getByMiniOpenId($openid);
         if (empty($admin)) {
-            $adminInfo = ['miniOpenId' => $openid];
+            $adminInfo = ['miniOpenId' => $openid, 'style' => 1];
             $admin = AdminService::replaceAdmin($adminInfo, $userSource);
             $adminId = $admin['id'];
         } else {

app-hd/controllers/RechargeController.php

@@ -2,8 +2,8 @@
 
 namespace hd\controllers;
 
-use biz\sj\classes\MerchantClass;
 use biz\recharge\classes\RechargeClass;
+use biz\sj\classes\SjClass;
 use bizHd\wx\classes\WxOpenClass;
 use common\components\dict;
 use common\components\httpUtil;

sql.sql

@@ -2084,4 +2084,5 @@ ALTER TABLE xhGhsOrder ADD `sendTimeWant` DATETIME NOT NULL DEFAULT '0000-00-00
 ALTER TABLE xhOrderExpress DROP COLUMN `sendTime`;
 ALTER TABLE xhOrderExpress ADD `sendTime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '实际配送时间' AFTER `tip`;
 ALTER TABLE xhOrderExpress ADD `sendTimeWant` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '客户要求的发货时间' AFTER `sendTime`;
-ALTER TABLE xhApply CHANGE `avatar` `logo` VARCHAR(800) NOT NULL DEFAULT '' COMMENT '商家头像';
+ALTER TABLE xhApply CHANGE `avatar` `logo` VARCHAR(800) NOT NULL DEFAULT '' COMMENT '商家头像';
+ALTER TABLE xhAdmin DROP COLUMN `identity`;