diff --git a/application/admin/service/AdminDao.php b/application/admin/dao/AdminDao.php similarity index 96% rename from application/admin/service/AdminDao.php rename to application/admin/dao/AdminDao.php index 1d36372..c6f12c2 100644 --- a/application/admin/service/AdminDao.php +++ b/application/admin/dao/AdminDao.php @@ -6,7 +6,7 @@ * Time: 15:49 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/CfChannelInfoDao.php b/application/admin/dao/CfChannelInfoDao.php similarity index 96% rename from application/admin/service/CfChannelInfoDao.php rename to application/admin/dao/CfChannelInfoDao.php index 1bda8f4..b5c5fb1 100644 --- a/application/admin/service/CfChannelInfoDao.php +++ b/application/admin/dao/CfChannelInfoDao.php @@ -6,7 +6,7 @@ * Time: 15:20 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/CfSuplierInfoDao.php b/application/admin/dao/CfSuplierInfoDao.php similarity index 96% rename from application/admin/service/CfSuplierInfoDao.php rename to application/admin/dao/CfSuplierInfoDao.php index 521cc60..e8cfb7e 100644 --- a/application/admin/service/CfSuplierInfoDao.php +++ b/application/admin/dao/CfSuplierInfoDao.php @@ -6,7 +6,7 @@ * Time: 16:03 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/OrderHotelDao.php b/application/admin/dao/OrderHotelDao.php similarity index 99% rename from application/admin/service/OrderHotelDao.php rename to application/admin/dao/OrderHotelDao.php index 1c40d85..197a8a8 100644 --- a/application/admin/service/OrderHotelDao.php +++ b/application/admin/dao/OrderHotelDao.php @@ -6,7 +6,7 @@ * Time: 13:36 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/OrderItemDao.php b/application/admin/dao/OrderItemDao.php similarity index 99% rename from application/admin/service/OrderItemDao.php rename to application/admin/dao/OrderItemDao.php index 5017255..1faed68 100644 --- a/application/admin/service/OrderItemDao.php +++ b/application/admin/dao/OrderItemDao.php @@ -6,7 +6,7 @@ * Time: 13:36 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/OrderMainDao.php b/application/admin/dao/OrderMainDao.php similarity index 99% rename from application/admin/service/OrderMainDao.php rename to application/admin/dao/OrderMainDao.php index f572934..350c3c2 100644 --- a/application/admin/service/OrderMainDao.php +++ b/application/admin/dao/OrderMainDao.php @@ -6,7 +6,7 @@ * Time: 11:26 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/PaymentOrderDao.php b/application/admin/dao/PaymentOrderDao.php similarity index 99% rename from application/admin/service/PaymentOrderDao.php rename to application/admin/dao/PaymentOrderDao.php index 8666f68..f7a3773 100644 --- a/application/admin/service/PaymentOrderDao.php +++ b/application/admin/dao/PaymentOrderDao.php @@ -6,7 +6,7 @@ * Time: 17:29 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/PurchaseDao.php b/application/admin/dao/PurchaseDao.php similarity index 99% rename from application/admin/service/PurchaseDao.php rename to application/admin/dao/PurchaseDao.php index f74202f..53002ad 100644 --- a/application/admin/service/PurchaseDao.php +++ b/application/admin/dao/PurchaseDao.php @@ -6,7 +6,7 @@ * Time: 16:38 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/PurchasePriceDao.php b/application/admin/dao/PurchasePriceDao.php similarity index 98% rename from application/admin/service/PurchasePriceDao.php rename to application/admin/dao/PurchasePriceDao.php index 1a180a1..a0da498 100644 --- a/application/admin/service/PurchasePriceDao.php +++ b/application/admin/dao/PurchasePriceDao.php @@ -6,7 +6,7 @@ * Time: 19:19 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/ReceiptOrderDao.php b/application/admin/dao/ReceiptOrderDao.php similarity index 99% rename from application/admin/service/ReceiptOrderDao.php rename to application/admin/dao/ReceiptOrderDao.php index ccb1884..377258a 100644 --- a/application/admin/service/ReceiptOrderDao.php +++ b/application/admin/dao/ReceiptOrderDao.php @@ -6,7 +6,7 @@ * Time: 10:20 */ -namespace app\admin\service; +namespace app\admin\dao; use app\admin\command\Util; diff --git a/application/admin/service/OrderMainService.php b/application/admin/service/OrderMainService.php index f4d03c0..ca70037 100644 --- a/application/admin/service/OrderMainService.php +++ b/application/admin/service/OrderMainService.php @@ -3,13 +3,11 @@ namespace app\admin\service; use app\admin\command\Util; -use app\admin\model\OrderHotel; -use app\admin\model\OrderItem; -use app\admin\model\OrderMain; -use app\admin\model\Purchase; -use app\admin\model\PurchasePrice; -use think\Exception; -use think\Url; +use app\admin\dao\OrderHotelDao; +use app\admin\dao\OrderItemDao; +use app\admin\dao\OrderMainDao; +use app\admin\dao\PurchaseDao; +use app\admin\dao\PurchasePriceDao; /** * Created by PhpStorm. @@ -217,7 +215,7 @@ class OrderMainService $orderMainDao = new OrderMainDao(); $orderMainDao->setOrderAmount($subOrderRe['data']['order_id']); return Util::returnArrSu("成功"); - }catch (Exception $e){ + }catch (\Exception $e){ return Util::returnArrEr("删除子订单失败:".$e->getMessage()); } } diff --git a/application/admin/service/PaymentOrderService.php b/application/admin/service/PaymentOrderService.php index dc68b4d..d51d713 100644 --- a/application/admin/service/PaymentOrderService.php +++ b/application/admin/service/PaymentOrderService.php @@ -10,6 +10,10 @@ namespace app\admin\service; use app\admin\command\Util; +use app\admin\dao\OrderHotelDao; +use app\admin\dao\OrderItemDao; +use app\admin\dao\OrderMainDao; +use app\admin\dao\PaymentOrderDao; use think\Db; class PaymentOrderService diff --git a/application/admin/service/ReceiptOrderService.php b/application/admin/service/ReceiptOrderService.php index 9a84cf7..7412607 100644 --- a/application/admin/service/ReceiptOrderService.php +++ b/application/admin/service/ReceiptOrderService.php @@ -10,8 +10,9 @@ namespace app\admin\service; use app\admin\command\Util; +use app\admin\dao\OrderMainDao; +use app\admin\dao\ReceiptOrderDao; use think\Db; -use think\Exception; class ReceiptOrderService {