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
6511c286
Commit
6511c286
authored
Dec 06, 2018
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sale
parent
e01d3454
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
GoodsUtil.php
application/library/Goods/GoodsUtil.php
+2
-1
SaleGoods.php
application/models/DAO/SaleGoods.php
+1
-1
No files found.
application/library/Goods/GoodsUtil.php
View file @
6511c286
...
...
@@ -30,9 +30,10 @@ class GoodsUtil {
if
(
$activities
){
if
(
$data
=
\DAO\SaleGoodsModel
::
getInstance
()
->
getSaleGoods
(
$storeId
,
$goodsId
)){
$price
=
\DAO\SaleGoodsModel
::
getInstance
()
->
getSalePrice
(
$data
,
$activities
,
$array
);
return
$price
?
$price
:
$goods
[
'goods_price'
];
}
}
return
$
price
?
$price
:
$
goods
[
'goods_price'
];
return
$goods
[
'goods_price'
];
}
else
{
$pBundlingService
=
\Business\Goods\GroupSaleServiceModel
::
getInstance
();
$pBundling
=
$pBundlingService
->
getOnePBundingCache
(
$goodsId
,
$dbName
);
...
...
application/models/DAO/SaleGoods.php
100755 → 100644
View file @
6511c286
...
...
@@ -110,7 +110,7 @@ class SaleGoodsModel extends \DAO\AbstractModel {
if
(
$data
&&
in_array
(
$data
[
'sale_act_id'
],
$activitiesKeys
)){
$price
=
$data
[
'discount_price'
];
}
if
(
$array
)
{
if
(
$array
&&
$price
)
{
return
array
(
'sale_act_id'
=>
$data
[
'sale_act_id'
],
'sale_id'
=>
$activities
[
$data
[
'sale_act_id'
]],
'price'
=>
$price
);
}
return
$price
;
...
...
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