Просмотр исходного кода

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

dev
nizongfeng 2 лет назад
Родитель
Сommit
c25d8de300
2 измененных файлов: 2 добавлений и 2 удалений
  1. +1
    -1
      application/admin/dao/OrderHotelDao.php
  2. +1
    -1
      application/admin/dao/OrderItemDao.php

+ 1
- 1
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;


+ 1
- 1
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;


Загрузка…
Отмена
Сохранить