From d8bce91d9bac3f386079bc69d8d09933f3eb3f6c Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 20 Jun 2022 18:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=A2=84=E7=BA=A6=E4=B8=8A?= =?UTF-8?q?=E9=97=A8=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/goods/GoodsController.java | 10 +++++++++- .../ghy/web/controller/order/OrderController.java | 6 +++++- .../web/controller/order/OrderDetailController.java | 4 ++++ .../web/controller/order/OrderMasterController.java | 6 ++++++ .../java/com/ghy/web/pojo/vo/OrderListResponse.java | 4 ++++ .../com/ghy/web/pojo/vo/OrderStandardDetail.java | 4 ++++ .../src/main/resources/mapper/goods/GoodsMapper.xml | 3 +++ .../main/java/com/ghy/order/domain/OrderDetail.java | 4 ++++ .../main/java/com/ghy/order/domain/OrderMaster.java | 4 ++++ .../java/com/ghy/order/request/AppOrderRequest.java | 6 ++++++ .../resources/mapper/order/OrderDetailMapper.xml | 12 +++++++++++- .../resources/mapper/order/OrderMasterMapper.xml | 10 ++++++++++ 12 files changed, 70 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java index 5d62de62..11c053d9 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java @@ -62,7 +62,7 @@ public class GoodsController extends BaseController { @PostMapping("/hot/list") @ResponseBody - public TableDataInfo hotList(Goods goods) { + public TableDataInfo hotList(@RequestBody Goods goods) { DeptGoodsCategory deptGoodsCategory = new DeptGoodsCategory(); deptGoodsCategory.setDeptId(goods.getDeptId()); deptGoodsCategory.setIsHot(1); @@ -76,6 +76,14 @@ public class GoodsController extends BaseController { startPage(); List list = goodsService.selectByCategoryIds(ids); list.forEach(one -> { + // 补全商品图片信息 + List goodsImgs = goodsImgsService.selectByGoodsId(one.getGoodsId()); + Map> listMap = new HashMap<>(); + for (GoodsImgs goodsImg : goodsImgs) { + listMap.computeIfAbsent(goodsImg.getImgType(), k -> new ArrayList<>()).add(goodsImg); + } + one.setGoodsImgsMap(listMap); + // 补全商品 List goodsAreas = goodsAreaService.selectByGoodsId(one.getGoodsId()); one.setGoodsAreaList(goodsAreas); 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 f95a045b..657f2da3 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 @@ -143,6 +143,8 @@ public class OrderController extends BaseController { od.setOrderStatus(OrderStatus.GOING.code()); od.setWorkerId(request.getWorkerId()); od.setRevTime(om.getRevTime()); + od.setExpectTimeStart(om.getExpectTimeStart()); + od.setExpectTimeEnd(om.getExpectTimeEnd()); orderDetailService.insertOrderDetail(od); // 批量生成订单商品 @@ -238,7 +240,9 @@ public class OrderController extends BaseController { orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode()); orderMaster.setCreateTime(new Date()); orderMaster.setWorkerId(goods.getWorkerId()); - orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); +// orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); + orderMaster.setExpectTimeStart(DateUtils.parseDate(appOrderRequest.getExpectTimeStart(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); + orderMaster.setExpectTimeEnd(DateUtils.parseDate(appOrderRequest.getExpectTimeEnd(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); orderMasterService.insertOrderMaster(orderMaster); Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!"); 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 2be302c2..9155dd30 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 @@ -146,6 +146,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setStandardList(standardList); orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setServerTime(detail.getRevTime()); + orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); + orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); orderListResponse.setCreateTime(detail.getCreateTime()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); @@ -223,6 +225,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setStandardList(standardList); orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setServerTime(detail.getRevTime()); + orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); + orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); orderListResponses.add(orderListResponse); 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 b3263481..9404a647 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 @@ -140,6 +140,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setServerTime(master.getRevTime()); + orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); + orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); orderListResponse.setOrderStatus(master.getOrderStatus()); orderListResponse.setPayStatus(master.getPayStatus()); orderListResponse.setPayType(master.getPayType()); @@ -185,6 +187,8 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setWorkerName(detailWorker.getName()); orderStandardDetail.setWorkerPhone(detailWorker.getPhone()); orderStandardDetail.setRevTime(orderDetail.getRevTime()); + orderStandardDetail.setExpectTimeStart(orderDetail.getExpectTimeStart()); + orderStandardDetail.setExpectTimeEnd(orderDetail.getExpectTimeEnd()); orderStandardDetail.setOrderStandardList(standardList); orderStandardDetails.add(orderStandardDetail); @@ -241,6 +245,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setStandardList(standardList); orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setServerTime(orderMaster.getRevTime()); + orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart()); + orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd()); orderListResponse.setCreateTime(orderMaster.getCreateTime()); orderListResponse.setOrderStandardDetailList(orderStandardDetails); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index c3f1db9e..1fb2fdf1 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -29,6 +29,10 @@ public class OrderListResponse { private Date serverTime; + private Date expectTimeStart; + + private Date expectTimeEnd; + private Date workBeginTime; private Date workFinishTime; diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java index 43901e7f..365d12ac 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java @@ -18,6 +18,10 @@ public class OrderStandardDetail { private Date revTime; + private Date expectTimeStart; + + private Date expectTimeEnd; + private Date workBeginTime; private Date workFinishTime; diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml index 608d405d..215b7e52 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml @@ -100,6 +100,9 @@ AND goods_name like concat('%', #{goodsName}, '%') + + AND status = #{status} + /* 默认生成时间排序 */ order by create_time diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index e25ea978..07b69f44 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -45,6 +45,10 @@ public class OrderDetail extends BaseEntity { @Excel(name = "接单时间", cellType = Excel.ColumnType.STRING) private Date revTime; + private Date expectTimeStart; + + private Date expectTimeEnd; + @Excel(name = "服务开始时间/上门时间", cellType = Excel.ColumnType.STRING) private Date workBeginTime; 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 7b40155a..dbcbda7a 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 @@ -55,6 +55,10 @@ public class OrderMaster extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date revTime; + private Date expectTimeStart; + + private Date expectTimeEnd; + private Worker worker; private FinancialMaster financialMaster; diff --git a/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java b/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java index 4ab75c70..4bf79e8d 100644 --- a/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java +++ b/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java @@ -24,6 +24,12 @@ public class AppOrderRequest { // 预约上门时间 private String serverTime; + // 预计上门时间段 开始时间点 + private String expectTimeStart; + + // 预计上门时间段 结束时间点 + private String expectTimeEnd; + // 地址 private Long addressId; diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index 9499e713..056b83c6 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -14,6 +14,8 @@ + + @@ -33,6 +35,8 @@ order_status, worker_id, rev_time, + expect_time_start, + expect_time_end, work_begin_time, work_finish_time, create_by, @@ -93,6 +97,8 @@ order_status = #{orderStatus}, worker_id = #{workerId}, rev_time = #{revTime}, + expect_time_start = #{expectTimeStart}, + expect_time_end = #{expectTimeEnd}, work_begin_time = #{workBeginTime}, work_finish_time = #{workFinishTime}, update_by = #{updateBy}, @@ -111,6 +117,8 @@ order_status, worker_id, rev_time, + expect_time_start, + expect_time_end, work_begin_time, work_finish_time, create_by, @@ -124,6 +132,8 @@ #{orderStatus}, #{workerId}, #{revTime}, + #{expectTimeStart}, + #{expectTimeEnd}, #{workBeginTime}, #{workFinishTime}, #{createBy}, @@ -146,4 +156,4 @@ - \ No newline at end of file + diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 7b408cc9..7eef5f52 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -17,6 +17,8 @@ + + @@ -37,6 +39,8 @@ worker_id, pay_time, rev_time, + expect_time_start, + expect_time_end, create_by, create_time, remark @@ -102,6 +106,8 @@ worker_id = #{workerId}, pay_time = #{payTime}, rev_time = #{revTime}, + expect_time_start = #{expectTimeStart}, + expect_time_end = #{expectTimeEnd}, update_by = #{updateBy}, update_time = SYSDATE() @@ -121,6 +127,8 @@ worker_id, pay_time, rev_time, + expect_time_start, + expect_time_end, create_by, create_time )VALUES( @@ -135,6 +143,8 @@ #{workerId}, #{payTime}, #{revTime}, + #{expectTimeStart}, + #{expectTimeEnd}, #{createBy}, SYSDATE() )