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
092e8e42
Commit
092e8e42
authored
Nov 13, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单确认页面增加buyerMobile
parent
a4b122c5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
26 deletions
+1
-26
Cart.php
application/controllers/Cart.php
+1
-26
No files found.
application/controllers/Cart.php
View file @
092e8e42
...
@@ -117,7 +117,7 @@ class CartController extends \Our\Controller_AbstractApi{
...
@@ -117,7 +117,7 @@ class CartController extends \Our\Controller_AbstractApi{
$storeCartData
=
$cartService
->
checkCouponForCart
(
$storeCartData
,
$this
->
memberId
);
$storeCartData
=
$cartService
->
checkCouponForCart
(
$storeCartData
,
$this
->
memberId
);
//$this->success($storeCartData);
//$this->success($storeCartData);
if
(
CURRENTVERSION
==
\Our\NameConst
::
versionOne
){
if
(
CURRENTVERSION
==
\Our\NameConst
::
versionOne
){
$storeCartData
=
$cartService
->
getDeliveryTypeForCartNew
(
$address
,
$storeCartData
);
$storeCartData
=
$cartService
->
getDeliveryTypeForCartNew
(
$address
,
$storeCartData
,
$this
->
memberId
);
//$this->success($storeCartData);
//$this->success($storeCartData);
$data
=
$cartService
->
getFormatCartListForOrderNew
(
$storeCartData
,
$address
);
$data
=
$cartService
->
getFormatCartListForOrderNew
(
$storeCartData
,
$address
);
}
else
{
}
else
{
...
@@ -128,31 +128,6 @@ class CartController extends \Our\Controller_AbstractApi{
...
@@ -128,31 +128,6 @@ class CartController extends \Our\Controller_AbstractApi{
}
}
/**
* 购物车购买
*/
public
function
checkoutNewAction
(){
$cartService
=
\Business\Cart\CartServiceModel
::
getInstance
();
$data
=
$this
->
req
[
\Our\NameConst
::
data
];
$sess
=
\Yaf\Session
::
getInstance
();
$currentAddress
=
$sess
->
get
(
'currentAddress'
);
$address
=
$cartService
->
checkCurrentAddress
(
$currentAddress
,
$this
->
memberId
);
$storeCartList
=
$cartService
->
checkCart
(
$data
,
$this
->
memberId
);
$pBundlingService
=
\Business\Goods\GroupSaleServiceModel
::
getInstance
();
$cartList
=
$pBundlingService
->
getFormatCartListForOrder
(
$storeCartList
,
$this
->
memberId
,
true
);
$gcIds
=
isset
(
$cartList
[
'gcIds'
])
?
$cartList
[
'gcIds'
]
:
array
();
$storeCartData
=
array
(
'cartList'
=>
$cartList
[
'list'
],
'storeIds'
=>
$storeCartList
[
'storeIds'
],
'goodsIds'
=>
$storeCartList
[
'goodsIds'
],
'goodsCommonIds'
=>
$storeCartList
[
'goodsCommonIds'
],
'blIds'
=>
$storeCartList
[
'blIds'
],
'gcIds'
=>
$gcIds
);
//var_dump($storeCartData);
$storeCartData
=
$cartService
->
checkCouponForCart
(
$storeCartData
,
$this
->
memberId
);
//$this->success($storeCartData);
$storeCartData
=
$cartService
->
getDeliveryTypeForCartNew
(
$address
,
$storeCartData
);
$data
=
$cartService
->
getFormatCartListForOrderNew
(
$storeCartData
,
$address
);
$this
->
success
(
$data
);
}
/**
/**
* 立即购买
* 立即购买
*/
*/
...
...
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