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
241d8b95
Commit
241d8b95
authored
Dec 08, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户名带特殊字符串用户下单问题
parent
b3fc2bad
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
Cart.php
application/controllers/Cart.php
+1
-0
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+4
-4
application.ini
conf/application.ini
+2
-2
No files found.
application/controllers/Cart.php
View file @
241d8b95
...
@@ -164,4 +164,5 @@ class CartController extends \Our\Controller_AbstractApi{
...
@@ -164,4 +164,5 @@ class CartController extends \Our\Controller_AbstractApi{
$result
=
$cartService
->
addOrder
(
$data
,
$this
->
memberId
,
$currentAddress
);
$result
=
$cartService
->
addOrder
(
$data
,
$this
->
memberId
,
$currentAddress
);
$this
->
success
(
$result
);
$this
->
success
(
$result
);
}
}
}
}
application/library/Order/OrderConfirmUtil.php
View file @
241d8b95
...
@@ -510,7 +510,7 @@ class OrderConfirmUtil {
...
@@ -510,7 +510,7 @@ class OrderConfirmUtil {
$order
[
'store_id'
]
=
$storeId
;
$order
[
'store_id'
]
=
$storeId
;
$order
[
'store_name'
]
=
$storeCarts
[
'storeName'
];
$order
[
'store_name'
]
=
$storeCarts
[
'storeName'
];
$order
[
'buyer_id'
]
=
$this
->
memberId
;
$order
[
'buyer_id'
]
=
$this
->
memberId
;
$order
[
'buyer_name'
]
=
$this
->
member
[
'memberName'
]
;
$order
[
'buyer_name'
]
=
addslashes
(
$this
->
member
[
'memberName'
])
;
if
(
CURRENTVERSION
==
\Our\NameConst
::
versionDefault
){
if
(
CURRENTVERSION
==
\Our\NameConst
::
versionDefault
){
$order
[
'buyer_email'
]
=
$this
->
member
[
'memberEmail'
];
$order
[
'buyer_email'
]
=
$this
->
member
[
'memberEmail'
];
}
else
{
}
else
{
...
@@ -600,12 +600,12 @@ class OrderConfirmUtil {
...
@@ -600,12 +600,12 @@ class OrderConfirmUtil {
if
(
$storeCarts
[
'delivery'
][
'deliveryType'
]
==
\Our\ApiConst
::
deliveryBuyer
){
if
(
$storeCarts
[
'delivery'
][
'deliveryType'
]
==
\Our\ApiConst
::
deliveryBuyer
){
list
(
$buyerStoreInfo
,
$buyerName
)
=
$this
->
getStoreInfoAndBuyerInfo
(
$store
,
array
(
'buyerMobile'
=>
$storeCarts
[
'delivery'
][
'buyerMobile'
],
'member_name'
=>
$this
->
member
[
'memberName'
]));
list
(
$buyerStoreInfo
,
$buyerName
)
=
$this
->
getStoreInfoAndBuyerInfo
(
$store
,
array
(
'buyerMobile'
=>
$storeCarts
[
'delivery'
][
'buyerMobile'
],
'member_name'
=>
$this
->
member
[
'memberName'
]));
$orderCommon
[
'reciver_info'
]
=
$buyerStoreInfo
;
$orderCommon
[
'reciver_info'
]
=
$buyerStoreInfo
;
$orderCommon
[
'reciver_name'
]
=
$buyerName
;
$orderCommon
[
'reciver_name'
]
=
addslashes
(
$buyerName
)
;
}
else
{
}
else
{
$orderCommon
[
'reciver_info'
]
=
$reciverInfo
;
$orderCommon
[
'reciver_info'
]
=
$reciverInfo
;
$orderCommon
[
'reciver_name'
]
=
$reciverName
;
$orderCommon
[
'reciver_name'
]
=
addslashes
(
$reciverName
)
;
}
}
$orderCommon
[
'reciver_city_id'
]
=
$this
->
address
[
'city_id'
];
$orderCommon
[
'reciver_city_id'
]
=
(
$storeCarts
[
'delivery'
][
'deliveryType'
]
==
\Our\ApiConst
::
deliveryBuyer
)
?
\Our\ApiConst
::
zero
:
$this
->
address
[
'city_id'
];
$orderCommonList
[]
=
$orderCommon
;
$orderCommonList
[]
=
$orderCommon
;
//$orderCommonDao->insert($orderCommon);
//$orderCommonDao->insert($orderCommon);
foreach
(
$storeCarts
[
'storeCarts'
]
as
$storeCart
){
foreach
(
$storeCarts
[
'storeCarts'
]
as
$storeCart
){
...
...
conf/application.ini
View file @
241d8b95
...
@@ -404,7 +404,7 @@ elastic.master.scheme="http";
...
@@ -404,7 +404,7 @@ elastic.master.scheme="http";
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.port
=
3306
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs"
resources.database.params.database
=
"
test
qmcs"
resources.database.params.username
=
"root"
resources.database.params.username
=
"root"
resources.database.params.password
=
"123456"
resources.database.params.password
=
"123456"
resources.database.params.charset
=
"UTF8"
resources.database.params.charset
=
"UTF8"
...
@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
...
@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.port
=
3306
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.database
=
"
test
qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.charset
=
"UTF8"
...
...
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