From d3d4b633fb955d7c801075edb35de664ba2b2854 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Wed, 21 Mar 2018 14:56:21 +0800 Subject: [PATCH 1/2] fix --- .../payment/manage/appclient/web/RetailAppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index 22031c480..701ba9cdc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -408,7 +408,7 @@ public class RetailAppController { } - @RequestMapping(value = "/manual_settle", method = RequestMethod.PUT) + @RequestMapping(value = "/client/manual_settle", method = RequestMethod.PUT) public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam boolean manual_settle) { retailAppService.changeManualSettle(device,manual_settle); } From 373f024a57f1a2bb73d696968c5b8496f61b43ed Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Wed, 21 Mar 2018 15:03:32 +0800 Subject: [PATCH 2/2] fix --- .../manage/signin/core/impls/SignInAccountServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index c68879275..15e17db04 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -320,7 +320,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati "company_name", "address","business_name","business_structure", "abn","acn","company_phone","suburb","postcode","state","contact_person","contact_phone","contact_email", "short_name", "logo_url", "enable_refund", "enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark", "logo_thumbnail", "creator", "create_time", "approver", "approve_result", "approve_time", "timezone", - "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay"}; + "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay","manual_settle"}; for (String col : columns) { simpleClient.put(col, client.get(col)); }