Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
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
huluobin
gogirl-miniapp-backend
Commits
f8ab4814
Commit
f8ab4814
authored
Jul 07, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '3.8' into 3.9
parents
12a7161f
a5b792d7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
SessionUtils.java
...ain/java/com/gogirl/infrastructure/util/SessionUtils.java
+2
-2
MallOrderController.java
...com/gogirl/interfaces/order/mall/MallOrderController.java
+1
-0
No files found.
src/main/java/com/gogirl/infrastructure/util/SessionUtils.java
View file @
f8ab4814
...
...
@@ -8,8 +8,8 @@ import com.gogirl.infrastructure.common.exception.RRException;
*/
public
class
SessionUtils
{
public
static
final
String
technician
=
"technician"
;
public
static
final
String
customer
=
"techncustomerician
"
;
public
static
final
String
technician
=
"technician"
;
public
static
final
String
customer
=
"customer
"
;
/*美甲师会话线程变量*/
private
static
final
ThreadLocal
<
GogirlToken
>
technicianTokenThreadLocal
=
new
ThreadLocal
<>();
...
...
src/main/java/com/gogirl/interfaces/order/mall/MallOrderController.java
View file @
f8ab4814
...
...
@@ -70,6 +70,7 @@ public class MallOrderController {
@ApiOperation
(
"用户端查看我的订单列表"
)
@PostMapping
(
"/customer/mallOrder/listMallOrderAggregate"
)
public
JsonResult
<
IPage
<
MallOrder
>>
listMallOrderAggregate
(
@RequestBody
ListMallOrderRequest
request
)
{
IPage
<
MallOrder
>
data
=
mallOrderService
.
listMallOrderAggregate
(
request
);
return
JsonResult
.
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