diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java index 490947d22..026a3d6be 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java @@ -4,7 +4,6 @@ import au.com.royalpay.payment.manage.support.abafile.ABAFile; import au.com.royalpay.payment.manage.tradelog.beans.ClearingLogQuery; import com.alibaba.fastjson.JSONObject; import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.InputStreamResource; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; @@ -21,7 +20,7 @@ import java.util.Map; */ public interface CleanService { - List listValidatedDays(Date month); + List listValidatedDays(Date month); List listClientCleanLogsForMonth(Date date, int clientId); diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index ee0e8812a..6a9600b1d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -159,13 +159,17 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider // private final String[] open_ids = { "o32MzuO4s8c7iFOVxnxejkbhMoEc" }; @Override - public List listValidatedDays(Date month) { - List dates = validationLogMapper.listValidatedDates(month); - List dateString = new ArrayList<>(); - for (Date date : dates) { - dateString.add(DateFormatUtils.format(date, "yyyy/MM/dd")); - } - return dateString; + public List listValidatedDays(Date month) { + List reports = validationLogMapper.listValidatedReports(month); + List topReports = new ArrayList<>(); + for (JSONObject report : reports) { + JSONObject item = new JSONObject(); + item.put("date", DateFormatUtils.format(item.getDate("valid_date"), "yyyy/MM/dd")); + JSONObject result = JSON.parseObject(report.getString("result")); + item.put("success", result.getBooleanValue("valid")); + topReports.add(item); + } + return topReports; } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java index 079b46a70..6f259bcbd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java @@ -29,7 +29,7 @@ public class FinancialController { private CleanService cleanService; @GetMapping("/validated_dates/{month}") - public List listMonthValidatedDays(@PathVariable String month) { + public List listMonthValidatedDays(@PathVariable String month) { try { Date mon = DateUtils.parseDate(month, new String[]{"yyyyMM"}); return cleanService.listValidatedDays(mon); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java index 0aaa7fa60..ed936be28 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java @@ -23,5 +23,5 @@ public interface ValidationLogMapper { JSONObject findByDate(@Param("valid_date") Date validDate); - List listValidatedDates(@Param("month") Date month); + List listValidatedReports(@Param("month") Date month); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.xml index 498ff3b43..a022a7728 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.xml @@ -7,7 +7,7 @@ - + SELECT valid_date,result FROM log_order_validation WHERE month(valid_date)=month(#{month}) and year(valid_date)=year(#{month}) \ No newline at end of file diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 34cfedcad..d6036335d 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -58,7 +58,7 @@ diff --git a/src/main/ui/static/payment/validation/order-validation.js b/src/main/ui/static/payment/validation/order-validation.js index f6f638771..59213dc6e 100644 --- a/src/main/ui/static/payment/validation/order-validation.js +++ b/src/main/ui/static/payment/validation/order-validation.js @@ -18,10 +18,14 @@ define(['angular', 'uiRouter'], function () { app.controller('orderValidCalendarCtrl', ['$scope', '$http', '$filter', function ($scope, $http, $filter) { $scope.today = new Date(); $scope.loadValidatedDates = function (month) { - var monthStr = $filter('date')(month, 'yyyyMM'); + let monthStr = $filter('date')(month, 'yyyyMM'); $http.get('/sys/financial/validated_dates/' + monthStr).then(function (resp) { $scope.validatedDates = resp.data; }) + }; + $scope.findReport = function (dateStr) { + let filtered = $scope.validatedDates.filter(rp => rp.date === dateStr); + return filtered.length ? filtered[0] : null } }]); app.controller('orderValidationCtrl', ['$scope', '$http', '$filter', '$stateParams', 'commonDialog', diff --git a/src/main/ui/static/payment/validation/templates/valid-calendar.html b/src/main/ui/static/payment/validation/templates/valid-calendar.html index 7b8750645..7a89f9ad7 100644 --- a/src/main/ui/static/payment/validation/templates/valid-calendar.html +++ b/src/main/ui/static/payment/validation/templates/valid-calendar.html @@ -12,7 +12,8 @@