From bcaec8cee63e9c1f209d0cb2a34338e09f18233c Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 6 Oct 2022 18:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=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 --- .../order/OrderMasterController.java | 20 +++++++++++-------- .../com/ghy/order/domain/OrderMaster.java | 3 +++ .../mapper/order/OrderMasterMapper.xml | 5 ++++- 3 files changed, 19 insertions(+), 9 deletions(-) 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 36dce88e..4916d2f8 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 @@ -355,7 +355,13 @@ public class OrderMasterController extends BaseController { List orderDetailList = orderDetailService.selectByOrderMasterId(orderMaster.getId()); List orderStandardDetails = new ArrayList<>(); - orderDetailList.forEach(orderDetail -> { + + // 财务信息 + FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMaster.getId()); + // 计算总额 + BigDecimal totalPayMoney = financialMaster.getPayMoney(); + + for (OrderDetail orderDetail: orderDetailList) { List standardList = new ArrayList<>(); // 子单施工师傅信息 Worker detailWorker = workerService.selectById(orderDetail.getWorkerId()); @@ -385,7 +391,7 @@ public class OrderMasterController extends BaseController { } FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(orderDetail.getId()); - BigDecimal totalPayMoney = financialDetail.getPayMoney(); + BigDecimal detailPayMoney = financialDetail.getPayMoney(); FinancialChangeRecord financialChangeRecord = null; // 查询子单加价记录 FinancialChangeRecord changeRecordQry = new FinancialChangeRecord(); @@ -394,6 +400,7 @@ public class OrderMasterController extends BaseController { if (CollectionUtils.isNotEmpty(financialChangeRecords)) { financialChangeRecord = financialChangeRecords.get(0); totalPayMoney = totalPayMoney.add(financialChangeRecord.getChangeMoney()); + detailPayMoney = detailPayMoney.add(financialChangeRecord.getChangeMoney()); } OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); @@ -409,7 +416,7 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setOrderStandardList(standardList); orderStandardDetail.setFinishImgList(finishImgList); orderStandardDetail.setRemark(orderDetail.getRemark()); - orderStandardDetail.setPayMoney(totalPayMoney); + orderStandardDetail.setPayMoney(detailPayMoney); orderStandardDetail.setFinancialChangeRecord(financialChangeRecord); AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); @@ -418,7 +425,7 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setAfterServiceRecordList(records); orderStandardDetails.add(orderStandardDetail); - }); + } // 初始化属性 OrderListResponse orderListResponse = new OrderListResponse(); @@ -446,9 +453,6 @@ public class OrderMasterController extends BaseController { Goods goods = goodsService.selectById(goodsStandard.getGoodsId()); - // 财务信息 - FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMaster.getId()); - // 地址信息 CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId()); SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId()); @@ -470,7 +474,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl()); orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); - orderListResponse.setPayMoney(financialMaster.getPayMoney()); + orderListResponse.setPayMoney(totalPayMoney); orderListResponse.setWorkerName(workerName); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setCustomerName(customerAddress.getName()); 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 a3ea0162..cdb6d403 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 @@ -8,6 +8,7 @@ import com.ghy.worker.domain.Worker; import lombok.Data; import java.util.Date; +import java.util.List; /** * @author clunt @@ -75,6 +76,8 @@ public class OrderMaster extends BaseEntity { private Integer exceptOrderStatus; + private String orderStatuses; + private Boolean isOverTime; private String orderMasterIds; diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index e85815e5..7a2c90eb 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -119,9 +119,12 @@ AND om.create_time < #{createTimeEnd} - + AND om.id in (${orderMasterIds}) + + AND om.order_status in (${orderStatuses}) + order by om.create_time