clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-13 09:18:38 +08:00
parent 087ea91ecf
commit 05ac0b5acb
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -464,10 +464,10 @@ public class OrderDetailController extends BaseController {
BigDecimal addMoneyTotal= BigDecimal.ZERO; BigDecimal addMoneyTotal= BigDecimal.ZERO;
for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){ for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){
addMoneyTotal.add(financialChangeRecord.getChangeMoney()); addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney());
} }
for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
} }
logger.info("加价的金额总额为{}",addMoneyTotal); logger.info("加价的金额总额为{}",addMoneyTotal);

17
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -828,9 +828,9 @@ public class OrderMasterController extends BaseController {
OrderAttachmentRecord param = new OrderAttachmentRecord(); OrderAttachmentRecord param = new OrderAttachmentRecord();
param.setOrderDetailId(detail.getId()); param.setOrderDetailId(detail.getId());
List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param); List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
logger.info("列表中子单的id{}，获取到的加价列表{}",detail.getId(),orderAttachmentRecordList);
for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
totalChangeMoney.add(orderAttachmentRecord.getAttachMoney()); totalChangeMoney = totalChangeMoney.add(orderAttachmentRecord.getAttachMoney());
} }
} }
logger.info("列表中加价的金额{}",totalPayMoney); logger.info("列表中加价的金额{}",totalPayMoney);
@ -1186,7 +1186,20 @@ public class OrderMasterController extends BaseController {
// detailPayMoney = detailPayMoney.add(financialChangeRecord.getChangeMoney()); // detailPayMoney = detailPayMoney.add(financialChangeRecord.getChangeMoney());
// } // }
OrderAttachmentRecord param = new OrderAttachmentRecord();
param.setOrderDetailId(orderDetail.getId());
List<OrderAttachmentRecord> 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 orderStandardDetail = new OrderStandardDetail();
orderStandardDetail.setAddMoney(addMoneyTotal);
orderStandardDetail.setOrderDetailId(orderDetail.getId()); orderStandardDetail.setOrderDetailId(orderDetail.getId());
orderStandardDetail.setOrderDetailCode(orderDetail.getCode()); orderStandardDetail.setOrderDetailCode(orderDetail.getCode());
orderStandardDetail.setWorkBeginTime(orderDetail.getWorkBeginTime()); orderStandardDetail.setWorkBeginTime(orderDetail.getWorkBeginTime());

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
View File

@ -82,4 +82,6 @@ public class OrderStandardDetail {
private Integer afterTimeout; private Integer afterTimeout;
private BigDecimal addMoney;
} }