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 fd5914473..814a96f16 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 @@ -6,7 +6,6 @@ import au.com.royalpay.payment.core.beans.OrderStatus; import au.com.royalpay.payment.manage.custom.core.CustomService; import au.com.royalpay.payment.manage.mappers.custom.CustomReportDetailsMapper; import au.com.royalpay.payment.manage.mappers.custom.CustomReportsMapper; -import au.com.royalpay.payment.manage.mappers.payment.OrderMapper; import au.com.royalpay.payment.tools.utils.PageListUtils; import com.alibaba.fastjson.JSONObject; @@ -31,8 +30,6 @@ public class CustomServiceImpl implements CustomService { private CustomReportsMapper customReportsMapper; @Resource private CustomReportDetailsMapper customReportDetailsMapper; - @Resource - private OrderMapper orderMapper; @Override public JSONObject findOneWithDetail(String report_id) { diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml index 092c62776..e3a2aadf3 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml @@ -11,6 +11,7 @@ left join pmt_transactions t on o.order_id = t.order_id + and transaction_type = 'Credit' and o.status in ( diff --git a/src/main/ui/static/payment/custom/custom.js b/src/main/ui/static/payment/custom/custom.js index 3d92af86d..bd69213d0 100644 --- a/src/main/ui/static/payment/custom/custom.js +++ b/src/main/ui/static/payment/custom/custom.js @@ -41,7 +41,11 @@ return $http.get('/custom/channelCustom?channel='+order.channel); }] } - }) + }).result.then(function () { + alert(1); + $scope.loadList(1); + + }) }; $scope.edit = function (order) { @@ -102,6 +106,7 @@ $scope.$close(); }, function (resp) { commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + $scope.$close(); }) } $scope.removeSubOrders = function (order) {