|
|
@@ -4425,8 +4425,7 @@ class WholeController extends Curd
|
|
|
}
|
|
|
$goodsName = trim($request->get('goods_name', ''));
|
|
|
if (!empty($goodsName)) {
|
|
|
- $goodsIds = Goods::whereIn('goods_classify', ['SERVICE', 'CHNMED', 'CHNNCD'])
|
|
|
- ->where('goods_name', 'like', '%' . $goodsName . '%')
|
|
|
+ $goodsIds = Goods::where('goods_name', 'like', '%' . $goodsName . '%')
|
|
|
->pluck('goods_id')
|
|
|
->toArray();
|
|
|
$goodsOrderIds = OrderSheet::whereIn('join_sheet_goods_id', $goodsIds)->pluck('join_sheet_order_id')->toArray();
|
|
|
@@ -4452,6 +4451,13 @@ class WholeController extends Curd
|
|
|
$where['order_category'] = 'RETURN';
|
|
|
}
|
|
|
|
|
|
+ // 自提订单
|
|
|
+ if (!empty($where['order_status_system']) && $where['order_status_system'] == 'PICKUP') {
|
|
|
+ $where['order_is_complete'] = 'N';
|
|
|
+ $where['order_status_system'] = 'SENDING';
|
|
|
+ $where['order_express.order_express_type'] = '自提';
|
|
|
+ }
|
|
|
+
|
|
|
$query = $this->doSelect($where, $field, $order);
|
|
|
|
|
|
_syslog("订单", "导出订单");
|
|
|
@@ -4544,6 +4550,7 @@ class WholeController extends Curd
|
|
|
$memberName .= $item['member']['member_mobile'];
|
|
|
}
|
|
|
}
|
|
|
+ dump($item);
|
|
|
$data[$key] = [
|
|
|
'goods_classify' => !empty($goodsClassify) && isset(self::$goodsClassify[$goodsClassify]) ? self::$goodsClassify[$goodsClassify] : '其他订单',
|
|
|
'order_id' => $item['order_id'],
|
|
|
@@ -5458,6 +5465,7 @@ class WholeController extends Curd
|
|
|
'PENDING' => "待确认",
|
|
|
'WAITING' => "待使用",
|
|
|
'SENDING' => "待发货",
|
|
|
+ 'PICKUP' => "待自提",
|
|
|
'RECVING' => "待收货",
|
|
|
'SIGNED' => "已签收",
|
|
|
'CONFIRM' => "确认收货",
|
gorden