Merge remote-tracking branch 'origin/dev' into dev

application/admin/dao/OrderHotelDao.php

@@ -152,7 +152,7 @@ class OrderHotelDao
     public function setSubOrderAmount( int $subOrderId) {
         try{
             $purchaseModel = new Purchase();
-            $purchaseList = $purchaseModel->where(["order_detail_id"=>$subOrderId,"del_flag"=>0])->select()->toArray();
+            $purchaseList = $purchaseModel->where(["order_detail_id"=>$subOrderId,"del_flag"=>0,"prod_type"=>"hotel"])->select()->toArray();
             $cost = 0;
             $amount = 0;
             $count = 0;

application/admin/dao/OrderItemDao.php

@@ -101,7 +101,7 @@ class OrderItemDao
     public function setSubOrderAmount( int $subOrderId) {
         try{
             $purchaseModel = new Purchase();
-            $purchaseList = $purchaseModel->where(["order_detail_id"=>$subOrderId,"del_flag"=>0])->select()->toArray();
+            $purchaseList = $purchaseModel->where(["order_detail_id"=>$subOrderId,"del_flag"=>0,"prod_type"=>"item"])->select()->toArray();
             $cost = 0;
             $amount = 0;
             $count = 0;