From 1a0a2843535b47c566d94497710ce5c097d038a2 Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 27 Oct 2022 00:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderController.java | 4 ++++ .../ghy/web/controller/order/OrderDetailController.java | 8 +++++++- .../ghy/web/controller/order/OrderMasterController.java | 8 ++++++++ .../java/com/ghy/web/controller/pay/WxPayController.java | 3 ++- .../main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 6 +++++- .../java/com/ghy/web/pojo/vo/OrderStandardDetail.java | 6 +++++- .../src/main/java/com/ghy/order/domain/OrderDetail.java | 1 + .../src/main/java/com/ghy/order/domain/OrderMaster.java | 2 ++ .../src/main/resources/mapper/order/OrderDetailMapper.xml | 1 + .../src/main/resources/mapper/order/OrderMasterMapper.xml | 1 + 10 files changed, 36 insertions(+), 4 deletions(-) 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 16f70555..0872e651 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 @@ -600,6 +600,8 @@ public class OrderController extends BaseController { orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(master.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(master.getExpectTimeEnd()); orderListResponse.setOrderStatus(master.getOrderStatus()); orderListResponse.setPayStatus(master.getPayStatus()); orderListResponse.setPayType(master.getPayType()); @@ -688,6 +690,8 @@ public class OrderController extends BaseController { orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); orderListResponse.setClockInLocation(detail.getClockInLocation()); 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 3d78a90c..c571400b 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 @@ -232,6 +232,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd()); orderListResponse.setCreateTime(detail.getCreateTime()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); @@ -346,6 +348,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); orderListResponse.setClockInLocation(detail.getClockInLocation()); @@ -362,7 +366,6 @@ public class OrderDetailController extends BaseController { @PostMapping("/after/list") @ResponseBody public TableDataInfo afterServiceList(@RequestBody OrderDetail orderDetail) { - FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderDetail.getOrderMasterId()); AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); afterServiceRecord.setExcludeAfterServiceFinished(Boolean.TRUE); List afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); @@ -442,6 +445,7 @@ public class OrderDetailController extends BaseController { Boolean isOverTime = orderTimeoutRecord == null ? false : true; if(this.checkIsOnlyServer(orderMaster.getId(), detail.getWorkerId())){ + FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(detail.getOrderMasterId()); BigDecimal workerFee = financialMaster.getPayMoney(); List financialDetailList = financialDetailService.selectByFinancialMasterId(financialMaster.getId()); for (FinancialDetail param : financialDetailList) { @@ -476,6 +480,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); orderListResponse.setRemark(goods.getRemark()); 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 b03d025d..c40a9bf9 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 @@ -191,6 +191,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(master.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(master.getExpectTimeEnd()); orderListResponse.setOrderStatus(master.getOrderStatus()); orderListResponse.setPayStatus(financialMaster.getPayStatus()); orderListResponse.setPayType(master.getPayType()); @@ -334,6 +336,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(master.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(master.getExpectTimeEnd()); orderListResponse.setOrderStatus(master.getOrderStatus()); orderListResponse.setPayStatus(master.getPayStatus()); orderListResponse.setPayType(master.getPayType()); @@ -428,6 +432,8 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setRevTime(orderDetail.getRevTime()); orderStandardDetail.setExpectTimeStart(orderDetail.getExpectTimeStart()); orderStandardDetail.setExpectTimeEnd(orderDetail.getExpectTimeEnd()); + orderStandardDetail.setExpectTimeStartFront(orderDetail.getExpectTimeStart()); + orderStandardDetail.setExpectTimeEndFront(orderDetail.getExpectTimeEnd()); orderStandardDetail.setOrderStandardList(standardList); orderStandardDetail.setFinishImgList(finishImgList); orderStandardDetail.setRemark(orderDetail.getRemark()); @@ -503,6 +509,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setServerTime(orderMaster.getRevTime()); orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd()); + orderListResponse.setExpectTimeStartFront(orderMaster.getExpectTimeStart()); + orderListResponse.setExpectTimeEndFront(orderMaster.getExpectTimeEnd()); orderListResponse.setCreateTime(orderMaster.getCreateTime()); orderListResponse.setRemark(goods.getRemark()); orderListResponse.setCustomerRemark(orderMaster.getRemark()); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java index 4530c15c..ee45389c 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java @@ -100,7 +100,8 @@ public class WxPayController extends BaseController { List divMembers = new ArrayList<>(); // divMembers.add(new DivMember("C7D101", String.valueOf(financialMaster.getPayMoney()), true)); // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description - PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + StringUtils.join(financialChangeRecordIds, ",") + "_"+ System.currentTimeMillis(), + String changeRecordIdStr = financialChangeRecordIds.size() > 0 ? StringUtils.join(financialChangeRecordIds, ",") + "_" : ""; + PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + changeRecordIdStr + System.currentTimeMillis(), String.valueOf(payMoney), "工圈子居家设备", "工圈子居家设备购买付费"); map = adapayService.wxLitePay(orderMaster.getDeptId(), payParam, expend, null, null); } catch (BaseAdaPayException e) { 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 eee25974..f2cf22b1 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 @@ -40,9 +40,13 @@ public class OrderListResponse { private Date serverTime; @JsonFormat(pattern = "YYYY-MM-dd HH:mm") - private Date expectTimeStart; + private Date expectTimeStartFront; @JsonFormat(pattern = "HH:mm") + private Date expectTimeEndFront; + + private Date expectTimeStart; + private Date expectTimeEnd; private Date workBeginTime; 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 8f684eb4..f42c9273 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 @@ -23,9 +23,13 @@ public class OrderStandardDetail { private Date revTime; @JsonFormat(pattern = "YYYY-MM-dd HH:mm") - private Date expectTimeStart; + private Date expectTimeStartFront; @JsonFormat(pattern = "HH:mm") + private Date expectTimeEndFront; + + private Date expectTimeStart; + private Date expectTimeEnd; private Date workBeginTime; 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 9d2e1c2b..ec360876 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 @@ -72,4 +72,5 @@ public class OrderDetail extends BaseEntity { private String orderDetailIds; + private Boolean useTimeNotRange; } 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 e7351d56..9a084dbc 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 @@ -83,4 +83,6 @@ public class OrderMaster extends BaseEntity { private Boolean isOverTime; private String orderMasterIds; + + private Boolean useTimeNotRange; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index a890f155..05f47aec 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -204,6 +204,7 @@ rev_time = #{revTime}, expect_time_start = #{expectTimeStart}, expect_time_end = #{expectTimeEnd}, + expect_time_end = null, work_begin_time = #{workBeginTime}, work_finish_time = #{workFinishTime}, clock_in_location = #{clockInLocation}, diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index b57925fd..3e947ef5 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -211,6 +211,7 @@ rev_time = #{revTime}, expect_time_start = #{expectTimeStart}, expect_time_end = #{expectTimeEnd}, + expect_time_end = null, update_by = #{updateBy}, update_time = SYSDATE()