|
@@ -34,8 +34,8 @@ class OrderController extends AbstractController
|
|
|
/***
|
|
|
* 状态说明
|
|
|
*/
|
|
|
-
|
|
|
- public function getStauts()
|
|
|
+
|
|
|
+ public function getStatus()
|
|
|
{
|
|
|
$data['order'] = [
|
|
|
1 => '通过',
|
|
@@ -74,7 +74,7 @@ class OrderController extends AbstractController
|
|
|
'endtime' => 'required',
|
|
|
'pageSize' => 'required',
|
|
|
'page' => 'required',
|
|
|
-
|
|
|
+
|
|
|
],
|
|
|
[
|
|
|
'ad_size_id.required' => '广告尺寸id不能为空',
|
|
@@ -82,7 +82,7 @@ class OrderController extends AbstractController
|
|
|
'endtime.required' => '广告结束时间不能为空',
|
|
|
'pageSize.required' => '显示条数不能为空',
|
|
|
'page.required' => '分页不能为空',
|
|
|
-
|
|
|
+
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
@@ -90,8 +90,8 @@ class OrderController extends AbstractController
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
$result = $this->orderServiceClient->getAD($requireData);
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
@@ -162,9 +162,35 @@ class OrderController extends AbstractController
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取广告订单价格
|
|
|
+ */
|
|
|
+
|
|
|
+ public function getPrice(){
|
|
|
+ $requireData = $this->request->all();
|
|
|
+ $validator = $this->validationFactory->make(
|
|
|
+ $requireData,
|
|
|
+ [
|
|
|
+ 'starttime' => 'required',
|
|
|
+ 'endtime' => 'required',
|
|
|
+ ],
|
|
|
+ [
|
|
|
+ 'starttime.required' => '广告开始时间不能为空',
|
|
|
+ 'endtime.required' => '广告结束时间不能为空',
|
|
|
+ ]
|
|
|
+ );
|
|
|
+ if ($validator->fails()) {
|
|
|
+ $errorMessage = $validator->errors()->first();
|
|
|
+ return Result::error($errorMessage);
|
|
|
+ }
|
|
|
+ var_dump($requireData);
|
|
|
+ $result = $this->orderServiceClient->getPrice($requireData);
|
|
|
+ return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
+ }
|
|
|
/**
|
|
|
* 添加订单
|
|
|
*/
|
|
|
+
|
|
|
public function addAD()
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
@@ -179,6 +205,7 @@ class OrderController extends AbstractController
|
|
|
'imgurl' => 'required',
|
|
|
'imgsrc' => 'required',
|
|
|
'pid' => 'required',
|
|
|
+ 'price' =>'required'
|
|
|
],
|
|
|
[
|
|
|
'name.required' => '广告名称不能为空',
|
|
@@ -188,7 +215,7 @@ class OrderController extends AbstractController
|
|
|
'imgurl.required' => '图片广告链接不能为空',
|
|
|
'imgsrc.required' => '图片广告地址不能为空',
|
|
|
'pid.required' => '广告位id不能为空',
|
|
|
-
|
|
|
+ 'price.required' => '价格不能为空'
|
|
|
]
|
|
|
);
|
|
|
|
|
@@ -197,13 +224,11 @@ class OrderController extends AbstractController
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
|
- $commaSeparatedString = $requireData['pid'];
|
|
|
- $array = explode(",", $commaSeparatedString);
|
|
|
- $requireData['pid'] = $array;
|
|
|
$result = $this->orderServiceClient->addAD($requireData);
|
|
|
// return $requireData;
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 获取订单列表
|
|
|
*/
|