From b1e967695e0a188465b2a01119a174d463cbc85c Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Tue, 14 Aug 2018 14:12:53 +0800
Subject: [PATCH 1/2] disable city partner

---
 .../citypartner/web/CityPartnerRegisterController.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java
index 78f84edb4..5110c2ae2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java
@@ -1,6 +1,8 @@
 package au.com.royalpay.payment.manage.citypartner.web;
+
 import au.com.royalpay.payment.manage.citypartner.beans.CityPartnerBean;
 import au.com.royalpay.payment.manage.citypartner.core.CityPartnerRegisterService;
+import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +25,9 @@ public class CityPartnerRegisterController {
     @RequestMapping(method = RequestMethod.POST)
     public void register(@RequestBody @Valid CityPartnerBean partner, Errors errors) {
         HttpUtils.handleValidErrors(errors);
+        if (true) {
+            throw new ForbiddenException();
+        }
         cityPartnerRegisterService.saveRegistry(partner);
     }
 }

From 6cd26407b3fccc8f8fa5dc0245437c0e22cf430e Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Tue, 14 Aug 2018 16:37:53 +0800
Subject: [PATCH 2/2] update

---
 .../payment/manage/custom/core/impl/CustomServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 da030ffec..36dede573 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,7 +57,7 @@ public class CustomServiceImpl implements CustomService {
         }
         CustomReport customReport = new CustomReport(addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
                 addCustomVO.getCustom());
-        customReport.addExtMchCustom(addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name());
+        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")));