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
ceeca93b
Commit
ceeca93b
authored
Nov 13, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下单相关修改
parent
eb556ff9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
CartService.php
application/models/Business/Cart/CartService.php
+10
-1
No files found.
application/models/Business/Cart/CartService.php
View file @
ceeca93b
...
@@ -605,8 +605,14 @@ class CartServiceModel extends \Business\AbstractModel{
...
@@ -605,8 +605,14 @@ class CartServiceModel extends \Business\AbstractModel{
$storeCarts
=
$storeCartData
[
'cartList'
][
$storeId
];
$storeCarts
=
$storeCartData
[
'cartList'
][
$storeId
];
$deliverySetting
[
'onelinePay'
]
=
$store
[
'wx_pay'
];
//是否支持线上支付
$deliverySetting
[
'onelinePay'
]
=
$store
[
'wx_pay'
];
//是否支持线上支付
$deliverySetting
[
'offlinePay'
]
=
$store
[
'offline_pay'
];
$deliverySetting
[
'offlinePay'
]
=
$store
[
'offline_pay'
];
if
(
$deliverySetting
[
'offlinePay'
]){
if
(
$deliverySetting
[
'offlinePay'
]){
$deliverySetting
[
'offlinePayway'
]
=
$store
[
'offline_payway'
];
if
(
\Our\Common
::
isSerialized
(
$store
[
'offline_payway'
])){
$paywayArray
=
unserialize
(
$store
[
'offline_payway'
]);
$deliverySetting
[
'offlinePayway'
]
=
$paywayArray
[
'payway'
];
}
else
{
$deliverySetting
[
'offlinePayway'
]
=
$store
[
'offline_payway'
];
}
}
}
$deliverySetting
[
'aogPay'
]
=
$store
[
'aog_pay'
];
$deliverySetting
[
'aogPay'
]
=
$store
[
'aog_pay'
];
$deliverySetting
[
'buyerDistribution'
]
=
$store
[
'buyer_distribution'
];
$deliverySetting
[
'buyerDistribution'
]
=
$store
[
'buyer_distribution'
];
...
@@ -668,6 +674,9 @@ class CartServiceModel extends \Business\AbstractModel{
...
@@ -668,6 +674,9 @@ class CartServiceModel extends \Business\AbstractModel{
$storeDao
=
\DAO\StoreModel
::
getInstance
();
$storeDao
=
\DAO\StoreModel
::
getInstance
();
$deliveryFormulaDao
=
\DAO\DeliveryFormulaModel
::
getInstance
(
$dbName
);
$deliveryFormulaDao
=
\DAO\DeliveryFormulaModel
::
getInstance
(
$dbName
);
$buyerMobile
=
\DAO\MemberModel
::
getInstance
(
$dbName
)
->
getInfo
(
$memberId
,
'member_mobile'
);
$buyerMobile
=
\DAO\MemberModel
::
getInstance
(
$dbName
)
->
getInfo
(
$memberId
,
'member_mobile'
);
if
(
$buyerMobile
&&!
\Our\Common
::
checkMobilePhone
(
$buyerMobile
)){
$buyerMobile
=
\Our\NameConst
::
emptyString
;
}
foreach
(
$storeIds
as
$storeId
){
foreach
(
$storeIds
as
$storeId
){
$store
=
$storeDao
->
get
(
$storeId
,
false
);
$store
=
$storeDao
->
get
(
$storeId
,
false
);
$storeCarts
=
$storeCartData
[
'cartList'
][
$storeId
];
$storeCarts
=
$storeCartData
[
'cartList'
][
$storeId
];
...
...
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