From 8005bec1bb091b7c69e190ce69ce3a41ed595130 Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 18 Oct 2019 00:31:31 +0800 Subject: [PATCH] parent update, fix compile error --- .../payment/manage/custom/core/impl/CustomServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java index 96a4b83f3..2b00aba51 100644 --- a/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java @@ -57,12 +57,12 @@ public class CustomServiceImpl implements CustomService { if (report != null) { throw new BadRequestException("report record exist"); } - CustomReport customReport = new CustomReport(UUID.randomUUID().toString(),addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(), + CustomReport customReport = new CustomReport(UUID.randomUUID().toString(), addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(), addCustomVO.getCustom()); customReport.addExtMchCustom(addCustomVO.getMch_ext_custom_id(), addCustomVO.getMch_ext_custom_name()); if (!CollectionUtils.isEmpty(addCustomVO.getSubOrders())) { addCustomVO.getSubOrders().forEach(p -> { - customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee"))); + customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee")), p.getString("sub_order_no")); }); } JSONObject result = customSupport.saveCustom(customReport);