|
|
@@ -103,8 +103,7 @@ class GoodsController extends Curd{
|
|
|
'express' => function ($query) {
|
|
|
$query->select('join_express_order_id', 'order_express_type');
|
|
|
}
|
|
|
- ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id')
|
|
|
- ->leftJoin('pay_detail','pay_detail.join_pay_order_id','=','order.order_groupby');
|
|
|
+ ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id');
|
|
|
// ->leftJoin('order_sheet','join_sheet_order_id','=','order.order_id');
|
|
|
foreach ($where as $column => $value) {
|
|
|
if (is_array($value)) {
|
gorden