更新项目部分结构，新增加DB

admin/models/Admin.php

@@ -3,10 +3,7 @@
 namespace admin\models;
 
 use common\enums\StatusEnum;
-use common\models\AdminAccessToken;
-use common\models\Region;
-use common\models\Role;
-use common\models\Store;
+use common\models\oldDb\Region;
 use Yii;
 use yii\web\IdentityInterface;
 
@@ -27,7 +24,7 @@ use yii\web\IdentityInterface;
  * @property integer $status
  * @property integer $is_sub
  */
-class Admin extends \common\modelsgii\Admin implements IdentityInterface
+class Admin extends \common\modelsgii\oldDb\Admin implements IdentityInterface
 {
     const STATUS_DELETED = 0;
     const STATUS_ACTIVE  = 1;
@@ -51,7 +48,7 @@ class Admin extends \common\modelsgii\Admin implements IdentityInterface
      */
     public static function findIdentityByAccessToken($token, $type = null)
     {
-        $adminAccessToken = AdminAccessToken::findOne(['access_token' => $token, 'status' => StatusEnum::ACTIVE]);
+        $adminAccessToken = \common\models\oldDb\AdminAccessToken::findOne(['access_token' => $token, 'status' => StatusEnum::ACTIVE]);
         if($adminAccessToken){
             return self::findIdentity($adminAccessToken->admin_id);
         }
@@ -187,16 +184,16 @@ class Admin extends \common\modelsgii\Admin implements IdentityInterface
 
     public function getStore()
     {
-    return $this->hasOne(Store::class,['id'=>'store_id']);
+    return $this->hasOne(\common\models\oldDb\Store::class,['id'=>'store_id']);
     }
 
     public function getRoles()
     {
-        return $this->hasOne(Role::class,['id'=>'role']);
+        return $this->hasOne(\common\models\oldDb\Role::class,['id'=>'role']);
     }
     public function getProvince()
     {
-        return $this->hasOne(Region::class,['id'=>'province_id']);
+        return $this->hasOne(\common\models\oldDb\Region::class,['id'=>'province_id']);
     }
     public function getCity()
     {

admin/models/Config.php

@@ -2,10 +2,8 @@
 
 namespace admin\models;
 
-use Yii;
 
-
-class Config extends \common\modelsgii\Config
+class Config extends \common\modelsgii\oldDb\Config
 {
     /**
      * @inheritdoc

admin/models/Menu.php

@@ -2,9 +2,6 @@
 
 namespace admin\models;
 
-use Yii;
-use common\helpers\ArrayHelper;
-
-class Menu extends \common\models\Menu
+class Menu extends \common\models\oldDb\Menu
 {
 }

admin/models/Page.php

@@ -2,14 +2,12 @@
 
 namespace admin\models;
 
-use Yii;
-
 /*
  * ---------------------------------------
  * 文章模型
  * ---------------------------------------
  */
-class Page extends \common\modelsgii\Page
+class Page extends \common\modelsgii\oldDb\Page
 {
     /**
      * @inheritdoc

admin/models/RegisterForm.php

@@ -5,11 +5,8 @@ namespace admin\models;
 use common\core\BaseModel;
 use common\enums\UserRoleEnum;
 use common\helpers\FuncHelper;
-use common\models\AdminAccessToken;
-use common\models\CashAccount;
-use common\models\Log;
-use common\models\Region;
-use common\models\Store;
+use common\models\oldDb\CashAccount;
+use common\models\oldDb\Log;
 use common\validators\MobileValidator;
 use yii\db\Exception;
 use yii\helpers\Json;
@@ -89,7 +86,7 @@ class RegisterForm extends BaseModel
 
         if ($this->role == UserRoleEnum::STORE_ADMIN) {
             if (empty($this->store_id)) throw new Exception('门店不能为空');
-            $store=Store::find()->where(['id'=>$this->store_id])->one();
+            $store= \common\models\oldDb\Store::find()->where(['id'=>$this->store_id])->one();
             if (!$store){
                 throw new Exception('门店不存在!!');
             }
@@ -121,7 +118,7 @@ class RegisterForm extends BaseModel
 
             if ($this->role == UserRoleEnum::SUPER_ADMIN) {
                 //可提现账户表
-                $CashAccount = new CashAccount();
+                $CashAccount = new \common\models\oldDb\CashAccount();
                 $CashAccount->user_id = 0;
                 $CashAccount->user_type = 2;//平台
                 $CashAccount->total_cash = 0;//累计收益
@@ -133,7 +130,7 @@ class RegisterForm extends BaseModel
                 $CashAccount->last_apply_time = date('Y-m-d H:i:s', time());
                 $CashAccount->saveOrFail();
 
-                $log = new Log();
+                $log = new \common\models\oldDb\Log();
                 $log->admin_id = $model->attributes['uid'];
                 $log->operate_time = date('Y-m-d H:i:s', time());
                 $log->type = '用户注册';
@@ -169,7 +166,7 @@ class RegisterForm extends BaseModel
 
             }
 
-            $token = AdminAccessToken::createToken($model->id, 'admin');
+            $token = \common\models\oldDb\AdminAccessToken::createToken($model->id, 'admin');
             $t->commit();
 
             return [
@@ -186,7 +183,7 @@ class RegisterForm extends BaseModel
     {
         $admin = \Yii::$app->user->identity;
 
-        $Store = Store::find()->where(['id' => $this->store_id])->one();
+        $Store = \common\models\oldDb\Store::find()->where(['id' => $this->store_id])->one();
         if (!$Store) throw new Exception('诊所不存在');
 
         if (!empty($this->bank_account_type)){

admin/models/forms/AttachmentUpload.php

@@ -2,7 +2,7 @@
 
 namespace admin\models\forms;
 
-use common\models\Attachment;
+use common\models\oldDb\Attachment;
 use OSS\OssClient;
 use yii\web\UploadedFile;
 

admin/models/forms/FreeRuleEditForm.php

@@ -1,7 +1,7 @@
 <?php
 namespace admin\models\forms;
 use admin\exceptions\ApiException;
-use common\models\FreeDeliveryRules;
+use common\models\oldDb\FreeDeliveryRules;
 use yii\base\Model;
 
 /**
@@ -12,7 +12,7 @@ use yii\base\Model;
  */
 
 /**
- * @property FreeDeliveryRules $model
+ * @property \common\models\oldDb\FreeDeliveryRules $model
  */
 class FreeRuleEditForm extends Model
 {

admin/models/forms/HospitalDocForm.php

@@ -4,12 +4,11 @@ namespace admin\models\forms;
 
 use common\core\BaseModel;
 use common\enums\UserRoleEnum;
-use common\models\DoctorApply;
-use common\models\DoctorPatient;
-use common\models\ServiceUser;
-use common\models\StoreDoctor;
+use common\models\oldDb\DoctorApply;
+use common\models\oldDb\DoctorPatient;
+use common\models\oldDb\ServiceUser;
+use common\models\oldDb\StoreDoctor;
 use GuzzleHttp\Client;
-use linslin\yii2\curl\Curl;
 use yii\db\Exception;
 
 class HospitalDocForm extends BaseModel

admin/models/forms/LoginForm.php

@@ -3,9 +3,8 @@
 namespace admin\models\forms;
 
 use admin\models\Admin;
-use common\models\AdminAccessToken;
-use Yii;
 use common\core\BaseModel;
+use common\models\oldDb\AdminAccessToken;
 use common\validators\MobieValidator;
 use yii\db\Exception;
 

admin/models/forms/PostageRulesEditForm.php

@@ -1,7 +1,7 @@
 <?php
 namespace admin\models\forms;
 use admin\exceptions\ApiException;
-use common\models\PostageRules;
+use common\models\oldDb\PostageRules;
 use yii\base\Model;
 
 /**

admin/models/forms/RefundAddressEditForm.php

@@ -7,10 +7,8 @@
  */
 
 namespace admin\models\forms;
-use admin\exceptions\ApiException;
-use common\models\DistrictArr;
-use common\models\RefundAddress;
-use yii\base\Model;
+use common\models\oldDb\DistrictArr;
+use common\models\oldDb\RefundAddress;
 
 class RefundAddressEditForm extends RefundAddress
 {

admin/models/forms/drug/AgreeForm.php

@@ -3,7 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\BaseConfig;
+use common\models\oldDb\BaseConfig;
 use yii\db\Exception;
 
 //协议Form

admin/models/forms/drug/ArticleForm.php

@@ -3,7 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\DoctorArticle;
+use common\models\oldDb\DoctorArticle;
 use yii\db\Exception;
 
 //文章Form

admin/models/forms/drug/ChineseForm.php

@@ -3,7 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\Drug;
+use common\models\oldDb\Drug;
 use yii\db\Exception;
 
 //中药饮片form

admin/models/forms/drug/DepartForm.php

@@ -2,18 +2,13 @@
 
 namespace admin\models\forms\drug;
 
-use admin\controllers\StoreController;
 use admin\models\Admin;
 use common\core\BaseModel;
 use common\enums\UserRoleEnum;
-use common\models\CashAccount;
-use common\models\Department;
-use common\models\Hospital;
-use common\models\Log;
-use common\models\Store;
+use common\models\oldDb\Department;
+use common\models\oldDb\Store;
 use common\services\WeappService;
 use yii\db\Exception;
-use yii\helpers\Json;
 
 //科室form
 class DepartForm extends BaseModel

admin/models/forms/drug/DiagnoseForm.php

@@ -8,8 +8,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-
-use common\modelsgii\Disease;
+use common\modelsgii\oldDb\Disease;
 use Overtrue\Pinyin\Pinyin;
 use yii\db\Exception;
 

admin/models/forms/drug/DrugCategoryForm.php

@@ -3,7 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\DrugCategories;
+use common\models\oldDb\DrugCategories;
 use yii\db\Exception;
 
 class DrugCategoryForm  extends BaseModel

admin/models/forms/drug/DrugForm.php

@@ -3,7 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\Drug;
+use common\models\oldDb\Drug;
 use yii\db\Exception;
 
 class DrugForm extends BaseModel

admin/models/forms/drug/GranularForm.php

@@ -3,8 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\Drug;
-use common\models\DrugStoreDrug;
+use common\models\oldDb\Drug;
 use yii\db\Exception;
 
 //颗粒配方form

admin/models/forms/drug/ImportForm.php

@@ -4,10 +4,10 @@ namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
 use common\helpers\ArrayHelper;
-use common\models\Drug;
-use common\models\DrugStoreDrug;
-use common\models\DrugStoreRelations;
-use common\models\Platform;
+use common\models\oldDb\Drug;
+use common\models\oldDb\DrugStoreDrug;
+use common\models\oldDb\DrugStoreRelations;
+use common\models\oldDb\Platform;
 use Overtrue\Pinyin\Pinyin;
 use yii\db\Exception;
 

admin/models/forms/drug/NavForm.php

@@ -3,7 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\Nav;
+use common\models\oldDb\Nav;
 use yii\db\Exception;
 
 class NavForm extends BaseModel

admin/models/forms/drug/ServerForm.php

@@ -3,8 +3,7 @@
 namespace admin\models\forms\drug;
 
 use common\core\BaseModel;
-use common\models\Drug;
-use common\models\DrugStoreDrug;
+use common\models\oldDb\Drug;
 use yii\db\Exception;
 
 //颗粒配方form

admin/models/forms/statistics/DataForm.php

@@ -4,10 +4,10 @@ namespace admin\models\forms\statistics;
 use admin\exceptions\ApiException;
 use common\models\Goods;
 use common\models\GoodsWarehouse;
-use common\models\Order;
+use common\models\oldDb\Order;
+use common\models\oldDb\OrderRefund;
+use common\models\oldDb\User;
 use common\models\OrderDetail;
-use common\models\OrderRefund;
-use common\models\User;
 use yii\base\Model;
 
 class DataForm extends Model

admin/models/forms/statistics/ServiceDataForm.php

@@ -5,12 +5,8 @@ use admin\exceptions\ApiException;
 use admin\models\forms\export\CommonExport;
 use common\models\Goods;
 use common\models\GoodsWarehouse;
-use common\models\ImMessage;
-use common\models\ImMessageSession;
-use common\models\Order;
+use common\models\oldDb\ImMessageSession;
 use common\models\OrderDetail;
-use common\models\OrderRefund;
-use common\models\User;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 

admin/models/search/AdminSearch.php

@@ -2,12 +2,10 @@
 
 namespace admin\models\search;
 
-use common\modelsgii\AuthItem;
-use Yii;
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
 use admin\models\Admin;
 use common\modelsgii\AuthAssignment;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
 
 /**
  * AdminSearch represents the model behind the search form about `backend\models\Admin`.

admin/models/search/MenuSearch.php

@@ -2,13 +2,13 @@
 
 namespace admin\models\search;
 
+use common\modelsgii\oldDb\Menu;
 use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
-use common\modelsgii\Menu;
 
 /**
- * MenuSearch represents the model behind the search form about `common\models\Menu`.
+ * MenuSearch represents the model behind the search form about `common\models\oldDb\Menu`.
  */
 class MenuSearch extends Menu
 {