diff --git a/app/api/model/dealer/Order.php b/app/api/model/dealer/Order.php index 43ebd092..2f0d1a92 100644 --- a/app/api/model/dealer/Order.php +++ b/app/api/model/dealer/Order.php @@ -12,17 +12,17 @@ declare (strict_types=1); namespace app\api\model\dealer; +use app\api\model\Order as OrderApiModel; +use app\api\model\User as UserApiModel; use app\api\service\User as UserService; use app\common\enum\dealer\DealerUserEnum; +use app\common\enum\order\PayStatus as PayStatusEnum; use app\common\enum\ServerEnum; -use app\common\model\Order as OrderModel; +use app\common\enum\user\UserTypeEnum; use app\common\model\dealer\Order as DealerOrderModel; -use app\api\model\Order as OrderApiModel; -use app\common\enum\order\PayStatus as PayStatusEnum; +use app\common\model\Order as OrderModel; use app\common\model\UserAddress as UserAddessModel; use cores\exception\BaseException; -use app\api\model\User as UserApiModel; -use app\common\enum\user\UserTypeEnum; /** @@ -64,11 +64,11 @@ class Order extends DealerOrderModel ->paginate(15); // 数据整理 foreach ($list as &$item) { - $with = ['goods' => ['image'],'user','address']; + $with = ['goods' => ['image'], 'user', 'address']; $where = ['order_id' => $item['order_id']]; // 查询订单记录 $order_goods = OrderApiModel::detail($where, $with); - $address = UserAddessModel::where('address_id',$item['user']->address_id)->find(); + $address = UserAddessModel::where('address_id', $item['user']->address_id)->find(); // 我的佣金 $money = [ $item['first_user_id'] => $item['first_money'], @@ -76,7 +76,7 @@ class Order extends DealerOrderModel $item['third_user_id'] => $item['third_money'], ]; $item['goods'] = $order_goods['goods'] ?? []; - $item['address_name'] =$address['name']; + $item['address_name'] = $address['name']; $item['order_no'] = $item['order']['order_no'] ?? ""; $item['my_money'] = $money[$userId]; } @@ -126,11 +126,13 @@ class Order extends DealerOrderModel return false; } //如果上级已经不是分销商 - if(!User::isDealerUser($dealerUser['first_user_id'])){ + if (!User::isDealerUser($dealerUser['first_user_id'])) { return false; } //如果上级已经不是分销商 - if(!UserApiModel::where('user_id',$dealerUser['first_user_id'])->value('user_type') !== UserTypeEnum::DEALER){ + $userModel = new UserApiModel; + $user_type = $userModel->where('user_id', $dealerUser['first_user_id'])->value('user_type'); + if ($user_type && $user_type != UserTypeEnum::DEALER) { return false; } // 计算订单分销佣金