diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 0c87980a..dc2150c5 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -354,6 +354,7 @@ public class OrderMasterController extends BaseController { // 编辑返回属性 orderListResponse.setOrderMasterId(master.getId()); + orderListResponse.setGoods(goods); orderListResponse.setGoodsName(goods.getGoodsName()); orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl()); orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); @@ -624,6 +625,10 @@ public class OrderMasterController extends BaseController { @PostMapping("/list") @ResponseBody public TableDataInfo list(OrderMaster orderMaster) { + if (orderMaster.getSearchAfterList() !=null && orderMaster.getSearchAfterList()) { + return this.afterList(orderMaster); + } + startPage(); if (this.getSysUser().getDept().getParentId() != 101) { orderMaster.setDeptId(this.getSysUser().getDept().getParentId()); @@ -897,8 +902,8 @@ public class OrderMasterController extends BaseController { @GetMapping("/differentStatus/count") @ResponseBody - public AjaxResult differentStatusOrderCount() { - return AjaxResult.success(orderMasterService.differentStatusOrderCount()); + public AjaxResult differentStatusOrderCount(OrderMaster orderMaster) { + return AjaxResult.success(orderMasterService.differentStatusOrderCount(orderMaster)); } @GetMapping("/count") diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index c5f19b32..00dcac59 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -254,7 +254,7 @@ 接单超时 - (0) + (0) 约单超时 @@ -284,7 +284,7 @@ 客诉中 (0) - + 审核中 (0) diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index a47a366d..5376da84 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -100,7 +100,7 @@ 确认审核 - (0) + (0) 完成 @@ -118,14 +118,22 @@ 明日待上门 (0) - + 售后 - (0) + (0) 急报中 (0) + + 退单 + (0) + + + 售后纠纷 + (0) +
@@ -137,6 +145,42 @@
+
+ 创建时间： +
+ + +
+ 至 +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
类别筛选：
@@ -146,17 +190,118 @@
+ + + + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + + + + + + + + +
+ + + + +
+
+ + +
- +
-  搜索 +  搜索  重置 + class="fa fa-refresh"> 重置
+
+ + 新订单 + (0) + + + 接单超时 + (0) + + + 约单超时 + (0) + + + 排单超时 + (0) + + + 无法排单 + (0) + + + 待上门超时 + (0) + + + 进行超时 + (0) + + + 售后超时 + (0) + + + 客诉中 + (0) + + + 审核中 + (0) + + + 一票价未改价 + (0) + +
@@ -265,9 +410,10 @@ url: prefix + '/differentStatus/count', success: function (result) { if (result.code == web_status.SUCCESS) { + $('#newOrderNum').text(result.data.newOrderNum); $('#acceptedOrderNum').text(result.data.acceptedOrderNum); $('#canceledOrderNum').text(result.data.canceledOrderNum); - $('#confirmingOrderNum').text(result.data.confirmingOrderNum); + $('.confirmingOrderNum').text(result.data.confirmingOrderNum); $('#finishedOrderNum').text(result.data.finishedOrderNum); $('#servingOrderNum').text(result.data.servingOrderNum); $('#waitForDoorOrderNum').text(result.data.waitForDoorOrderNum); @@ -277,6 +423,24 @@ } }) + + $.ajax({ + type: "GET", + dataType:"json", + url: prefix + '/differentStatus/count', + data: {timeout: 1}, + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#newTimeoutOrderNum').text(result.data.newOrderNum); + $('.acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum); + $('#servingTimeoutOrderNum').text(result.data.servingOrderNum); + $('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) + $.ajax({ type: "GET", @@ -343,6 +507,22 @@ } } }) + + + $.ajax({ + type: "POST", + dataType:"json", + url: prefix + '/after/count', + contentType: 'application/json', + data: JSON.stringify({}), + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#afterServiceOrderNum').text(result.data); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) }); function changeOrderMode(orderMode) { @@ -596,6 +776,25 @@ $.table.search(); } + function searchByForm() { + let params = { + createTimeStart: $('#createTimeStart').val() ? $('#createTimeStart').val() + " 00:00:00" : undefined, + createTimeEnd: $('#createTimeEnd').val() ? $('#createTimeEnd').val() + " 23:59:59" : undefined, + + + + + storeName: $('#storeName').val(), + storePhone: $('#storePhone').val(), + workerName: $('#workerName').val(), + workerPhone: $('#workerPhone').val(), + keyWords: $('#keyWords').val() + } + + customParams = Object.assign(customParams, params); + $.table.search(); + } + function resetForm() { $.form.reset(); customParams = {}; diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index e7f7be28..6e2b2596 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -11,8 +11,10 @@ import com.ghy.payment.domain.FinancialMaster; import com.ghy.worker.domain.Worker; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -150,4 +152,12 @@ public class OrderMaster extends BaseEntity { private String isCall; private BigDecimal serverMoney; + + private Boolean searchAfterList; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTimeStart; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTimeEnd; } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java index ee2b86ef..f1ecd051 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java @@ -109,5 +109,5 @@ public interface OrderMasterMapper { */ int removeWorker(Long id); - OrderMasterCount differentStatusOrderCount(); + OrderMasterCount differentStatusOrderCount(OrderMaster orderMaster); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java index 027b6a20..98d9f5fe 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java @@ -167,5 +167,5 @@ public interface OrderMasterService { int reject(OrderMaster orderMaster); - OrderMasterCount differentStatusOrderCount(); + OrderMasterCount differentStatusOrderCount(OrderMaster orderMaster); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 7f3f6662..164d7c82 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -560,7 +560,7 @@ public class OrderMasterServiceImpl implements OrderMasterService { } @Override - public OrderMasterCount differentStatusOrderCount() { - return orderMasterMapper.differentStatusOrderCount(); + public OrderMasterCount differentStatusOrderCount(OrderMaster orderMaster) { + return orderMasterMapper.differentStatusOrderCount(orderMaster); } } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 2440f324..bc3c02a9 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -163,7 +163,7 @@ AND om.create_time >= #{createTimeStart} - AND om.create_time < #{createTimeEnd} + AND om.create_time <= #{createTimeEnd} AND om.id in (${orderMasterIds}) @@ -423,8 +423,9 @@ WHERE id = #{id} - select + count(case when om.order_status = 0 then 1 else null end) as newOrderNum, count(case when om.order_status = 1 then 1 else null end) as acceptedOrderNum, count(case when om.order_status = 2 then 1 else null end) as waitForDoorOrderNum, count(case when om.order_status = 3 then 1 else null end) as servingOrderNum, @@ -432,6 +433,10 @@ count(case when om.order_status = 5 then 1 else null end) as finishedOrderNum, count(case when om.order_status = 6 then 1 else null end) as canceledOrderNum from order_master om + where 1 = 1 + + AND om.timeout_ = #{timeout} +