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
b149bb05
Commit
b149bb05
authored
Aug 21, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
e70e79b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
OrderService.php
application/models/Business/Order/OrderService.php
+0
-1
Goods.php
application/models/DAO/Goods.php
+1
-0
No files found.
application/models/Business/Order/OrderService.php
View file @
b149bb05
...
...
@@ -559,7 +559,6 @@ class OrderServiceModel extends \Business\AbstractModel
$reciverInfo
=
unserialize
(
$this
->
orderCommon
[
'reciverInfo'
]);
//定单商品表
$this
->
orderGoodsList
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderId
,
$this
->
getGoodsDetailField
()),
\Our\ApiConst
::
oneDaySecond
);
echo
json_encode
(
$this
->
orderGoodsList
);
exit
;
if
(
empty
(
$this
->
orderGoodsList
)){
ErrorModel
::
throwException
(
CodeConfigModel
::
notExistOrderGoods
);
}
...
...
application/models/DAO/Goods.php
View file @
b149bb05
...
...
@@ -389,6 +389,7 @@ class GoodsModel extends \DAO\AbstractModel {
}
else
{
$goods
[
'goodsAttr'
]
=
array
();
}
echo
json_encode
(
$goods
);
exit
;
if
(
isset
(
$goods
[
'refundStateName'
])){
$goods
[
'refundStateName'
]
=
$goods
[
'refundStateName'
]
?
$goods
[
'refundStateName'
]
:
''
;
}
...
...
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