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
df28dae1
Commit
df28dae1
authored
Dec 24, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upd
parent
b12d5e0d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
Cart.php
application/controllers/Cart.php
+1
-1
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+4
-4
GoodsCommonService.php
application/models/Business/Goods/GoodsCommonService.php
+1
-0
No files found.
application/controllers/Cart.php
View file @
df28dae1
...
...
@@ -161,7 +161,7 @@ class CartController extends \Our\Controller_AbstractApi{
$sess
=
\Yaf\Session
::
getInstance
();
$currentAddress
=
$sess
->
get
(
'currentAddress'
);
$result
=
$cartService
->
addOrder
(
$data
,
$this
->
memberId
,
$currentAddress
);
$result
=
$cartService
->
addOrder
(
$data
,
$this
->
memberId
,
$currentAddress
);
$this
->
success
(
$result
);
}
...
...
application/library/Order/OrderConfirmUtil.php
View file @
df28dae1
...
...
@@ -145,10 +145,10 @@ class OrderConfirmUtil {
$cartList
=
$pBundlingService
->
getFormatCartListForOrder
(
$storeCartList
,
$this
->
memberId
,
true
,
$dbName
);
$gcIds
=
isset
(
$cartList
[
'gcIds'
])
?
$cartList
[
'gcIds'
]
:
array
();
$storeCartData
=
array
(
'cartList'
=>
$cartList
[
'list'
],
'storeIds'
=>
array_keys
(
$cartList
[
'list'
]),
'goodsIds'
=>
$storeCartList
[
'goodsIds'
],
'goodsCommonIds'
=>
$storeCartList
[
'goodsCommonIds'
],
'blIds'
=>
$storeCartList
[
'blIds'
],
'gcIds'
=>
$gcIds
);
}
if
(
$this
->
storeCouponIds
&&
$this
->
couponIds
)
{
$storeCartData
=
$this
->
checkCouponForOrder
(
$storeCartData
,
$this
->
memberId
);
if
(
$this
->
storeCouponIds
&&
$this
->
couponIds
)
{
$storeCartData
=
$this
->
checkCouponForOrder
(
$storeCartData
,
$this
->
memberId
);
}
return
$storeCartData
;
...
...
@@ -1255,4 +1255,4 @@ class OrderConfirmUtil {
return
self
::
$_instance
;
}
}
\ No newline at end of file
}
application/models/Business/Goods/GoodsCommonService.php
View file @
df28dae1
...
...
@@ -314,6 +314,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
* Time: 下午 3:37
*/
public
function
updateStatGoods
(){
file_put_contents
(
$this
->
baseDir
.
\Our\PathConst
::
goodsStatTime
,
'1545632401'
);
$beginTime
=
file_get_contents
(
$this
->
baseDir
.
\Our\PathConst
::
goodsStatTime
,
TIMESTAMP
);
$beginTime
=
$beginTime
?
$beginTime
:
ApiConst
::
zero
;
$endTime
=
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