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
4a2f8bb6
Commit
4a2f8bb6
authored
Oct 07, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商城订单过滤 代理商订单
parent
7ddcbd24
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
MallOrderServiceImpl.java
...irl/application/order/mall/impl/MallOrderServiceImpl.java
+2
-0
MallOrder.java
src/main/java/com/gogirl/domain/order/mall/MallOrder.java
+6
-0
ScheduleManageController.java
...girl/interfaces/order/serve/ScheduleManageController.java
+1
-1
No files found.
src/main/java/com/gogirl/application/order/mall/impl/MallOrderServiceImpl.java
View file @
4a2f8bb6
...
@@ -400,6 +400,8 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
...
@@ -400,6 +400,8 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
IPage
<
MallOrder
>
page
=
new
Page
<>(
request
.
getPageNum
(),
request
.
getPageSize
());
IPage
<
MallOrder
>
page
=
new
Page
<>(
request
.
getPageNum
(),
request
.
getPageSize
());
LambdaQueryWrapper
<
MallOrder
>
wrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
MallOrder
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
eq
(
MallOrder:
:
getType
,
MallOrder
.
TYPE_AGENT
)
if
(
request
.
getStatus
()
!=
null
)
{
if
(
request
.
getStatus
()
!=
null
)
{
wrapper
.
eq
(
MallOrder:
:
getStatus
,
request
.
getStatus
());
wrapper
.
eq
(
MallOrder:
:
getStatus
,
request
.
getStatus
());
}
}
...
...
src/main/java/com/gogirl/domain/order/mall/MallOrder.java
View file @
4a2f8bb6
...
@@ -46,6 +46,12 @@ public class MallOrder implements Serializable {
...
@@ -46,6 +46,12 @@ public class MallOrder implements Serializable {
public
static
final
Integer
TRANSPORT_MODE_MAIL
=
1
;
public
static
final
Integer
TRANSPORT_MODE_MAIL
=
1
;
public
static
final
Integer
TRANSPORT_MODE_SELF_TAKE
=
2
;
public
static
final
Integer
TRANSPORT_MODE_SELF_TAKE
=
2
;
//默认小程序订单
public
static
final
Integer
TYPE_DEFAULT
=
1
;
//代理商订单
public
static
final
Integer
TYPE_AGENT
=
2
;
@TableId
(
type
=
IdType
.
ID_WORKER
)
@TableId
(
type
=
IdType
.
ID_WORKER
)
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
id
;
private
Long
id
;
...
...
src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java
View file @
4a2f8bb6
...
@@ -216,7 +216,7 @@ public class ScheduleManageController {
...
@@ -216,7 +216,7 @@ public class ScheduleManageController {
ScheduledLock
scheduledLock
=
ScheduledLock
.
getInstance
();
ScheduledLock
scheduledLock
=
ScheduledLock
.
getInstance
();
if
(
cmd
.
getScheduleManageDTO
().
getId
()
==
null
)
{
if
(
cmd
.
getScheduleManageDTO
().
getId
()
==
null
)
{
throw
new
InvalidParameterException
(
);
throw
new
RRException
(
"参数错误"
);
}
}
try
{
try
{
log
.
info
(
"店员更新预约:{}"
,
cmd
);
log
.
info
(
"店员更新预约:{}"
,
cmd
);
...
...
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