diff --git a/app/common/model/dealer/User.php b/app/common/model/dealer/User.php index 11886a2f..250f065c 100644 --- a/app/common/model/dealer/User.php +++ b/app/common/model/dealer/User.php @@ -45,7 +45,23 @@ class User extends BaseModel ]; // 追加的字段 - protected $append = ['full_money']; + protected $append = ['full_money', 'type_text']; + + /** + * @notes:身份标识 + * @param $value + * @param $data + * @return mixed + * @author: wanghousheng + */ + public function getTypeTextAttr($value, $data) + { + $result = DealerUserEnum::data(); + if (!empty($result[$data['type']]['name'])) { + return $result[$data['type']]['name']; + } + return '未知'; + } /** * 关联会员记录表 diff --git a/app/common/model/server/Order.php b/app/common/model/server/Order.php index 6b2f6144..e5e52b10 100644 --- a/app/common/model/server/Order.php +++ b/app/common/model/server/Order.php @@ -34,12 +34,18 @@ class Order extends BaseModel /** * 获取器:订单状态文字描述 + * @param $value + * @param $data * @return string */ public function getOrderStatusTextAttr($value, $data): string { // 订单状态 - return ServerEnum::data()[$data['order_status']]['name']; + $result = ServerEnum::data(); + if (!empty($result[$data['order_status']]['name'])) { + return $result[$data['order_status']]['name']; + } + return '未知'; } /** diff --git a/app/store/controller/Server.php b/app/store/controller/Server.php index 1d347dcc..687d88fd 100644 --- a/app/store/controller/Server.php +++ b/app/store/controller/Server.php @@ -3,6 +3,7 @@ declare (strict_types=1); namespace app\store\controller; +use app\common\enum\ServerEnum; use app\store\model\server\Server as ServerModel; use app\store\model\ServerCategory; use cores\exception\BaseException; @@ -218,6 +219,17 @@ class Server extends Controller return $this->renderSuccess(compact('list')); } + /** + * @notes:订单状态 + * @return Json + * @author: wanghousheng + */ + public function OrderStatus(): Json + { + $list = array_values(ServerEnum::data()); + return $this->renderSuccess(compact('list')); + } + /** * @notes:取消服务订单 * @param int $orderId diff --git a/app/store/controller/dealer/User.php b/app/store/controller/dealer/User.php index acb8441e..3ae2a860 100644 --- a/app/store/controller/dealer/User.php +++ b/app/store/controller/dealer/User.php @@ -12,6 +12,7 @@ declare (strict_types=1); namespace app\store\controller\dealer; +use app\common\enum\dealer\DealerUserEnum; use app\common\service\qrcode\Poster; use app\store\controller\Controller; use app\store\model\dealer\Referee as RefereeModel; @@ -111,4 +112,15 @@ class User extends Controller $list = UserModel::getEngineer(); return $this->renderSuccess(compact('list')); } + + /** + * @notes:分销商身份 + * @return Json + * @author: wanghousheng + */ + public function typeList(): Json + { + $list = array_values(DealerUserEnum::data()); + return $this->renderSuccess(compact('list')); + } } \ No newline at end of file