From 992c94250dc90bcc5c2f70662797f8d5be07c67c Mon Sep 17 00:00:00 2001 From: liqi Date: Thu, 19 Dec 2024 19:20:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=BB=93=E6=9E=84=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/components/BaseAdminController.php | 14 +- admin/controllers/AdminController.php | 8 +- admin/controllers/AttachmentController.php | 2 +- admin/controllers/AuthController.php | 6 +- admin/controllers/LoginController.php | 8 +- admin/controllers/MenuController.php | 6 +- admin/controllers/PublicController.php | 4 +- admin/controllers/StoreController.php | 5 +- admin/controllers/UserController.php | 14 +- admin/controllers/base/ArticleController.php | 5 +- .../controllers/base/ChargeCashController.php | 3 +- admin/controllers/base/DataController.php | 23 +- admin/controllers/base/DepartController.php | 7 +- admin/controllers/base/DiagnoseController.php | 3 +- .../base/DivideAccountController.php | 32 +- admin/controllers/base/FinanceController.php | 19 +- admin/controllers/base/HomeController.php | 28 +- admin/controllers/base/NavController.php | 4 +- admin/controllers/base/NoticeController.php | 3 +- admin/controllers/base/OrderController.php | 19 +- .../base/PrescriptionController.php | 6 +- admin/controllers/base/RegionController.php | 4 +- admin/controllers/base/RegisterController.php | 6 +- admin/controllers/base/SetController.php | 5 +- .../base/StatementAccountController.php | 23 +- admin/controllers/base/SupplyController.php | 7 +- admin/controllers/base/SyncController.php | 9 +- .../controllers/dashboard/IndexController.php | 2 - admin/controllers/doctor/DoctorController.php | 25 +- .../doctor/PharmacistController.php | 7 +- admin/controllers/drug/ChineseController.php | 3 +- .../drug/DrugCategoryController.php | 3 +- admin/controllers/drug/DrugController.php | 14 +- .../drug/ProcessRuleController.php | 4 +- admin/controllers/drug/ServerController.php | 4 +- admin/controllers/store/StoreController.php | 13 +- admin/controllers/store/WareController.php | 20 +- admin/controllers/system/AdminController.php | 4 +- .../system/AttachmentController.php | 6 +- admin/controllers/system/ConfigController.php | 6 +- .../controllers/system/DeliveryController.php | 8 +- .../controllers/system/DistrictController.php | 2 +- .../controllers/system/FreeRuleController.php | 9 +- .../system/GeneratorController.php | 7 - .../system/RefundAddressController.php | 13 +- admin/controllers/system/RoleController.php | 7 +- .../system/SubAccountController.php | 6 +- admin/models/Admin.php | 15 +- admin/models/Config.php | 4 +- admin/models/Menu.php | 5 +- admin/models/Page.php | 4 +- admin/models/RegisterForm.php | 17 +- admin/models/forms/AttachmentUpload.php | 2 +- admin/models/forms/FreeRuleEditForm.php | 4 +- admin/models/forms/HospitalDocForm.php | 9 +- admin/models/forms/LoginForm.php | 3 +- admin/models/forms/PostageRulesEditForm.php | 2 +- admin/models/forms/RefundAddressEditForm.php | 6 +- admin/models/forms/drug/AgreeForm.php | 2 +- admin/models/forms/drug/ArticleForm.php | 2 +- admin/models/forms/drug/ChineseForm.php | 2 +- admin/models/forms/drug/DepartForm.php | 9 +- admin/models/forms/drug/DiagnoseForm.php | 3 +- admin/models/forms/drug/DrugCategoryForm.php | 2 +- admin/models/forms/drug/DrugForm.php | 2 +- admin/models/forms/drug/GranularForm.php | 3 +- admin/models/forms/drug/ImportForm.php | 8 +- admin/models/forms/drug/NavForm.php | 2 +- admin/models/forms/drug/ServerForm.php | 3 +- admin/models/forms/statistics/DataForm.php | 6 +- .../forms/statistics/ServiceDataForm.php | 6 +- admin/models/search/AdminSearch.php | 6 +- admin/models/search/MenuSearch.php | 4 +- common/config/main-local.php | 8 + common/config/test.php | 2 +- common/core/BaseAdminController.php | 2 +- common/core/BaseAppController.php | 2 +- common/core/BaseNewActiveRecord.php | 22 ++ common/core/BasePharmacistController.php | 3 +- common/core/BasePlatformController.php | 2 +- common/core/BaseServiceController.php | 4 +- common/core/ConsoleApplication.php | 5 - common/core/WebApplication.php | 18 +- common/events/OrderEvent.php | 2 +- common/events/PrescriptionEvent.php | 2 +- common/events/ProductOrderEvent.php | 2 +- common/events/RegisterEvent.php | 4 +- common/fixtures/UserFixture.php | 2 +- common/forms/DrugRollBackForm.php | 13 +- common/forms/ImMessageForm.php | 8 +- common/forms/ImSessionForm.php | 8 +- common/forms/LedgerForm.php | 20 +- common/forms/OrderRefundForm.php | 13 +- common/forms/PrescripRefundForm.php | 8 +- common/forms/ProductCancelForm.php | 6 +- common/forms/ProductRefundCancelForm.php | 5 +- common/forms/ProductRefundForm.php | 11 +- common/forms/RegisterRefundForm.php | 11 +- common/handlers/OrderPayedHandler.php | 2 +- common/handlers/OrderPayedHandlerClass.php | 9 +- common/handlers/PrescripPayHandlerClass.php | 6 +- common/handlers/RegisterPayHandler.php | 6 +- .../orderHandler/BaseOrderCanceledHandler.php | 2 +- .../orderHandler/BaseOrderPayedHandler.php | 2 +- .../orderHandler/BaseOrderSalesHandler.php | 10 +- .../orderHandler/OrderPayedHandlerClass.php | 4 +- common/jobs/ArticleMassSendJob.php | 4 +- common/jobs/LogJob.php | 10 +- common/jobs/NewSendJob.php | 8 +- common/jobs/OrderCancelJob.php | 4 +- common/jobs/OrderOverJob.php | 10 +- common/jobs/OrderPayImJob.php | 13 +- common/jobs/OrderRefundJob.php | 10 +- common/jobs/PrescripCancelJob.php | 4 +- common/jobs/PrescripRefundJob.php | 6 +- common/jobs/PrescriptionAutoExpireJob.php | 9 +- common/jobs/ProductOrderAutoReceivedJob.php | 8 +- common/jobs/ProductOrderCancelJob.php | 4 +- common/jobs/ProductOrderPaidJob.php | 6 +- common/jobs/ProductOrderRefundJob.php | 6 +- common/jobs/ProductOrderSendJob.php | 6 +- common/jobs/ProductOrderSyncJob.php | 4 +- common/jobs/ProductOrderSyncPlatformJob.php | 8 +- common/jobs/ProductRefundJob.php | 6 +- common/jobs/RegisterAcceptJob.php | 5 +- common/jobs/RegisterCancelJob.php | 4 +- common/jobs/RegisterOverJob.php | 4 +- common/jobs/RegisterPaidJob.php | 5 +- common/jobs/RegisterRefundJob.php | 6 +- .../jobs/Sms/PrescriptionPassMessageJob.php | 7 +- .../jobs/Sms/PrescriptionRefuseMessageJob.php | 7 +- common/jobs/Sms/RegisterMessageJob.php | 4 +- common/jobs/Sms/WaitApprovalMessageJob.php | 6 +- common/jobs/SyncHospitalJob.php | 5 +- .../templateMessage/PrescriptionCreated.php | 7 +- .../jobs/templateMessage/ProductOrderSend.php | 12 +- .../jobs/templateMessage/RegisterAccept.php | 12 +- common/mail/emailVerify-html.php | 2 +- common/mail/emailVerify-text.php | 2 +- common/mail/passwordResetToken-html.php | 2 +- common/mail/passwordResetToken-text.php | 2 +- common/models/AuthItem.php | 8 - common/models/AuthRule.php | 8 - common/models/DocPhaImgs.php | 8 - common/models/DoctorNotice.php | 22 -- common/models/DoctorTagIll.php | 23 -- common/models/DoctorTitle.php | 9 - common/models/DrugCategories.php | 11 - common/models/DrugDosage.php | 8 - common/models/DrugUseFrequency.php | 8 - common/models/DrugUseNum.php | 9 - common/models/DrugUseTime.php | 8 - common/models/DrugUseType.php | 8 - common/models/DrugUseWay.php | 8 - common/models/ExpressNos.php | 11 - common/models/HospitalYardDepartment.php | 8 - common/models/Menu.php | 9 - common/models/PhysicalReserveTotal.php | 12 - common/models/WestUnit.php | 8 - common/models/newDb/AdminModel.php | 20 ++ common/models/{ => oldDb}/Address.php | 4 +- common/models/{ => oldDb}/Admin.php | 7 +- .../models/{ => oldDb}/AdminAccessToken.php | 6 +- common/models/{ => oldDb}/Attachment.php | 4 +- common/models/{ => oldDb}/AttachmentGroup.php | 4 +- common/models/oldDb/AuthItem.php | 8 + common/models/{ => oldDb}/AuthRole.php | 4 +- common/models/oldDb/AuthRule.php | 8 + common/models/{ => oldDb}/BaseConfig.php | 4 +- common/models/{ => oldDb}/Callback.php | 4 +- common/models/{ => oldDb}/CashAccount.php | 4 +- common/models/{ => oldDb}/CashApply.php | 4 +- common/models/{ => oldDb}/Categories.php | 4 +- .../{ => oldDb}/ChargeCashPayRecord.php | 4 +- common/models/{ => oldDb}/ChineseRepice.php | 4 +- common/models/{ => oldDb}/Config.php | 4 +- common/models/{ => oldDb}/Department.php | 4 +- common/models/{ => oldDb}/DiagnoseCommon.php | 4 +- common/models/{ => oldDb}/Disease.php | 4 +- common/models/{ => oldDb}/DiseaseCommon.php | 4 +- common/models/{ => oldDb}/DistrictArr.php | 2 +- common/models/oldDb/DocPhaImgs.php | 8 + common/models/{ => oldDb}/DoctorApply.php | 4 +- common/models/{ => oldDb}/DoctorArticle.php | 4 +- common/models/{ => oldDb}/DoctorCommon.php | 4 +- .../DoctorIdentity.php} | 4 +- common/models/{ => oldDb}/DoctorInfo.php | 4 +- .../DoctorNotice.php} | 6 +- common/models/{ => oldDb}/DoctorPatient.php | 4 +- .../{ => oldDb}/DoctorPatientRemark.php | 4 +- common/models/oldDb/DoctorPracticing.php | 24 ++ common/models/{ => oldDb}/DoctorService.php | 4 +- .../DoctorTagIll.php} | 7 +- common/models/oldDb/DoctorTitle.php | 9 + common/models/{ => oldDb}/Drug.php | 4 +- common/models/oldDb/DrugCategories.php | 11 + common/models/oldDb/DrugDosage.php | 8 + common/models/{ => oldDb}/DrugStore.php | 4 +- common/models/{ => oldDb}/DrugStoreDrug.php | 4 +- .../models/{ => oldDb}/DrugStoreRelations.php | 7 +- common/models/oldDb/DrugUseFrequency.php | 8 + common/models/oldDb/DrugUseNum.php | 9 + common/models/oldDb/DrugUseTime.php | 8 + common/models/oldDb/DrugUseType.php | 8 + common/models/oldDb/DrugUseWay.php | 8 + common/models/{ => oldDb}/ExamineLog.php | 4 +- .../models/{ => oldDb}/ExpressCompanies.php | 4 +- common/models/oldDb/ExpressNos.php | 8 + common/models/{ => oldDb}/FollowDoctor.php | 4 +- common/models/{ => oldDb}/FollowUser.php | 4 +- .../models/{ => oldDb}/FreeDeliveryRules.php | 2 +- common/models/{ => oldDb}/FundWater.php | 4 +- common/models/{ => oldDb}/GranularRepice.php | 4 +- common/models/{ => oldDb}/HealthyNews.php | 4 +- common/models/{ => oldDb}/Hospital.php | 5 +- .../{ => oldDb}/HospitalDepartmentIntro.php | 5 +- common/models/{ => oldDb}/HospitalYard.php | 5 +- .../models/oldDb/HospitalYardDepartment.php | 8 + .../{ => oldDb}/HospitalYardPhysical.php | 4 +- common/models/{ => oldDb}/ImMessage.php | 4 +- .../models/{ => oldDb}/ImMessageSession.php | 4 +- .../{ => oldDb}/ImMessageSessionOrder.php | 4 +- common/models/oldDb/InquiryRefuseReason.php | 24 ++ common/models/{ => oldDb}/LeadInfo.php | 5 +- common/models/{ => oldDb}/Ledger.php | 4 +- common/models/{ => oldDb}/LedgerLog.php | 4 +- common/models/{ => oldDb}/Log.php | 4 +- common/models/oldDb/Menu.php | 6 + common/models/{ => oldDb}/Nav.php | 4 +- common/models/{ => oldDb}/OpLog.php | 7 +- common/models/{ => oldDb}/Order.php | 4 +- common/models/{ => oldDb}/OrderLog.php | 4 +- .../models/{ => oldDb}/OrderNumberChange.php | 4 +- common/models/{ => oldDb}/OrderRefund.php | 4 +- common/models/{ => oldDb}/OrderVideoInfo.php | 4 +- .../models/{ => oldDb}/PatientVisitRecord.php | 4 +- common/models/{ => oldDb}/PaymentOrder.php | 4 +- .../{ => oldDb}/PaymentPrescripOrder.php | 4 +- .../{ => oldDb}/PaymentPrescripRefund.php | 4 +- .../{ => oldDb}/PaymentProductOrder.php | 4 +- .../{ => oldDb}/PaymentProductRefund.php | 4 +- common/models/{ => oldDb}/PaymentRefund.php | 4 +- common/models/{ => oldDb}/PaymentRegister.php | 4 +- .../{ => oldDb}/PaymentRegisterRefund.php | 4 +- .../models/{ => oldDb}/PharmacistIdentity.php | 4 +- .../{ => oldDb}/PharmacistPracticing.php | 4 +- common/models/{ => oldDb}/PharmacistrInfo.php | 4 +- common/models/{ => oldDb}/PhysicalPackage.php | 4 +- common/models/{ => oldDb}/PhysicalReserve.php | 4 +- common/models/oldDb/PhysicalReserveTotal.php | 8 + common/models/{ => oldDb}/Platform.php | 5 +- common/models/{ => oldDb}/PostageRules.php | 2 +- .../models/{ => oldDb}/PrescripOrderLog.php | 4 +- .../{ => oldDb}/PrescripOrderRefund.php | 4 +- common/models/{ => oldDb}/Prescription.php | 4 +- .../{ => oldDb}/PrescriptionChinese.php | 5 +- .../{ => oldDb}/PrescriptionGranular.php | 4 +- common/models/{ => oldDb}/PrescriptionLog.php | 4 +- .../models/{ => oldDb}/PrescriptionWest.php | 5 +- common/models/{ => oldDb}/ProcessRule.php | 4 +- common/models/{ => oldDb}/ProcessRuleNote.php | 4 +- common/models/{ => oldDb}/ProductOrder.php | 4 +- .../models/{ => oldDb}/ProductOrderItems.php | 4 +- common/models/{ => oldDb}/ProductOrderLog.php | 4 +- .../models/{ => oldDb}/ProductOrderRefund.php | 4 +- common/models/{ => oldDb}/Reconciliation.php | 4 +- common/models/{ => oldDb}/RefundAddress.php | 2 +- common/models/{ => oldDb}/Region.php | 4 +- common/models/{ => oldDb}/Register.php | 4 +- common/models/{ => oldDb}/RegisterLog.php | 4 +- common/models/{ => oldDb}/RegisterRefund.php | 4 +- common/models/{ => oldDb}/ReplayTemplate.php | 4 +- .../{ => oldDb}/ReplayTemplateGroup.php | 4 +- common/models/{ => oldDb}/Role.php | 4 +- common/models/{ => oldDb}/RoleMenu.php | 4 +- common/models/{ => oldDb}/ServInfo.php | 5 +- common/models/{ => oldDb}/ServiceUser.php | 4 +- .../models/{ => oldDb}/ServiceUserToken.php | 4 +- common/models/{ => oldDb}/Store.php | 4 +- common/models/{ => oldDb}/StoreDepartment.php | 4 +- common/models/{ => oldDb}/StoreDoctor.php | 4 +- common/models/{ => oldDb}/StoreUser.php | 4 +- common/models/{ => oldDb}/SubAccountMenu.php | 4 +- common/models/{ => oldDb}/SystemConfig.php | 4 +- common/models/{ => oldDb}/SystemNotice.php | 4 +- common/models/{ => oldDb}/User.php | 4 +- common/models/{ => oldDb}/UserCollect.php | 4 +- common/models/{ => oldDb}/UserComment.php | 4 +- common/models/{ => oldDb}/UserInquiry.php | 4 +- common/models/{ => oldDb}/UserPatient.php | 4 +- common/models/{ => oldDb}/UserPatientCase.php | 4 +- .../{ => oldDb}/UserPatientHealthInquiry.php | 4 +- common/models/{ => oldDb}/UserPatientIll.php | 4 +- .../models/{ => oldDb}/UserPatientRecord.php | 4 +- .../models/{ => oldDb}/UserRelationship.php | 2 +- common/models/{ => oldDb}/UserRelative.php | 2 +- common/models/{ => oldDb}/WestRepice.php | 6 +- common/models/oldDb/WestUnit.php | 8 + common/modelsgii/newDb/AdminModelGii.php | 49 ++++ common/modelsgii/{ => oldDb}/Address.php | 4 +- common/modelsgii/{ => oldDb}/Admin.php | 4 +- .../{ => oldDb}/AdminAccessToken.php | 4 +- common/modelsgii/{ => oldDb}/Attachment.php | 4 +- .../modelsgii/{ => oldDb}/AttachmentGroup.php | 4 +- common/modelsgii/{ => oldDb}/AuthItem.php | 4 +- .../modelsgii/{ => oldDb}/AuthItemChild.php | 4 +- common/modelsgii/{ => oldDb}/AuthRole.php | 4 +- common/modelsgii/{ => oldDb}/AuthRule.php | 4 +- common/modelsgii/{ => oldDb}/BaseConfig.php | 4 +- common/modelsgii/{ => oldDb}/Callback.php | 4 +- common/modelsgii/{ => oldDb}/CashAccount.php | 4 +- common/modelsgii/{ => oldDb}/CashApply.php | 4 +- common/modelsgii/{ => oldDb}/Categories.php | 4 +- .../{ => oldDb}/ChargeCashPayRecord.php | 4 +- .../modelsgii/{ => oldDb}/ChineseMedicine.php | 4 +- .../modelsgii/{ => oldDb}/ChineseRepice.php | 4 +- common/modelsgii/{ => oldDb}/Config.php | 4 +- common/modelsgii/{ => oldDb}/Department.php | 4 +- .../modelsgii/{ => oldDb}/DiagnoseCommon.php | 4 +- common/modelsgii/{ => oldDb}/Disease.php | 4 +- .../modelsgii/{ => oldDb}/DiseaseCommon.php | 4 +- common/modelsgii/{ => oldDb}/DocPhaImgs.php | 4 +- common/modelsgii/{ => oldDb}/DoctorApply.php | 4 +- .../modelsgii/{ => oldDb}/DoctorArticle.php | 4 +- common/modelsgii/{ => oldDb}/DoctorCommon.php | 4 +- .../modelsgii/{ => oldDb}/DoctorIdentity.php | 4 +- common/modelsgii/{ => oldDb}/DoctorInfo.php | 4 +- common/modelsgii/{ => oldDb}/DoctorNotice.php | 4 +- .../modelsgii/{ => oldDb}/DoctorPatient.php | 4 +- .../{ => oldDb}/DoctorPatientRemark.php | 4 +- .../{ => oldDb}/DoctorPracticing.php | 4 +- .../modelsgii/{ => oldDb}/DoctorService.php | 4 +- common/modelsgii/{ => oldDb}/DoctorTagIll.php | 4 +- common/modelsgii/{ => oldDb}/DoctorTitle.php | 4 +- common/modelsgii/{ => oldDb}/Drug.php | 4 +- .../modelsgii/{ => oldDb}/DrugCategories.php | 4 +- common/modelsgii/{ => oldDb}/DrugDosage.php | 4 +- .../modelsgii/{ => oldDb}/DrugStoreDrug.php | 4 +- .../{ => oldDb}/DrugStoreRelations.php | 4 +- .../{ => oldDb}/DrugUseFrequency.php | 4 +- common/modelsgii/{ => oldDb}/DrugUseNum.php | 4 +- common/modelsgii/{ => oldDb}/DrugUseTime.php | 4 +- common/modelsgii/{ => oldDb}/DrugUseType.php | 4 +- common/modelsgii/{ => oldDb}/DrugUseWay.php | 4 +- common/modelsgii/{ => oldDb}/Drugstore.php | 4 +- common/modelsgii/{ => oldDb}/ExamineLog.php | 4 +- .../{ => oldDb}/ExpressCompanies.php | 4 +- .../modelsgii/{ => oldDb}/ExpressDetails.php | 4 +- common/modelsgii/{ => oldDb}/ExpressNos.php | 4 +- common/modelsgii/{ => oldDb}/FollowDoctor.php | 4 +- common/modelsgii/{ => oldDb}/FollowUser.php | 4 +- common/modelsgii/{ => oldDb}/FundWater.php | 4 +- .../{ => oldDb}/GranularMedicine.php | 4 +- .../modelsgii/{ => oldDb}/GranularRepice.php | 4 +- common/modelsgii/{ => oldDb}/HealthyNews.php | 2 +- common/modelsgii/{ => oldDb}/Hospital.php | 4 +- .../{ => oldDb}/HospitalDepartmentIntro.php | 2 +- common/modelsgii/{ => oldDb}/HospitalYard.php | 4 +- .../{ => oldDb}/HospitalYardDepartment.php | 4 +- .../{ => oldDb}/HospitalYardPhysical.php | 2 +- common/modelsgii/{ => oldDb}/ImBind.php | 4 +- common/modelsgii/{ => oldDb}/ImMessage.php | 4 +- .../{ => oldDb}/ImMessageSession.php | 4 +- .../{ => oldDb}/ImMessageSessionOrder.php | 4 +- .../{ => oldDb}/InquiryRefuseReason.php | 4 +- common/modelsgii/{ => oldDb}/LeadInfo.php | 4 +- common/modelsgii/{ => oldDb}/Ledger.php | 4 +- common/modelsgii/{ => oldDb}/LedgerLog.php | 4 +- common/modelsgii/{ => oldDb}/Log.php | 4 +- .../modelsgii/{ => oldDb}/MedicalAdvice.php | 4 +- common/modelsgii/{ => oldDb}/Menu.php | 4 +- common/modelsgii/{ => oldDb}/Nav.php | 4 +- common/modelsgii/{ => oldDb}/OpLog.php | 4 +- common/modelsgii/{ => oldDb}/Order.php | 4 +- common/modelsgii/{ => oldDb}/OrderLog.php | 4 +- .../{ => oldDb}/OrderNumberChange.php | 4 +- common/modelsgii/{ => oldDb}/OrderRefund.php | 4 +- .../modelsgii/{ => oldDb}/OrderVideoInfo.php | 4 +- common/modelsgii/{ => oldDb}/OtherInfo.php | 4 +- common/modelsgii/{ => oldDb}/Page.php | 4 +- .../{ => oldDb}/PatientVisitRecord.php | 4 +- common/modelsgii/{ => oldDb}/PayConfig.php | 4 +- common/modelsgii/{ => oldDb}/PaymentOrder.php | 4 +- .../{ => oldDb}/PaymentPrescripOrder.php | 4 +- .../{ => oldDb}/PaymentPrescripRefund.php | 4 +- .../{ => oldDb}/PaymentProductOrder.php | 4 +- .../{ => oldDb}/PaymentProductRefund.php | 4 +- .../modelsgii/{ => oldDb}/PaymentRefund.php | 4 +- .../modelsgii/{ => oldDb}/PaymentRegister.php | 4 +- .../{ => oldDb}/PaymentRegisterRefund.php | 4 +- common/modelsgii/{ => oldDb}/Pharmacist.php | 4 +- .../{ => oldDb}/PharmacistIdentity.php | 4 +- .../modelsgii/{ => oldDb}/PharmacistInfo.php | 4 +- .../{ => oldDb}/PharmacistPracticing.php | 4 +- .../modelsgii/{ => oldDb}/PhysicalPackage.php | 2 +- .../modelsgii/{ => oldDb}/PhysicalReserve.php | 3 +- .../{ => oldDb}/PhysicalReserveTotal.php | 2 +- common/modelsgii/{ => oldDb}/Platform.php | 4 +- .../{ => oldDb}/PrescripOrderLog.php | 4 +- .../{ => oldDb}/PrescripOrderRefund.php | 4 +- common/modelsgii/{ => oldDb}/Prescription.php | 4 +- .../{ => oldDb}/PrescriptionChinese.php | 4 +- .../{ => oldDb}/PrescriptionGranular.php | 4 +- .../modelsgii/{ => oldDb}/PrescriptionLog.php | 4 +- .../{ => oldDb}/PrescriptionWest.php | 4 +- common/modelsgii/{ => oldDb}/ProcessRule.php | 4 +- .../modelsgii/{ => oldDb}/ProcessRuleNote.php | 4 +- common/modelsgii/{ => oldDb}/ProductOrder.php | 4 +- .../{ => oldDb}/ProductOrderItems.php | 2 +- .../modelsgii/{ => oldDb}/ProductOrderLog.php | 4 +- .../{ => oldDb}/ProductOrderRefund.php | 4 +- .../modelsgii/{ => oldDb}/Reconciliation.php | 4 +- common/modelsgii/{ => oldDb}/RefundReason.php | 4 +- common/modelsgii/{ => oldDb}/Region.php | 4 +- common/modelsgii/{ => oldDb}/Register.php | 4 +- common/modelsgii/{ => oldDb}/RegisterLog.php | 4 +- .../modelsgii/{ => oldDb}/RegisterRefund.php | 4 +- .../modelsgii/{ => oldDb}/ReplayTemplate.php | 4 +- .../{ => oldDb}/ReplayTemplateGroup.php | 4 +- common/modelsgii/{ => oldDb}/Role.php | 4 +- common/modelsgii/{ => oldDb}/RoleMenu.php | 4 +- common/modelsgii/{ => oldDb}/ServInfo.php | 4 +- common/modelsgii/{ => oldDb}/ServiceUser.php | 4 +- .../{ => oldDb}/ServiceUserToken.php | 4 +- common/modelsgii/{ => oldDb}/Store.php | 4 +- .../modelsgii/{ => oldDb}/StoreDepartment.php | 4 +- common/modelsgii/{ => oldDb}/StoreDoctor.php | 4 +- common/modelsgii/{ => oldDb}/StoreUser.php | 4 +- .../modelsgii/{ => oldDb}/SubAccountMenu.php | 4 +- common/modelsgii/{ => oldDb}/SystemConfig.php | 4 +- common/modelsgii/{ => oldDb}/SystemNotice.php | 4 +- common/modelsgii/{ => oldDb}/User.php | 4 +- common/modelsgii/{ => oldDb}/UserCollect.php | 4 +- common/modelsgii/{ => oldDb}/UserComment.php | 4 +- common/modelsgii/{ => oldDb}/UserInquiry.php | 4 +- common/modelsgii/{ => oldDb}/UserPatient.php | 4 +- .../modelsgii/{ => oldDb}/UserPatientCase.php | 4 +- .../{ => oldDb}/UserPatientHealthInquiry.php | 4 +- .../modelsgii/{ => oldDb}/UserPatientIll.php | 4 +- .../{ => oldDb}/UserPatientRecord.php | 4 +- common/modelsgii/{ => oldDb}/WestRecipe.php | 4 +- common/modelsgii/{ => oldDb}/WestUnit.php | 4 +- common/services/ExpressService.php | 6 +- common/services/PrescriptionService.php | 11 +- member/models/User.php | 2 +- member/models/forms/AddressForm.php | 3 +- member/models/forms/AskForm.php | 13 +- member/models/forms/CommentForm.php | 4 +- member/models/forms/FollowForm.php | 2 +- member/models/forms/HealthForm.php | 6 +- member/models/forms/LoginForm.php | 8 +- member/models/forms/OrderSubmitResultForm.php | 5 +- member/models/forms/PatientForm.php | 6 +- member/models/forms/PayForm.php | 2 +- member/models/forms/PhysicalForm.php | 8 +- .../models/forms/PrescripOrderSubmitForm.php | 12 +- .../models/forms/ProductOrderSubmitForm.php | 12 +- member/models/forms/RegisterForm.php | 12 +- member/models/forms/RegisterSubmitForm.php | 8 +- member/models/search/ImSessionSearch.php | 6 +- .../v1/controllers/AttachmentController.php | 2 +- .../v1/controllers/CallbackController.php | 50 ++-- .../v1/controllers/DoctorController.php | 25 +- .../controllers/EplpayCallbackController.php | 36 ++- .../modules/v1/controllers/ImController.php | 20 +- .../modules/v1/controllers/InfoController.php | 4 +- .../v1/controllers/LeadConsultController.php | 8 +- .../modules/v1/controllers/MyController.php | 28 +- .../v1/controllers/OrderController.php | 12 +- .../v1/controllers/OrderVideoController.php | 4 +- .../v1/controllers/OtherController.php | 4 +- .../v1/controllers/PatientController.php | 2 +- .../v1/controllers/PhysicalController.php | 5 +- .../controllers/PrescripOrderController.php | 2 +- .../v1/controllers/ProductOrderController.php | 26 +- .../v1/controllers/RegisterController.php | 2 +- .../v1/controllers/StoreController.php | 4 +- .../v1/controllers/SystemNoticeController.php | 8 +- .../modules/v1/controllers/TestController.php | 4 +- .../v1/controllers/UserCommentController.php | 4 +- .../modules/v1/controllers/UserController.php | 12 +- .../ResendVerificationEmailCest.php | 6 +- member/tests/functional/SignupCest.php | 4 +- member/tests/functional/VerifyEmailCest.php | 6 +- .../models/PasswordResetRequestFormTest.php | 5 +- member/tests/unit/models/SignupFormTest.php | 8 +- .../tests/unit/models/VerifyEmailFormTest.php | 6 +- platform/models/Platform.php | 4 +- platform/models/forms/SyncPatientForm.php | 9 +- .../v1/controllers/DoctorController.php | 6 +- .../modules/v1/controllers/ErpController.php | 11 +- .../modules/v1/controllers/SyncController.php | 4 +- service/models/ServiceUser.php | 7 +- service/models/forms/AgreementForm.php | 2 +- service/models/forms/CaseForm.php | 2 +- service/models/forms/DoctorCompleteFour.php | 6 +- service/models/forms/DoctorCompleteOne.php | 10 +- service/models/forms/DoctorServiceForm.php | 4 +- service/models/forms/DrugCompleteOne.php | 7 +- service/models/forms/HospitalDocForm.php | 4 +- service/models/forms/LeadCompleteOne.php | 5 +- service/models/forms/LoginForm.php | 6 +- service/models/forms/RegisterForm.php | 2 +- service/models/forms/ResetPasswordForm.php | 2 +- service/models/forms/ServiceCompleteOne.php | 6 +- service/models/forms/UpdatePasswordForm.php | 1 - .../v1/controllers/AttachmentController.php | 1 - .../v1/controllers/CallbackController.php | 32 +- .../modules/v1/controllers/CaseController.php | 2 +- .../v1/controllers/CompleteController.php | 15 +- .../v1/controllers/DiagnoseController.php | 2 +- .../controllers/DoctorArticleController.php | 4 +- .../v1/controllers/DoctorMyController.php | 2 +- .../v1/controllers/DoctorNoticeController.php | 2 +- .../v1/controllers/DoctorWorkController.php | 20 +- .../v1/controllers/ExamineController.php | 18 +- .../modules/v1/controllers/HomeController.php | 2 +- .../modules/v1/controllers/ImController.php | 14 +- .../v1/controllers/ImageOrderController.php | 14 +- .../v1/controllers/LeaderController.php | 4 +- .../v1/controllers/OrderVideoController.php | 8 +- .../v1/controllers/PatientController.php | 24 +- .../v1/controllers/PharmacistController.php | 5 +- .../controllers/PrescripDetailController.php | 16 +- .../v1/controllers/PrescriptionController.php | 276 +++++++++++++++--- .../v1/controllers/QuickController.php | 5 +- .../v1/controllers/RecipeController.php | 14 +- .../v1/controllers/RegisterController.php | 4 +- .../v1/controllers/StoreAcceptController.php | 11 +- .../v1/controllers/StoreController.php | 10 +- .../v1/controllers/SystemNoticeController.php | 2 +- .../v1/controllers/TagManageController.php | 4 +- .../modules/v1/controllers/UserController.php | 11 +- .../ResendVerificationEmailCest.php | 6 +- service/tests/functional/SignupCest.php | 4 +- service/tests/functional/VerifyEmailCest.php | 6 +- .../models/PasswordResetRequestFormTest.php | 4 +- service/tests/unit/models/SignupFormTest.php | 8 +- .../tests/unit/models/VerifyEmailFormTest.php | 6 +- 539 files changed, 1667 insertions(+), 1906 deletions(-) create mode 100644 common/core/BaseNewActiveRecord.php delete mode 100644 common/models/AuthItem.php delete mode 100644 common/models/AuthRule.php delete mode 100644 common/models/DocPhaImgs.php delete mode 100644 common/models/DoctorNotice.php delete mode 100644 common/models/DoctorTagIll.php delete mode 100644 common/models/DoctorTitle.php delete mode 100644 common/models/DrugCategories.php delete mode 100644 common/models/DrugDosage.php delete mode 100644 common/models/DrugUseFrequency.php delete mode 100644 common/models/DrugUseNum.php delete mode 100644 common/models/DrugUseTime.php delete mode 100644 common/models/DrugUseType.php delete mode 100644 common/models/DrugUseWay.php delete mode 100644 common/models/ExpressNos.php delete mode 100644 common/models/HospitalYardDepartment.php delete mode 100644 common/models/Menu.php delete mode 100644 common/models/PhysicalReserveTotal.php delete mode 100644 common/models/WestUnit.php create mode 100644 common/models/newDb/AdminModel.php rename common/models/{ => oldDb}/Address.php (83%) rename common/models/{ => oldDb}/Admin.php (82%) rename common/models/{ => oldDb}/AdminAccessToken.php (92%) rename common/models/{ => oldDb}/Attachment.php (82%) rename common/models/{ => oldDb}/AttachmentGroup.php (81%) create mode 100644 common/models/oldDb/AuthItem.php rename common/models/{ => oldDb}/AuthRole.php (61%) create mode 100644 common/models/oldDb/AuthRule.php rename common/models/{ => oldDb}/BaseConfig.php (82%) rename common/models/{ => oldDb}/Callback.php (83%) rename common/models/{ => oldDb}/CashAccount.php (88%) rename common/models/{ => oldDb}/CashApply.php (98%) rename common/models/{ => oldDb}/Categories.php (82%) rename common/models/{ => oldDb}/ChargeCashPayRecord.php (83%) rename common/models/{ => oldDb}/ChineseRepice.php (88%) rename common/models/{ => oldDb}/Config.php (95%) rename common/models/{ => oldDb}/Department.php (89%) rename common/models/{ => oldDb}/DiagnoseCommon.php (81%) rename common/models/{ => oldDb}/Disease.php (83%) rename common/models/{ => oldDb}/DiseaseCommon.php (85%) rename common/models/{ => oldDb}/DistrictArr.php (99%) create mode 100644 common/models/oldDb/DocPhaImgs.php rename common/models/{ => oldDb}/DoctorApply.php (82%) rename common/models/{ => oldDb}/DoctorArticle.php (85%) rename common/models/{ => oldDb}/DoctorCommon.php (86%) rename common/models/{InquiryRefuseReason.php => oldDb/DoctorIdentity.php} (81%) rename common/models/{ => oldDb}/DoctorInfo.php (95%) rename common/models/{DoctorIdentity.php => oldDb/DoctorNotice.php} (82%) rename common/models/{ => oldDb}/DoctorPatient.php (96%) rename common/models/{ => oldDb}/DoctorPatientRemark.php (80%) create mode 100644 common/models/oldDb/DoctorPracticing.php rename common/models/{ => oldDb}/DoctorService.php (81%) rename common/models/{DoctorPracticing.php => oldDb/DoctorTagIll.php} (82%) create mode 100644 common/models/oldDb/DoctorTitle.php rename common/models/{ => oldDb}/Drug.php (98%) create mode 100644 common/models/oldDb/DrugCategories.php create mode 100644 common/models/oldDb/DrugDosage.php rename common/models/{ => oldDb}/DrugStore.php (83%) rename common/models/{ => oldDb}/DrugStoreDrug.php (92%) rename common/models/{ => oldDb}/DrugStoreRelations.php (86%) create mode 100644 common/models/oldDb/DrugUseFrequency.php create mode 100644 common/models/oldDb/DrugUseNum.php create mode 100644 common/models/oldDb/DrugUseTime.php create mode 100644 common/models/oldDb/DrugUseType.php create mode 100644 common/models/oldDb/DrugUseWay.php rename common/models/{ => oldDb}/ExamineLog.php (82%) rename common/models/{ => oldDb}/ExpressCompanies.php (81%) create mode 100644 common/models/oldDb/ExpressNos.php rename common/models/{ => oldDb}/FollowDoctor.php (91%) rename common/models/{ => oldDb}/FollowUser.php (82%) rename common/models/{ => oldDb}/FreeDeliveryRules.php (98%) rename common/models/{ => oldDb}/FundWater.php (97%) rename common/models/{ => oldDb}/GranularRepice.php (85%) rename common/models/{ => oldDb}/HealthyNews.php (88%) rename common/models/{ => oldDb}/Hospital.php (86%) rename common/models/{ => oldDb}/HospitalDepartmentIntro.php (87%) rename common/models/{ => oldDb}/HospitalYard.php (84%) create mode 100644 common/models/oldDb/HospitalYardDepartment.php rename common/models/{ => oldDb}/HospitalYardPhysical.php (86%) rename common/models/{ => oldDb}/ImMessage.php (95%) rename common/models/{ => oldDb}/ImMessageSession.php (95%) rename common/models/{ => oldDb}/ImMessageSessionOrder.php (79%) create mode 100644 common/models/oldDb/InquiryRefuseReason.php rename common/models/{ => oldDb}/LeadInfo.php (96%) rename common/models/{ => oldDb}/Ledger.php (97%) rename common/models/{ => oldDb}/LedgerLog.php (86%) rename common/models/{ => oldDb}/Log.php (90%) create mode 100644 common/models/oldDb/Menu.php rename common/models/{ => oldDb}/Nav.php (85%) rename common/models/{ => oldDb}/OpLog.php (75%) rename common/models/{ => oldDb}/Order.php (98%) rename common/models/{ => oldDb}/OrderLog.php (89%) rename common/models/{ => oldDb}/OrderNumberChange.php (80%) rename common/models/{ => oldDb}/OrderRefund.php (85%) rename common/models/{ => oldDb}/OrderVideoInfo.php (84%) rename common/models/{ => oldDb}/PatientVisitRecord.php (84%) rename common/models/{ => oldDb}/PaymentOrder.php (82%) rename common/models/{ => oldDb}/PaymentPrescripOrder.php (79%) rename common/models/{ => oldDb}/PaymentPrescripRefund.php (79%) rename common/models/{ => oldDb}/PaymentProductOrder.php (80%) rename common/models/{ => oldDb}/PaymentProductRefund.php (79%) rename common/models/{ => oldDb}/PaymentRefund.php (81%) rename common/models/{ => oldDb}/PaymentRegister.php (81%) rename common/models/{ => oldDb}/PaymentRegisterRefund.php (79%) rename common/models/{ => oldDb}/PharmacistIdentity.php (80%) rename common/models/{ => oldDb}/PharmacistPracticing.php (79%) rename common/models/{ => oldDb}/PharmacistrInfo.php (95%) rename common/models/{ => oldDb}/PhysicalPackage.php (87%) rename common/models/{ => oldDb}/PhysicalReserve.php (91%) create mode 100644 common/models/oldDb/PhysicalReserveTotal.php rename common/models/{ => oldDb}/Platform.php (88%) rename common/models/{ => oldDb}/PostageRules.php (98%) rename common/models/{ => oldDb}/PrescripOrderLog.php (88%) rename common/models/{ => oldDb}/PrescripOrderRefund.php (80%) rename common/models/{ => oldDb}/Prescription.php (98%) rename common/models/{ => oldDb}/PrescriptionChinese.php (90%) rename common/models/{ => oldDb}/PrescriptionGranular.php (94%) rename common/models/{ => oldDb}/PrescriptionLog.php (88%) rename common/models/{ => oldDb}/PrescriptionWest.php (94%) rename common/models/{ => oldDb}/ProcessRule.php (84%) rename common/models/{ => oldDb}/ProcessRuleNote.php (83%) rename common/models/{ => oldDb}/ProductOrder.php (99%) rename common/models/{ => oldDb}/ProductOrderItems.php (87%) rename common/models/{ => oldDb}/ProductOrderLog.php (88%) rename common/models/{ => oldDb}/ProductOrderRefund.php (83%) rename common/models/{ => oldDb}/Reconciliation.php (96%) rename common/models/{ => oldDb}/RefundAddress.php (98%) rename common/models/{ => oldDb}/Region.php (84%) rename common/models/{ => oldDb}/Register.php (97%) rename common/models/{ => oldDb}/RegisterLog.php (88%) rename common/models/{ => oldDb}/RegisterRefund.php (84%) rename common/models/{ => oldDb}/ReplayTemplate.php (81%) rename common/models/{ => oldDb}/ReplayTemplateGroup.php (83%) rename common/models/{ => oldDb}/Role.php (87%) rename common/models/{ => oldDb}/RoleMenu.php (86%) rename common/models/{ => oldDb}/ServInfo.php (88%) rename common/models/{ => oldDb}/ServiceUser.php (96%) rename common/models/{ => oldDb}/ServiceUserToken.php (93%) rename common/models/{ => oldDb}/Store.php (95%) rename common/models/{ => oldDb}/StoreDepartment.php (80%) rename common/models/{ => oldDb}/StoreDoctor.php (88%) rename common/models/{ => oldDb}/StoreUser.php (90%) rename common/models/{ => oldDb}/SubAccountMenu.php (81%) rename common/models/{ => oldDb}/SystemConfig.php (82%) rename common/models/{ => oldDb}/SystemNotice.php (82%) rename common/models/{ => oldDb}/User.php (94%) rename common/models/{ => oldDb}/UserCollect.php (82%) rename common/models/{ => oldDb}/UserComment.php (91%) rename common/models/{ => oldDb}/UserInquiry.php (82%) rename common/models/{ => oldDb}/UserPatient.php (94%) rename common/models/{ => oldDb}/UserPatientCase.php (89%) rename common/models/{ => oldDb}/UserPatientHealthInquiry.php (78%) rename common/models/{ => oldDb}/UserPatientIll.php (86%) rename common/models/{ => oldDb}/UserPatientRecord.php (80%) rename common/models/{ => oldDb}/UserRelationship.php (72%) rename common/models/{ => oldDb}/UserRelative.php (86%) rename common/models/{ => oldDb}/WestRepice.php (92%) create mode 100644 common/models/oldDb/WestUnit.php create mode 100644 common/modelsgii/newDb/AdminModelGii.php rename common/modelsgii/{ => oldDb}/Address.php (97%) rename common/modelsgii/{ => oldDb}/Admin.php (98%) rename common/modelsgii/{ => oldDb}/AdminAccessToken.php (97%) rename common/modelsgii/{ => oldDb}/Attachment.php (98%) rename common/modelsgii/{ => oldDb}/AttachmentGroup.php (97%) rename common/modelsgii/{ => oldDb}/AuthItem.php (98%) rename common/modelsgii/{ => oldDb}/AuthItemChild.php (97%) rename common/modelsgii/{ => oldDb}/AuthRole.php (95%) rename common/modelsgii/{ => oldDb}/AuthRule.php (97%) rename common/modelsgii/{ => oldDb}/BaseConfig.php (97%) rename common/modelsgii/{ => oldDb}/Callback.php (97%) rename common/modelsgii/{ => oldDb}/CashAccount.php (97%) rename common/modelsgii/{ => oldDb}/CashApply.php (97%) rename common/modelsgii/{ => oldDb}/Categories.php (96%) rename common/modelsgii/{ => oldDb}/ChargeCashPayRecord.php (97%) rename common/modelsgii/{ => oldDb}/ChineseMedicine.php (97%) rename common/modelsgii/{ => oldDb}/ChineseRepice.php (98%) rename common/modelsgii/{ => oldDb}/Config.php (97%) rename common/modelsgii/{ => oldDb}/Department.php (96%) rename common/modelsgii/{ => oldDb}/DiagnoseCommon.php (95%) rename common/modelsgii/{ => oldDb}/Disease.php (96%) rename common/modelsgii/{ => oldDb}/DiseaseCommon.php (95%) rename common/modelsgii/{ => oldDb}/DocPhaImgs.php (97%) rename common/modelsgii/{ => oldDb}/DoctorApply.php (96%) rename common/modelsgii/{ => oldDb}/DoctorArticle.php (97%) rename common/modelsgii/{ => oldDb}/DoctorCommon.php (96%) rename common/modelsgii/{ => oldDb}/DoctorIdentity.php (97%) rename common/modelsgii/{ => oldDb}/DoctorInfo.php (98%) rename common/modelsgii/{ => oldDb}/DoctorNotice.php (97%) rename common/modelsgii/{ => oldDb}/DoctorPatient.php (97%) rename common/modelsgii/{ => oldDb}/DoctorPatientRemark.php (96%) rename common/modelsgii/{ => oldDb}/DoctorPracticing.php (97%) rename common/modelsgii/{ => oldDb}/DoctorService.php (96%) rename common/modelsgii/{ => oldDb}/DoctorTagIll.php (96%) rename common/modelsgii/{ => oldDb}/DoctorTitle.php (95%) rename common/modelsgii/{ => oldDb}/Drug.php (98%) rename common/modelsgii/{ => oldDb}/DrugCategories.php (97%) rename common/modelsgii/{ => oldDb}/DrugDosage.php (95%) rename common/modelsgii/{ => oldDb}/DrugStoreDrug.php (97%) rename common/modelsgii/{ => oldDb}/DrugStoreRelations.php (97%) rename common/modelsgii/{ => oldDb}/DrugUseFrequency.php (95%) rename common/modelsgii/{ => oldDb}/DrugUseNum.php (95%) rename common/modelsgii/{ => oldDb}/DrugUseTime.php (95%) rename common/modelsgii/{ => oldDb}/DrugUseType.php (95%) rename common/modelsgii/{ => oldDb}/DrugUseWay.php (95%) rename common/modelsgii/{ => oldDb}/Drugstore.php (96%) rename common/modelsgii/{ => oldDb}/ExamineLog.php (97%) rename common/modelsgii/{ => oldDb}/ExpressCompanies.php (97%) rename common/modelsgii/{ => oldDb}/ExpressDetails.php (97%) rename common/modelsgii/{ => oldDb}/ExpressNos.php (97%) rename common/modelsgii/{ => oldDb}/FollowDoctor.php (96%) rename common/modelsgii/{ => oldDb}/FollowUser.php (96%) rename common/modelsgii/{ => oldDb}/FundWater.php (98%) rename common/modelsgii/{ => oldDb}/GranularMedicine.php (97%) rename common/modelsgii/{ => oldDb}/GranularRepice.php (97%) rename common/modelsgii/{ => oldDb}/HealthyNews.php (97%) rename common/modelsgii/{ => oldDb}/Hospital.php (96%) rename common/modelsgii/{ => oldDb}/HospitalDepartmentIntro.php (97%) rename common/modelsgii/{ => oldDb}/HospitalYard.php (96%) rename common/modelsgii/{ => oldDb}/HospitalYardDepartment.php (96%) rename common/modelsgii/{ => oldDb}/HospitalYardPhysical.php (96%) rename common/modelsgii/{ => oldDb}/ImBind.php (96%) rename common/modelsgii/{ => oldDb}/ImMessage.php (97%) rename common/modelsgii/{ => oldDb}/ImMessageSession.php (97%) rename common/modelsgii/{ => oldDb}/ImMessageSessionOrder.php (96%) rename common/modelsgii/{ => oldDb}/InquiryRefuseReason.php (96%) rename common/modelsgii/{ => oldDb}/LeadInfo.php (97%) rename common/modelsgii/{ => oldDb}/Ledger.php (97%) rename common/modelsgii/{ => oldDb}/LedgerLog.php (97%) rename common/modelsgii/{ => oldDb}/Log.php (97%) rename common/modelsgii/{ => oldDb}/MedicalAdvice.php (97%) rename common/modelsgii/{ => oldDb}/Menu.php (97%) rename common/modelsgii/{ => oldDb}/Nav.php (97%) rename common/modelsgii/{ => oldDb}/OpLog.php (98%) rename common/modelsgii/{ => oldDb}/Order.php (99%) rename common/modelsgii/{ => oldDb}/OrderLog.php (96%) rename common/modelsgii/{ => oldDb}/OrderNumberChange.php (96%) rename common/modelsgii/{ => oldDb}/OrderRefund.php (97%) rename common/modelsgii/{ => oldDb}/OrderVideoInfo.php (98%) rename common/modelsgii/{ => oldDb}/OtherInfo.php (97%) rename common/modelsgii/{ => oldDb}/Page.php (96%) rename common/modelsgii/{ => oldDb}/PatientVisitRecord.php (97%) rename common/modelsgii/{ => oldDb}/PayConfig.php (97%) rename common/modelsgii/{ => oldDb}/PaymentOrder.php (97%) rename common/modelsgii/{ => oldDb}/PaymentPrescripOrder.php (97%) rename common/modelsgii/{ => oldDb}/PaymentPrescripRefund.php (97%) rename common/modelsgii/{ => oldDb}/PaymentProductOrder.php (97%) rename common/modelsgii/{ => oldDb}/PaymentProductRefund.php (97%) rename common/modelsgii/{ => oldDb}/PaymentRefund.php (97%) rename common/modelsgii/{ => oldDb}/PaymentRegister.php (97%) rename common/modelsgii/{ => oldDb}/PaymentRegisterRefund.php (97%) rename common/modelsgii/{ => oldDb}/Pharmacist.php (97%) rename common/modelsgii/{ => oldDb}/PharmacistIdentity.php (97%) rename common/modelsgii/{ => oldDb}/PharmacistInfo.php (97%) rename common/modelsgii/{ => oldDb}/PharmacistPracticing.php (96%) rename common/modelsgii/{ => oldDb}/PhysicalPackage.php (97%) rename common/modelsgii/{ => oldDb}/PhysicalReserve.php (95%) rename common/modelsgii/{ => oldDb}/PhysicalReserveTotal.php (97%) rename common/modelsgii/{ => oldDb}/Platform.php (96%) rename common/modelsgii/{ => oldDb}/PrescripOrderLog.php (96%) rename common/modelsgii/{ => oldDb}/PrescripOrderRefund.php (97%) rename common/modelsgii/{ => oldDb}/Prescription.php (99%) rename common/modelsgii/{ => oldDb}/PrescriptionChinese.php (98%) rename common/modelsgii/{ => oldDb}/PrescriptionGranular.php (98%) rename common/modelsgii/{ => oldDb}/PrescriptionLog.php (96%) rename common/modelsgii/{ => oldDb}/PrescriptionWest.php (98%) rename common/modelsgii/{ => oldDb}/ProcessRule.php (97%) rename common/modelsgii/{ => oldDb}/ProcessRuleNote.php (96%) rename common/modelsgii/{ => oldDb}/ProductOrder.php (98%) rename common/modelsgii/{ => oldDb}/ProductOrderItems.php (96%) rename common/modelsgii/{ => oldDb}/ProductOrderLog.php (96%) rename common/modelsgii/{ => oldDb}/ProductOrderRefund.php (97%) rename common/modelsgii/{ => oldDb}/Reconciliation.php (97%) rename common/modelsgii/{ => oldDb}/RefundReason.php (95%) rename common/modelsgii/{ => oldDb}/Region.php (96%) rename common/modelsgii/{ => oldDb}/Register.php (98%) rename common/modelsgii/{ => oldDb}/RegisterLog.php (96%) rename common/modelsgii/{ => oldDb}/RegisterRefund.php (97%) rename common/modelsgii/{ => oldDb}/ReplayTemplate.php (96%) rename common/modelsgii/{ => oldDb}/ReplayTemplateGroup.php (96%) rename common/modelsgii/{ => oldDb}/Role.php (96%) rename common/modelsgii/{ => oldDb}/RoleMenu.php (96%) rename common/modelsgii/{ => oldDb}/ServInfo.php (97%) rename common/modelsgii/{ => oldDb}/ServiceUser.php (97%) rename common/modelsgii/{ => oldDb}/ServiceUserToken.php (96%) rename common/modelsgii/{ => oldDb}/Store.php (98%) rename common/modelsgii/{ => oldDb}/StoreDepartment.php (96%) rename common/modelsgii/{ => oldDb}/StoreDoctor.php (97%) rename common/modelsgii/{ => oldDb}/StoreUser.php (97%) rename common/modelsgii/{ => oldDb}/SubAccountMenu.php (96%) rename common/modelsgii/{ => oldDb}/SystemConfig.php (96%) rename common/modelsgii/{ => oldDb}/SystemNotice.php (97%) rename common/modelsgii/{ => oldDb}/User.php (98%) rename common/modelsgii/{ => oldDb}/UserCollect.php (94%) rename common/modelsgii/{ => oldDb}/UserComment.php (97%) rename common/modelsgii/{ => oldDb}/UserInquiry.php (98%) rename common/modelsgii/{ => oldDb}/UserPatient.php (98%) rename common/modelsgii/{ => oldDb}/UserPatientCase.php (98%) rename common/modelsgii/{ => oldDb}/UserPatientHealthInquiry.php (98%) rename common/modelsgii/{ => oldDb}/UserPatientIll.php (96%) rename common/modelsgii/{ => oldDb}/UserPatientRecord.php (97%) rename common/modelsgii/{ => oldDb}/WestRecipe.php (97%) rename common/modelsgii/{ => oldDb}/WestUnit.php (95%) diff --git a/admin/components/BaseAdminController.php b/admin/components/BaseAdminController.php index 2c45cfe..fcfc35f 100644 --- a/admin/components/BaseAdminController.php +++ b/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等方法 diff --git a/admin/controllers/AdminController.php b/admin/controllers/AdminController.php index d6ed8a6..63b636b 100644 --- a/admin/controllers/AdminController.php +++ b/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; /** * 后台用户控制器 diff --git a/admin/controllers/AttachmentController.php b/admin/controllers/AttachmentController.php index d8316c1..8541e83 100644 --- a/admin/controllers/AttachmentController.php +++ b/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; /** diff --git a/admin/controllers/AuthController.php b/admin/controllers/AuthController.php index 4d9295c..a26e28f 100644 --- a/admin/controllers/AuthController.php +++ b/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; diff --git a/admin/controllers/LoginController.php b/admin/controllers/LoginController.php index a866f9e..ff935fc 100644 --- a/admin/controllers/LoginController.php +++ b/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 { diff --git a/admin/controllers/MenuController.php b/admin/controllers/MenuController.php index ef847c8..7ac5d56 100644 --- a/admin/controllers/MenuController.php +++ b/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; /** diff --git a/admin/controllers/PublicController.php b/admin/controllers/PublicController.php index e1128ad..caaacb1 100644 --- a/admin/controllers/PublicController.php +++ b/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; /** * 公共调用处理 diff --git a/admin/controllers/StoreController.php b/admin/controllers/StoreController.php index 0b18299..971724d 100644 --- a/admin/controllers/StoreController.php +++ b/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; diff --git a/admin/controllers/UserController.php b/admin/controllers/UserController.php index 02553b0..2070ca5 100644 --- a/admin/controllers/UserController.php +++ b/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; /** diff --git a/admin/controllers/base/ArticleController.php b/admin/controllers/base/ArticleController.php index 2d23dfc..ddee11f 100644 --- a/admin/controllers/base/ArticleController.php +++ b/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 diff --git a/admin/controllers/base/ChargeCashController.php b/admin/controllers/base/ChargeCashController.php index 704d8c0..86e1569 100644 --- a/admin/controllers/base/ChargeCashController.php +++ b/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 待付 diff --git a/admin/controllers/base/DataController.php b/admin/controllers/base/DataController.php index 157f100..84289be 100644 --- a/admin/controllers/base/DataController.php +++ b/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; diff --git a/admin/controllers/base/DepartController.php b/admin/controllers/base/DepartController.php index 9246a30..983fc95 100644 --- a/admin/controllers/base/DepartController.php +++ b/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 科室与门店 diff --git a/admin/controllers/base/DiagnoseController.php b/admin/controllers/base/DiagnoseController.php index b5e0c25..728c65a 100644 --- a/admin/controllers/base/DiagnoseController.php +++ b/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; diff --git a/admin/controllers/base/DivideAccountController.php b/admin/controllers/base/DivideAccountController.php index 4cfb399..bba1490 100644 --- a/admin/controllers/base/DivideAccountController.php +++ b/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; } diff --git a/admin/controllers/base/FinanceController.php b/admin/controllers/base/FinanceController.php index 902a280..7cf0cad 100644 --- a/admin/controllers/base/FinanceController.php +++ b/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; diff --git a/admin/controllers/base/HomeController.php b/admin/controllers/base/HomeController.php index 4357377..26c86c8 100644 --- a/admin/controllers/base/HomeController.php +++ b/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); diff --git a/admin/controllers/base/NavController.php b/admin/controllers/base/NavController.php index dae043d..402dae3 100644 --- a/admin/controllers/base/NavController.php +++ b/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 diff --git a/admin/controllers/base/NoticeController.php b/admin/controllers/base/NoticeController.php index 2c3435a..d18bcd6 100644 --- a/admin/controllers/base/NoticeController.php +++ b/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 公告 diff --git a/admin/controllers/base/OrderController.php b/admin/controllers/base/OrderController.php index ab7ee7f..2920492 100644 --- a/admin/controllers/base/OrderController.php +++ b/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; diff --git a/admin/controllers/base/PrescriptionController.php b/admin/controllers/base/PrescriptionController.php index 13a2d4e..ef234fb 100644 --- a/admin/controllers/base/PrescriptionController.php +++ b/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 处方 diff --git a/admin/controllers/base/RegionController.php b/admin/controllers/base/RegionController.php index 5aa97fe..c3908be 100644 --- a/admin/controllers/base/RegionController.php +++ b/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 diff --git a/admin/controllers/base/RegisterController.php b/admin/controllers/base/RegisterController.php index 60031f4..a400f77 100644 --- a/admin/controllers/base/RegisterController.php +++ b/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 diff --git a/admin/controllers/base/SetController.php b/admin/controllers/base/SetController.php index a16d8a5..f90d8f7 100644 --- a/admin/controllers/base/SetController.php +++ b/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; /** diff --git a/admin/controllers/base/StatementAccountController.php b/admin/controllers/base/StatementAccountController.php index 14eec9f..9fc81c3 100644 --- a/admin/controllers/base/StatementAccountController.php +++ b/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; diff --git a/admin/controllers/base/SupplyController.php b/admin/controllers/base/SupplyController.php index 1733af3..4ebeac1 100644 --- a/admin/controllers/base/SupplyController.php +++ b/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; /** diff --git a/admin/controllers/base/SyncController.php b/admin/controllers/base/SyncController.php index be53044..3906372 100644 --- a/admin/controllers/base/SyncController.php +++ b/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; diff --git a/admin/controllers/dashboard/IndexController.php b/admin/controllers/dashboard/IndexController.php index b2061f3..1b962d0 100644 --- a/admin/controllers/dashboard/IndexController.php +++ b/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 工作台 diff --git a/admin/controllers/doctor/DoctorController.php b/admin/controllers/doctor/DoctorController.php index 234f571..96dac41 100644 --- a/admin/controllers/doctor/DoctorController.php +++ b/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 { diff --git a/admin/controllers/doctor/PharmacistController.php b/admin/controllers/doctor/PharmacistController.php index 4b00f65..43f07d9 100644 --- a/admin/controllers/doctor/PharmacistController.php +++ b/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; /** diff --git a/admin/controllers/drug/ChineseController.php b/admin/controllers/drug/ChineseController.php index e67b387..7572095 100644 --- a/admin/controllers/drug/ChineseController.php +++ b/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; diff --git a/admin/controllers/drug/DrugCategoryController.php b/admin/controllers/drug/DrugCategoryController.php index 4e72c77..2f86299 100644 --- a/admin/controllers/drug/DrugCategoryController.php +++ b/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 { diff --git a/admin/controllers/drug/DrugController.php b/admin/controllers/drug/DrugController.php index 314c1a4..4288bd6 100644 --- a/admin/controllers/drug/DrugController.php +++ b/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; diff --git a/admin/controllers/drug/ProcessRuleController.php b/admin/controllers/drug/ProcessRuleController.php index da6785b..c01b262 100644 --- a/admin/controllers/drug/ProcessRuleController.php +++ b/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 { diff --git a/admin/controllers/drug/ServerController.php b/admin/controllers/drug/ServerController.php index 6265da1..071d958 100644 --- a/admin/controllers/drug/ServerController.php +++ b/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; /** diff --git a/admin/controllers/store/StoreController.php b/admin/controllers/store/StoreController.php index ed00ac0..af70487 100644 --- a/admin/controllers/store/StoreController.php +++ b/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; diff --git a/admin/controllers/store/WareController.php b/admin/controllers/store/WareController.php index 9921e63..e710e40 100644 --- a/admin/controllers/store/WareController.php +++ b/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 仓库 */ diff --git a/admin/controllers/system/AdminController.php b/admin/controllers/system/AdminController.php index a771ccd..4682a75 100644 --- a/admin/controllers/system/AdminController.php +++ b/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; diff --git a/admin/controllers/system/AttachmentController.php b/admin/controllers/system/AttachmentController.php index 607faa4..de089d3 100644 --- a/admin/controllers/system/AttachmentController.php +++ b/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; diff --git a/admin/controllers/system/ConfigController.php b/admin/controllers/system/ConfigController.php index 265393c..e8ce5be 100644 --- a/admin/controllers/system/ConfigController.php +++ b/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']); diff --git a/admin/controllers/system/DeliveryController.php b/admin/controllers/system/DeliveryController.php index 5ae9e7b..e9e4378 100644 --- a/admin/controllers/system/DeliveryController.php +++ b/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 diff --git a/admin/controllers/system/DistrictController.php b/admin/controllers/system/DistrictController.php index a0ca1b5..0aae198 100644 --- a/admin/controllers/system/DistrictController.php +++ b/admin/controllers/system/DistrictController.php @@ -1,7 +1,7 @@ $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() { diff --git a/admin/models/Config.php b/admin/models/Config.php index 492b9e6..745f849 100644 --- a/admin/models/Config.php +++ b/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 diff --git a/admin/models/Menu.php b/admin/models/Menu.php index 0f28a1d..bbc6cd5 100644 --- a/admin/models/Menu.php +++ b/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 { } diff --git a/admin/models/Page.php b/admin/models/Page.php index 8973dc4..913a959 100644 --- a/admin/models/Page.php +++ b/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 diff --git a/admin/models/RegisterForm.php b/admin/models/RegisterForm.php index 7280fbc..39a63be 100644 --- a/admin/models/RegisterForm.php +++ b/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)){ diff --git a/admin/models/forms/AttachmentUpload.php b/admin/models/forms/AttachmentUpload.php index 8eac09f..a773fa9 100644 --- a/admin/models/forms/AttachmentUpload.php +++ b/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; diff --git a/admin/models/forms/FreeRuleEditForm.php b/admin/models/forms/FreeRuleEditForm.php index 995a72e..4793719 100644 --- a/admin/models/forms/FreeRuleEditForm.php +++ b/admin/models/forms/FreeRuleEditForm.php @@ -1,7 +1,7 @@ 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', diff --git a/common/config/test.php b/common/config/test.php index c50955f..cdcd10d 100644 --- a/common/config/test.php +++ b/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', ], ], ]; diff --git a/common/core/BaseAdminController.php b/common/core/BaseAdminController.php index b33695c..387583f 100644 --- a/common/core/BaseAdminController.php +++ b/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 diff --git a/common/core/BaseAppController.php b/common/core/BaseAppController.php index 750226f..c665d86 100644 --- a/common/core/BaseAppController.php +++ b/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; diff --git a/common/core/BaseNewActiveRecord.php b/common/core/BaseNewActiveRecord.php new file mode 100644 index 0000000..8e006f2 --- /dev/null +++ b/common/core/BaseNewActiveRecord.php @@ -0,0 +1,22 @@ +get('new_db'); + } + public function saveOrFail($runValidation = true, $attributeNames = null){ + if(!$this->save($runValidation, $attributeNames)){ + throw new Exception(implode(',',$this->getFirstErrors())); + } + return true; + } +} diff --git a/common/core/BasePharmacistController.php b/common/core/BasePharmacistController.php index 1ef3e04..3e8eadd 100644 --- a/common/core/BasePharmacistController.php +++ b/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 diff --git a/common/core/BasePlatformController.php b/common/core/BasePlatformController.php index 2c1de02..a4957be 100644 --- a/common/core/BasePlatformController.php +++ b/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 diff --git a/common/core/BaseServiceController.php b/common/core/BaseServiceController.php index 9b6e66f..4e5f942 100644 --- a/common/core/BaseServiceController.php +++ b/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 { diff --git a/common/core/ConsoleApplication.php b/common/core/ConsoleApplication.php index 452bb13..937425f 100644 --- a/common/core/ConsoleApplication.php +++ b/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 diff --git a/common/core/WebApplication.php b/common/core/WebApplication.php index 1ebcf56..fe8fddf 100644 --- a/common/core/WebApplication.php +++ b/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; /*** diff --git a/common/events/OrderEvent.php b/common/events/OrderEvent.php index 5340ff5..8c612eb 100644 --- a/common/events/OrderEvent.php +++ b/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; } diff --git a/common/events/PrescriptionEvent.php b/common/events/PrescriptionEvent.php index 96b18f1..28a7c09 100644 --- a/common/events/PrescriptionEvent.php +++ b/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; } diff --git a/common/events/ProductOrderEvent.php b/common/events/ProductOrderEvent.php index 4b6810e..7ee3e92 100644 --- a/common/events/ProductOrderEvent.php +++ b/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; } diff --git a/common/events/RegisterEvent.php b/common/events/RegisterEvent.php index a3e756c..5ff2e6f 100644 --- a/common/events/RegisterEvent.php +++ b/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; } \ No newline at end of file diff --git a/common/fixtures/UserFixture.php b/common/fixtures/UserFixture.php index 6df7a98..10af225 100644 --- a/common/fixtures/UserFixture.php +++ b/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'; } diff --git a/common/forms/DrugRollBackForm.php b/common/forms/DrugRollBackForm.php index 2b3a97c..04e4516 100644 --- a/common/forms/DrugRollBackForm.php +++ b/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 diff --git a/common/forms/ImMessageForm.php b/common/forms/ImMessageForm.php index 687ec9e..fe16a3a 100644 --- a/common/forms/ImMessageForm.php +++ b/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 diff --git a/common/forms/ImSessionForm.php b/common/forms/ImSessionForm.php index 2a73fbe..cf18a2f 100644 --- a/common/forms/ImSessionForm.php +++ b/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 diff --git a/common/forms/LedgerForm.php b/common/forms/LedgerForm.php index 10fd755..b9aada5 100644 --- a/common/forms/LedgerForm.php +++ b/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; diff --git a/common/forms/OrderRefundForm.php b/common/forms/OrderRefundForm.php index fc67925..69856d8 100644 --- a/common/forms/OrderRefundForm.php +++ b/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 { diff --git a/common/forms/PrescripRefundForm.php b/common/forms/PrescripRefundForm.php index 391ae26..11b59d1 100644 --- a/common/forms/PrescripRefundForm.php +++ b/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; diff --git a/common/forms/ProductCancelForm.php b/common/forms/ProductCancelForm.php index 1062c32..605eb61 100644 --- a/common/forms/ProductCancelForm.php +++ b/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 diff --git a/common/forms/ProductRefundCancelForm.php b/common/forms/ProductRefundCancelForm.php index ea30870..ff7a726 100644 --- a/common/forms/ProductRefundCancelForm.php +++ b/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 diff --git a/common/forms/ProductRefundForm.php b/common/forms/ProductRefundForm.php index 356bb80..372c6c6 100644 --- a/common/forms/ProductRefundForm.php +++ b/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; diff --git a/common/forms/RegisterRefundForm.php b/common/forms/RegisterRefundForm.php index e986e7d..74a2787 100644 --- a/common/forms/RegisterRefundForm.php +++ b/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; diff --git a/common/handlers/OrderPayedHandler.php b/common/handlers/OrderPayedHandler.php index 2611e8e..e42ca0a 100644 --- a/common/handlers/OrderPayedHandler.php +++ b/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 { diff --git a/common/handlers/OrderPayedHandlerClass.php b/common/handlers/OrderPayedHandlerClass.php index 389f227..a106c27 100644 --- a/common/handlers/OrderPayedHandlerClass.php +++ b/common/handlers/OrderPayedHandlerClass.php @@ -1,16 +1,13 @@ setRequest(); - /* @var Order $order */ + /* @var \common\models\oldDb\Order $order */ $order = Order::find()->where([ 'id' => $this->orderId, 'is_pay' => 1, diff --git a/common/jobs/OrderRefundJob.php b/common/jobs/OrderRefundJob.php index c579bed..5dd7501 100644 --- a/common/jobs/OrderRefundJob.php +++ b/common/jobs/OrderRefundJob.php @@ -1,15 +1,13 @@ urlManager->createAbsoluteUrl(['site/verify-email', 'token' => $user->verification_token]); ?> diff --git a/common/mail/emailVerify-text.php b/common/mail/emailVerify-text.php index 48a68fc..30f711a 100644 --- a/common/mail/emailVerify-text.php +++ b/common/mail/emailVerify-text.php @@ -1,7 +1,7 @@ urlManager->createAbsoluteUrl(['site/verify-email', 'token' => $user->verification_token]); ?> diff --git a/common/mail/passwordResetToken-html.php b/common/mail/passwordResetToken-html.php index 9f6e470..a8844b0 100644 --- a/common/mail/passwordResetToken-html.php +++ b/common/mail/passwordResetToken-html.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /** @var yii\web\View $this */ -/** @var common\models\User $user */ +/** @var \common\models\oldDb\User $user */ $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]); ?> diff --git a/common/mail/passwordResetToken-text.php b/common/mail/passwordResetToken-text.php index 6a5120f..68cbc07 100644 --- a/common/mail/passwordResetToken-text.php +++ b/common/mail/passwordResetToken-text.php @@ -1,7 +1,7 @@ urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]); ?> diff --git a/common/models/AuthItem.php b/common/models/AuthItem.php deleted file mode 100644 index 482067e..0000000 --- a/common/models/AuthItem.php +++ /dev/null @@ -1,8 +0,0 @@ - TimestampBehavior::class, - 'attributes' => [ - ActiveRecord::EVENT_BEFORE_INSERT => ['created_at','updated_at'], - ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'], - ], - ], - ]; - } -} \ No newline at end of file diff --git a/common/models/DoctorTagIll.php b/common/models/DoctorTagIll.php deleted file mode 100644 index 123c98b..0000000 --- a/common/models/DoctorTagIll.php +++ /dev/null @@ -1,23 +0,0 @@ - TimestampBehavior::class, - 'attributes' => [ - ActiveRecord::EVENT_BEFORE_INSERT => ['created_at','updated_at'], - ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'], - ], - ], - ]; - } -} \ No newline at end of file diff --git a/common/models/DoctorTitle.php b/common/models/DoctorTitle.php deleted file mode 100644 index 1d70928..0000000 --- a/common/models/DoctorTitle.php +++ /dev/null @@ -1,9 +0,0 @@ - TimestampBehavior::class, + 'attributes' => [ + ], + ], + ]; + } +} \ No newline at end of file diff --git a/common/models/Address.php b/common/models/oldDb/Address.php similarity index 83% rename from common/models/Address.php rename to common/models/oldDb/Address.php index 44429ee..5939925 100644 --- a/common/models/Address.php +++ b/common/models/oldDb/Address.php @@ -1,11 +1,11 @@ TimestampBehavior::class, + 'attributes' => [ + ActiveRecord::EVENT_BEFORE_INSERT => ['created_at','updated_at'], + ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'], + ], + ], + ]; + } + + +} \ No newline at end of file diff --git a/common/models/DoctorService.php b/common/models/oldDb/DoctorService.php similarity index 81% rename from common/models/DoctorService.php rename to common/models/oldDb/DoctorService.php index d901742..e7f61e0 100644 --- a/common/models/DoctorService.php +++ b/common/models/oldDb/DoctorService.php @@ -1,11 +1,11 @@ TimestampBehavior::class, + 'attributes' => [ + ActiveRecord::EVENT_BEFORE_INSERT => ['created_at','updated_at'], + ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'], + ], + ], + ]; + } + + +} \ No newline at end of file diff --git a/common/models/LeadInfo.php b/common/models/oldDb/LeadInfo.php similarity index 96% rename from common/models/LeadInfo.php rename to common/models/oldDb/LeadInfo.php index ce2d822..617b65c 100644 --- a/common/models/LeadInfo.php +++ b/common/models/oldDb/LeadInfo.php @@ -1,13 +1,14 @@ user->identity->getId(); - $patient = \common\models\UserPatient::findOne([ + $patient = \common\models\oldDb\UserPatient::findOne([ 'id' => $this->user_patient_id, 'user_id' =>$user_id, 'is_delete' => 0 diff --git a/member/models/forms/LoginForm.php b/member/models/forms/LoginForm.php index 2e0f2aa..0ab1e8f 100644 --- a/member/models/forms/LoginForm.php +++ b/member/models/forms/LoginForm.php @@ -3,14 +3,12 @@ namespace member\models\forms; use common\core\BaseModel; -use common\models\StoreUser; -use common\models\User; +use common\models\oldDb\StoreUser; +use common\models\oldDb\User; use common\services\WechatService; use common\validators\MobileValidator; -use GuzzleHttp\Client; -use linslin\yii2\curl\Curl; -use yii\base\Exception; use Yii; +use yii\base\Exception; //登录form diff --git a/member/models/forms/OrderSubmitResultForm.php b/member/models/forms/OrderSubmitResultForm.php index 0f4b16f..c5e39c1 100644 --- a/member/models/forms/OrderSubmitResultForm.php +++ b/member/models/forms/OrderSubmitResultForm.php @@ -9,12 +9,11 @@ use common\helpers\FuncHelper; use common\jobs\OrderSubmitJob; use common\models\Activity; use common\models\Mall; -use common\models\Order; +use common\models\oldDb\Order; +use common\models\oldDb\PaymentOrder; use common\models\OrderCommission; use common\models\OrderGroup; use common\models\OrderSubmitResult; -use common\models\PaymentOrder; -use common\models\User; use common\services\WechatService; use yii\base\Exception; diff --git a/member/models/forms/PatientForm.php b/member/models/forms/PatientForm.php index 890789d..ff06b50 100644 --- a/member/models/forms/PatientForm.php +++ b/member/models/forms/PatientForm.php @@ -3,10 +3,8 @@ namespace member\models\forms; use common\core\BaseModel; -use common\models\UserPatient; -use common\models\UserPatientHealthInquiry; -use GuzzleHttp\Client; -use linslin\yii2\curl\Curl; +use common\models\oldDb\UserPatient; +use common\models\oldDb\UserPatientHealthInquiry; use yii\base\Exception; //就诊人form diff --git a/member/models/forms/PayForm.php b/member/models/forms/PayForm.php index 0e14ff7..e0bd125 100644 --- a/member/models/forms/PayForm.php +++ b/member/models/forms/PayForm.php @@ -3,7 +3,7 @@ namespace member\models\forms; use common\core\BaseModel; -use common\models\UserPatientRecord; +use common\models\oldDb\UserPatientRecord; use yii\db\Exception; //缴费 diff --git a/member/models/forms/PhysicalForm.php b/member/models/forms/PhysicalForm.php index c83b0f1..aaab838 100644 --- a/member/models/forms/PhysicalForm.php +++ b/member/models/forms/PhysicalForm.php @@ -2,11 +2,9 @@ namespace member\models\forms; use common\core\BaseModel; -use common\models\PhysicalPackage; -use common\models\PhysicalReserveTotal; -use common\models\UserCollect; -use common\models\PhysicalReserve; -use JetBrains\PhpStorm\ArrayShape; +use common\models\oldDb\PhysicalPackage; +use common\models\oldDb\PhysicalReserve; +use common\models\oldDb\PhysicalReserveTotal; use yii\base\Exception; use yii\data\ActiveDataProvider; diff --git a/member/models/forms/PrescripOrderSubmitForm.php b/member/models/forms/PrescripOrderSubmitForm.php index b5d3618..f2368c1 100644 --- a/member/models/forms/PrescripOrderSubmitForm.php +++ b/member/models/forms/PrescripOrderSubmitForm.php @@ -7,12 +7,12 @@ use common\enums\OrderAcceptEnum; use common\events\OrderEvent; use common\helpers\ArrayHelper; use common\helpers\FuncHelper; -use common\models\ChineseRepice; -use common\models\PaymentPrescripOrder; -use common\models\PrescripOrderLog; -use common\models\Prescription; -use common\models\ProductOrder; -use common\models\WestRepice; +use common\models\oldDb\ChineseRepice; +use common\models\oldDb\PaymentPrescripOrder; +use common\models\oldDb\PrescripOrderLog; +use common\models\oldDb\Prescription; +use common\models\oldDb\ProductOrder; +use common\models\oldDb\WestRepice; use common\services\WechatService; use yii\base\Exception; diff --git a/member/models/forms/ProductOrderSubmitForm.php b/member/models/forms/ProductOrderSubmitForm.php index 2f8490d..74010b2 100644 --- a/member/models/forms/ProductOrderSubmitForm.php +++ b/member/models/forms/ProductOrderSubmitForm.php @@ -5,20 +5,18 @@ namespace member\models\forms; use common\core\BaseModel; use common\enums\ProductOrderEnum; use common\events\ProductOrderEvent; -use common\forms\LedgerForm; use common\helpers\ArrayHelper; use common\helpers\FuncHelper; use common\jobs\ProductOrderPaidJob; use common\jobs\ProductOrderSyncPlatformJob; -use common\models\Prescription; -use common\models\ProductOrder; -use common\models\ProductOrderItems; -use common\models\SystemNotice; -use common\modelsgii\PaymentProductOrder; +use common\models\oldDb\Prescription; +use common\models\oldDb\ProductOrder; +use common\models\oldDb\ProductOrderItems; +use common\models\oldDb\SystemNotice; +use common\modelsgii\oldDb\PaymentProductOrder; use common\services\EplPayService; use common\services\WechatService; use yii\base\Exception; -use yii\helpers\Json; //产品订单form class ProductOrderSubmitForm extends BaseModel diff --git a/member/models/forms/RegisterForm.php b/member/models/forms/RegisterForm.php index 081a16b..6952400 100644 --- a/member/models/forms/RegisterForm.php +++ b/member/models/forms/RegisterForm.php @@ -8,12 +8,12 @@ use common\enums\UserRoleEnum; use common\enums\UserStatusEnum; use common\events\RegisterEvent; use common\helpers\FuncHelper; -use common\models\DoctorPatient; -use common\models\Register; -use common\models\ServiceUser; -use common\models\StoreDoctor; -use common\models\UserPatient; -use common\modelsgii\PayConfig; +use common\models\oldDb\DoctorPatient; +use common\models\oldDb\Register; +use common\models\oldDb\ServiceUser; +use common\models\oldDb\StoreDoctor; +use common\models\oldDb\UserPatient; +use common\modelsgii\oldDb\PayConfig; use yii\db\Exception; //挂号form diff --git a/member/models/forms/RegisterSubmitForm.php b/member/models/forms/RegisterSubmitForm.php index b49e2e2..cc2d8a6 100644 --- a/member/models/forms/RegisterSubmitForm.php +++ b/member/models/forms/RegisterSubmitForm.php @@ -7,10 +7,10 @@ use common\events\RegisterEvent; use common\helpers\ArrayHelper; use common\helpers\FuncHelper; use common\jobs\Sms\RegisterMessageJob; -use common\models\PaymentRegister; -use common\models\Register; -use common\models\RegisterLog; -use common\models\SystemNotice; +use common\models\oldDb\PaymentRegister; +use common\models\oldDb\Register; +use common\models\oldDb\RegisterLog; +use common\models\oldDb\SystemNotice; use common\services\EplPayService; use common\services\WechatService; use yii\db\Exception; diff --git a/member/models/search/ImSessionSearch.php b/member/models/search/ImSessionSearch.php index c3b60d6..1c162a7 100644 --- a/member/models/search/ImSessionSearch.php +++ b/member/models/search/ImSessionSearch.php @@ -2,11 +2,7 @@ namespace member\models\search; -use common\models\ImMessage; -use common\models\ImMessageSession; -use yii\base\Model; -use yii\data\ActiveDataProvider; -use common\models\Order; +use common\models\oldDb\ImMessageSession; class ImSessionSearch extends ImMessageSession { diff --git a/member/modules/v1/controllers/AttachmentController.php b/member/modules/v1/controllers/AttachmentController.php index 495e2f5..05e86a1 100644 --- a/member/modules/v1/controllers/AttachmentController.php +++ b/member/modules/v1/controllers/AttachmentController.php @@ -1,7 +1,7 @@ submitForm($this->formId, $this->formParams('test@mail.com')); $I->canSeeEmailIsSent(); - $I->seeRecord('common\models\User', [ + $I->seeRecord('common\models\oldDb\User', [ 'email' => 'test@mail.com', 'username' => 'test.test', - 'status' => \common\models\User::STATUS_INACTIVE + 'status' => \common\models\oldDb\User::STATUS_INACTIVE ]); $I->see('Check your email for further instructions.'); } diff --git a/member/tests/functional/SignupCest.php b/member/tests/functional/SignupCest.php index 325e7e8..e4dbe7b 100644 --- a/member/tests/functional/SignupCest.php +++ b/member/tests/functional/SignupCest.php @@ -47,10 +47,10 @@ class SignupCest 'SignupForm[password]' => 'tester_password', ]); - $I->seeRecord('common\models\User', [ + $I->seeRecord('common\models\oldDb\User', [ 'username' => 'tester', 'email' => 'tester.email@example.com', - 'status' => \common\models\User::STATUS_INACTIVE + 'status' => \common\models\oldDb\User::STATUS_INACTIVE ]); $I->seeEmailIsSent(); diff --git a/member/tests/functional/VerifyEmailCest.php b/member/tests/functional/VerifyEmailCest.php index 1a9fca9..bc975d7 100644 --- a/member/tests/functional/VerifyEmailCest.php +++ b/member/tests/functional/VerifyEmailCest.php @@ -2,8 +2,8 @@ namespace app\tests\functional; -use common\fixtures\UserFixture; use app\tests\FunctionalTester; +use common\fixtures\UserFixture; class VerifyEmailCest { @@ -59,10 +59,10 @@ class VerifyEmailCest $I->canSee('Congratulations!', 'h1'); $I->see('Logout (test.test)', 'form button[type=submit]'); - $I->seeRecord('common\models\User', [ + $I->seeRecord('common\models\oldDb\User', [ 'username' => 'test.test', 'email' => 'test@mail.com', - 'status' => \common\models\User::STATUS_ACTIVE + 'status' => \common\models\oldDb\User::STATUS_ACTIVE ]); } } diff --git a/member/tests/unit/models/PasswordResetRequestFormTest.php b/member/tests/unit/models/PasswordResetRequestFormTest.php index ee6e536..37e0eef 100644 --- a/member/tests/unit/models/PasswordResetRequestFormTest.php +++ b/member/tests/unit/models/PasswordResetRequestFormTest.php @@ -2,10 +2,9 @@ namespace app\tests\unit\models; -use Yii; use app\models\PasswordResetRequestForm; use common\fixtures\UserFixture as UserFixture; -use common\models\User; +use Yii; class PasswordResetRequestFormTest extends \Codeception\Test\Unit { @@ -46,7 +45,7 @@ class PasswordResetRequestFormTest extends \Codeception\Test\Unit $model = new PasswordResetRequestForm(); $model->email = $userFixture['email']; - $user = User::findOne(['password_reset_token' => $userFixture['password_reset_token']]); + $user = \common\models\oldDb\User::findOne(['password_reset_token' => $userFixture['password_reset_token']]); verify($model->sendEmail())->notEmpty(); verify($user->password_reset_token)->notEmpty(); diff --git a/member/tests/unit/models/SignupFormTest.php b/member/tests/unit/models/SignupFormTest.php index 94dc617..b1dd83d 100644 --- a/member/tests/unit/models/SignupFormTest.php +++ b/member/tests/unit/models/SignupFormTest.php @@ -2,8 +2,8 @@ namespace app\tests\unit\models; -use common\fixtures\UserFixture; use app\models\SignupForm; +use common\fixtures\UserFixture; class SignupFormTest extends \Codeception\Test\Unit { @@ -34,11 +34,11 @@ class SignupFormTest extends \Codeception\Test\Unit $user = $model->signup(); verify($user)->notEmpty(); - /** @var \common\models\User $user */ - $user = $this->tester->grabRecord('common\models\User', [ + /** @var \common\models\oldDb\User $user */ + $user = $this->tester->grabRecord('common\models\oldDb\User', [ 'username' => 'some_username', 'email' => 'some_email@example.com', - 'status' => \common\models\User::STATUS_INACTIVE + 'status' => \common\models\oldDb\User::STATUS_INACTIVE ]); $this->tester->seeEmailIsSent(); diff --git a/member/tests/unit/models/VerifyEmailFormTest.php b/member/tests/unit/models/VerifyEmailFormTest.php index 1f56e15..1996151 100644 --- a/member/tests/unit/models/VerifyEmailFormTest.php +++ b/member/tests/unit/models/VerifyEmailFormTest.php @@ -2,8 +2,8 @@ namespace app\tests\unit\models; -use common\fixtures\UserFixture; use app\models\VerifyEmailForm; +use common\fixtures\UserFixture; class VerifyEmailFormTest extends \Codeception\Test\Unit { @@ -45,11 +45,11 @@ class VerifyEmailFormTest extends \Codeception\Test\Unit { $model = new VerifyEmailForm('4ch0qbfhvWwkcuWqjN8SWRq72SOw1KYT_1548675330'); $user = $model->verifyEmail(); - verify($user)->instanceOf('common\models\User'); + verify($user)->instanceOf('common\models\oldDb\User'); verify($user->username)->equals('test.test'); verify($user->email)->equals('test@mail.com'); - verify($user->status)->equals(\common\models\User::STATUS_ACTIVE); + verify($user->status)->equals(\common\models\oldDb\User::STATUS_ACTIVE); verify($user->validatePassword('Test1234'))->true(); } } diff --git a/platform/models/Platform.php b/platform/models/Platform.php index 091a238..1bdea9e 100644 --- a/platform/models/Platform.php +++ b/platform/models/Platform.php @@ -2,11 +2,11 @@ namespace platform\models; +use common\enums\StatusEnum; use Yii; use yii\web\IdentityInterface; -use common\enums\StatusEnum; -class Platform extends \common\models\Platform implements IdentityInterface +class Platform extends \common\models\oldDb\Platform implements IdentityInterface { public static function findIdentity($id) { diff --git a/platform/models/forms/SyncPatientForm.php b/platform/models/forms/SyncPatientForm.php index 33924d0..33cc85e 100644 --- a/platform/models/forms/SyncPatientForm.php +++ b/platform/models/forms/SyncPatientForm.php @@ -2,13 +2,10 @@ namespace platform\models\forms; use common\core\BaseModel; -use common\helpers\ArrayHelper; -use common\helpers\FuncHelper; -use GuzzleHttp\Client; -use yii\base\Exception; -use common\models\UserPatient; +use common\models\oldDb\UserPatient; +use common\models\oldDb\UserPatientHealthInquiry; use common\validators\MobileValidator; -use common\models\UserPatientHealthInquiry; +use yii\base\Exception; //同步用户form class SyncPatientForm extends BaseModel diff --git a/platform/modules/v1/controllers/DoctorController.php b/platform/modules/v1/controllers/DoctorController.php index ff22f88..70ceb23 100644 --- a/platform/modules/v1/controllers/DoctorController.php +++ b/platform/modules/v1/controllers/DoctorController.php @@ -2,11 +2,9 @@ namespace platform\modules\v1\controllers; use common\core\BasePlatformController; -use common\models\ServiceUser; -use common\models\ServiceUserToken; -use common\helpers\ArrayHelper; +use common\models\oldDb\ServiceUser; +use common\models\oldDb\ServiceUserToken; use yii\base\Exception; -use GuzzleHttp\Client; /** * @doc-module 互医医生相关接口 diff --git a/platform/modules/v1/controllers/ErpController.php b/platform/modules/v1/controllers/ErpController.php index 16acf5f..646e2de 100644 --- a/platform/modules/v1/controllers/ErpController.php +++ b/platform/modules/v1/controllers/ErpController.php @@ -8,14 +8,13 @@ namespace platform\modules\v1\controllers; use common\jobs\ProductOrderSendJob; use common\jobs\templateMessage\ProductOrderSend; -use common\models\Drug; -use common\models\ExpressNos; -use common\models\Prescription; -use common\models\ProductOrder; -use common\models\ProductOrderLog; +use common\models\oldDb\ExpressNos; +use common\models\oldDb\Prescription; +use common\models\oldDb\ProductOrder; +use common\models\oldDb\ProductOrderLog; use GuzzleHttp\Client; -use yii\base\Exception; use yii\base\Controller; +use yii\base\Exception; use yii\helpers\Json; /** diff --git a/platform/modules/v1/controllers/SyncController.php b/platform/modules/v1/controllers/SyncController.php index 472e89c..b7ceef3 100644 --- a/platform/modules/v1/controllers/SyncController.php +++ b/platform/modules/v1/controllers/SyncController.php @@ -2,9 +2,9 @@ namespace platform\modules\v1\controllers; use common\core\BasePlatformController; -use yii\base\Exception; -use common\models\UserPatient; +use common\models\oldDb\UserPatient; use platform\models\forms\SyncPatientForm; +use yii\base\Exception; /** * @doc-module 互医数据同步 diff --git a/service/models/ServiceUser.php b/service/models/ServiceUser.php index f85a802..254a4da 100644 --- a/service/models/ServiceUser.php +++ b/service/models/ServiceUser.php @@ -2,11 +2,10 @@ namespace service\models; -use common\models\ServiceUserToken; -use yii\web\IdentityInterface; use Yii; +use yii\web\IdentityInterface; -class ServiceUser extends \common\models\ServiceUser implements IdentityInterface +class ServiceUser extends \common\models\oldDb\ServiceUser implements IdentityInterface { public static $token = null;//记录下当前token,方便退出 @@ -17,7 +16,7 @@ class ServiceUser extends \common\models\ServiceUser implements IdentityInterfac public static function findIdentityByAccessToken($token, $type = null) { - $checkToken = ServiceUserToken::checkToken($token); + $checkToken = \common\models\oldDb\ServiceUserToken::checkToken($token); if(!$checkToken){ return false; } diff --git a/service/models/forms/AgreementForm.php b/service/models/forms/AgreementForm.php index 47b6ec0..3dcf42a 100644 --- a/service/models/forms/AgreementForm.php +++ b/service/models/forms/AgreementForm.php @@ -3,7 +3,7 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\BaseConfig; +use common\models\oldDb\BaseConfig; use yii\db\Exception; // 协议 diff --git a/service/models/forms/CaseForm.php b/service/models/forms/CaseForm.php index d26a3e6..3965618 100644 --- a/service/models/forms/CaseForm.php +++ b/service/models/forms/CaseForm.php @@ -3,7 +3,7 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\UserPatientCase; +use common\models\oldDb\UserPatientCase; use yii\db\Exception; //病历 diff --git a/service/models/forms/DoctorCompleteFour.php b/service/models/forms/DoctorCompleteFour.php index f7f4173..80c898b 100644 --- a/service/models/forms/DoctorCompleteFour.php +++ b/service/models/forms/DoctorCompleteFour.php @@ -3,11 +3,9 @@ namespace service\models\forms; use common\core\BaseModel; use common\enums\UserStatusEnum; -use common\models\DoctorService; -use common\models\ServiceUser; +use common\models\oldDb\DoctorService; +use common\models\oldDb\ServiceUser; use yii\base\Exception; -use GuzzleHttp\Client; -use common\models\StoreDoctor; //医生完善信息第四步 class DoctorCompleteFour extends BaseModel diff --git a/service/models/forms/DoctorCompleteOne.php b/service/models/forms/DoctorCompleteOne.php index 0039c15..0064429 100644 --- a/service/models/forms/DoctorCompleteOne.php +++ b/service/models/forms/DoctorCompleteOne.php @@ -2,15 +2,13 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\DoctorInfo; -use common\models\PharmacistrInfo; -use common\models\Store; -use common\models\StoreDoctor; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\PharmacistrInfo; +use common\models\oldDb\Store; +use common\models\oldDb\StoreDoctor; use common\validators\MobileValidator; -use GuzzleHttp\Client; use yii\base\Exception; use yii\helpers\Json; -use function PHPUnit\Framework\any; //医生完善信息第一步 class DoctorCompleteOne extends BaseModel diff --git a/service/models/forms/DoctorServiceForm.php b/service/models/forms/DoctorServiceForm.php index b43bcac..df319bb 100644 --- a/service/models/forms/DoctorServiceForm.php +++ b/service/models/forms/DoctorServiceForm.php @@ -2,8 +2,8 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\DoctorService; -use common\models\ServiceUser; +use common\models\oldDb\DoctorService; +use common\models\oldDb\ServiceUser; use yii\base\Exception; //医生服务设置 diff --git a/service/models/forms/DrugCompleteOne.php b/service/models/forms/DrugCompleteOne.php index c80ba0d..02f753f 100644 --- a/service/models/forms/DrugCompleteOne.php +++ b/service/models/forms/DrugCompleteOne.php @@ -2,13 +2,10 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\DoctorInfo; -use common\models\PharmacistrInfo; -use common\models\StoreDoctor; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\PharmacistrInfo; use common\validators\MobileValidator; -use GuzzleHttp\Client; use yii\base\Exception; -use yii\helpers\Json; //药师完善信息第一步 class DrugCompleteOne extends BaseModel diff --git a/service/models/forms/HospitalDocForm.php b/service/models/forms/HospitalDocForm.php index 80e49da..be2d895 100644 --- a/service/models/forms/HospitalDocForm.php +++ b/service/models/forms/HospitalDocForm.php @@ -5,8 +5,8 @@ namespace service\models\forms; use common\core\BaseModel; use common\enums\UserRoleEnum; use common\enums\UserStatusEnum; -use common\models\DoctorPatient; -use common\models\ServiceUser; +use common\models\oldDb\DoctorPatient; +use common\models\oldDb\ServiceUser; use yii\db\Exception; //互医 diff --git a/service/models/forms/LeadCompleteOne.php b/service/models/forms/LeadCompleteOne.php index 04ef37e..67c650a 100644 --- a/service/models/forms/LeadCompleteOne.php +++ b/service/models/forms/LeadCompleteOne.php @@ -3,11 +3,8 @@ namespace service\models\forms; use common\core\BaseModel; use common\enums\UserStatusEnum; -use common\models\DoctorInfo; -use common\models\LeadInfo; -use common\models\PharmacistrInfo; +use common\models\oldDb\LeadInfo; use common\validators\MobileValidator; -use GuzzleHttp\Client; use yii\base\Exception; //导医完善信息第一步 diff --git a/service/models/forms/LoginForm.php b/service/models/forms/LoginForm.php index 6c6524d..b82559d 100644 --- a/service/models/forms/LoginForm.php +++ b/service/models/forms/LoginForm.php @@ -5,9 +5,9 @@ namespace service\models\forms; use common\core\BaseModel; use common\enums\UserRoleEnum; use common\enums\UserStatusEnum; -use common\models\ServiceUser; -use common\models\ServiceUserToken; -use common\models\StoreDoctor; +use common\models\oldDb\ServiceUser; +use common\models\oldDb\ServiceUserToken; +use common\models\oldDb\StoreDoctor; use common\services\WechatService; use common\validators\MobileValidator; use yii\base\Exception; diff --git a/service/models/forms/RegisterForm.php b/service/models/forms/RegisterForm.php index face549..fd00c85 100644 --- a/service/models/forms/RegisterForm.php +++ b/service/models/forms/RegisterForm.php @@ -2,7 +2,7 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\ServiceUserToken; +use common\models\oldDb\ServiceUserToken; use common\validators\MobileValidator; use service\models\ServiceUser; use yii\base\Exception; diff --git a/service/models/forms/ResetPasswordForm.php b/service/models/forms/ResetPasswordForm.php index 86dab0b..7fc0c47 100644 --- a/service/models/forms/ResetPasswordForm.php +++ b/service/models/forms/ResetPasswordForm.php @@ -3,7 +3,7 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\ServiceUserToken; +use common\models\oldDb\ServiceUserToken; use common\validators\MobileValidator; use service\models\ServiceUser; use yii\base\Exception; diff --git a/service/models/forms/ServiceCompleteOne.php b/service/models/forms/ServiceCompleteOne.php index 7ced2d8..504d697 100644 --- a/service/models/forms/ServiceCompleteOne.php +++ b/service/models/forms/ServiceCompleteOne.php @@ -3,12 +3,8 @@ namespace service\models\forms; use common\core\BaseModel; use common\enums\UserStatusEnum; -use common\models\DoctorInfo; -use common\models\LeadInfo; -use common\models\PharmacistrInfo; -use common\models\ServInfo; +use common\models\oldDb\ServInfo; use common\validators\MobileValidator; -use GuzzleHttp\Client; use yii\base\Exception; //客服完善信息第一步 diff --git a/service/models/forms/UpdatePasswordForm.php b/service/models/forms/UpdatePasswordForm.php index 2fcec26..35ed0f8 100644 --- a/service/models/forms/UpdatePasswordForm.php +++ b/service/models/forms/UpdatePasswordForm.php @@ -3,7 +3,6 @@ namespace service\models\forms; use common\core\BaseModel; -use common\models\ServiceUserToken; use service\models\ServiceUser; use yii\base\Exception; diff --git a/service/modules/v1/controllers/AttachmentController.php b/service/modules/v1/controllers/AttachmentController.php index 0bc1a8c..aa682e0 100644 --- a/service/modules/v1/controllers/AttachmentController.php +++ b/service/modules/v1/controllers/AttachmentController.php @@ -1,7 +1,6 @@ request->post('id'); if ($id) { - /* @var DoctorArticle $info */ + /* @var \common\models\oldDb\DoctorArticle $info */ $info = DoctorArticle::find()->where([ 'id' => $id, 'su_id' => \Yii::$app->user->identity->getId(), diff --git a/service/modules/v1/controllers/DoctorMyController.php b/service/modules/v1/controllers/DoctorMyController.php index af07079..883e5fd 100644 --- a/service/modules/v1/controllers/DoctorMyController.php +++ b/service/modules/v1/controllers/DoctorMyController.php @@ -3,7 +3,7 @@ namespace service\modules\v1\controllers; use common\core\BaseAppController; -use common\models\DoctorApply; +use common\models\oldDb\DoctorApply; use service\models\forms\HospitalDocForm; use yii\db\Exception; diff --git a/service/modules/v1/controllers/DoctorNoticeController.php b/service/modules/v1/controllers/DoctorNoticeController.php index 15035cd..349659d 100644 --- a/service/modules/v1/controllers/DoctorNoticeController.php +++ b/service/modules/v1/controllers/DoctorNoticeController.php @@ -3,7 +3,7 @@ namespace service\modules\v1\controllers; use common\core\BaseServiceController; -use common\modelsgii\DoctorNotice; +use common\modelsgii\oldDb\DoctorNotice; use yii\db\Exception; /** diff --git a/service/modules/v1/controllers/DoctorWorkController.php b/service/modules/v1/controllers/DoctorWorkController.php index 49dfa43..fc5e1a8 100644 --- a/service/modules/v1/controllers/DoctorWorkController.php +++ b/service/modules/v1/controllers/DoctorWorkController.php @@ -6,16 +6,16 @@ use common\core\BaseAppController; use common\enums\RegisterEnum; use common\helpers\FuncHelper; use common\helpers\StringHelper; -use common\models\DoctorIdentity; -use common\models\DoctorInfo; -use common\models\DoctorPracticing; -use common\models\DoctorService; -use common\models\Register; -use common\models\Store; -use common\models\StoreDoctor; -use common\models\User; -use common\models\UserComment; -use common\models\UserPatient; +use common\models\oldDb\DoctorIdentity; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\DoctorPracticing; +use common\models\oldDb\DoctorService; +use common\models\oldDb\Register; +use common\models\oldDb\Store; +use common\models\oldDb\StoreDoctor; +use common\models\oldDb\User; +use common\models\oldDb\UserComment; +use common\models\oldDb\UserPatient; use common\services\UploadService; use common\services\WechatService; use service\models\ServiceUser; diff --git a/service/modules/v1/controllers/ExamineController.php b/service/modules/v1/controllers/ExamineController.php index 3af1d07..5ba5d2b 100644 --- a/service/modules/v1/controllers/ExamineController.php +++ b/service/modules/v1/controllers/ExamineController.php @@ -3,21 +3,19 @@ namespace service\modules\v1\controllers; use common\core\BasePharmacistController; -use common\core\sms\PrescriptionPassMessage; use common\events\ProductOrderEvent; use common\forms\ProductCancelForm; use common\forms\ProductRefundForm; use common\jobs\Sms\PrescriptionPassMessageJob; use common\jobs\Sms\PrescriptionRefuseMessageJob; -use common\models\Department; -use common\models\ExamineLog; -use common\models\Store; -use common\models\DoctorInfo; -use common\models\DrugUseWay; -use common\models\PharmacistrInfo; -use common\models\Prescription; -use common\models\ProductOrder; -use common\models\SystemNotice; +use common\models\oldDb\Department; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\DrugUseWay; +use common\models\oldDb\PharmacistrInfo; +use common\models\oldDb\Prescription; +use common\models\oldDb\ProductOrder; +use common\models\oldDb\Store; +use common\models\oldDb\SystemNotice; use common\services\PrescriptionService; use yii\base\Exception; diff --git a/service/modules/v1/controllers/HomeController.php b/service/modules/v1/controllers/HomeController.php index 218976d..c5b6087 100644 --- a/service/modules/v1/controllers/HomeController.php +++ b/service/modules/v1/controllers/HomeController.php @@ -3,7 +3,7 @@ namespace service\modules\v1\controllers; use common\core\BaseServiceController; -use common\models\PatientVisitRecord; +use common\models\oldDb\PatientVisitRecord; /** * @doc-module 首页 diff --git a/service/modules/v1/controllers/ImController.php b/service/modules/v1/controllers/ImController.php index 1854c16..e7f33c2 100644 --- a/service/modules/v1/controllers/ImController.php +++ b/service/modules/v1/controllers/ImController.php @@ -11,13 +11,13 @@ use common\enums\UserRoleEnum; use common\forms\ImMessageForm; use common\helpers\ArrayHelper; use common\helpers\FuncHelper; -use common\models\DoctorInfo; -use common\models\ImMessage; -use common\models\ImMessageSession; -use common\models\LeadInfo; -use common\models\Order; -use common\models\PharmacistrInfo; -use common\models\User; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\ImMessage; +use common\models\oldDb\ImMessageSession; +use common\models\oldDb\LeadInfo; +use common\models\oldDb\Order; +use common\models\oldDb\PharmacistrInfo; +use common\models\oldDb\User; use yii\base\Exception; /** diff --git a/service/modules/v1/controllers/ImageOrderController.php b/service/modules/v1/controllers/ImageOrderController.php index 5a30260..7dd602c 100644 --- a/service/modules/v1/controllers/ImageOrderController.php +++ b/service/modules/v1/controllers/ImageOrderController.php @@ -11,13 +11,13 @@ use common\forms\ImMessageForm; use common\helpers\ArrayHelper; use common\helpers\FuncHelper; use common\jobs\OrderOverJob; -use common\models\ImMessage; -use common\models\ImMessageSession; -use common\models\InquiryRefuseReason; -use common\models\Order; -use common\models\OrderNumberChange; -use common\models\OrderRefund; -use common\models\UserInquiry; +use common\models\oldDb\ImMessage; +use common\models\oldDb\ImMessageSession; +use common\models\oldDb\InquiryRefuseReason; +use common\models\oldDb\Order; +use common\models\oldDb\OrderNumberChange; +use common\models\oldDb\OrderRefund; +use common\models\oldDb\UserInquiry; use yii\base\Exception; /** diff --git a/service/modules/v1/controllers/LeaderController.php b/service/modules/v1/controllers/LeaderController.php index a907847..84389d2 100644 --- a/service/modules/v1/controllers/LeaderController.php +++ b/service/modules/v1/controllers/LeaderController.php @@ -7,8 +7,8 @@ use common\enums\UserRoleEnum; use common\enums\UserStatusEnum; use common\helpers\ArrayHelper; use common\models\HospitalDepartment; -use common\models\LeadInfo; -use common\models\ServiceUser; +use common\models\oldDb\LeadInfo; +use common\models\oldDb\ServiceUser; /** * @doc-module 导医 diff --git a/service/modules/v1/controllers/OrderVideoController.php b/service/modules/v1/controllers/OrderVideoController.php index 764fa17..cf24241 100644 --- a/service/modules/v1/controllers/OrderVideoController.php +++ b/service/modules/v1/controllers/OrderVideoController.php @@ -5,8 +5,8 @@ namespace service\modules\v1\controllers; use Carbon\Carbon; use common\core\BaseAppController; use common\enums\OrderAcceptEnum; -use common\models\Order; -use common\models\OrderVideoInfo; +use common\models\oldDb\Order; +use common\models\oldDb\OrderVideoInfo; use yii\base\Exception; /** @@ -59,7 +59,7 @@ class OrderVideoController extends BaseAppController throw new Exception('您的订单非视频问诊订单'); } - /* @var OrderVideoInfo $video */ + /* @var \common\models\oldDb\OrderVideoInfo $video */ $video = $order['video']; return [ 'is_limit' => $video->is_limit, @@ -96,7 +96,7 @@ class OrderVideoController extends BaseAppController throw new Exception('您的订单非视频问诊订单'); } - /* @var OrderVideoInfo $video */ + /* @var \common\models\oldDb\OrderVideoInfo $video */ $video = $order['video']; if ($video->is_limit == 0) { return [ diff --git a/service/modules/v1/controllers/PatientController.php b/service/modules/v1/controllers/PatientController.php index 56f5149..516b507 100644 --- a/service/modules/v1/controllers/PatientController.php +++ b/service/modules/v1/controllers/PatientController.php @@ -6,17 +6,17 @@ use Carbon\Carbon; use common\core\BaseServiceController; use common\helpers\FuncHelper; use common\jobs\NewSendJob; -use common\models\DoctorPatient; -use common\models\DoctorTagIll; -use common\models\Prescription; -use common\models\Register; -use common\models\User; -use common\models\UserPatient; -use common\models\UserPatientCase; -use common\models\UserPatientHealthInquiry; -use common\models\UserPatientIll; -use common\modelsgii\DoctorPatientRemark; -use common\modelsgii\PatientVisitRecord; +use common\models\oldDb\DoctorPatient; +use common\models\oldDb\DoctorTagIll; +use common\models\oldDb\Prescription; +use common\models\oldDb\Register; +use common\models\oldDb\User; +use common\models\oldDb\UserPatient; +use common\models\oldDb\UserPatientCase; +use common\models\oldDb\UserPatientHealthInquiry; +use common\models\oldDb\UserPatientIll; +use common\modelsgii\oldDb\DoctorPatientRemark; +use common\modelsgii\oldDb\PatientVisitRecord; use common\services\ExportService; use yii\db\Exception; use yii\helpers\Json; @@ -362,7 +362,7 @@ class PatientController extends BaseServiceController ->select('ti_id') ->column(); - $remark = \common\models\DoctorPatientRemark::find() + $remark = \common\models\oldDb\DoctorPatientRemark::find() ->where([ 'su_id' => \Yii::$app->user->identity->id, 'up_id' => $post['up_id'] diff --git a/service/modules/v1/controllers/PharmacistController.php b/service/modules/v1/controllers/PharmacistController.php index e9301f9..fdf2d4d 100644 --- a/service/modules/v1/controllers/PharmacistController.php +++ b/service/modules/v1/controllers/PharmacistController.php @@ -4,9 +4,8 @@ namespace service\modules\v1\controllers; use common\core\BaseServiceController; -use common\models\DoctorInfo; -use common\models\PharmacistIdentity; -use common\models\PharmacistrInfo; +use common\models\oldDb\PharmacistIdentity; +use common\models\oldDb\PharmacistrInfo; use yii\db\Exception; /** diff --git a/service/modules/v1/controllers/PrescripDetailController.php b/service/modules/v1/controllers/PrescripDetailController.php index dd907a8..e6902cd 100644 --- a/service/modules/v1/controllers/PrescripDetailController.php +++ b/service/modules/v1/controllers/PrescripDetailController.php @@ -3,16 +3,16 @@ namespace service\modules\v1\controllers; use common\core\BaseAppController; -use common\models\ChineseRepice; -use common\models\PrescriptionChinese; -use common\models\PrescriptionWest; -use common\models\Prescription; -use common\models\WestRepice; +use common\helpers\FuncHelper; +use common\models\oldDb\ChineseRepice; +use common\models\oldDb\GranularRepice; +use common\models\oldDb\Prescription; +use common\models\oldDb\PrescriptionChinese; +use common\models\oldDb\PrescriptionGranular; +use common\models\oldDb\PrescriptionWest; +use common\models\oldDb\WestRepice; use common\services\PrescriptionService; use yii\base\Exception; -use common\helpers\FuncHelper; -use common\models\GranularRepice; -use common\models\PrescriptionGranular; /** * @doc-module 处方详情 diff --git a/service/modules/v1/controllers/PrescriptionController.php b/service/modules/v1/controllers/PrescriptionController.php index ed5fb88..72fa46d 100644 --- a/service/modules/v1/controllers/PrescriptionController.php +++ b/service/modules/v1/controllers/PrescriptionController.php @@ -4,47 +4,46 @@ namespace service\modules\v1\controllers; use Carbon\Carbon; use common\core\BaseAppController; -use common\enums\ProductOrderEnum; use common\enums\DrugEnum; +use common\enums\ProductOrderEnum; use common\events\PrescriptionEvent; use common\events\ProductOrderEvent; -use common\forms\LedgerForm; use common\helpers\FuncHelper; use common\jobs\Sms\WaitApprovalMessageJob; use common\jobs\templateMessage\PrescriptionCreated; -use common\models\Address; -use common\models\ChineseRepice; -use common\models\DoctorCommon; -use common\models\DoctorInfo; -use common\models\Drug; -use common\models\DrugDosage; -use common\models\DrugUseFrequency; -use common\models\DrugUseNum; -use common\models\DrugUseTime; -use common\models\DrugUseType; -use common\models\DrugUseWay; -use common\models\GranularRepice; -use common\models\Prescription; -use common\models\PrescriptionChinese; -use common\models\PrescriptionGranular; -use common\models\PrescriptionWest; -use common\models\ProductOrder; -use common\models\ProductOrderItems; -use common\models\Region; -use common\models\SystemConfig; -use common\models\UserPatient; -use common\models\WestRepice; -use common\models\WestUnit; -use common\models\SystemNotice; -use common\modelsgii\ChineseMedicine; -use common\modelsgii\Disease; -use common\models\DiseaseCommon; -use common\models\Register; -use common\modelsgii\GranularMedicine; -use common\modelsgii\PayConfig; +use common\models\oldDb\Address; +use common\models\oldDb\ChineseRepice; +use common\models\oldDb\DiseaseCommon; +use common\models\oldDb\DoctorCommon; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\Drug; +use common\models\oldDb\DrugDosage; +use common\models\oldDb\DrugUseFrequency; +use common\models\oldDb\DrugUseNum; +use common\models\oldDb\DrugUseTime; +use common\models\oldDb\DrugUseType; +use common\models\oldDb\DrugUseWay; +use common\models\oldDb\GranularRepice; +use common\models\oldDb\Prescription; +use common\models\oldDb\PrescriptionChinese; +use common\models\oldDb\PrescriptionGranular; +use common\models\oldDb\PrescriptionWest; +use common\models\oldDb\ProcessRule; +use common\models\oldDb\ProcessRuleNote; +use common\models\oldDb\ProductOrder; +use common\models\oldDb\ProductOrderItems; +use common\models\oldDb\Region; +use common\models\oldDb\Register; +use common\models\oldDb\SystemConfig; +use common\models\oldDb\SystemNotice; +use common\models\oldDb\UserPatient; +use common\models\oldDb\WestRepice; +use common\models\oldDb\WestUnit; +use common\modelsgii\oldDb\ChineseMedicine; +use common\modelsgii\oldDb\Disease; +use common\modelsgii\oldDb\GranularMedicine; +use common\modelsgii\oldDb\PayConfig; use common\services\PrescriptionService; -use common\models\ProcessRule; -use common\models\ProcessRuleNote; use yii\base\Exception; use yii\helpers\Json; @@ -968,7 +967,7 @@ class PrescriptionController extends BaseAppController try { $store_id = $param['store_id']; - /* @var UserPatient $userPatient */ + /* @var \common\models\oldDb\UserPatient $userPatient */ $userPatient = UserPatient::find()->select('id,name,sex,id_card,user_id,mobile')->where(['id' => $param['up_id']])->one(); if(!$userPatient){ throw new Exception('就诊人不存在'); @@ -2119,4 +2118,211 @@ class PrescriptionController extends BaseAppController ]; } + + + /** + * @doc-name 添加产品服务包-全部产品服务包列表 + * @doc-param name string 药名 + */ + public function actionServicePackageList() + { + $name = \Yii::$app->request->post('name'); + $store_id = \Yii::$app->request->post('store_id'); + if (!$name) { + $common = DoctorCommon::find()->alias('dc')->where([ + 'dc.su_id' => \Yii::$app->user->identity->id, + 'dc.store_id' => $store_id + ])->joinWith([ + 'drug d' => function($q){ + $q->andWhere([ + 'in','d.type',[5] + ]); + } + ])->joinWith([ + 'drugStoreDrug','drugStoreRelation' + ])->asArray()->all(); + //有收藏药品 + if ($common) { + foreach ($common as $v) { + $drug = $v['drug']; + $ids[] = $drug['id']; + $drug['buy_price'] = $v['drugStoreRelation']['buy_price']; + $drug['price'] = $v['drugStoreRelation']['price']; + $drug['stock'] = $v['drugStoreDrug']['stock']; + $collect[] = $drug; + } + $unCollect = Drug::find()->alias('d')->select('d.*')->where([ + 'in','d.type',[2,4] + ])->andWhere([ + 'not in', 'd.id', $ids + ])->with('drugStoreDrug')->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){ + $q->andWhere(['dsr.store_id' => $store_id]); + $q->andWhere(['dsr.status' => 2]); + }])->asArray()->all(); + foreach($unCollect as $k=>$v){ + $unCollect[$k]['buy_price'] = $v['drugStoreRelation']['buy_price']; + $unCollect[$k]['price'] = $v['drugStoreRelation']['price']; + $unCollect[$k]['stock'] = $v['drugStoreDrug']['stock']; + unset($unCollect[$k]['drugStoreRelation']); + unset($unCollect[$k]['drugStoreDrug']); + } + return ['collect' => $collect, 'uncollect' => $unCollect]; + } + + $unCollect = Drug::find()->alias('d')->select('d.*')->where([ + 'in','d.type', [5] + ])->joinWith(['drugStoreDrug dsd' => function($q){ + $q->andWhere(['dsd.status' => 2]); + }])->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){ + $q->andWhere(['dsr.store_id' => $store_id]); + $q->andWhere(['dsr.status' => 2]); + }])->asArray()->all(); + foreach($unCollect as $k=>$v){ + $unCollect[$k]['buy_price'] = $v['drugStoreRelation']['buy_price']; + $unCollect[$k]['price'] = $v['drugStoreRelation']['price']; + $unCollect[$k]['stock'] = $v['drugStoreDrug']['stock']; + + unset($unCollect[$k]['drugStoreRelation']); + unset($unCollect[$k]['drugStoreDrug']); + } + return ['uncollect' => $unCollect]; + } + //搜索 + $allDrug = Drug::find()->alias('d')->select('d.*')->where([ + 'in','d.type', [5] + ])->andWhere([ + 'or', + ['like', 'd.drug_name', '%' . $name . "%", false], + ['like', 'd.pinyin_simple', '%' . $name . "%", false], + ['like', 'd.drug_alias', '%' . $name . "%", false] + ])->joinWith(['drugStoreDrug dsd' => function($q){ + $q->andWhere(['dsd.status' => 2]); + }])->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){ + $q->andWhere(['dsr.store_id' => $store_id]); + $q->andWhere(['dsr.status' => 2]); + }])->asArray()->all(); + if (!$allDrug) { + throw new Exception('没有搜到'); + } + + foreach($allDrug as $k=>$v){ + $allDrug[$k]['buy_price'] = $v['drugStoreRelation']['buy_price']; + $allDrug[$k]['price'] = $v['drugStoreRelation']['price']; + $allDrug[$k]['stock'] = $v['drugStoreDrug']['stock']; + unset($allDrug[$k]['drugStoreRelation']); + unset($allDrug[$k]['drugStoreDrug']); + $ids[] = $v['id']; + } + + $is_collect = DoctorCommon::find()->alias('dc')->select(['dc.drug_id'])->where([ + 'in', 'dc.drug_id', $ids + ])->andWhere([ + 'dc.su_id'=>\Yii::$app->user->identity->id, + 'dc.store_id' => $store_id + ])->joinWith([ + 'drug d' => function ($q){ + $q->andWhere([ + 'in','d.type', [5] + ]); + } + ])->joinWith([ + 'drugStoreDrug','drugStoreRelation' + ])->column(); + //没有收藏的药品 + if (!$is_collect) { + return ['uncollect' => $allDrug]; + } + + foreach ($ids as $k => $v) { + foreach ($is_collect as $val) { + if ($v == $val) { + unset($ids[$k]); + } + } + } + + $no_collect = Drug::find()->alias('d')->select('d.*')->where([ + 'in', 'd.id', $ids + ])->andWhere([ + 'in','d.type', [5] + ])->joinWith(['drugStoreDrug dsd' => function($q){ + $q->andWhere(['dsd.status' => 2]); + }])->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){ + $q->andWhere(['dsr.store_id' => $store_id]); + $q->andWhere(['dsr.status' => 2]); + }])->asArray()->all(); + foreach($no_collect as $k=>$v){ + $no_collect[$k]['buy_price'] = $v['drugStoreRelation']['buy_price']; + $no_collect[$k]['price'] = $v['drugStoreRelation']['price']; + $no_collect[$k]['stock'] = $v['drugStoreDrug']['stock']; + unset($no_collect[$k]['drugStoreRelation']); + unset($no_collect[$k]['drugStoreDrug']); + } + + $collected = Drug::find()->alias('d')->select('d.*')->where([ + 'in', 'd.id', $is_collect + ])->andWhere([ + 'in','d.type', [5] + ])->joinWith(['drugStoreDrug dsd' => function($q){ + $q->andWhere(['dsd.status' => 2]); + }])->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){ + $q->andWhere(['dsr.store_id' => $store_id]); + $q->andWhere(['dsr.status' => 2]); + }])->asArray()->all(); + foreach($collected as $k=>$v){ + $collected[$k]['buy_price'] = $v['drugStoreRelation']['buy_price']; + $collected[$k]['price'] = $v['drugStoreRelation']['price']; + $collected[$k]['stock'] = $v['drugStoreDrug']['stock']; + unset($collected[$k]['drugStoreRelation']); + unset($collected[$k]['drugStoreDrug']); + } + + if (!$no_collect) { + return ['collected' => $collected]; + } + + return [ + 'uncollect' => $no_collect, + 'collected' => $collected + ]; + } + + /** + * @doc-name 添加产品服务包-常用产品服务包列表 + * @doc-param name string 药名 + */ + public function actionServicePackageCommon() + { + $name = \Yii::$app->request->post('name'); + $store_id = \Yii::$app->request->post('store_id'); + $common = DoctorCommon::find()->alias('dc')->where([ + 'dc.su_id' => \Yii::$app->user->identity->id, + 'dc.store_id' => $store_id + ])->joinWith([ + 'drug d' => function ($q) use ($name){ + $q->andWhere([ + 'in','d.type',[5] + ]); + if($name){ + $q->andWhere([ + 'like', 'd.drug_name', '%' . $name . "%", false + ]); + } + } + ])->joinWith([ + 'drugStoreDrug','drugStoreRelation' + ])->asArray()->all(); + if (!$common) throw new Exception('你还没有添加常用药'); + foreach($common as $k=>$v){ + $drug = $v['drug']; + $data[$k] = $drug; + $data[$k]['buy_price'] = $v['drugStoreRelation']['buy_price']; + $data[$k]['price'] = $v['drugStoreRelation']['price']; + $data[$k]['stock'] = $v['drugStoreDrug']['stock']; + unset($v[$k]['store']); + unset($v[$k]['drugStoreRelation']); + unset($v[$k]['drugStoreDrug']); + } + return $data; + } } diff --git a/service/modules/v1/controllers/QuickController.php b/service/modules/v1/controllers/QuickController.php index ddad50c..2103802 100644 --- a/service/modules/v1/controllers/QuickController.php +++ b/service/modules/v1/controllers/QuickController.php @@ -3,10 +3,9 @@ namespace service\modules\v1\controllers; use common\core\BaseServiceController; -use common\models\ReplayTemplate; -use common\models\ReplayTemplateGroup; +use common\models\oldDb\ReplayTemplate; +use common\models\oldDb\ReplayTemplateGroup; use yii\base\Exception; -use yii\helpers\Json; /** * @doc-module 快捷功能 diff --git a/service/modules/v1/controllers/RecipeController.php b/service/modules/v1/controllers/RecipeController.php index 6ad76cf..37922ca 100644 --- a/service/modules/v1/controllers/RecipeController.php +++ b/service/modules/v1/controllers/RecipeController.php @@ -3,13 +3,13 @@ namespace service\modules\v1\controllers; use common\core\BaseAppController; -use common\models\ChineseRepice; -use common\models\DoctorInfo; -use common\models\GranularRepice; -use common\models\WestRepice; -use common\models\DrugStoreDrug; -use common\modelsgii\ChineseMedicine; -use common\modelsgii\GranularMedicine; +use common\models\oldDb\ChineseRepice; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\DrugStoreDrug; +use common\models\oldDb\GranularRepice; +use common\models\oldDb\WestRepice; +use common\modelsgii\oldDb\ChineseMedicine; +use common\modelsgii\oldDb\GranularMedicine; use yii\base\Exception; use yii\helpers\Json; diff --git a/service/modules/v1/controllers/RegisterController.php b/service/modules/v1/controllers/RegisterController.php index deef2fa..96607ac 100644 --- a/service/modules/v1/controllers/RegisterController.php +++ b/service/modules/v1/controllers/RegisterController.php @@ -5,8 +5,8 @@ namespace service\modules\v1\controllers; use common\core\BaseAppController; use common\enums\RegisterEnum; use common\helpers\FuncHelper; -use common\models\Register; -use common\models\UserPatientCase; +use common\models\oldDb\Register; +use common\models\oldDb\UserPatientCase; use common\services\ExportService; use yii\db\Exception; diff --git a/service/modules/v1/controllers/StoreAcceptController.php b/service/modules/v1/controllers/StoreAcceptController.php index 6dd8e53..9019db9 100644 --- a/service/modules/v1/controllers/StoreAcceptController.php +++ b/service/modules/v1/controllers/StoreAcceptController.php @@ -7,12 +7,11 @@ use common\enums\RegisterEnum; use common\forms\RegisterRefundForm; use common\jobs\RegisterAcceptJob; use common\jobs\templateMessage\RegisterAccept; -use common\models\DoctorPatient; -use common\models\Prescription; -use common\models\Register; -use common\models\RegisterRefund; -use common\models\SystemNotice; -use common\models\UserPatient; +use common\models\oldDb\DoctorPatient; +use common\models\oldDb\Prescription; +use common\models\oldDb\Register; +use common\models\oldDb\SystemNotice; +use common\models\oldDb\UserPatient; use yii\db\Exception; /** diff --git a/service/modules/v1/controllers/StoreController.php b/service/modules/v1/controllers/StoreController.php index 669b185..b0699a2 100644 --- a/service/modules/v1/controllers/StoreController.php +++ b/service/modules/v1/controllers/StoreController.php @@ -3,11 +3,11 @@ namespace service\modules\v1\controllers; use common\core\BaseServiceController; -use common\models\Department; -use common\models\DoctorInfo; -use common\models\Store; -use common\models\StoreDoctor; -use common\modelsgii\DoctorTitle; +use common\models\oldDb\Department; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\Store; +use common\models\oldDb\StoreDoctor; +use common\modelsgii\oldDb\DoctorTitle; use yii\db\Exception; use function GuzzleHttp\Promise\all; diff --git a/service/modules/v1/controllers/SystemNoticeController.php b/service/modules/v1/controllers/SystemNoticeController.php index 48c4a6c..7d16b2a 100644 --- a/service/modules/v1/controllers/SystemNoticeController.php +++ b/service/modules/v1/controllers/SystemNoticeController.php @@ -3,7 +3,7 @@ namespace service\modules\v1\controllers; use common\core\BaseServiceController; -use common\models\SystemNotice; +use common\models\oldDb\SystemNotice; use yii\base\Exception; /** diff --git a/service/modules/v1/controllers/TagManageController.php b/service/modules/v1/controllers/TagManageController.php index 531aa7d..02e78a9 100644 --- a/service/modules/v1/controllers/TagManageController.php +++ b/service/modules/v1/controllers/TagManageController.php @@ -4,8 +4,8 @@ namespace service\modules\v1\controllers; use common\core\BaseAppController; use common\helpers\FuncHelper; -use common\models\DoctorTagIll; -use common\models\UserPatientIll; +use common\models\oldDb\DoctorTagIll; +use common\models\oldDb\UserPatientIll; use yii\base\Exception; /** diff --git a/service/modules/v1/controllers/UserController.php b/service/modules/v1/controllers/UserController.php index 1643261..76b4a64 100644 --- a/service/modules/v1/controllers/UserController.php +++ b/service/modules/v1/controllers/UserController.php @@ -3,14 +3,11 @@ namespace service\modules\v1\controllers; use common\core\BaseServiceController; -use common\enums\UserRoleEnum; -use common\models\DoctorInfo; -use common\models\HospitalYard; -use common\models\PharmacistrInfo; -use common\models\ServiceUserToken; +use common\models\oldDb\DoctorInfo; +use common\models\oldDb\HospitalYard; +use common\models\oldDb\ServiceUserToken; use common\services\SmsService; use common\services\WeappService; -use GuzzleHttp\Client; use service\models\forms\AgreementForm; use service\models\forms\LoginForm; use service\models\forms\MobileForm; @@ -61,7 +58,7 @@ class UserController extends BaseServiceController $this->requestValidate($post, [ [['role', 'mobile'], 'required'] ]); - $ServiceUser = \common\models\ServiceUser::findOne(['mobile' => $post['mobile']]); + $ServiceUser = \common\models\oldDb\ServiceUser::findOne(['mobile' => $post['mobile']]); if (!$ServiceUser) { throw new Exception('您还没有任何账号'); } diff --git a/service/tests/functional/ResendVerificationEmailCest.php b/service/tests/functional/ResendVerificationEmailCest.php index 9cb7284..dba9b5f 100644 --- a/service/tests/functional/ResendVerificationEmailCest.php +++ b/service/tests/functional/ResendVerificationEmailCest.php @@ -2,8 +2,8 @@ namespace app\tests\functional; -use common\fixtures\UserFixture; use app\tests\FunctionalTester; +use common\fixtures\UserFixture; class ResendVerificationEmailCest { @@ -73,10 +73,10 @@ class ResendVerificationEmailCest { $I->submitForm($this->formId, $this->formParams('test@mail.com')); $I->canSeeEmailIsSent(); - $I->seeRecord('common\models\User', [ + $I->seeRecord('common\models\oldDb\User', [ 'email' => 'test@mail.com', 'username' => 'test.test', - 'status' => \common\models\User::STATUS_INACTIVE + 'status' => \common\models\oldDb\User::STATUS_INACTIVE ]); $I->see('Check your email for further instructions.'); } diff --git a/service/tests/functional/SignupCest.php b/service/tests/functional/SignupCest.php index 325e7e8..e4dbe7b 100644 --- a/service/tests/functional/SignupCest.php +++ b/service/tests/functional/SignupCest.php @@ -47,10 +47,10 @@ class SignupCest 'SignupForm[password]' => 'tester_password', ]); - $I->seeRecord('common\models\User', [ + $I->seeRecord('common\models\oldDb\User', [ 'username' => 'tester', 'email' => 'tester.email@example.com', - 'status' => \common\models\User::STATUS_INACTIVE + 'status' => \common\models\oldDb\User::STATUS_INACTIVE ]); $I->seeEmailIsSent(); diff --git a/service/tests/functional/VerifyEmailCest.php b/service/tests/functional/VerifyEmailCest.php index 1a9fca9..bc975d7 100644 --- a/service/tests/functional/VerifyEmailCest.php +++ b/service/tests/functional/VerifyEmailCest.php @@ -2,8 +2,8 @@ namespace app\tests\functional; -use common\fixtures\UserFixture; use app\tests\FunctionalTester; +use common\fixtures\UserFixture; class VerifyEmailCest { @@ -59,10 +59,10 @@ class VerifyEmailCest $I->canSee('Congratulations!', 'h1'); $I->see('Logout (test.test)', 'form button[type=submit]'); - $I->seeRecord('common\models\User', [ + $I->seeRecord('common\models\oldDb\User', [ 'username' => 'test.test', 'email' => 'test@mail.com', - 'status' => \common\models\User::STATUS_ACTIVE + 'status' => \common\models\oldDb\User::STATUS_ACTIVE ]); } } diff --git a/service/tests/unit/models/PasswordResetRequestFormTest.php b/service/tests/unit/models/PasswordResetRequestFormTest.php index ee6e536..32126b9 100644 --- a/service/tests/unit/models/PasswordResetRequestFormTest.php +++ b/service/tests/unit/models/PasswordResetRequestFormTest.php @@ -2,10 +2,10 @@ namespace app\tests\unit\models; -use Yii; use app\models\PasswordResetRequestForm; use common\fixtures\UserFixture as UserFixture; -use common\models\User; +use common\models\oldDb\User; +use Yii; class PasswordResetRequestFormTest extends \Codeception\Test\Unit { diff --git a/service/tests/unit/models/SignupFormTest.php b/service/tests/unit/models/SignupFormTest.php index 94dc617..b1dd83d 100644 --- a/service/tests/unit/models/SignupFormTest.php +++ b/service/tests/unit/models/SignupFormTest.php @@ -2,8 +2,8 @@ namespace app\tests\unit\models; -use common\fixtures\UserFixture; use app\models\SignupForm; +use common\fixtures\UserFixture; class SignupFormTest extends \Codeception\Test\Unit { @@ -34,11 +34,11 @@ class SignupFormTest extends \Codeception\Test\Unit $user = $model->signup(); verify($user)->notEmpty(); - /** @var \common\models\User $user */ - $user = $this->tester->grabRecord('common\models\User', [ + /** @var \common\models\oldDb\User $user */ + $user = $this->tester->grabRecord('common\models\oldDb\User', [ 'username' => 'some_username', 'email' => 'some_email@example.com', - 'status' => \common\models\User::STATUS_INACTIVE + 'status' => \common\models\oldDb\User::STATUS_INACTIVE ]); $this->tester->seeEmailIsSent(); diff --git a/service/tests/unit/models/VerifyEmailFormTest.php b/service/tests/unit/models/VerifyEmailFormTest.php index 1f56e15..1996151 100644 --- a/service/tests/unit/models/VerifyEmailFormTest.php +++ b/service/tests/unit/models/VerifyEmailFormTest.php @@ -2,8 +2,8 @@ namespace app\tests\unit\models; -use common\fixtures\UserFixture; use app\models\VerifyEmailForm; +use common\fixtures\UserFixture; class VerifyEmailFormTest extends \Codeception\Test\Unit { @@ -45,11 +45,11 @@ class VerifyEmailFormTest extends \Codeception\Test\Unit { $model = new VerifyEmailForm('4ch0qbfhvWwkcuWqjN8SWRq72SOw1KYT_1548675330'); $user = $model->verifyEmail(); - verify($user)->instanceOf('common\models\User'); + verify($user)->instanceOf('common\models\oldDb\User'); verify($user->username)->equals('test.test'); verify($user->email)->equals('test@mail.com'); - verify($user->status)->equals(\common\models\User::STATUS_ACTIVE); + verify($user->status)->equals(\common\models\oldDb\User::STATUS_ACTIVE); verify($user->validatePassword('Test1234'))->true(); } }