|
|
@ -115,9 +115,10 @@ class Order extends OrderModel |
|
|
|
// 设置订单类型条件 |
|
|
|
// 设置订单类型条件 |
|
|
|
$dataTypeFilter = $this->getFilterDataType($dataType); |
|
|
|
$dataTypeFilter = $this->getFilterDataType($dataType); |
|
|
|
//判断当前用户身份 |
|
|
|
//判断当前用户身份 |
|
|
|
|
|
|
|
$userId = UserService::getCurrentLoginUserId(); |
|
|
|
$where = []; |
|
|
|
$where = []; |
|
|
|
if (!UserService::isStore()) { |
|
|
|
if (!UserService::isStore()) { |
|
|
|
$where['user_id'] = UserService::getCurrentLoginUserId(); |
|
|
|
$where['user_id'] = $userId; |
|
|
|
} |
|
|
|
} |
|
|
|
// 当前用户ID |
|
|
|
// 当前用户ID |
|
|
|
$query = $this->with(['goods.image']); |
|
|
|
$query = $this->with(['goods.image']); |
|
|
|