|
@@ -100,17 +100,17 @@ class MayCurServerService extends Service
|
|
|
}
|
|
|
|
|
|
public function reimburseRule($data){
|
|
|
- if(empty($data['createdAtStart']) || empty($data['createdAtEnd'])) return [false, '单据的创建时间不能为空'];
|
|
|
- $createAtStart = strtotime($data['createdAtStart'] . '00:00:00');
|
|
|
- $createdAtEnd = strtotime($data['createdAtEnd'] . '23:59:59');
|
|
|
- if(empty($createAtStart)) return [false, '单据的创建开始时间格式错误'];
|
|
|
- if(empty($createdAtEnd)) return [false, '单据的创建结束时间格式错误'];
|
|
|
+ if(empty($data['settledAtStart']) || empty($data['settledAtEnd'])) return [false, '单据的支付时间不能为空'];
|
|
|
+ $settledAtStart = strtotime($data['settledAtStart'] . '00:00:00');
|
|
|
+ $settledAtEnd = strtotime($data['settledAtEnd'] . '23:59:59');
|
|
|
+ if(empty($settledAtStart)) return [false, '单据的支付时间格式错误'];
|
|
|
+ if(empty($settledAtEnd)) return [false, '单据的支付时间格式错误'];
|
|
|
|
|
|
$pageNo = 1;
|
|
|
$pageSize = 10;
|
|
|
if(! empty($data['pageNo'])) $pageNo = $data['pageNo'];
|
|
|
if(! empty($data['pageSize'])) {
|
|
|
- if($data['pageSize'] >= 100) {
|
|
|
+ if($data['pageSize'] >= 10) {
|
|
|
$pageSize = 10;
|
|
|
}else{
|
|
|
$pageSize = $data['pageSize'];
|
|
@@ -118,8 +118,8 @@ class MayCurServerService extends Service
|
|
|
}
|
|
|
|
|
|
$return = [
|
|
|
- 'createdAtStart' => $createAtStart * 1000,
|
|
|
- 'createdAtEnd' => $createdAtEnd * 1000,
|
|
|
+ 'settledAtStart' => $settledAtStart * 1000,
|
|
|
+ 'settledAtEnd' => $settledAtEnd * 1000,
|
|
|
'pageNo' => $pageNo,
|
|
|
'pageSize' => $pageSize,
|
|
|
'formStatus' => 'COMPLETED',
|