|
@@ -783,9 +783,9 @@ HTML;
|
|
|
$price['pay_price_other'] = $v['sum_pay_price'];
|
|
$price['pay_price_other'] = $v['sum_pay_price'];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- $price['pay_price_offline_1'] = self::getOrderWhere($where, $model)->where($whereData)->where('offline_type', 1)->sum('pay_price');
|
|
|
|
|
|
|
+ $price['pay_price_offline_1'] = self::getOrderWhere($where, $model)->where($whereData)->where('pay_type', 'offline')->where('offline_type', 1)->sum('pay_price');
|
|
|
// $price['pay_price_offline'] -= $price['pay_price_offline_1'];
|
|
// $price['pay_price_offline'] -= $price['pay_price_offline_1'];
|
|
|
- $price['pay_price_offline'] = self::getOrderWhere($where, $model)->where($whereData)->where('offline_type', 0)->sum('pay_price');
|
|
|
|
|
|
|
+ $price['pay_price_offline'] = self::getOrderWhere($where, $model)->where($whereData)->where('pay_type', 'offline')->where('offline_type', 0)->sum('pay_price');
|
|
|
return $price;
|
|
return $price;
|
|
|
}
|
|
}
|
|
|
|
|
|