|
|
@@ -4393,7 +4393,7 @@ class WholeController extends Curd
|
|
|
$where['order_classify'] = $request->get('goods_classify');
|
|
|
}
|
|
|
|
|
|
- $where['order_category'] = ['<>', 'RECHARGE'];
|
|
|
+// $where['order_category'] = ['<>', 'RECHARGE'];
|
|
|
if (!empty($request->get('order_ids'))) {
|
|
|
$where['order_id'] = ['in', $request->get('order_ids')];
|
|
|
}
|
|
|
@@ -4419,7 +4419,7 @@ class WholeController extends Curd
|
|
|
$orderIds = [];
|
|
|
if (!empty($orderId)) {
|
|
|
$orderIds = Order::where('order_id', 'like', '%' . $orderId . '%')
|
|
|
- ->whereIn('order_classify', ['SERVICE', 'CHNMED', 'CHNNCD'])
|
|
|
+// ->whereIn('order_classify', ['SERVICE', 'CHNMED', 'CHNNCD'])
|
|
|
->pluck('order_id')
|
|
|
->toArray();
|
|
|
}
|
|
|
@@ -4460,7 +4460,6 @@ class WholeController extends Curd
|
|
|
|
|
|
$query = $this->doSelect($where, $field, $order);
|
|
|
|
|
|
- _syslog("订单", "导出订单");
|
|
|
return $this->exportDoFormat($query, $format, 1000);
|
|
|
}
|
|
|
|
|
|
@@ -4550,7 +4549,9 @@ class WholeController extends Curd
|
|
|
$memberName .= $item['member']['member_mobile'];
|
|
|
}
|
|
|
}
|
|
|
- dump($item);
|
|
|
+ if ($item['order_express_type'] == '自提' && $item['order_status_system'] == 'SENDING') {
|
|
|
+ $item['order_status_system'] = 'PICKUP';
|
|
|
+ }
|
|
|
$data[$key] = [
|
|
|
'goods_classify' => !empty($goodsClassify) && isset(self::$goodsClassify[$goodsClassify]) ? self::$goodsClassify[$goodsClassify] : '其他订单',
|
|
|
'order_id' => $item['order_id'],
|
|
|
@@ -5453,7 +5454,10 @@ class WholeController extends Curd
|
|
|
'OTHER' => '其他订单',
|
|
|
'DISHES' => '餐饮订单',
|
|
|
'MEALS' => '餐饮订单',
|
|
|
- 'VIP' => '康养城订单'
|
|
|
+ 'VIP' => '康养城订单',
|
|
|
+ 'COMBINE' => '新客专享订单',
|
|
|
+ 'PARTNER' => '会员合伙人订单',
|
|
|
+ 'REFERRER' => '康养推荐官订单'
|
|
|
];
|
|
|
|
|
|
// systemStatus: {BEING:"待生效",PAYING:"待支付",PENDING:"待确认",WAITING:"待受理",SENDING:"待发货",RECVING:"待收货",SIGNED:"已签收",CONFIRM:"确认收货"},
|
gorden