Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
weixiuhui
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
蒋林
weixiuhui
Commits
1701d516
Commit
1701d516
authored
Nov 09, 2016
by
蒋林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
苏宁业务修改
parent
c8183734
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
13 deletions
+11
-13
Chigo.php
application/controllers/api/Chigo.php
+1
-1
Suning.php
application/controllers/test/Suning.php
+6
-6
Receive.php
application/libraries/Receive/Receive.php
+2
-2
ReceiveSuning.php
application/libraries/Receive/ReceiveSuning.php
+1
-1
SourceSuning.php
application/libraries/Source/SourceSuning.php
+1
-3
No files found.
application/controllers/api/Chigo.php
View file @
1701d516
...
@@ -138,7 +138,7 @@ class Chigo extends BaseController
...
@@ -138,7 +138,7 @@ class Chigo extends BaseController
{
{
//记录日志
//记录日志
$this
->
load
->
model
(
'api_log_model'
);
$this
->
load
->
model
(
'api_log_model'
);
$this
->
api_log_model
->
add
(
$search
,
'
suning
'
,
$method
,
$data
);
$this
->
api_log_model
->
add
(
$search
,
'
chigo
'
,
$method
,
$data
);
}
}
private
function
sourceObj
(
$username
,
$pwd
)
private
function
sourceObj
(
$username
,
$pwd
)
...
...
application/controllers/test/Suning.php
View file @
1701d516
...
@@ -76,9 +76,9 @@ class Suning extends BaseController
...
@@ -76,9 +76,9 @@ class Suning extends BaseController
'mark'
=>
'1'
,
'mark'
=>
'1'
,
'siteBp'
=>
'904102'
,
'siteBp'
=>
'904102'
,
'startTime'
=>
'20161025'
,
'startTime'
=>
'20161025'
,
'endTime'
=>
'2016111
0
'
,
'endTime'
=>
'2016111
3
'
,
'objectIds'
=>
''
,
'objectIds'
=>
''
,
'phone'
=>
'
13423871233
'
,
'phone'
=>
''
,
];
];
$data
[
'nonce_str'
]
=
$obj
->
GetNonceStr
();
$data
[
'nonce_str'
]
=
$obj
->
GetNonceStr
();
...
@@ -89,7 +89,7 @@ class Suning extends BaseController
...
@@ -89,7 +89,7 @@ class Suning extends BaseController
$url
=
self
::
$apiUrl
.
"api/suning/selectServiceOrder"
;
$url
=
self
::
$apiUrl
.
"api/suning/selectServiceOrder"
;
$result
=
curl_post
(
$url
,
$values
);
$result
=
curl_post
(
$url
,
$values
);
$result
[
'data'
]
=
json_decode
(
$result
[
'data'
],
true
);
//
$result['data'] = json_decode($result['data'], true);
$this
->
show
(
$result
);
$this
->
show
(
$result
);
}
}
...
@@ -128,8 +128,8 @@ class Suning extends BaseController
...
@@ -128,8 +128,8 @@ class Suning extends BaseController
'pwd'
=>
self
::
$testp
,
'pwd'
=>
self
::
$testp
,
'type'
=>
'1'
,
'type'
=>
'1'
,
'siteBp'
=>
'904102'
,
'siteBp'
=>
'904102'
,
'startTime'
=>
'20161
02
6'
,
'startTime'
=>
'20161
10
6'
,
'endTime'
=>
'2016111
0
'
,
'endTime'
=>
'2016111
3
'
,
'objectIds'
=>
''
'objectIds'
=>
''
];
];
...
@@ -159,7 +159,7 @@ class Suning extends BaseController
...
@@ -159,7 +159,7 @@ class Suning extends BaseController
$object
=
[
$object
=
[
[
[
'srvOrder'
=>
'7215
781123
'
,
'srvOrder'
=>
'7215
839556
'
,
'processType'
=>
'ZS06'
'processType'
=>
'ZS06'
]
]
];
];
...
...
application/libraries/Receive/Receive.php
View file @
1701d516
...
@@ -248,7 +248,7 @@ class Receive
...
@@ -248,7 +248,7 @@ class Receive
protected
function
DateFormatValues
(
$date
,
$format
=
'Y-m-d'
)
protected
function
DateFormatValues
(
$date
,
$format
=
'Y-m-d'
)
{
{
if
(
empty
(
$
val
))
{
if
(
empty
(
$
date
))
{
return
$date
;
return
$date
;
}
}
...
@@ -257,7 +257,7 @@ class Receive
...
@@ -257,7 +257,7 @@ class Receive
protected
function
TimeFormatValues
(
$time
,
$format
=
'Y-m-d'
)
protected
function
TimeFormatValues
(
$time
,
$format
=
'Y-m-d'
)
{
{
if
(
empty
(
$
val
))
{
if
(
empty
(
$
time
))
{
return
$time
;
return
$time
;
}
}
...
...
application/libraries/Receive/ReceiveSuning.php
View file @
1701d516
...
@@ -25,7 +25,7 @@ class ReceiveSuning extends Receive
...
@@ -25,7 +25,7 @@ class ReceiveSuning extends Receive
'processType'
,
'processType'
,
];
];
$this
->
SetDefaultValues
(
$dfields
);
$this
->
SetDefaultValues
(
$dfields
);
$this
->
values
[
'startTime'
]
=
$this
->
DateFormatValues
(
$this
->
values
[
'startTime'
]);
$this
->
values
[
'startTime'
]
=
$this
->
DateFormatValues
(
$this
->
values
[
'startTime'
]);
$this
->
values
[
'endTime'
]
=
$this
->
DateFormatValues
(
$this
->
values
[
'endTime'
]);
$this
->
values
[
'endTime'
]
=
$this
->
DateFormatValues
(
$this
->
values
[
'endTime'
]);
}
}
...
...
application/libraries/Source/SourceSuning.php
View file @
1701d516
...
@@ -77,8 +77,6 @@ class SourceSuning extends Source
...
@@ -77,8 +77,6 @@ class SourceSuning extends Source
'processType'
=>
$condition
[
'processType'
]
//订单类型编号
'processType'
=>
$condition
[
'processType'
]
//订单类型编号
];
];
//return_msg(true, '', $post);
//debug
//debug
$this
->
Debug
(
'ServiceOrder-condition'
,
$post
);
$this
->
Debug
(
'ServiceOrder-condition'
,
$post
);
...
@@ -244,7 +242,7 @@ class SourceSuning extends Source
...
@@ -244,7 +242,7 @@ class SourceSuning extends Source
//debug
//debug
$this
->
Debug
(
'ServiceOrderTab1-table'
,
$table
);
$this
->
Debug
(
'ServiceOrderTab1-table'
,
$table
);
if
(
!
isset
(
$table
[
0
])
&&
!
$table
[
0
]
)
{
if
(
!
isset
(
$table
[
0
]))
{
return
$order
;
return
$order
;
}
}
...
...
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