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

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
 {