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
a4b122c5
Commit
a4b122c5
authored
Nov 13, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单确认页面增加buyerMobile
parent
bdda341b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
Cart.php
application/controllers/Cart.php
+1
-1
CartService.php
application/models/Business/Cart/CartService.php
+4
-2
No files found.
application/controllers/Cart.php
View file @
a4b122c5
...
...
@@ -170,7 +170,7 @@ class CartController extends \Our\Controller_AbstractApi{
$storeCartData
=
$cartService
->
checkCouponForCart
(
$storeCartData
,
$this
->
memberId
);
//$this->success($storeCartData);
if
(
CURRENTVERSION
==
\Our\NameConst
::
versionOne
){
$storeCartData
=
$cartService
->
getDeliveryTypeForCartNew
(
$address
,
$storeCartData
);
$storeCartData
=
$cartService
->
getDeliveryTypeForCartNew
(
$address
,
$storeCartData
,
$this
->
memberId
);
$data
=
$cartService
->
getFormatCartListForOrderNew
(
$storeCartData
,
$address
);
}
else
{
$storeCartData
=
$cartService
->
getDeliveryTypeForCart
(
$address
,
$storeCartData
);
...
...
application/models/Business/Cart/CartService.php
View file @
a4b122c5
...
...
@@ -663,10 +663,11 @@ class CartServiceModel extends \Business\AbstractModel{
* @param $address
* @param $storeCartData
*/
public
function
getDeliveryTypeForCartNew
(
$address
,
$storeCartData
,
$dbName
=
\Our\DbNameConst
::
salveDBConnectName
,
$checkFlag
=
false
){
public
function
getDeliveryTypeForCartNew
(
$address
,
$storeCartData
,
$
memberId
,
$
dbName
=
\Our\DbNameConst
::
salveDBConnectName
,
$checkFlag
=
false
){
$storeIds
=
$storeCartData
[
'storeIds'
];
$storeDao
=
\DAO\StoreModel
::
getInstance
();
$deliveryFormulaDao
=
\DAO\DeliveryFormulaModel
::
getInstance
(
$dbName
);
$buyerMobile
=
\DAO\MemberModel
::
getInstance
(
$dbName
)
->
getInfo
(
$memberId
,
'member_mobile'
);
foreach
(
$storeIds
as
$storeId
){
$store
=
$storeDao
->
get
(
$storeId
,
false
);
$storeCarts
=
$storeCartData
[
'cartList'
][
$storeId
];
...
...
@@ -692,7 +693,8 @@ class CartServiceModel extends \Business\AbstractModel{
'address'
=>
(
$store
[
'store_address'
]
.
$store
[
'store_subaddress'
]),
'longitude'
=>
$store
[
'store_longitude'
],
'latitude'
=>
$store
[
'store_latitude'
],
'cityCode'
=>
$store
[
'store_citycode'
]
'cityCode'
=>
$store
[
'store_citycode'
],
'buyerMobile'
=>
$buyerMobile
);
if
(
$deliverySetting
[
'buyerDistribution'
]){
$selfDeliveryTimeData
=
$deliveryFormulaDao
->
getBuyerFormulaForCart
(
$store
);
...
...
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