Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
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
chenchuanwen
my-yaf-project
Commits
50c653a1
Commit
50c653a1
authored
Nov 18, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
recieve
parent
b6b9ada5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
OrderService.php
application/models/Business/Order/OrderService.php
+3
-0
index.php
public/index.php
+3
-0
No files found.
application/models/Business/Order/OrderService.php
View file @
50c653a1
...
@@ -297,6 +297,8 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -297,6 +297,8 @@ class OrderServiceModel extends \Business\AbstractModel
$returnData
[
'offlinePayway'
]
=
$this
->
store
[
'offlinePayway'
]
?
$this
->
store
[
'offlinePayway'
]
:
''
;
$returnData
[
'offlinePayway'
]
=
$this
->
store
[
'offlinePayway'
]
?
$this
->
store
[
'offlinePayway'
]
:
''
;
$this
->
address
[
'address'
]
=
$orderCommonDao
->
convertReceiveAddress
(
$this
->
address
[
'address'
]);
$this
->
address
[
'address'
]
=
$orderCommonDao
->
convertReceiveAddress
(
$this
->
address
[
'address'
]);
$returnData
[
'reciverInfo'
]
=
$this
->
address
;
$returnData
[
'reciverInfo'
]
=
$this
->
address
;
$returnData
[
'reciverInfo'
][
'mobPhone'
]
=!
empty
(
$returnData
[
'reciverInfo'
][
'mobPhone'
])
?
$returnData
[
'reciverInfo'
][
'mobPhone'
]
:
''
;
$returnData
[
'reciverInfo'
][
'telPhone'
]
=!
empty
(
$returnData
[
'reciverInfo'
][
'telPhone'
])
?
$returnData
[
'reciverInfo'
][
'telPhone'
]
:
''
;
$returnData
[
'reciverInfo'
][
'lng'
]
=!
empty
(
$returnData
[
'reciverInfo'
][
'lng'
])
?
$returnData
[
'reciverInfo'
][
'lng'
]
:
ApiConst
::
zero
;
$returnData
[
'reciverInfo'
][
'lng'
]
=!
empty
(
$returnData
[
'reciverInfo'
][
'lng'
])
?
$returnData
[
'reciverInfo'
][
'lng'
]
:
ApiConst
::
zero
;
$returnData
[
'reciverInfo'
][
'lat'
]
=!
empty
(
$returnData
[
'reciverInfo'
][
'lat'
])
?
$returnData
[
'reciverInfo'
][
'lat'
]
:
ApiConst
::
zero
;
$returnData
[
'reciverInfo'
][
'lat'
]
=!
empty
(
$returnData
[
'reciverInfo'
][
'lat'
])
?
$returnData
[
'reciverInfo'
][
'lat'
]
:
ApiConst
::
zero
;
$refundStateName
=
$orderDao
->
getRefundText
(
$this
->
order
);
$refundStateName
=
$orderDao
->
getRefundText
(
$this
->
order
);
...
@@ -879,6 +881,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -879,6 +881,7 @@ class OrderServiceModel extends \Business\AbstractModel
//收货人信息
//收货人信息
$this
->
orderCommon
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderCommonDao
,
'findByOrderId'
),
array
(
$orderId
,
$orderCommonDao
->
orderCommonField
),
\Our\ApiConst
::
oneDaySecond
);
$this
->
orderCommon
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderCommonDao
,
'findByOrderId'
),
array
(
$orderId
,
$orderCommonDao
->
orderCommonField
),
\Our\ApiConst
::
oneDaySecond
);
$reciverInfo
=
unserialize
(
$this
->
orderCommon
[
'reciverInfo'
]);
$reciverInfo
=
unserialize
(
$this
->
orderCommon
[
'reciverInfo'
]);
//定单商品表
//定单商品表
$this
->
orderGoodsList
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderId
,
$this
->
getGoodsDetailField
()),
\Our\ApiConst
::
oneDaySecond
);
$this
->
orderGoodsList
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderId
,
$this
->
getGoodsDetailField
()),
\Our\ApiConst
::
oneDaySecond
);
if
(
empty
(
$this
->
orderGoodsList
))
{
if
(
empty
(
$this
->
orderGoodsList
))
{
...
...
public/index.php
View file @
50c653a1
<?php
<?php
$arr
=
json_decode
(
'{"phone":18305954597,"mob_phone":18305954597,"tel_phone":18305954597,"address":"江滨西大道120号","name":"身边店友_110667","area":"福建省福州市仓山区","street":"江滨西大道120号","lng":"119.280337","lat":"26.057641","citycode":"0591","address_id":"","subaddress":"江滨西大道120号"}'
,
true
);
echo
serialize
(
$arr
);
exit
;
date_default_timezone_set
(
"Asia/Shanghai"
);
date_default_timezone_set
(
"Asia/Shanghai"
);
mb_internal_encoding
(
"UTF-8"
);
mb_internal_encoding
(
"UTF-8"
);
define
(
"TIMESTAMP"
,
time
());
define
(
"TIMESTAMP"
,
time
());
...
...
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