diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index c69cea96..6964495f 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -190,14 +190,19 @@ public class OrderController extends BaseController { // 接单师傅 Worker acceptWorker = workerService.selectById(request.getWorkerId()); Assert.notNull(acceptWorker, "查询接单师傅信息失败"); + om.setAllSelfAssigned(0); // 校验接单师傅和派单师傅是不是同一个Team if(!om.getWorkerId().equals(request.getWorkerId())){ boolean checkInTeam = workerService.checkInTeam(assignWorker.getWorkerId(), acceptWorker.getWorkerId()); Assert.isTrue(checkInTeam, "接单师傅不在本团队"); }else { // 自己接单 -- 计算剩余金额 + om.setAllSelfAssigned(1); BigDecimal realPay = fm.getPayMoney(); for (FinancialDetail financialDetail : financialDetailService.selectByFinancialMasterId(fm.getId())) { + if (FinancialDetailType.ORDER_FEE.equals(financialDetail.getFinancialDetailType())) { + om.setAllSelfAssigned(0); + } realPay = realPay.subtract(financialDetail.getPayMoney()); } request.setTotalPay(realPay); @@ -447,7 +452,10 @@ public class OrderController extends BaseController { response.setNewOrderNum(newMasterOrderCount + newDetailOrderCount); // 统计未排的单量 orderMaster.setOrderStatus(OrderStatus.PLAIN.code()); - response.setPlanOrderNum(orderMasterService.countOrderMasterList(orderMaster)); + orderDetail.setOrderStatus(OrderStatus.PLAIN.code()); + Long planMasterOrderCount = orderMasterService.countOrderMasterList(orderMaster); + Long planDetailOrderCount = orderDetailService.countOrderDetailList(orderDetail); + response.setPlanOrderNum(planMasterOrderCount + planDetailOrderCount); // 统计待上门单量 orderDetail.setOrderStatus(OrderStatus.GOING.code()); response.setWaitServOrderNum(orderDetailService.countOrderDetailList(orderDetail)); @@ -462,9 +470,9 @@ public class OrderController extends BaseController { response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); // 统计监控单量 orderMaster.setOrderStatus(null); - orderMaster.setFilterOnlyServOrder(true); + orderMaster.setIsMonitoredOrder(true); response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster)); - orderMaster.setFilterOnlyServOrder(false); + orderMaster.setIsMonitoredOrder(false); // 统计搁置单量 orderDetail.setShelveStatus(1); response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 792add99..385676c6 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -213,6 +213,12 @@ public class OrderDetailController extends BaseController { orderListResponse.setPayMoney(detailPayMoney); orderListResponse.setIsOnlyServ(Boolean.FALSE); } + + // 售后记录 + AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); + afterServiceRecord.setOrderDetailId(detail.getId()); + List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); + // 编辑返回属性 orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailCode(detail.getCode()); @@ -246,6 +252,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setCustomerRemark(orderMaster.getRemark()); orderListResponse.setFinishImgList(finishImgList); orderListResponse.setWorkerRemark(detail.getRemark()); + orderListResponse.setAfterServiceRecordList(afterServiceRecordList); return AjaxResult.success(orderListResponse); } catch (Exception e) { 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 1ac0f54a..7ae13772 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 @@ -86,5 +86,7 @@ public class OrderMaster extends BaseEntity { private Boolean useTimeNotRange; - private Boolean filterOnlyServOrder; + private Boolean isMonitoredOrder; + + private Integer allSelfAssigned; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 9ee18c5f..02fbf0c4 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -25,6 +25,7 @@ + @@ -44,7 +45,8 @@ expect_time_end, create_by, create_time, - remark + remark, + all_self_assigned FROM order_master @@ -65,58 +67,18 @@ om.create_by, om.create_time, om.remark, + om.all_self_assigned, om.goods_id FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id - - select om.id, - om.dept_id, - om.code, - om.customer_id, - om.address_id, - om.order_type, - om.order_status, - om.pay_type, - om.pay_status, - om.worker_id, - om.pay_time, - om.rev_time, - om.expect_time_start, - om.expect_time_end, - om.create_by, - om.create_time, - om.remark, - om.goods_id - from order_master om - left join ( - select om.id, count(om.id) as subOrderCount, max(od.worker_id) as odWorkerId from order_master om - left join order_detail od on od.order_master_id = om.id - group by om.id) odCount - on odCount.id = om.id - - - - select count(*) from order_master om - left join ( - select om.id, count(om.id) as subOrderCount, max(od.worker_id) as odWorkerId from order_master om - left join order_detail od on od.order_master_id = om.id - group by om.id) odCount - on odCount.id = om.id - -