Commit 4a2f8bb6 by huluobin

商城订单过滤 代理商订单

parent 7ddcbd24
...@@ -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());
} }
......
...@@ -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;
......
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment