From 96891f811c29d30d0f2a8180d527e935da0ec1c0 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 5 Jun 2024 23:26:10 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E4=B8=BB=E5=8D=95=E6=B4=BE=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=A7=93=E5=90=8D=EF=BC=88=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=88=86=E6=B4=BE=E9=82=A3=E9=87=8C=EF=BC=89=202=EF=BC=8C?= =?UTF-8?q?=E6=B4=BE=E5=8D=95=E6=90=9C=E7=B4=A2=E5=A7=93=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E8=83=BD=E6=90=9C=E7=B4=A2=EF=BC=88=E6=B3=A8=E6=84=8F?= =?UTF-8?q?=E6=B4=BE=E4=B8=BB=E5=8D=95=E5=A4=84=E6=90=9C=E7=B4=A2=E5=92=8C?= =?UTF-8?q?=E5=88=86=E6=B4=BE=E5=A4=84=E6=90=9C=E7=B4=A2=EF=BC=89=203?= =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E5=9C=B0=E5=9D=80=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8D=E4=BA=86=E3=80=82=204=EF=BC=8C=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=92=8C=E8=A7=84=E6=A0=BC=E6=90=9C=E7=B4=A2=E4=B8=8D=E4=BA=86?= =?UTF-8?q?=E3=80=82=205=EF=BC=8C=E4=B8=8B=E5=8D=95=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=9C=AA=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=B8=94=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=A4=84=E6=9C=AA=E8=83=BD=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=A8=A1=E5=BC=8F=E3=80=82=206=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=AC=AC5=E7=82=B9=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E5=A4=87=E6=B3=A8=E6=8F=90=E5=88=B0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E3=80=82=E6=9C=AA=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/order/OrderDetailController.java | 10 ++++++++++ .../controller/order/OrderMasterController.java | 17 +++++++++++++++++ .../main/resources/templates/order/master.html | 7 ++++++- .../resources/templates/order/orderManager.html | 5 +++++ .../resources/templates/order/pc-master.html | 6 +++++- .../templates/order/pcOrderWorker.html | 7 ++++++- .../java/com/ghy/order/domain/OrderDetail.java | 3 +++ .../java/com/ghy/order/domain/OrderMaster.java | 2 ++ .../mapper/order/OrderDetailMapper.xml | 2 ++ .../mapper/order/OrderMasterMapper.xml | 5 ++++- .../resources/mapper/worker/WorkerMapper.xml | 4 +++- 11 files changed, 63 insertions(+), 5 deletions(-) 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 1c4b8a34..62ab9bf9 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 @@ -267,6 +267,16 @@ public class OrderDetailController extends BaseController { if (fc != null) { detail.setChangeMoney(fc.getChangeMoney()); } + // 完单图片 + GoodsImgs param = new GoodsImgs(); + param.setRemark(String.valueOf(detail.getId())); + param.setImgType(ImgType.FINISH_IMG.getId()); + List imgsList = goodsImgsService.qryGoodsImgs(param); + StringBuilder stringBuilder = new StringBuilder(); + imgsList.forEach(model->{ + stringBuilder.append("查看图片"); + }); + detail.setOrderImgs(stringBuilder.toString()); } return getDataTable(orderDetails); 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 703c97b7..3a059fa2 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 @@ -1293,6 +1293,23 @@ public class OrderMasterController extends BaseController { if(master.getExpectTimeStart() != null && master.getExpectTimeEnd() != null){ master.setMixExpectTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",master.getExpectTimeStart()) +"-"+ DateUtils.parseDateToStr("HH:mm",master.getExpectTimeEnd())); } + if("01".equals(master.getConsultMode())){ + master.setOrderMode("05"); + } else if (StringUtils.isEmpty(master.getOrderMode())) { + master.setOrderMode("01"); + } + List details = orderDetailService.selectByOrderMasterId(master.getId()); + StringBuilder stringBuilder = new StringBuilder(); + details.forEach(model->{ + GoodsImgs param = new GoodsImgs(); + param.setRemark(String.valueOf(model.getId())); + param.setImgType(ImgType.FINISH_IMG.getId()); + List imgsList = goodsImgsService.qryGoodsImgs(param); + imgsList.forEach(imgs->{ + stringBuilder.append("查看图片"); + }); + }); + master.setOrderImgs(stringBuilder.toString()); } return getDataTable(orderMasterList); } diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index 3503f118..4d8d4d06 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -698,7 +698,12 @@ field: 'changeMoney', title: '商家追加金额', align: 'center' - },{ + }, + { + field: 'orderImgs', + title: '完单图片' + }, + { field: 'orderType', title: '订单类型', align: 'center', diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index ce80a38c..0a5a7aa8 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -733,6 +733,11 @@ title: '商家追加金额', align: 'center' }, + { + field: 'orderImgs', + title: '完单图片', + align: 'center' + }, { field: 'payMode', title: '商家付费模式', diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index fc65018b..a6dd23b3 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -148,7 +148,7 @@
- +
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 9b32e514..390c12ff 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -104,7 +104,8 @@ om.is_call, fm.server_money, om.goods_brand, - om.goods_specification + om.goods_specification, + om.consult_mode 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 @@ -121,6 +122,8 @@ om.code LIKE concat('%', #{keywords}, '%') or ca.name LIKE concat('%', #{keywords}, '%') or ca.phone LIKE concat('%', #{keywords}, '%') + or ca.address like concat('%', #{keywords}, '%') + or g.goods_name like concat('%', #{keywords}, '%') ) diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index 13a947a5..aaec7f47 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -62,6 +62,7 @@ SELECT w.worker_id FROM worker w LEFT JOIN worker_area wa ON wa.worker_id = w.worker_id LEFT JOIN worker_goods_category wgc ON wgc.worker_id = w.worker_id + LEFT JOIN worker_certification wc on w.worker_id = wc.worker_id AND dept_id = #{deptId} @@ -77,7 +78,8 @@ AND (w.name LIKE '%${keyWords}%' - OR w.phone LIKE '%${keyWords}%') + OR w.phone LIKE '%${keyWords}%' + OR concat(wc.surname,'', wc.name) like '%${keyWords}%') AND w.name LIKE '%${name}%'