Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
068a73a7
Commit
068a73a7
authored
Feb 27, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兼容
parent
e9f426f4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
18 deletions
+11
-18
DailyPaperService.php
application/api_broker/service/DailyPaperService.php
+1
-1
DailyPaper.php
application/index/controller/DailyPaper.php
+10
-17
No files found.
application/api_broker/service/DailyPaperService.php
View file @
068a73a7
...
@@ -546,7 +546,7 @@ class DailyPaperService
...
@@ -546,7 +546,7 @@ class DailyPaperService
$arr
[
"update_time"
]
=
date
(
"Y-m-d H:i:s"
,
time
());
$arr
[
"update_time"
]
=
date
(
"Y-m-d H:i:s"
,
time
());
return
$arr
;
return
$arr
;
}
}
/**
/**
* @param $daily_id
* @param $daily_id
...
...
application/index/controller/DailyPaper.php
View file @
068a73a7
...
@@ -86,8 +86,8 @@ class DailyPaper extends Basic
...
@@ -86,8 +86,8 @@ class DailyPaper extends Basic
if
(
empty
(
$params
[
"agent_id"
])
||
empty
(
$params
[
"agent_name"
])
||
empty
(
$params
[
"daily_date"
])
||
if
(
empty
(
$params
[
"agent_id"
])
||
empty
(
$params
[
"agent_name"
])
||
empty
(
$params
[
"daily_date"
])
||
!
isset
(
$params
[
"alipay"
])
||
!
isset
(
$params
[
"tenpay"
])
||
!
isset
(
$params
[
"realty_pay"
])
||
!
isset
(
$params
[
"alipay"
])
||
!
isset
(
$params
[
"tenpay"
])
||
!
isset
(
$params
[
"realty_pay"
])
||
!
isset
(
$params
[
"family_pay"
])
||
!
isset
(
$params
[
"private_bank"
])
||
!
isset
(
$params
[
"cash"
])
||
!
isset
(
$params
[
"family_pay"
])
||
!
isset
(
$params
[
"private_bank"
])
||
!
isset
(
$params
[
"cash"
])
||
!
isset
(
$params
[
"pos"
])
||
!
isset
(
$params
[
"other_bank"
])
||
!
isset
(
$params
[
"bank_card_yun"
])
!
isset
(
$params
[
"pos"
])
||
!
isset
(
$params
[
"other_bank"
])
||
!
isset
(
$params
[
"bank_card_lin"
])
||
!
isset
(
$params
[
"bank_card_new"
])
// || !isset($params["bank_card_yun"])
|| !isset($params["bank_card_lin"]) || !isset($params["bank_card_new"])
)
{
)
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
...
@@ -106,9 +106,9 @@ class DailyPaper extends Basic
...
@@ -106,9 +106,9 @@ class DailyPaper extends Basic
$pos
=
$params
[
"pos"
];
$pos
=
$params
[
"pos"
];
$other_bank
=
$params
[
"other_bank"
];
$other_bank
=
$params
[
"other_bank"
];
$bank_card
=
$params
[
"bank_card"
];
$bank_card
=
$params
[
"bank_card"
];
$bank_card_yun
=
$params
[
"bank_card_yun"
];
$bank_card_yun
=
$params
[
"bank_card_yun"
]
?
$params
[
"bank_card_yun"
]
:
0
;
$bank_card_lin
=
$params
[
"bank_card_lin"
];
$bank_card_lin
=
$params
[
"bank_card_lin"
]
?
$params
[
"bank_card_lin"
]
:
0
;
$bank_card_new
=
$params
[
"bank_card_new"
];
$bank_card_new
=
$params
[
"bank_card_new"
]
?
$params
[
"bank_card_new"
]
:
0
;
$site_id
=
$this
->
siteId
;
$site_id
=
$this
->
siteId
;
$result
=
$this
->
service_
->
addDaily
(
$agent_id
,
$agent_name
,
$daily_date
,
$alipay
,
$tenpay
,
$realty_pay
,
$result
=
$this
->
service_
->
addDaily
(
$agent_id
,
$agent_name
,
$daily_date
,
$alipay
,
$tenpay
,
$realty_pay
,
$family_pay
,
$private_bank
,
$cash
,
$pos
,
$other_bank
,
$tenpay_2
,
$alipay_2
,
$site_id
,
$bank_card
,
$bank_card_yun
$family_pay
,
$private_bank
,
$cash
,
$pos
,
$other_bank
,
$tenpay_2
,
$alipay_2
,
$site_id
,
$bank_card
,
$bank_card_yun
...
@@ -148,13 +148,6 @@ class DailyPaper extends Basic
...
@@ -148,13 +148,6 @@ class DailyPaper extends Basic
"bank_card_lin"=>"1213",
"bank_card_lin"=>"1213",
"bank_card_new"=>"123123"
"bank_card_new"=>"123123"
);*/
);*/
// if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) ||
// !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
// !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
// !isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"])
// ) {
// return $this->response("101", "请求参数错误");
// }
$m_daily
=
new
ODaily
();
$m_daily
=
new
ODaily
();
$daily_data
=
$m_daily
->
getDailyList
(
'id,site_id'
,[
'id'
=>
$params
[
'daily_id'
]],
1
,
1
);
$daily_data
=
$m_daily
->
getDailyList
(
'id,site_id'
,[
'id'
=>
$params
[
'daily_id'
]],
1
,
1
);
...
@@ -164,8 +157,8 @@ class DailyPaper extends Basic
...
@@ -164,8 +157,8 @@ class DailyPaper extends Basic
if
(
!
isset
(
$params
[
"daily_id"
])
||
empty
(
$params
[
"agent_id"
])
||
empty
(
$params
[
"agent_name"
])
||
if
(
!
isset
(
$params
[
"daily_id"
])
||
empty
(
$params
[
"agent_id"
])
||
empty
(
$params
[
"agent_name"
])
||
!
isset
(
$params
[
"alipay"
])
||
!
isset
(
$params
[
"tenpay"
])
||
!
isset
(
$params
[
"realty_pay"
])
||
!
isset
(
$params
[
"alipay"
])
||
!
isset
(
$params
[
"tenpay"
])
||
!
isset
(
$params
[
"realty_pay"
])
||
!
isset
(
$params
[
"family_pay"
])
||
!
isset
(
$params
[
"private_bank"
])
||
!
isset
(
$params
[
"cash"
])
||
!
isset
(
$params
[
"family_pay"
])
||
!
isset
(
$params
[
"private_bank"
])
||
!
isset
(
$params
[
"cash"
])
||
!
isset
(
$params
[
"pos"
])
||
!
isset
(
$params
[
"other_bank"
])
||
!
isset
(
$params
[
"operation_status"
])
||
!
isset
(
$params
[
"pos"
])
||
!
isset
(
$params
[
"other_bank"
])
||
!
isset
(
$params
[
"operation_status"
])
!
isset
(
$params
[
"bank_card_yun"
])
||
!
isset
(
$params
[
"bank_card_lin"
])
||
!
isset
(
$params
[
"bank_card_new"
])
//||
!isset($params["bank_card_yun"]) || !isset($params["bank_card_lin"]) || !isset($params["bank_card_new"])
)
{
)
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
...
@@ -186,9 +179,9 @@ class DailyPaper extends Basic
...
@@ -186,9 +179,9 @@ class DailyPaper extends Basic
$tenpay_2
=
$params
[
"tenpay_2"
];
$tenpay_2
=
$params
[
"tenpay_2"
];
$alipay_2
=
$params
[
"alipay_2"
];
$alipay_2
=
$params
[
"alipay_2"
];
$bank_card
=
$params
[
"bank_card"
];
$bank_card
=
$params
[
"bank_card"
];
$bank_card_yun
=
$params
[
"bank_card_yun"
];
$bank_card_yun
=
$params
[
"bank_card_yun"
]
?
$params
[
"bank_card_yun"
]
:
0
;
$bank_card_lin
=
$params
[
"bank_card_lin"
];
$bank_card_lin
=
$params
[
"bank_card_lin"
]
?
$params
[
"bank_card_lin"
]
:
0
;
$bank_card_new
=
$params
[
"bank_card_new"
];
$bank_card_new
=
$params
[
"bank_card_new"
]
?
$params
[
"bank_card_new"
]
:
0
;
if
(
$operation_status
!=
0
&&
$operation_status
!=
1
){
if
(
$operation_status
!=
0
&&
$operation_status
!=
1
){
return
$this
->
response
(
"101"
,
"审核状态错误"
);
return
$this
->
response
(
"101"
,
"审核状态错误"
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment