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 a8d2e807..0f182d18 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 @@ -464,10 +464,10 @@ public class OrderDetailController extends BaseController { BigDecimal addMoneyTotal= BigDecimal.ZERO; for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){ - addMoneyTotal.add(financialChangeRecord.getChangeMoney()); + addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney()); } for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ - addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); + addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); } logger.info("加价的金额总额为{}",addMoneyTotal); 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 f2173957..d7502ae7 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 @@ -828,9 +828,9 @@ public class OrderMasterController extends BaseController { OrderAttachmentRecord param = new OrderAttachmentRecord(); param.setOrderDetailId(detail.getId()); List orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param); - + logger.info("列表中子单的id{},获取到的加价列表{}",detail.getId(),orderAttachmentRecordList); for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ - totalChangeMoney.add(orderAttachmentRecord.getAttachMoney()); + totalChangeMoney = totalChangeMoney.add(orderAttachmentRecord.getAttachMoney()); } } logger.info("列表中加价的金额{}",totalPayMoney); @@ -1186,7 +1186,20 @@ public class OrderMasterController extends BaseController { // detailPayMoney = detailPayMoney.add(financialChangeRecord.getChangeMoney()); // } + OrderAttachmentRecord param = new OrderAttachmentRecord(); + param.setOrderDetailId(orderDetail.getId()); + List orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param); + BigDecimal addMoneyTotal= BigDecimal.ZERO; + + for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){ + addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney()); + } + for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ + addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); + } + OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); + orderStandardDetail.setAddMoney(addMoneyTotal); orderStandardDetail.setOrderDetailId(orderDetail.getId()); orderStandardDetail.setOrderDetailCode(orderDetail.getCode()); orderStandardDetail.setWorkBeginTime(orderDetail.getWorkBeginTime()); 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 57b447a6..ed104a17 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 @@ -82,4 +82,6 @@ public class OrderStandardDetail { private Integer afterTimeout; + private BigDecimal addMoney; + }