|
@@ -67,20 +67,31 @@ class OrderController extends AbstractController
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
|
[
|
|
|
- 'ad_size_id' => 'required',
|
|
|
+ 'ad_size_id' => [
|
|
|
+ 'nullable',
|
|
|
+ function ($attribute, $value, $fail) {
|
|
|
+ if ($value === null) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ if (is_numeric($value)) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ if (is_array($value) && count(array_filter($value, 'is_numeric')) === count($value)) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ $fail($attribute.' 必须是一个数字或者一个只包含数字的数组');
|
|
|
+ },
|
|
|
+ ],
|
|
|
'starttime' => 'required',
|
|
|
'endtime' => 'required',
|
|
|
'pageSize' => 'required',
|
|
|
'page' => 'required',
|
|
|
-
|
|
|
],
|
|
|
[
|
|
|
- 'ad_size_id.required' => '广告尺寸id不能为空',
|
|
|
'starttime.required' => '广告开始时间不能为空',
|
|
|
'endtime.required' => '广告结束时间不能为空',
|
|
|
'pageSize.required' => '显示条数不能为空',
|
|
|
'page.required' => '分页不能为空',
|
|
|
-
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
@@ -88,8 +99,8 @@ class OrderController extends AbstractController
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ $requireData['website_id'] = Context::get("WebsiteId")??'2';
|
|
|
+ // return Result::success($requireData);
|
|
|
$result = $this->orderServiceClient->getAD($requireData);
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|