Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
service
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
aimeiyue
service
Commits
9688fd29
Commit
9688fd29
authored
9 months ago
by
lizhilin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
f04a3114
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/Http/Controllers/Api/OrderController.php
+2
-2
No files found.
app/Http/Controllers/Api/OrderController.php
View file @
9688fd29
...
@@ -487,7 +487,7 @@ public function scanCodeVerifi(Request $request)
...
@@ -487,7 +487,7 @@ public function scanCodeVerifi(Request $request)
}
else
{
}
else
{
return
$this
->
JsonResponse
(
''
,
'该码已核销,无需多次重复扫码'
,
500
);
return
$this
->
JsonResponse
(
''
,
'该码已核销,无需多次重复扫码'
,
500
);
}
}
Log
::
add
(
'核销操作
6
'
,
$orderObj
->
toArray
());
Log
::
add
(
'核销操作'
,
$orderObj
->
toArray
());
return
$this
->
JsonResponse
(
''
);
return
$this
->
JsonResponse
(
''
);
}
}
...
@@ -621,7 +621,7 @@ public function CheckoutCartOrder(Request $request)
...
@@ -621,7 +621,7 @@ public function CheckoutCartOrder(Request $request)
{
{
$cartKey
=
$request
->
cartKey
??
''
;
//商品ID拼接 5_1,6_1
$cartKey
=
$request
->
cartKey
??
''
;
//商品ID拼接 5_1,6_1
if
(
!
$cartKey
)
{
if
(
!
$cartKey
)
{
return
$this
->
JsonResponse
(
''
,
'
参数错误'
,
201
);
return
$this
->
JsonResponse
(
''
,
'
请选择购物车商品'
,
500
);
}
}
$gidArr
=
explode
(
","
,
$cartKey
);
$gidArr
=
explode
(
","
,
$cartKey
);
$user
=
$request
->
user
();
$user
=
$request
->
user
();
...
...
This diff is collapsed.
Click to expand it.
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