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

admin/components/BaseAdminController.php

@@ -2,33 +2,27 @@
 
 namespace admin\components;
 
-use admin\behaviors\PageFilterBehavior;
 use admin\components\UI\Event;
 use admin\foundation\Cors;
 use admin\models\Admin;
 use admin\models\Config;
 use common\helpers\FakeId;
-use common\models\AdminAccessToken;
-use common\models\AuthRole;
-use common\models\AuthRule;
+use common\models\oldDb\AdminAccessToken;
+use common\models\oldDb\AuthRole;
+use common\models\oldDb\AuthRule;
 use Yii;
 use yii\base\Arrayable;
+use yii\base\Controller;
 use yii\base\DynamicModel;
 use yii\base\InvalidArgumentException;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use yii\data\DataProviderInterface;
-use yii\data\Pagination;
-use yii\db\ActiveRecord;
 use yii\db\Exception;
 use yii\filters\auth\HttpBearerAuth;
 use yii\helpers\ArrayHelper;
-use yii\rest\ActiveController;
-use common\core\TokenAuth;
-use yii\base\Controller;
 use yii\web\Response;
 use yii\web\UnauthorizedHttpException;
-use function Symfony\Component\String\b;
 
 /**
  * 这里注意是继承 yii\rest\ActiveController 因为源码中已经帮我们实现了index/update等方法

admin/controllers/AdminController.php

@@ -3,16 +3,14 @@
 namespace admin\controllers;
 
 use admin\components\BaseAdminController;
+use admin\models\Admin;
 use admin\models\Menu;
 use common\enums\UserRoleEnum;
 use common\helpers\ArrayHelper;
-use common\models\SubAccountMenu;
-use common\modelsgii\RoleMenu;
+use common\models\oldDb\SubAccountMenu;
+use common\modelsgii\oldDb\RoleMenu;
 use Yii;
-use admin\models\Admin;
-use admin\models\search\AdminSearch;
 use yii\base\Exception;
-use yii\web\ForbiddenHttpException;
 
 /**
  * 后台用户控制器

admin/controllers/AttachmentController.php

@@ -3,7 +3,7 @@
 namespace admin\controllers;
 
 use admin\components\BaseAdminController;
-use common\models\Attachment;
+use common\models\oldDb\Attachment;
 use common\services\UploadService;
 
 /**

admin/controllers/AuthController.php

@@ -6,9 +6,9 @@ use admin\components\BaseAdminController;
 use admin\models\Admin;
 use common\enums\UserRoleEnum;
 use common\helpers\ArrayHelper;
-use common\models\AuthRole;
-use common\models\AuthRule;
-use common\models\Role;
+use common\models\oldDb\AuthRole;
+use common\models\oldDb\AuthRule;
+use common\models\oldDb\Role;
 use yii\db\Exception;
 use yii\web\ForbiddenHttpException;
 

admin/controllers/LoginController.php

@@ -5,14 +5,14 @@ namespace admin\controllers;
 use admin\models\Admin;
 use admin\models\forms\LoginForm;
 use admin\models\RegisterForm;
+use common\core\BaseAdminController;
 use common\enums\UserRoleEnum;
 use common\helpers\ArrayHelper;
-use common\models\AdminAccessToken;
-use common\models\Role;
-use common\models\Store;
+use common\models\oldDb\AdminAccessToken;
+use common\models\oldDb\Role;
+use common\models\oldDb\Store;
 use Yii;
 use yii\base\Exception;
-use common\core\BaseAdminController;
 
 class LoginController extends BaseAdminController
 {

admin/controllers/MenuController.php

@@ -3,9 +3,9 @@
 namespace admin\controllers;
 
 use common\helpers\ArrayHelper;
-use common\models\AuthRole;
-use common\models\AuthRule;
-use common\models\Menu;
+use common\models\oldDb\AuthRole;
+use common\models\oldDb\AuthRule;
+use common\models\oldDb\Menu;
 use yii\base\Exception;
 
 /**

admin/controllers/PublicController.php

@@ -2,10 +2,10 @@
 
 namespace admin\controllers;
 
+use common\modelsgii\oldDb\Region;
+use kartik\depdrop\DepDropAction;
 use Yii;
 use yii\helpers\ArrayHelper;
-use common\modelsgii\Region;
-use kartik\depdrop\DepDropAction;
 
 /**
  * 公共调用处理

admin/controllers/StoreController.php

@@ -3,11 +3,8 @@
 namespace admin\controllers;
 
 use common\core\BaseController;
-use common\helpers\FuncHelper;
-use common\models\Store;
-use common\services\UploadService;
+use common\models\oldDb\Store;
 use common\services\WeappService;
-use common\services\WechatService;
 use yii\db\Exception;
 
 

admin/controllers/UserController.php

@@ -4,13 +4,13 @@ namespace admin\controllers;
 
 use admin\components\BaseAdminController;
 use common\helpers\FuncHelper;
-use common\models\Order;
-use common\models\Prescription;
-use common\models\Register;
-use common\models\DoctorInfo;
-use common\models\User;
-use common\models\UserPatient;
-use common\models\UserPatientHealthInquiry;
+use common\models\oldDb\DoctorInfo;
+use common\models\oldDb\Order;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\Register;
+use common\models\oldDb\User;
+use common\models\oldDb\UserPatient;
+use common\models\oldDb\UserPatientHealthInquiry;
 use yii\db\Exception;
 
 /**

admin/controllers/base/ArticleController.php

@@ -3,10 +3,9 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\ArticleForm;
-use common\models\Categories;
-use common\models\DoctorArticle;
+use common\models\oldDb\Categories;
+use common\models\oldDb\DoctorArticle;
 use yii\db\Exception;
 
 class ArticleController extends BaseAdminController

admin/controllers/base/ChargeCashController.php

@@ -3,8 +3,7 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use common\models\ChargeCashPayRecord;
-use common\models\Ledger;
+use common\models\oldDb\ChargeCashPayRecord;
 
 /**
  * @doc-module 待付

admin/controllers/base/DataController.php

@@ -3,23 +3,12 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
-use common\enums\UserRoleEnum;
-use common\jobs\SyncHospitalJob;
-use common\models\CashAccount;
-use common\models\Drug;
-use common\models\DrugStoreDrug;
-use common\models\DrugStoreRelations;
-use common\models\PrescripOrderRefund;
-use common\models\Prescription;
-use common\models\ProductOrder;
-use common\models\ProductOrderRefund;
-use common\models\Reconciliation;
-use common\models\Register;
-use common\models\Store;
-use common\models\User;
-use common\services\PlatformService;
-use linslin\yii2\curl\Curl;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\Reconciliation;
+use common\models\oldDb\Register;
+use common\models\oldDb\Store;
+use common\models\oldDb\User;
 use yii\db\ActiveRecord;
 use yii\db\Exception;
 

admin/controllers/base/DepartController.php

@@ -3,13 +3,12 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\DepartForm;
 use common\enums\UserRoleEnum;
 use common\helpers\ArrayHelper;
-use common\models\Department;
-use common\models\Platform;
-use common\models\Store;
+use common\models\oldDb\Department;
+use common\models\oldDb\Platform;
+use common\models\oldDb\Store;
 
 /**
  * @doc-module 科室与门店

admin/controllers/base/DiagnoseController.php

@@ -3,9 +3,8 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\DiagnoseForm;
-use common\modelsgii\Disease;
+use common\modelsgii\oldDb\Disease;
 use moonland\phpexcel\Excel;
 use yii\db\Exception;
 use yii\web\UploadedFile;

admin/controllers/base/DivideAccountController.php

@@ -3,24 +3,24 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\Admin;
 use common\enums\UserRoleEnum;
 use common\helpers\FuncHelper;
-use common\models\CashAccount;
-use common\models\CashApply;
-use common\models\ChargeCashPayRecord;
-use common\models\Ledger;
-use common\models\LedgerLog;
-use common\models\Log;
-use common\models\Register;
-use common\models\Store;
-use common\modelsgii\ProductOrder;
+use common\models\newDb\AdminModel;
+use common\models\oldDb\CashAccount;
+use common\models\oldDb\CashApply;
+use common\models\oldDb\ChargeCashPayRecord;
+use common\models\oldDb\Ledger;
+use common\models\oldDb\LedgerLog;
+use common\models\oldDb\Log;
+use common\models\oldDb\Register;
+use common\models\oldDb\Store;
+use common\modelsgii\oldDb\ProductOrder;
 use common\services\EplPayService;
+use common\services\ExportService;
 use yii\base\Exception;
 use yii\helpers\Json;
 use yii\web\Response;
-use common\services\ExportService;
 
 /**
  * @doc-module 分账
@@ -1043,10 +1043,16 @@ class DivideAccountController extends BaseAdminController
         return $this->create($query, $get);
     }
 
-
+    /**
+     * 获取結算订单金额
+     *
+     * @param $order_id
+     * @param $user_type
+     * @param $order_type
+     * @return bool|int|mixed|string
+     */
     public function actionTotal($order_id='',$user_type=1,$order_type='')
     {
-
         $money = Ledger::find()->alias('l')->where(['l.order_id' => $order_id, 'l.status' => [0, 1]])->andWhere(['l.user_type'=>$user_type,'l.order_type'=>$order_type])->sum('money');
         return $money ?? 0;
     }

admin/controllers/base/FinanceController.php

@@ -3,20 +3,19 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\Admin;
 use common\enums\UserRoleEnum;
 use common\forms\ProductRefundForm;
 use common\helpers\FuncHelper;
-use common\models\CashApply;
-use common\models\FundWater;
-use common\models\Ledger;
-use common\models\ProductOrder;
-use common\models\ProductOrderRefund;
-use common\models\Reconciliation;
-use common\models\Register;
-use common\models\Store;
-use common\models\SystemNotice;
+use common\models\oldDb\CashApply;
+use common\models\oldDb\FundWater;
+use common\models\oldDb\Ledger;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\ProductOrderRefund;
+use common\models\oldDb\Reconciliation;
+use common\models\oldDb\Register;
+use common\models\oldDb\Store;
+use common\models\oldDb\SystemNotice;
 use common\services\ExportService;
 use yii\db\Exception;
 use yii\web\Response;

admin/controllers/base/HomeController.php

@@ -3,23 +3,17 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
-use admin\models\User;
 use common\enums\UserRoleEnum;
-use common\jobs\SyncHospitalJob;
-use common\models\CashAccount;
-use common\models\Drug;
-use common\models\DrugStoreDrug;
-use common\models\DrugStoreRelations;
-use common\models\PrescripOrderRefund;
-use common\models\Prescription;
-use common\models\ProductOrder;
-use common\models\ProductOrderRefund;
-use common\models\Reconciliation;
-use common\models\Register;
-use common\models\Store;
-use common\services\PlatformService;
-use linslin\yii2\curl\Curl;
+use common\models\oldDb\CashAccount;
+use common\models\oldDb\Drug;
+use common\models\oldDb\DrugStoreDrug;
+use common\models\oldDb\DrugStoreRelations;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\ProductOrderRefund;
+use common\models\oldDb\Reconciliation;
+use common\models\oldDb\Register;
+use common\models\oldDb\Store;
 use yii\db\ActiveRecord;
 use yii\db\Exception;
 
@@ -36,7 +30,7 @@ class HomeController extends BaseAdminController
         $get = \Yii::$app->request->get();
         $whereTime = $this->getWhereTime($get['start_time'], $get['end_time']);
         $storeCount = Store::find()->where(['is_delete' => 0])->andWhere($whereTime);
-        $userCount = \common\models\User::find()->where($whereTime);
+        $userCount = \common\models\oldDb\User::find()->where($whereTime);
         $orderCount = ProductOrder::find()->where(['is_pay' => 1])->andWhere($whereTime);
         $totalPrice = Reconciliation::find()->where(['status' => 1])->andWhere($whereTime);
         $drugCount = Drug::find()->where($whereTime);

admin/controllers/base/NavController.php

@@ -3,10 +3,8 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\NavForm;
-use common\enums\UserRoleEnum;
-use common\models\Nav;
+use common\models\oldDb\Nav;
 use yii\db\Exception;
 
 class NavController extends BaseAdminController

admin/controllers/base/NoticeController.php

@@ -3,8 +3,7 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
-use common\models\SystemNotice;
+use common\models\oldDb\SystemNotice;
 
 /**
  * @doc-module 公告

admin/controllers/base/OrderController.php

@@ -3,21 +3,18 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
-use common\events\ProductOrderEvent;
 use common\forms\ProductCancelForm;
 use common\forms\ProductRefundForm;
 use common\helpers\FuncHelper;
-use common\jobs\ProductOrderSendJob;
-use common\models\DrugStore;
-use common\models\Prescription;
-use common\models\ProductOrder;
-use common\models\ProductOrderItems;
-use common\models\ProductOrderRefund;
-use common\models\Store;
-use common\models\SystemConfig;
-use common\models\UserPatient;
+use common\models\oldDb\DrugStore;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\ProductOrderItems;
+use common\models\oldDb\ProductOrderRefund;
+use common\models\oldDb\Store;
+use common\models\oldDb\SystemConfig;
+use common\models\oldDb\UserPatient;
 use common\services\ExportService;
 use common\services\ExpressService;
 use yii\db\Exception;

admin/controllers/base/PrescriptionController.php

@@ -3,15 +3,13 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
 use common\helpers\FuncHelper;
-use common\models\Prescription;
-use common\models\ProductOrder;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\ProductOrder;
 use common\services\ExportService;
 use yii\db\Exception;
 use yii\helpers\Json;
-use yii\web\Response;
 
 /**
  * @doc-module 处方

admin/controllers/base/RegionController.php

@@ -3,10 +3,8 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\helpers\ArrayHelper;
-use common\helpers\FuncHelper;
-use common\models\Region;
+use common\models\oldDb\Region;
 use yii\db\Exception;
 
 class RegionController extends BaseAdminController

admin/controllers/base/RegisterController.php

@@ -5,9 +5,9 @@ namespace admin\controllers\base;
 use admin\components\BaseAdminController;
 use common\enums\UserRoleEnum;
 use common\helpers\FuncHelper;
-use common\models\DoctorService;
-use common\models\Register;
-use common\models\ServiceUser;
+use common\models\oldDb\DoctorService;
+use common\models\oldDb\Register;
+use common\models\oldDb\ServiceUser;
 use yii\db\Exception;
 
 class RegisterController extends BaseAdminController

admin/controllers/base/SetController.php

@@ -3,10 +3,9 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\AgreeForm;
-use common\models\BaseConfig;
-use common\models\SystemConfig;
+use common\models\oldDb\BaseConfig;
+use common\models\oldDb\SystemConfig;
 use yii\db\Exception;
 
 /**

admin/controllers/base/StatementAccountController.php

@@ -3,21 +3,18 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
-use common\helpers\FuncHelper;
 use common\helpers\ArrayHelper;
-use common\models\DrugStoreDrug;
-use common\models\DrugStoreRelations;
-use common\models\Ledger;
-use common\models\Log;
-use common\models\Prescription;
-use common\models\ProductOrder;
-use common\models\Reconciliation;
-use common\models\Register;
-use common\models\Store;
-use common\models\StoreDoctor;
-use common\models\DoctorInfo;
+use common\helpers\FuncHelper;
+use common\models\oldDb\DoctorInfo;
+use common\models\oldDb\DrugStoreDrug;
+use common\models\oldDb\DrugStoreRelations;
+use common\models\oldDb\Ledger;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\Reconciliation;
+use common\models\oldDb\Register;
+use common\models\oldDb\Store;
+use common\models\oldDb\StoreDoctor;
 use common\services\ExportService;
 use yii\db\Exception;
 use yii\web\Response;

admin/controllers/base/SupplyController.php

@@ -3,12 +3,9 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
-use common\models\Admin;
-use common\models\ProductOrder;
-use common\models\Reconciliation;
-use common\models\Store;
+use common\models\oldDb\Reconciliation;
+use common\models\oldDb\Store;
 use yii\db\Exception;
 
 /**

admin/controllers/base/SyncController.php

@@ -3,14 +3,11 @@
 namespace admin\controllers\base;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
 use common\jobs\SyncHospitalJob;
-use common\models\DrugStoreDrug;
-use common\models\DrugStoreRelations;
-use common\models\Store;
-use common\services\PlatformService;
-use linslin\yii2\curl\Curl;
+use common\models\oldDb\DrugStoreDrug;
+use common\models\oldDb\DrugStoreRelations;
+use common\models\oldDb\Store;
 use yii\db\Exception;
 
 

admin/controllers/dashboard/IndexController.php

@@ -2,8 +2,6 @@
 namespace admin\controllers\dashboard;
 use admin\components\BaseAdminController;
 use admin\models\forms\statistics\DataForm;
-use common\models\Order;
-use yii\web\Response;
 
 /**
  * @doc-module 工作台

admin/controllers/doctor/DoctorController.php

@@ -3,25 +3,22 @@
 namespace admin\controllers\doctor;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
 use common\enums\UserStatusEnum;
 use common\helpers\FuncHelper;
-use common\models\Department;
-use common\models\DoctorInfo;
-use common\models\DoctorPracticing;
-use common\models\DoctorService;
-use common\models\DoctorTitle;
-use common\models\Ledger;
-use common\models\ProductOrder;
-use common\models\Reconciliation;
-use common\models\Register;
-use common\models\ServiceUser;
-use common\models\Store;
-use common\models\StoreDoctor;
+use common\models\oldDb\Department;
+use common\models\oldDb\DoctorInfo;
+use common\models\oldDb\DoctorPracticing;
+use common\models\oldDb\DoctorService;
+use common\models\oldDb\DoctorTitle;
+use common\models\oldDb\Ledger;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\Reconciliation;
+use common\models\oldDb\ServiceUser;
+use common\models\oldDb\Store;
+use common\models\oldDb\StoreDoctor;
 use GuzzleHttp\Client;
 use yii\base\Exception;
-use function Symfony\Component\String\s;
 
 class DoctorController extends BaseAdminController
 {

admin/controllers/doctor/PharmacistController.php

@@ -3,12 +3,11 @@
 namespace admin\controllers\doctor;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
 use common\enums\UserStatusEnum;
-use common\models\Department;
-use common\models\PharmacistrInfo;
-use common\models\ServiceUser;
+use common\models\oldDb\Department;
+use common\models\oldDb\PharmacistrInfo;
+use common\models\oldDb\ServiceUser;
 
 
 /**

admin/controllers/drug/ChineseController.php

@@ -3,10 +3,9 @@
 namespace admin\controllers\drug;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\ChineseForm;
 use admin\models\forms\drug\ImportForm;
-use common\models\SystemConfig;
+use common\models\oldDb\SystemConfig;
 use moonland\phpexcel\Excel;
 use yii\db\Exception;
 use yii\web\UploadedFile;

admin/controllers/drug/DrugCategoryController.php

@@ -3,9 +3,8 @@
 namespace admin\controllers\drug;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\DrugCategoryForm;
-use common\models\DrugCategories;
+use common\models\oldDb\DrugCategories;
 
 class DrugCategoryController extends BaseAdminController
 {

admin/controllers/drug/DrugController.php

@@ -3,18 +3,16 @@
 namespace admin\controllers\drug;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\DrugForm;
 use admin\models\forms\drug\ImportForm;
 use common\enums\UserRoleEnum;
 use common\helpers\FuncHelper;
-use common\models\Drug;
-use common\models\DrugUseFrequency;
-use common\models\DrugUseTime;
-use common\models\DrugUseType;
-use common\models\DrugUseWay;
-use common\models\Prescription;
-use common\models\WestUnit;
+use common\models\oldDb\Drug;
+use common\models\oldDb\DrugUseFrequency;
+use common\models\oldDb\DrugUseTime;
+use common\models\oldDb\DrugUseType;
+use common\models\oldDb\DrugUseWay;
+use common\models\oldDb\WestUnit;
 use common\services\ExportService;
 use moonland\phpexcel\Excel;
 use yii\db\Exception;

admin/controllers/drug/ProcessRuleController.php

@@ -2,9 +2,9 @@
 namespace admin\controllers\drug;
 
 use admin\components\BaseAdminController;
-use common\models\ProcessRule;
-use common\models\ProcessRuleNote;
 use admin\components\Tree;
+use common\models\oldDb\ProcessRule;
+use common\models\oldDb\ProcessRuleNote;
 
 class ProcessRuleController extends BaseAdminController
 {

admin/controllers/drug/ServerController.php

@@ -3,15 +3,13 @@
 namespace admin\controllers\drug;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\forms\drug\GranularForm;
 use admin\models\forms\drug\ImportForm;
 use admin\models\forms\drug\ServerForm;
 use common\enums\UserRoleEnum;
 use common\helpers\FuncHelper;
-use common\models\Drug;
+use common\models\oldDb\Drug;
 use moonland\phpexcel\Excel;
-use yii\db\Exception;
 use yii\web\UploadedFile;
 
 /**

admin/controllers/store/StoreController.php

@@ -3,15 +3,14 @@
 namespace admin\controllers\store;
 
 use admin\components\BaseAdminController;
-use admin\controllers\AuthController;
 use admin\models\Admin;
 use common\enums\UserRoleEnum;
-use common\models\AdminAccessToken;
-use common\models\DrugStoreDrug;
-use common\models\DrugStoreRelations;
-use common\models\Role;
-use common\models\Store;
-use common\modelsgii\Drug;
+use common\models\oldDb\AdminAccessToken;
+use common\models\oldDb\DrugStoreDrug;
+use common\models\oldDb\DrugStoreRelations;
+use common\models\oldDb\Role;
+use common\models\oldDb\Store;
+use common\modelsgii\oldDb\Drug;
 use yii\db\Exception;
 
 

admin/controllers/store/WareController.php

@@ -4,18 +4,15 @@ namespace admin\controllers\store;
 
 use admin\components\BaseAdminController;
 use admin\models\forms\drug\ImportForm;
-//use common\enums\UserRoleEnum;
 use common\jobs\ProductOrderAutoReceivedJob;
-//use common\jobs\ProductOrderSendJob;
 use common\jobs\templateMessage\ProductOrderSend;
-use common\models\DrugStoreDrug;
-use common\models\DrugStoreRelations;
-use common\models\ExpressCompanies;
-use common\models\ExpressNos;
-use common\models\FundWater;
-use common\models\Log;
-use common\models\ProductOrder;
-use common\models\Store;
+use common\models\oldDb\DrugStoreDrug;
+use common\models\oldDb\DrugStoreRelations;
+use common\models\oldDb\ExpressCompanies;
+use common\models\oldDb\ExpressNos;
+use common\models\oldDb\Log;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\Store;
 use common\services\ExportService;
 use GuzzleHttp\Client;
 use moonland\phpexcel\Excel;
@@ -24,6 +21,9 @@ use yii\helpers\Json;
 use yii\web\Response;
 use yii\web\UploadedFile;
 
+//use common\enums\UserRoleEnum;
+//use common\jobs\ProductOrderSendJob;
+
 /**
  * @doc-module 仓库
  */

admin/controllers/system/AdminController.php

@@ -2,12 +2,10 @@
 
 namespace admin\controllers\system;
 
-use admin\controllers\AuthController;
-use admin\exceptions\ApiException;
 use admin\models\Admin;
 use common\core\BaseAdminController;
 use common\enums\UserRoleEnum;
-use common\models\Store;
+use common\models\oldDb\Store;
 use yii\base\DynamicModel;
 use yii\base\Exception;
 use yii\data\ActiveDataProvider;

admin/controllers/system/AttachmentController.php

@@ -8,10 +8,10 @@
 
 namespace admin\controllers\goods;
 
-use common\core\BaseAdminController;
 use admin\models\forms\AttachmentUploadForm;
-use common\models\Attachment;
-use common\models\AttachmentGroup;
+use common\core\BaseAdminController;
+use common\models\oldDb\Attachment;
+use common\models\oldDb\AttachmentGroup;
 use common\services\UploadService;
 use yii\helpers\ArrayHelper;
 use yii\web\UploadedFile;

admin/controllers/system/ConfigController.php

@@ -2,11 +2,11 @@
 
 namespace admin\controllers\system;
 
+use admin\models\search\ConfigSearch;
 use common\core\BaseAdminController;
 use common\helpers\ArrayHelper;
+use common\models\oldDb\Config;
 use Yii;
-use common\models\Config;
-use admin\models\search\ConfigSearch;
 use yii\base\Exception;
 use yii\web\NotFoundHttpException;
 
@@ -91,7 +91,7 @@ class ConfigController extends BaseAdminController
      */
     public function actionGroup()
     {
-        $config = \common\models\Config::find()->where([
+        $config = \common\models\oldDb\Config::find()->where([
             'name' => 'GROUP'
         ])->one();
         $tab_groups = Config::parse(3, $config['value']);

admin/controllers/system/DeliveryController.php

@@ -8,17 +8,13 @@
 
 namespace admin\controllers\system;
 
-use app\forms\common\CommonPostageRules;
 use admin\components\BaseAdminController;
-use admin\components\UI\Form;
-use admin\components\UI\Layout;
 use admin\components\UI\Table;
-use admin\components\UI\Tabs;
 use admin\exceptions\ApiException;
 use admin\models\forms\PostageRulesEditForm;
 use admin\models\search\CommonSearch;
-use common\models\FreeDeliveryRules;
-use common\models\PostageRules;
+use app\forms\common\CommonPostageRules;
+use common\models\oldDb\PostageRules;
 use yii\db\ActiveQuery;
 
 class DeliveryController extends BaseAdminController

admin/controllers/system/DistrictController.php

@@ -1,7 +1,7 @@
 <?php
 namespace admin\controllers\system;
 use admin\components\BaseAdminController;
-use common\models\DistrictArr;
+use common\models\oldDb\DistrictArr;
 
 /**
  * Created by PhpStorm.

admin/controllers/system/FreeRuleController.php

@@ -8,18 +8,13 @@
 
 namespace admin\controllers\system;
 
-use app\forms\common\CommonPostageRules;
 use admin\components\BaseAdminController;
-use admin\components\UI\Form;
-use admin\components\UI\Layout;
 use admin\components\UI\Table;
-use admin\components\UI\Tabs;
 use admin\exceptions\ApiException;
 use admin\models\forms\FreeRuleEditForm;
-use admin\models\forms\PostageRulesEditForm;
 use admin\models\search\CommonSearch;
-use common\models\FreeDeliveryRules;
-use common\models\PostageRules;
+use app\forms\common\CommonPostageRules;
+use common\models\oldDb\FreeDeliveryRules;
 use yii\db\ActiveQuery;
 
 class FreeRuleController extends BaseAdminController

admin/controllers/system/GeneratorController.php

@@ -2,15 +2,8 @@
 namespace admin\controllers\system;
 
 use admin\components\BaseAdminController;
-use admin\exceptions\ApiException;
 use admin\generators\model\Generator;
-use admin\models\Menu;
-use common\enums\StatusEnum;
-use common\helpers\ArrayHelper;
-use common\models\Role;
 use common\modelsgii\Menu2;
-use common\modelsgii\RoleMenu;
-use yii\web\Controller;
 
 /**
  * Created by PhpStorm.

admin/controllers/system/RefundAddressController.php

@@ -8,21 +8,14 @@
 
 namespace admin\controllers\system;
 
-use app\forms\common\CommonPostageRules;
 use admin\components\BaseAdminController;
 use admin\components\UI\Form;
-use admin\components\UI\Layout;
 use admin\components\UI\Table;
-use admin\components\UI\Tabs;
 use admin\exceptions\ApiException;
-use admin\models\forms\FreeRuleEditForm;
-use admin\models\forms\PostageRulesEditForm;
-use admin\models\forms\RefundAddressEditForm;
 use admin\models\search\CommonSearch;
-use common\models\DistrictArr;
-use common\models\FreeDeliveryRules;
-use common\models\PostageRules;
-use common\models\RefundAddress;
+use app\forms\common\CommonPostageRules;
+use common\models\oldDb\DistrictArr;
+use common\models\oldDb\RefundAddress;
 use yii\db\ActiveQuery;
 use yii\web\NotFoundHttpException;
 

admin/controllers/system/RoleController.php

@@ -1,11 +1,10 @@
 <?php
 namespace admin\controllers\system;
-use common\core\BaseAdminController;
 use admin\models\Menu;
-use common\enums\StatusEnum;
+use common\core\BaseAdminController;
 use common\helpers\ArrayHelper;
-use common\models\Role;
-use common\modelsgii\RoleMenu;
+use common\models\oldDb\Role;
+use common\modelsgii\oldDb\RoleMenu;
 
 class RoleController extends BaseAdminController {
 

admin/controllers/system/SubAccountController.php

@@ -4,16 +4,16 @@ namespace admin\controllers\system;
 
 use admin\models\Admin;
 use admin\models\Menu;
+use common\core\BaseAdminController;
 use common\helpers\ArrayHelper;
-use common\models\SubAccountMenu;
-use common\modelsgii\RoleMenu;
+use common\models\oldDb\SubAccountMenu;
+use common\modelsgii\oldDb\RoleMenu;
 use common\validators\DateRangeValidator;
 use yii\base\DynamicModel;
 use yii\base\Exception;
 use yii\data\ActiveDataProvider;
 use yii\db\ActiveRecord;
 use yii\web\NotFoundHttpException;
-use common\core\BaseAdminController;
 
 class SubAccountController extends BaseAdminController
 {

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
 {

common/config/main-local.php

@@ -10,6 +10,14 @@ return [
             'charset' => env('DB_CHARSET'),
             'tablePrefix' => env('DB_TABLE_PREFIX'),
         ],
+        'new_db' => [
+            'class' => \yii\db\Connection::class,
+            'dsn' => env('NEW_DB_DSN'),
+            'username' => env('NEW_DB_USERNAME'),
+            'password' => env('NEW_DB_PASSWORD'),
+            'charset' => env('NEW_DB_CHARSET'),
+            'tablePrefix' => env('NEW_DB_TABLE_PREFIX'),
+        ],
         'mailer' => [
             'class' => \yii\symfonymailer\Mailer::class,
             'viewPath' => '@common/mail',

common/config/test.php

@@ -5,7 +5,7 @@ return [
     'components' => [
         'user' => [
             'class' => \yii\web\User::class,
-            'identityClass' => 'common\models\User',
+            'identityClass' => 'common\models\oldDb\User',
         ],
     ],
 ];

common/core/BaseAdminController.php

@@ -3,7 +3,7 @@
 namespace common\core;
 
 use common\foundation\Cors;
-use common\models\Config;
+use common\models\oldDb\Config;
 use yii\filters\auth\HttpBearerAuth;
 
 class BaseAdminController extends BaseController

common/core/BaseAppController.php

@@ -3,7 +3,7 @@
 namespace common\core;
 
 use common\foundation\Cors;
-use common\models\Config;
+use common\models\oldDb\Config;
 use member\behaviors\MallBehavior;
 use yii\filters\auth\HttpBearerAuth;
 

common/core/BaseNewActiveRecord.php

@@ -0,0 +1,22 @@
+<?php
+namespace common\core;
+
+use yii\base\Exception;
+use yii\db\ActiveRecord;
+
+/**
+ * 对框架的AR的扩展，所有前台/后台数据模型都继承自该类
+ */
+class BaseNewActiveRecord extends ActiveRecord
+{
+    public static function getDb()
+    {
+        return \Yii::$app->get('new_db');
+    }
+    public function saveOrFail($runValidation = true, $attributeNames = null){
+        if(!$this->save($runValidation, $attributeNames)){
+            throw new Exception(implode(',',$this->getFirstErrors()));
+        }
+        return true;
+    }
+}

common/core/BasePharmacistController.php

@@ -3,8 +3,7 @@
 namespace common\core;
 
 use common\foundation\Cors;
-use common\models\Config;
-use member\behaviors\MallBehavior;
+use common\models\oldDb\Config;
 use yii\filters\auth\HttpBearerAuth;
 
 class BasePharmacistController extends BaseController

common/core/BasePlatformController.php

@@ -3,7 +3,7 @@
 namespace common\core;
 
 use common\foundation\Cors;
-use common\models\Config;
+use common\models\oldDb\Config;
 use yii\filters\auth\HttpBearerAuth;
 
 class BasePlatformController extends BaseController

common/core/BaseServiceController.php

@@ -3,11 +3,9 @@
 namespace common\core;
 
 use common\foundation\Cors;
-use common\models\Config;
-use yii\base\Event;
+use common\models\oldDb\Config;
 use yii\db\Exception;
 use yii\filters\auth\HttpBearerAuth;
-use yii\web\Response;
 
 class BaseServiceController extends BaseController
 {

common/core/ConsoleApplication.php

@@ -3,11 +3,6 @@
 namespace common\core;
 
 
-use common\events\OrderEvent;
-use common\handlers\OrderCreatedHandlerClass;
-use common\handlers\OrderPayedHandlerClass;
-use common\models\Order;
-
 /***
  * Class Application
  * @package common\core

common/core/WebApplication.php

@@ -3,17 +3,17 @@
 namespace common\core;
 
 
-use common\events\RegisterEvent;
-use common\handlers\ProductOrderPayedHandlerClass;
-use common\handlers\RegisterPayHandler;
-use common\handlers\RegisterCreatedHandler;
-use common\models\Register;
-use common\events\ProductOrderEvent;
-use common\handlers\ProductOrderCreatedHandlerClass;
-use common\models\ProductOrder;
 use common\events\PrescriptionEvent;
+use common\events\ProductOrderEvent;
+use common\events\RegisterEvent;
 use common\handlers\PrescriptionAutoExpireHandlerClass;
-use common\models\Prescription;
+use common\handlers\ProductOrderCreatedHandlerClass;
+use common\handlers\ProductOrderPayedHandlerClass;
+use common\handlers\RegisterCreatedHandler;
+use common\handlers\RegisterPayHandler;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\Register;
 
 
 /***

common/events/OrderEvent.php

@@ -5,6 +5,6 @@ use yii\base\Event;
 
 class OrderEvent extends Event
 {
-    /** @var \common\models\Order */
+    /** @var \common\models\oldDb\Order */
     public $order;
 }

common/events/PrescriptionEvent.php

@@ -5,7 +5,7 @@ use yii\base\Event;
 
 class PrescriptionEvent extends Event
 {
-    /** @var \common\models\Prescription */
+    /** @var \common\models\oldDb\Prescription */
     public $prescription;
 
 }

common/events/ProductOrderEvent.php

@@ -5,6 +5,6 @@ use yii\base\Event;
 
 class ProductOrderEvent extends Event
 {
-    /** @var \common\models\ProductOrder */
+    /** @var \common\models\oldDb\ProductOrder */
     public $order;
 }

common/events/RegisterEvent.php

@@ -2,12 +2,12 @@
 
 namespace common\events;
 
-use common\models\Register;
+use common\models\oldDb\Register;
 use yii\base\Event;
 
 class RegisterEvent extends Event
 {
-    /** @var Register */
+    /** @var \common\models\oldDb\Register */
     // 事件的名称
     public $register;
 }

common/fixtures/UserFixture.php

@@ -6,5 +6,5 @@ use yii\test\ActiveFixture;
 
 class UserFixture extends ActiveFixture
 {
-    public $modelClass = 'common\models\User';
+    public $modelClass = 'common\models\oldDb\User';
 }

common/forms/DrugRollBackForm.php

@@ -3,13 +3,12 @@
 namespace common\forms;
 
 use common\core\BaseModel;
-use common\models\ChineseRepice;
-use common\models\DrugStoreDrug;
-use common\models\GranularRepice;
-use common\models\Prescription;
-use common\models\ProductOrderItems;
-use common\models\WestRepice;
-use yii\base\Exception;
+use common\models\oldDb\ChineseRepice;
+use common\models\oldDb\DrugStoreDrug;
+use common\models\oldDb\GranularRepice;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\ProductOrderItems;
+use common\models\oldDb\WestRepice;
 use yii\helpers\Json;
 
 class DrugRollBackForm extends BaseModel

common/forms/ImMessageForm.php

@@ -7,10 +7,10 @@ use common\enums\ImSessionStatusEnum;
 use common\enums\ImSessionTypeEnum;
 use common\enums\UserRoleEnum;
 use common\jobs\MessageSendJob;
-use common\models\ImMessage;
-use common\models\ImMessageSession;
-use common\models\ServiceUser;
-use common\models\User;
+use common\models\oldDb\ImMessage;
+use common\models\oldDb\ImMessageSession;
+use common\models\oldDb\ServiceUser;
+use common\models\oldDb\User;
 use yii\base\Exception;
 
 class ImMessageForm extends BaseModel

common/forms/ImSessionForm.php

@@ -2,14 +2,8 @@
 namespace common\models\forms;
 
 use common\core\BaseModel;
-use common\enums\ImMessageSendTypeEnum;
-use common\enums\ImSessionStatusEnum;
 use common\enums\UserRoleEnum;
-use common\jobs\MessageSendJob;
-use common\models\ImMessage;
-use common\models\ImMessageSession;
-use common\models\ServiceUser;
-use common\models\User;
+use common\models\oldDb\ImMessageSession;
 use yii\base\Exception;
 
 class ImSessionForm extends BaseModel

common/forms/LedgerForm.php

@@ -3,16 +3,16 @@
 namespace common\forms;
 
 use common\core\BaseModel;
-use common\models\CashAccount;
-use common\models\Ledger;
-use common\models\LedgerLog;
-use common\models\ProductOrder;
-use common\models\ProductOrderItems;
-use common\models\ProductOrderLog;
-use common\models\Reconciliation;
-use common\models\Register;
-use common\models\RegisterLog;
-use common\models\Store;
+use common\models\oldDb\CashAccount;
+use common\models\oldDb\Ledger;
+use common\models\oldDb\LedgerLog;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\ProductOrderItems;
+use common\models\oldDb\ProductOrderLog;
+use common\models\oldDb\Reconciliation;
+use common\models\oldDb\Register;
+use common\models\oldDb\RegisterLog;
+use common\models\oldDb\Store;
 use yii\db\Exception;
 
 

common/forms/OrderRefundForm.php

@@ -7,16 +7,15 @@ use common\enums\OrderAcceptEnum;
 use common\enums\SystemNoticeTypeEnum;
 use common\events\OrderEvent;
 use common\helpers\FuncHelper;
-use common\models\ImMessageSession;
-use common\models\Order;
-use common\models\OrderRefund;
-use common\models\PaymentOrder;
-use common\models\PaymentRefund;
-use common\models\SystemNotice;
+use common\models\oldDb\ImMessageSession;
+use common\models\oldDb\Order;
+use common\models\oldDb\OrderRefund;
+use common\models\oldDb\PaymentOrder;
+use common\models\oldDb\PaymentRefund;
+use common\models\oldDb\SystemNotice;
 use common\services\EplPayService;
 use common\services\WechatService;
 use yii\base\Exception;
-use yii\web\Application;
 
 class OrderRefundForm extends BaseModel
 {

common/forms/PrescripRefundForm.php

@@ -5,10 +5,10 @@ namespace common\forms;
 use common\core\BaseModel;
 use common\events\OrderEvent;
 use common\helpers\FuncHelper;
-use common\models\PaymentPrescripOrder;
-use common\models\PaymentPrescripRefund;
-use common\models\PrescripOrderRefund;
-use common\models\Prescription;
+use common\models\oldDb\PaymentPrescripOrder;
+use common\models\oldDb\PaymentPrescripRefund;
+use common\models\oldDb\PrescripOrderRefund;
+use common\models\oldDb\Prescription;
 use common\services\WechatService;
 use yii\base\Exception;
 

common/forms/ProductCancelForm.php

@@ -3,10 +3,10 @@
 namespace common\forms;
 
 use common\core\BaseModel;
-use common\jobs\ProductOrderSyncPlatformJob;
-use common\models\ProductOrder;
 use common\enums\ProductOrderEnum;
-use common\models\Prescription;
+use common\jobs\ProductOrderSyncPlatformJob;
+use common\models\oldDb\Prescription;
+use common\models\oldDb\ProductOrder;
 use yii\base\Exception;
 
 class ProductCancelForm extends BaseModel

common/forms/ProductRefundCancelForm.php

@@ -4,9 +4,8 @@ namespace common\forms;
 
 use common\core\BaseModel;
 use common\enums\ProductOrderEnum;
-use common\models\ProductOrder;
-use common\models\ProductOrderRefund;
-
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\ProductOrderRefund;
 use yii\base\Exception;
 
 class ProductRefundCancelForm extends BaseModel

common/forms/ProductRefundForm.php

@@ -3,13 +3,12 @@
 namespace common\forms;
 
 use common\core\BaseModel;
-use common\events\OrderEvent;
-use common\helpers\FuncHelper;
-use common\models\PaymentProductOrder;
-use common\models\PaymentProductRefund;
-use common\models\ProductOrder;
-use common\models\ProductOrderRefund;
 use common\enums\ProductOrderEnum;
+use common\helpers\FuncHelper;
+use common\models\oldDb\PaymentProductOrder;
+use common\models\oldDb\PaymentProductRefund;
+use common\models\oldDb\ProductOrder;
+use common\models\oldDb\ProductOrderRefund;
 use common\services\EplPayService;
 use common\services\WechatService;
 use yii\base\Exception;

common/forms/RegisterRefundForm.php

@@ -5,13 +5,12 @@ namespace common\forms;
 use common\core\BaseModel;
 use common\enums\RegisterEnum;
 use common\enums\SystemNoticeTypeEnum;
-use common\events\RegisterEvent;
 use common\helpers\FuncHelper;
-use common\models\PaymentRegister;
-use common\models\PaymentRegisterRefund;
-use common\models\Register;
-use common\models\RegisterRefund;
-use common\models\SystemNotice;
+use common\models\oldDb\PaymentRegister;
+use common\models\oldDb\PaymentRegisterRefund;
+use common\models\oldDb\Register;
+use common\models\oldDb\RegisterRefund;
+use common\models\oldDb\SystemNotice;
 use common\services\EplPayService;
 use common\services\WechatService;
 use yii\base\Exception;

common/handlers/OrderPayedHandler.php

@@ -3,7 +3,7 @@ namespace common\handlers;
 
 use common\events\OrderEvent;
 use common\forms\order\CommonOrder;
-use common\models\Order;
+use common\models\oldDb\Order;
 
 class OrderPayedHandler extends HandlerBase
 {

common/handlers/OrderPayedHandlerClass.php

@@ -1,16 +1,13 @@
 <?php
 namespace common\handlers;
 
-use common\core\BaseModel;
 use common\enums\OrderAcceptEnum;
 use common\helpers\FuncHelper;
 use common\jobs\OrderPayImJob;
 use common\jobs\OrderRefundJob;
-use common\models\Order;
-use common\models\OrderLog;
-use common\models\OrderRefund;
-use common\models\User;
-use yii\base\Exception;
+use common\models\oldDb\Order;
+use common\models\oldDb\OrderLog;
+use common\models\oldDb\OrderRefund;
 
 class OrderPayedHandlerClass extends BaseOrderHandler
 {