diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java index a5b0305..187b129 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java @@ -72,6 +72,10 @@ public class OmsOrderController { qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" ); + if(StringUtils.isNotBlank(omsOrderQuery.getStatus())){ + qw.eq("status",omsOrderQuery.getStatus()); + + } return new CommonResult().success(IOmsOrderService.page(new Page(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList))); } catch (Exception e) { diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java index cd335ca..516fbea 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java @@ -19,4 +19,6 @@ public class OmsOrderQuery { @ApiModelProperty(value = "提交结束时间",required = false) private String createTimeEnd; + + private String status; }