From fb8fd1cf713206b701d9b6ed34085503860bb5fb Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 18 Oct 2019 10:44:12 +0800
Subject: [PATCH] fix fix complie error

---
 pom.xml                                                       | 2 +-
 .../payment/manage/custom/core/impl/CustomServiceImpl.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc7a422a6..8748c3129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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);