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
58b69e19
Commit
58b69e19
authored
Aug 22, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试数据
parent
d7625325
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+2
-2
No files found.
application/library/Order/OrderConfirmUtil.php
View file @
58b69e19
...
...
@@ -445,14 +445,14 @@ class OrderConfirmUtil {
$orderGoods
[
'goods_group'
]
=
serialize
(
$storeCart
[
'goodsList'
]);
$orderGoods
[
'goods_price'
]
=
$storeCart
[
'goodsPrice'
];
$orderGoods
[
'goods_commonid'
]
=
\Our\ApiConst
::
zero
;
$orderGoods
[
'goods_spec'
]
=
null
;
$orderGoods
[
'goods_spec'
]
=
''
;
}
else
{
$orderGoods
[
'goods_price'
]
=
\Goods\GoodsUtil
::
getInstance
()
->
getRealPrice
(
$storeCart
[
'goodsId'
],
$this
->
memberId
);
$orderGoods
[
'goods_commonid'
]
=
$storeCart
[
'goodsCommonId'
];
if
(
$orderGoods
[
'sale_act_id'
]
&&
$orderGoods
[
'sale_id'
]){
//当前商品有参与销售活动结算时
$this
->
saleGoodsIds
[]
=
$storeCart
[
'goodsId'
];
}
$orderGoods
[
'goods_group'
]
=
null
;
$orderGoods
[
'goods_group'
]
=
''
;
}
$orderGoods
[
'gmt_create'
]
=
TIMESTAMP
;
...
...
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