From 7e9b36605c49419d709050b01800f267db81d30b Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 23 Aug 2019 16:37:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=B6=E4=BD=9C=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=BF=94=E8=BF=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impl/ClientComplianceApplyImpl.java | 1 + .../core/impls/ClientManagerImpl.java | 29 +++++++++---------- .../static/payment/partner/partner-manage.js | 2 +- .../payment/partner/partner_compliance.js | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java b/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java index d03bca3ae..8f7431e19 100644 --- a/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java @@ -85,6 +85,7 @@ public class ClientComplianceApplyImpl implements ClientComplianceApply } complianceDetail.put("operator_id", manager.getString("manager_id")); complianceDetail.put("status",1); + complianceDetail.put("description",' '); clientComplianceCompanyMapper.update(complianceDetail); clientFilesMapper.passCompliance(clientId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index ae922adb0..9ae3cdb23 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -2005,47 +2005,46 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new InvalidShortIdException(); } - JSONObject result = new JSONObject(); String address = client.getString("address").trim(); if (address.contains(",")) { - result.put("address", address.substring(0, address.lastIndexOf(",")).trim()); - result.put("address_sub", address.substring(address.lastIndexOf(",") + 1).trim()); + client.put("address", address.substring(0, address.lastIndexOf(",")).trim()); + client.put("address_sub", address.substring(address.lastIndexOf(",") + 1).trim()); } if (client.getString("acn") != null && !client.getString("acn").equals("")) { - result.put("acn_type", "ACN: (" + client.getString("acn") + ")"); - result.put("company_name_acn", client.getString("company_name") + " (ACN " + client.getString("acn") + ")"); + client.put("acn_type", "ACN: (" + client.getString("acn") + ")"); + client.put("company_name_acn", client.getString("company_name") + " (ACN " + client.getString("acn") + ")"); } else { - result.put("acn_type", "ABN: (" + client.getString("abn") + ")"); - result.put("company_name_acn", client.getString("company_name") + " (ABN " + client.getString("abn") + ")"); + client.put("acn_type", "ABN: (" + client.getString("abn") + ")"); + client.put("company_name_acn", client.getString("company_name") + " (ABN " + client.getString("abn") + ")"); } JSONObject weChatRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat"); if (weChatRate == null) { throw new BadRequestException("The Partner's Rate is not config!"); } - result.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); - result.put("clean", "T+" + weChatRate.getString("clean_days")); - result.put("clean_days", weChatRate.getString("clean_days")); + client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); + client.put("clean", "T+" + weChatRate.getString("clean_days")); + client.put("clean_days", weChatRate.getString("clean_days")); try { JSONObject alipayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Alipay"); if (alipayRate != null) { - result.put("alipay_rate", alipayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); + client.put("alipay_rate", alipayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); } JSONObject bestPayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Bestpay"); if (bestPayRate != null) { - result.put("bestpay_rate", bestPayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); + client.put("bestpay_rate", bestPayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); } JSONObject jdRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "jd"); if (jdRate != null) { - result.put("jd_rate", jdRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); + client.put("jd_rate", jdRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); } JSONObject alipayOnlineRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "AlipayOnline"); if (alipayOnlineRate != null) { - result.put("alipay_online_rate", alipayOnlineRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); + client.put("alipay_online_rate", alipayOnlineRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); } JSONObject cbBankPayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "CB_BankPay"); @@ -2069,7 +2068,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid Date endDate = TimeZoneUtils.nextYearByCurrDay(); String end_date = DateFormatUtils.format(endDate, "dd/MM/yyyy"); result.put("end_date", end_date); - return result; + return client; } @Override diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 5a95c0144..10d947d48 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -3808,7 +3808,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter title: 'Warning', content: 'This operation will delete the file, Are you sure?' }).then(function () { - $http.put('/sys/partners/auth_file/' + $scope.file_id + '/delete').then(function (resp) { + $http.put('/sys/partners/auth_file/' + file_id + '/delete').then(function (resp) { commonDialog.alert({ title: 'Success', content: 'Delete Successful', diff --git a/src/main/ui/static/payment/partner/partner_compliance.js b/src/main/ui/static/payment/partner/partner_compliance.js index 68f52af55..a8d71646a 100644 --- a/src/main/ui/static/payment/partner/partner_compliance.js +++ b/src/main/ui/static/payment/partner/partner_compliance.js @@ -56,7 +56,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.passPartnerComplianceFiles = function () { $http.put('/compliance/audit/'+$scope.file.client.client_id+'/pass/complianceFile',{}).then(function (resp) { - $scope.reload(); + $state.reload(); }, function (resp) { commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); })