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 d7502ae7..85029be7 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 @@ -1190,15 +1190,19 @@ public class OrderMasterController extends BaseController { param.setOrderDetailId(orderDetail.getId()); List orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param); BigDecimal addMoneyTotal= BigDecimal.ZERO; - + String remark=null; for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){ addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney()); + if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){ + remark= financialChangeRecord.getRemark(); + } } for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); } OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); + orderStandardDetail.setRemark(remark); orderStandardDetail.setAddMoney(addMoneyTotal); orderStandardDetail.setOrderDetailId(orderDetail.getId()); orderStandardDetail.setOrderDetailCode(orderDetail.getCode());