|
@@ -266,9 +266,9 @@ class Orders extends Api{
|
|
|
// 查询状态
|
|
|
if( $status ) $map[] = ['status','=',$status];
|
|
|
// 查询
|
|
|
- $Paginator = $Model->query()->where($map)->orderByDesc('id')->paginate($limit,['id','pay_total','status','price_total','coupon_total','business_id','pay_total','insert_time']);
|
|
|
+ $Paginator = $Model->query()->where($map)->orderByDesc('id')->paginate($limit,['id','pay_total','status','price_total','coupon_total','business_id','pay_total','weizan_orderid','insert_time']);
|
|
|
// 订单产品
|
|
|
- $productList = $OrdersProduct->query()->whereIn('order_id', array_column($Paginator->items(),'id'))->select(['id as item_id','order_id','product_id','buy_num','is_rebate','sku_attr_names as product_spec','product_name','product_thumb',])->get()->toArray();
|
|
|
+ $productList = $OrdersProduct->query()->whereIn('order_id', array_column($Paginator->items(),'id'))->select(['id as item_id','order_id','product_id','buy_num','is_rebate','sku_attr_names as product_spec','product_name','product_thumb'])->get()->toArray();
|
|
|
// 循环处理
|
|
|
foreach ($Paginator as $key => $order) {
|
|
|
// 商品列表
|
|
@@ -283,7 +283,7 @@ class Orders extends Api{
|
|
|
// 获取子列表
|
|
|
$order['state'] = (string) $Model->getState($order['status'],'state');
|
|
|
// 获取子列表
|
|
|
- $order['business_name'] = (string) $Business->getOne($order['business_id'],'name');
|
|
|
+ $order['business_name'] = (string) ($order['business_id'] ? $Business->getOne($order['business_id'],'name') : ($order['weizan_orderid'] ? '微赞订单' : ''));
|
|
|
// 获取子列表
|
|
|
$order['contents_class']= 0;
|
|
|
// 获取子列表
|