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
ce51d921
Commit
ce51d921
authored
Aug 19, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
7a11f213
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
+2
-0
Goods.php
application/models/DAO/Goods.php
+4
-0
No files found.
application/models/Business/Order/OrderService.php
View file @
ce51d921
...
...
@@ -498,6 +498,8 @@ class OrderServiceModel extends \Business\AbstractModel
$delivery
[
'mobPhone'
]
=
$delivery
[
'reciverInfo'
][
'mob_phone'
];
$delivery
[
'getTime'
]
=
$value
[
'getTime'
];
$delivery
[
'finishTime'
]
=
$value
[
'finishTime'
];
$delivery
[
'mobPhone'
]
=
$delivery
[
'mobPhone'
]
?
$delivery
[
'mobPhone'
]
:
''
;
$delivery
[
'finishTime'
]
=
$delivery
[
'finishTime'
]
?
$delivery
[
'finishTime'
]
:
ApiConst
::
zero
;
$delivery
[
'orderGoods'
]
=
$orderGoods
;
$delivery
[
'street'
]
=
$delivery
[
'reciverInfo'
][
'address'
]
.
$delivery
[
'reciverInfo'
][
'street'
];
$delivery
[
'lng'
]
=
$delivery
[
'reciverInfo'
][
'lng'
]
?
$delivery
[
'reciverInfo'
][
'lng'
]
:
0.0
;
...
...
application/models/DAO/Goods.php
View file @
ce51d921
...
...
@@ -386,6 +386,10 @@ class GoodsModel extends \DAO\AbstractModel {
}
else
{
$goods
[
'goodsAttr'
]
=
array
();
}
if
(
isset
(
$goods
[
'refundStateName'
])){
$goods
[
'refundStateName'
]
=
$goods
[
'refundStateName'
]
?
$goods
[
'refundStateName'
]
:
''
;
}
unset
(
$goods
[
'goodsSpec'
]);
if
(
isset
(
$goods
[
'goodsGroup'
])
&&!
empty
(
$goods
[
'goodsGroup'
])){
$goods
[
'goodsGroup'
]
=
$this
->
getGoodsGroup
(
$goods
[
'goodsGroup'
]);
...
...
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