master
kira 6 years ago
parent 5fc1275493
commit 77567eaaf9

@ -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.custom.core.CustomService;
import au.com.royalpay.payment.manage.mappers.custom.CustomReportDetailsMapper; 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.custom.CustomReportsMapper;
import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
import au.com.royalpay.payment.tools.utils.PageListUtils; import au.com.royalpay.payment.tools.utils.PageListUtils;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -31,8 +30,6 @@ public class CustomServiceImpl implements CustomService {
private CustomReportsMapper customReportsMapper; private CustomReportsMapper customReportsMapper;
@Resource @Resource
private CustomReportDetailsMapper customReportDetailsMapper; private CustomReportDetailsMapper customReportDetailsMapper;
@Resource
private OrderMapper orderMapper;
@Override @Override
public JSONObject findOneWithDetail(String report_id) { public JSONObject findOneWithDetail(String report_id) {

@ -11,6 +11,7 @@
left join left join
pmt_transactions t pmt_transactions t
on o.order_id = t.order_id on o.order_id = t.order_id
and transaction_type = 'Credit'
and and
o.status in ( o.status in (
<foreach collection="orderStatus" item="item" separator=","> <foreach collection="orderStatus" item="item" separator=",">

@ -41,7 +41,11 @@
return $http.get('/custom/channelCustom?channel='+order.channel); return $http.get('/custom/channelCustom?channel='+order.channel);
}] }]
} }
}) }).result.then(function () {
alert(1);
$scope.loadList(1);
})
}; };
$scope.edit = function (order) { $scope.edit = function (order) {
@ -102,6 +106,7 @@
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
$scope.$close();
}) })
} }
$scope.removeSubOrders = function (order) { $scope.removeSubOrders = function (order) {

Loading…
Cancel
Save