From 1cac5ccf16e3ecf3551704abbc072b61e0349c52 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 16:00:06 +0800
Subject: [PATCH] 20220505

---
 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java   |   41 ++++++++++++++++----
 zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java |   29 +++++++++++++-
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
index bd74596..64ba519 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
@@ -89,12 +89,35 @@
         pageVo.setOffset(offset);
         pageVo.setLimit(limit);
 
+        //默认排序
+        if (StringUtils.isBlank(pageVo.getSort())) {
+            pageVo.setSort("order_time");
+        }
+        if (StringUtils.isBlank(pageVo.getOrder())) {
+            pageVo.setOrder("desc");
+        }
         if (!DataAuthUtil.hasAllShopAuth()) {
-            orderListDto.setShopId(user.getShopId());
+            orderListDto.setShopId(getMe().getShopId());
         }
         QueryUtil.setQueryLimitCom(orderListDto);
-        return AjaxResult.buildSuccessInstance(sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo),
-                sysOrderService.findPadApiOrderListTotal(orderListDto));
+
+        SysOrder sysOrder = new SysOrder();
+        sysOrder.setShopId(orderListDto.getShopId());
+        if(ObjectUtil.isNotEmpty(orderListDto.getOrderStatus())){
+            sysOrder.setStatu(orderListDto.getStatus());
+        }
+
+        if(ObjectUtil.isNotEmpty(orderListDto.getBeginTimeVo())){
+            sysOrder.setBeginTimeVo(orderListDto.getBeginTimeVo());
+        }
+        if(ObjectUtil.isNotEmpty(orderListDto.getEndTimeVo())){
+            sysOrder.setEndTimeVo(orderListDto.getEndTimeVo());
+        }
+        if(StrUtil.isNotEmpty(orderListDto.getQueryKey())){
+            sysOrder.setKeyWordVo(orderListDto.getQueryKey());
+        }
+        return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
+                orderService.findTotal(sysOrder));
     }
 
     @ApiOperation(value = "获取订单详情", notes = "获取订单详情")
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
index 1bf2b5a..64fb66e 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
@@ -1,5 +1,6 @@
 package com.matrix.system.padApi.dto;
 
+import com.matrix.core.tools.DateUtil;
 import com.matrix.system.app.dto.BasePageDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,8 +20,30 @@
     @ApiModelProperty(value = "查询字段")
     private String queryKey;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    private Date orderTime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+//    private Date orderTime;
+
+    public Date getBeginTimeVo() {
+        return beginTimeVo;
+    }
+
+    public void setBeginTimeVo(Date beginTimeVo) {
+        this.beginTimeVo = beginTimeVo;
+    }
+
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+    private Date beginTimeVo;
+
+    public Date getEndTimeVo() {
+        return endTimeVo;
+    }
+
+    public void setEndTimeVo(Date endTimeVo) {
+        this.endTimeVo = endTimeVo;
+    }
+
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+    private Date endTimeVo;
 
     @ApiModelProperty(hidden = true)
     private Long shopId;
@@ -28,13 +51,13 @@
     @ApiModelProperty(hidden = true)
     private Long companyId;
 
-    public Date getOrderTime() {
-        return orderTime;
-    }
-
-    public void setOrderTime(Date orderTime) {
-        this.orderTime = orderTime;
-    }
+//    public Date getOrderTime() {
+//        return orderTime;
+//    }
+//
+//    public void setOrderTime(Date orderTime) {
+//        this.orderTime = orderTime;
+//    }
 
     public Long getCompanyId() {
         return companyId;

--
Gitblit v1.9.1