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:58:36 +08:00
parent 60c02a28ed
commit 60952f6b47
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,9 +462,13 @@ public class OrderDetailController extends BaseController {
param.setOrderDetailId(detail.getId()); param.setOrderDetailId(detail.getId());
List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param); List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
BigDecimal addMoneyTotal= BigDecimal.ZERO; BigDecimal addMoneyTotal= BigDecimal.ZERO;
String addMoneyRemark=null;
for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){ for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){
addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney()); addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney());
if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){
addMoneyRemark=financialChangeRecord.getRemark();
}
} }
for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
@ -472,6 +476,7 @@ public class OrderDetailController extends BaseController {
logger.info("加价的金额总额为{}",addMoneyTotal); logger.info("加价的金额总额为{}",addMoneyTotal);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setAddMoneyRemark(addMoneyRemark);
orderListResponse.setAddMoney(addMoneyTotal); orderListResponse.setAddMoney(addMoneyTotal);
orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailId(detail.getId());
orderListResponse.setOrderDetailCode(detail.getCode()); orderListResponse.setOrderDetailCode(detail.getCode());

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

@ -204,4 +204,6 @@ public class OrderListResponse {
private Boolean isMonitoredOrder; private Boolean isMonitoredOrder;
private BigDecimal addMoney; private BigDecimal addMoney;
private String addMoneyRemark;
} }