msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix20180306transdownload' into develop

Browse Source
master
yixian 7 years ago
parent ed810dcefa b93660ca9e
commit 1b0d05c1a7
15 changed files with 71 additions and 79 deletions
Show Stats Download Patch File Download Diff File

17
src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerCardDashboardController.java
Unescape View File

@ -21,7 +21,7 @@ import java.util.List;
* Created by yishuqian on 20/02/2017. * Created by yishuqian on 20/02/2017.
*/ */
@RestController @RestController
@ManagerMapping(role = {ManagerRole.ADMIN,ManagerRole.OPERATOR, ManagerRole.BD_USER,ManagerRole.DIRECTOR,ManagerRole.FINANCIAL_STAFF}, @ManagerMapping(role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER, ManagerRole.DIRECTOR, ManagerRole.FINANCIAL_STAFF},
value = "/analysis/partner_card", method = RequestMethod.GET) value = "/analysis/partner_card", method = RequestMethod.GET)
public class PartnerCardDashboardController { public class PartnerCardDashboardController {
@ -65,23 +65,18 @@ public class PartnerCardDashboardController {
@RequestMapping("{client_moniker}/settlement_logs") @RequestMapping("{client_moniker}/settlement_logs")
public JSONObject getPartnerSettlementLog(@PathVariable String client_moniker, TradeLogQuery query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { public JSONObject getPartnerSettlementLog(@PathVariable String client_moniker, TradeLogQuery query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
return partnerCardDashboardService.getSettlementLog(client_moniker,query); return partnerCardDashboardService.getSettlementLog(client_moniker, query);
} }
@RequestMapping("{client_moniker}/login_logs") @RequestMapping("{client_moniker}/login_logs")
public JSONObject getPartnerLoginLog(@PathVariable String client_moniker, ClientLoginLogQueryBean query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { public JSONObject getPartnerLoginLog(@PathVariable String client_moniker, ClientLoginLogQueryBean query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
return clientLoginLogRepository.listClientLoginLogs(client_moniker,query.getPage(),query.getLimit()); return clientLoginLogRepository.listClientLoginLogs(client_moniker, query.getPage(), query.getLimit());
} }
@RequestMapping("/{client_id}/{clearing_data}") @RequestMapping("/{client_id}/settlement_logs/{detailId}")
public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable String clearing_data){ public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable String detailId) {
try { return cleanService.getCleanLogTransactions(client_id, detailId);
return cleanService.getCleanLogTransactions(client_id, DateUtils.parseDate(clearing_data, new String[]{"yyyy-MM-dd"}));
}catch (ParseException e){
throw new BadRequestException("error.payment.valid.invalid_date_format");
}
} }
} }

32
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -444,8 +444,8 @@ public class RetailAppServiceImp implements RetailAppService {
date_query.setClient_ids((String[]) params.get("client_ids")); date_query.setClient_ids((String[]) params.get("client_ids"));
} }
JSONObject date_params = date_query.toParams(query.getTimezone()); JSONObject date_params = date_query.toParams(query.getTimezone());
date_params.put("begin",date_params.getDate("from")); date_params.put("begin", date_params.getDate("from"));
date_params.put("end",date_params.getDate("to")); date_params.put("end", date_params.getDate("to"));
date_params.put("client_id", device.getIntValue("client_id")); date_params.put("client_id", device.getIntValue("client_id"));
JSONObject analysis = transactionAnalysisMapper.getClientTransaction(date_params); JSONObject analysis = transactionAnalysisMapper.getClientTransaction(date_params);
order.put("date_total", analysis); order.put("date_total", analysis);
@ -627,9 +627,12 @@ public class RetailAppServiceImp implements RetailAppService {
@Override @Override
public void sendNoticeMessage(final NoticeInfo notice, final String[] client_monikers) { public void sendNoticeMessage(final NoticeInfo notice, final String[] client_monikers) {
sendingAppleMsgPool.execute(() -> { for (String clientMoniker : client_monikers) {
for (String clientMoniker : client_monikers) { JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); if(client==null){
continue;
}
sendingAppleMsgPool.execute(() -> {
List<JSONObject> tokens = clientDeviceTokenMapper.listAllTokensByClient_id(client.getIntValue("client_id")); List<JSONObject> tokens = clientDeviceTokenMapper.listAllTokensByClient_id(client.getIntValue("client_id"));
if (tokens != null && tokens.size() > 0) { if (tokens != null && tokens.size() > 0) {
for (JSONObject devToken : tokens) { for (JSONObject devToken : tokens) {
@ -667,8 +670,8 @@ public class RetailAppServiceImp implements RetailAppService {
} }
} }
} }
} });
}); }
} }
@Override @Override
@ -1032,15 +1035,12 @@ public class RetailAppServiceImp implements RetailAppService {
Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType); Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType); String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
int update_type = 0;// 0:不更新 1：更新 2：强制更新 int update_type = 0;// 0:不更新 1：更新 2：强制更新
String[] versionArr = version.split("\\."); String versionInt = version.replace(".","");
String[] newVersionArr = newAppVersion.split("\\."); String newAppVersionInt = newAppVersion.replace(".","");
for (int i = 0; i < newVersionArr.length; i++) { if (Integer.valueOf(versionInt)<Integer.valueOf(newAppVersionInt)){
if (Integer.valueOf(newVersionArr[i]) > Integer.valueOf(versionArr[i])) { update_type = 1;
update_type = 1; if(isUpdate){
if (isUpdate) { update_type=2;
update_type = 2;
}
i = newVersionArr.length + 1;
} }
} }
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();

6
src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
Unescape View File

@ -31,7 +31,7 @@ public interface CleanService {
JSONObject getCleanLogTransactions(int detailId, JSONObject manager); JSONObject getCleanLogTransactions(int detailId, JSONObject manager);
JSONObject getCleanLogTransactions(int client_id, Date date); JSONObject getCleanLogTransactions(int client_id, String detailId);
void settlementCsv(Date dt, HttpServletResponse resp) throws IOException; void settlementCsv(Date dt, HttpServletResponse resp) throws IOException;
@ -58,9 +58,9 @@ public interface CleanService {
List<String> listSettledDatesInMonth(Date mon); List<String> listSettledDatesInMonth(Date mon);
JSONObject listClearingTransactions(int client_id, Date date, JSONObject partner); JSONObject listClearingTransactions(int client_id, String clearingDetailId, JSONObject partner);
void exportListClearingTransactions(int client_id, Date date, JSONObject partner, HttpServletResponse resp); void exportListClearingTransactions(int client_id, String clearingDetailId, JSONObject partner, HttpServletResponse resp);
List<JSONObject> getSettlementMonthReport(int year, int monthOfYear); List<JSONObject> getSettlementMonthReport(int year, int monthOfYear);

19
src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
Unescape View File

@ -238,8 +238,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
} }
@Override @Override
public JSONObject getCleanLogTransactions(int clientId, Date date) { public JSONObject getCleanLogTransactions(int clientId, String clearingDetailId) {
return settlementSupport.listSettlementTransactionsForClient(clientId, date); return settlementSupport.listSettlementTransactionsForClient(clientId, clearingDetailId);
} }
@Override @Override
@ -596,17 +596,17 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
} }
@Override @Override
public JSONObject listClearingTransactions(int client_id, Date date, JSONObject partner) { public JSONObject listClearingTransactions(int client_id, String clearingDetailId, JSONObject partner) {
JSONObject client = clientManager.getClientInfo(client_id); JSONObject client = clientManager.getClientInfo(client_id);
Assert.notNull(client); Assert.notNull(client, "Client not exists");
int parent_client_id = client.getIntValue("parent_client_id"); int parent_client_id = client.getIntValue("parent_client_id");
if (client_id != partner.getIntValue("client_id") && parent_client_id != partner.getIntValue("client_id")) { if (client_id != partner.getIntValue("client_id") && parent_client_id != partner.getIntValue("client_id")) {
throw new ForbiddenException("No Permission"); throw new ForbiddenException("No Permission");
} }
JSONObject clearClient = clearingDetailMapper.listReport(date, client_id); JSONObject clearClient = clearingDetailMapper.listReport(clearingDetailId, client_id);
if (clearClient == null) { if (clearClient == null) {
throw new NotFoundException(); throw new NotFoundException();
} }
@ -624,12 +624,13 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
} }
@Override @Override
public void exportListClearingTransactions(int client_id, Date date, JSONObject partner, HttpServletResponse resp) { public void exportListClearingTransactions(int client_id, String clearingDetailId, JSONObject partner, HttpServletResponse resp) {
OutputStream ous = null; OutputStream ous = null;
try { try {
JSONObject clearTransation = listClearingTransactions(client_id, date, partner); JSONObject clearTransation = listClearingTransactions(client_id, clearingDetailId, partner);
resp.setContentType("application/octet-stream;"); resp.setContentType("application/octet-stream;");
resp.addHeader("Content-Disposition", "attachment; filename=" + "Merchant_Settlement_Info_" + DateFormatUtils.format(date, "yyyy-MM-dd") + ".xls"); Date reportDate = clearTransation.getDate("report_date");
resp.addHeader("Content-Disposition", "attachment; filename=" + "Merchant_Settlement_Info_" + DateFormatUtils.format(reportDate, "yyyy-MM-dd") + ".xls");
ous = resp.getOutputStream(); ous = resp.getOutputStream();
HSSFWorkbook wb = new HSSFWorkbook(); HSSFWorkbook wb = new HSSFWorkbook();
Cell cell = null; Cell cell = null;
@ -638,7 +639,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
font.setFontHeightInPoints((short) 10); font.setFontHeightInPoints((short) 10);
CellStyle analysisStyle = wb.createCellStyle(); CellStyle analysisStyle = wb.createCellStyle();
analysisStyle.setFont(font); analysisStyle.setFont(font);
Sheet sheet = wb.createSheet("Merchant_Settlement_Info_" + DateFormatUtils.format(date, "yyyyMMdd")); Sheet sheet = wb.createSheet("Merchant_Settlement_Info_" + DateFormatUtils.format(reportDate, "yyyyMMdd"));
int rowNum = 0; int rowNum = 0;
Row row = sheet.createRow(rowNum); Row row = sheet.createRow(rowNum);
String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency", String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency",

2
src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/SettleDelayConfigurerImpl.java
Unescape View File

@ -226,7 +226,7 @@ public class SettleDelayConfigurerImpl implements SettleDelayConfigurer {
continue; continue;
} }
String clientMoniker = client.getString("client_moniker"); String clientMoniker = client.getString("client_moniker");
JSONObject clearing = clearingDetailMapper.listReport(date, clientId); JSONObject clearing = clearingDetailMapper.listReportByDate(date, clientId);
if (clearing == null) { if (clearing == null) {
continue; continue;
} }

23
src/main/java/au/com/royalpay/payment/manage/management/clearing/web/CleanLogClientController.java
Unescape View File

@ -15,7 +15,6 @@ import java.text.ParseException;
import java.util.List; import java.util.List;
/** /**
*
* Created by davep on 2016-08-29. * Created by davep on 2016-08-29.
*/ */
@RestController @RestController
@ -27,30 +26,22 @@ public class CleanLogClientController {
@RequestMapping @RequestMapping
public List<JSONObject> listMonthCleanLogs(@RequestParam String month, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject client) { public List<JSONObject> listMonthCleanLogs(@RequestParam String month, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject client) {
try { try {
return cleanService.listClientCleanLogsForMonth(DateUtils.parseDate(month, new String[] { "yyyyMM" }), client.getIntValue("client_id")); return cleanService.listClientCleanLogsForMonth(DateUtils.parseDate(month, new String[]{"yyyyMM"}), client.getIntValue("client_id"));
} catch (ParseException e) { } catch (ParseException e) {
throw new BadRequestException("error.payment.valid.invalid_date_format"); throw new BadRequestException("error.payment.valid.invalid_date_format");
} }
} }
@RequestMapping("/{client_id}/{clearing_data}") @RequestMapping("/{client_id}/settlement_logs/{clearingDetailId}")
public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable String clearing_data, public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable String clearingDetailId,
@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) { @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) {
try { return cleanService.listClearingTransactions(client_id, clearingDetailId, partner);
return cleanService.listClearingTransactions(client_id, DateUtils.parseDate(clearing_data, new String[] { "yyyy-MM-dd" }), partner);
} catch (ParseException e) {
throw new BadRequestException("error.payment.valid.invalid_date_format");
}
} }
@PartnerMapping("/{client_id}/{clearing_data}/export") @PartnerMapping("/{client_id}/settlement_logs/{clearingDetailId}/export")
public void exportListClearingTransactions(@PathVariable int client_id, @PathVariable String clearing_data, public void exportListClearingTransactions(@PathVariable int client_id, @PathVariable String clearingDetailId,
@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, HttpServletResponse resp) { @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, HttpServletResponse resp) {
try { cleanService.exportListClearingTransactions(client_id, clearingDetailId, partner, resp);
cleanService.exportListClearingTransactions(client_id,DateUtils.parseDate(clearing_data, new String[] { "yyyy-MM-dd dd:mm:ss","yyyy-MM-dd" }), partner,resp);
} catch (ParseException e) {
throw new BadRequestException("error.payment.valid.invalid_date_format");
}
} }
// @RequestMapping(value = "/{clearId}.json") // @RequestMapping(value = "/{clearId}.json")

5
src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java
Unescape View File

@ -34,7 +34,10 @@ public interface ClearingDetailMapper {
PageList<JSONObject> listReportsOfSettlementLogs(JSONObject params, PageBounds pagination); PageList<JSONObject> listReportsOfSettlementLogs(JSONObject params, PageBounds pagination);
@AutoSql(type = SqlType.SELECT) @AutoSql(type = SqlType.SELECT)
JSONObject listReport(@Param("report_date") Date report_date, @Param("client_id") int client_id); JSONObject listReport(@Param("clear_detail_id") String clearDetailId, @Param("client_id") int client_id);
@AutoSql(type = SqlType.SELECT)
JSONObject listReportByDate(@Param("report_date") Date date, @Param("client_id") int clientId);
PageList<JSONObject> listClientSettlementLog(JSONObject params, PageBounds pagination); PageList<JSONObject> listClientSettlementLog(JSONObject params, PageBounds pagination);
} }

2
src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillMapper.xml
Unescape View File

@ -5,7 +5,7 @@
<select id="listWithOrderAnalysis" resultType="com.alibaba.fastjson.JSONObject" > <select id="listWithOrderAnalysis" resultType="com.alibaba.fastjson.JSONObject" >
select b.bill_id,b.status,b.currency,DATE_FORMAT(b.create_time,'%Y-%c-%e') create_date, DATE_FORMAT(b.create_time,'%H:%m:%s') create_time,b.remark,b.price,count(o.bill_order_id) order_counts,sum(o.order_total_amount) order_total_amount select b.bill_id,b.status,b.currency,DATE_FORMAT(b.create_time,'%Y-%c-%e') create_date, DATE_FORMAT(b.create_time,'%H:%m:%s') create_time,b.remark,b.price,count(o.bill_order_id) order_counts,sum(o.order_total_amount) order_total_amount
from pmt_bill b left join pmt_bill_order o from pmt_bill b left join pmt_bill_order o
on b.bill_id = o.bill_id and o.order_status &lt; 2 on b.bill_id = o.bill_id and o.order_status = 1
<where> <where>
b.client_id = #{param.client_id} b.client_id = #{param.client_id}
<if test="param.status != null"> <if test="param.status != null">

3
src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
Unescape View File

@ -237,7 +237,8 @@
sum(if(LOCATE('SURCHARGE',t.system_transaction_id),clearing_amount,0)) fee, sum(if(LOCATE('SURCHARGE',t.system_transaction_id),clearing_amount,0)) fee,
(SELECT min(r.rate_value) FROM sys_client_rates r WHERE r.client_id = t.client_id (SELECT min(r.rate_value) FROM sys_client_rates r WHERE r.client_id = t.client_id
AND date(r.expiry_time) >= DATE(t.clearing_time) AND date(r.expiry_time) >= DATE(t.clearing_time)
AND date(r.active_time) <= DATE(t.clearing_time)) rate AND date(r.active_time) <= DATE(t.clearing_time)) rate,
t.clearing_order clear_detail_id
FROM pmt_transactions t FROM pmt_transactions t
WHERE t.channel='Settlement' WHERE t.channel='Settlement'
]]> ]]>

6
src/main/ui/static/analysis/partner_card.js
Unescape View File

@ -358,18 +358,18 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
// clearingDetailService.clientClearingDetail(client_id, clearData, false) // clearingDetailService.clientClearingDetail(client_id, clearData, false)
// }; // };
$scope.getClearingTransactions = function (client_id,clear_date) { $scope.getClearingTransactions = function (client_id,detail_id) {
$uibModal.open({ $uibModal.open({
templateUrl: '/static/analysis/templates/settlement_transactions.html', templateUrl: '/static/analysis/templates/settlement_transactions.html',
controller: 'managerClearingDetailCtrl', controller: 'managerClearingDetailCtrl',
resolve: { resolve: {
detail: ['$http', '$stateParams', function ($http) { detail: ['$http', '$stateParams', function ($http) {
return $http.get('/analysis/partner_card/' + client_id+'/'+clear_date); return $http.get('/analysis/partner_card/' + client_id+'/settlement_logs/'+detail_id);
}] }]
}, },
size: 'lg' size: 'lg'
}); });
} };
$scope.loadLoginLogs = function (page) { $scope.loadLoginLogs = function (page) {
var params = angular.copy($scope.params) || {}; var params = angular.copy($scope.params) || {};

13
src/main/ui/static/commons/services/clearingDetailService.js
Unescape View File

@ -4,7 +4,7 @@
define(['../app'], function (app) { define(['../app'], function (app) {
'use strict'; 'use strict';
app.factory('clearingDetailService', ['$uibModal', function ($uibModal) { app.factory('clearingDetailService', ['$uibModal', function ($uibModal) {
function openDetail(url,is_partner) { function openDetail(url, is_partner) {
$uibModal.open({ $uibModal.open({
templateUrl: '/static/payment/tradelog/templates/partner_settlement_dialog.html', templateUrl: '/static/payment/tradelog/templates/partner_settlement_dialog.html',
controller: 'clearingDetailCtrl', controller: 'clearingDetailCtrl',
@ -12,19 +12,20 @@ define(['../app'], function (app) {
detail: ['$http', function ($http) { detail: ['$http', function ($http) {
return $http.get(url); return $http.get(url);
}], }],
is_partner:is_partner is_partner: is_partner
}, },
size:'lg' size: 'lg'
}) })
} }
return { return {
clientClearingDetail: function (client_id,clearing_data,is_partner) { clientClearingDetail: function (client_id, detailId, is_partner) {
openDetail('/client/clean_logs/' + client_id+'/'+clearing_data,is_partner); openDetail('/client/clean_logs/' + client_id + '/settlement_logs/' + detailId, is_partner);
} }
} }
}]); }]);
app.controller('clearingDetailCtrl', ['$scope','detail','is_partner', function ($scope,detail,is_partner) { app.controller('clearingDetailCtrl', ['$scope', 'detail', 'is_partner', function ($scope, detail, is_partner) {
$scope.ctrl = {channel: null}; $scope.ctrl = {channel: null};
$scope.report = detail.data; $scope.report = detail.data;
$scope.is_partner = is_partner; $scope.is_partner = is_partner;

8
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -147,7 +147,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}] }]
} }
}).state('partners.detail.settlement', { }).state('partners.detail.settlement', {
url: '/settlement/{clientMoniker}', url: '/settlement',
templateUrl: '/static/payment/partner/templates/partner_settlement.html', templateUrl: '/static/payment/partner/templates/partner_settlement.html',
controller: 'partnerSettlementCtrl', controller: 'partnerSettlementCtrl',
resolve: { resolve: {
@ -201,7 +201,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.locations = resp.data; $scope.locations = resp.data;
window.merchant_maps.initMap($scope.locations); window.merchant_maps.initMap($scope.locations);
}); });
} };
$scope.today = new Date(); $scope.today = new Date();
$scope.listBDUsers = function () { $scope.listBDUsers = function () {
@ -2448,13 +2448,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.pagination = resp.data.pagination; $scope.pagination = resp.data.pagination;
}); });
}; };
$scope.getClearingTransactions = function (client_id, clear_date) { $scope.getClearingTransactions = function (client_id, detail_id) {
$uibModal.open({ $uibModal.open({
templateUrl: '/static/analysis/templates/settlement_transactions.html', templateUrl: '/static/analysis/templates/settlement_transactions.html',
controller: 'managerClearingDetailCtrl', controller: 'managerClearingDetailCtrl',
resolve: { resolve: {
detail: ['$http', '$stateParams', function ($http) { detail: ['$http', '$stateParams', function ($http) {
return $http.get('/analysis/partner_card/' + client_id + '/' + clear_date); return $http.get('/analysis/partner_card/' + client_id + '/settlement_logs/' + detail_id);
}] }]
}, },
size: 'lg' size: 'lg'

2
src/main/ui/static/payment/partner/templates/partner_settlement.html
Unescape View File

@ -84,7 +84,7 @@
<td> <td>
<a role="button" class="text-bold" <a role="button" class="text-bold"
ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'"
ng-click="getClearingTransactions(log.client_id,(log.clearing_time|limitTo:10))" ng-click="getClearingTransactions(log.client_id,log.clear_detail_id)"
title="Detail"> title="Detail">
<i class="fa fa-list-alt"></i> <i class="fa fa-list-alt"></i>
</a> </a>

8
src/main/ui/static/payment/tradelog/partner-settlement-log.js
Unescape View File

@ -12,7 +12,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
controller: 'partnerSettlementLogCtrl' controller: 'partnerSettlementLogCtrl'
}) })
}]); }]);
app.controller('partnerSettlementLogCtrl', ['$scope','clearingDetailService','$http', '$filter','$sce', function ($scope,clearingDetailService, $http, $filter,$sce) { app.controller('partnerSettlementLogCtrl', ['$scope', 'clearingDetailService', '$http', '$filter', '$sce', function ($scope, clearingDetailService, $http, $filter, $sce) {
$scope.params = {}; $scope.params = {};
$scope.pagination = {}; $scope.pagination = {};
$scope.htmlTooltip = $sce.trustAsHtml('<div style="text-align: left;width:350px">' + $scope.htmlTooltip = $sce.trustAsHtml('<div style="text-align: left;width:350px">' +
@ -90,7 +90,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}); });
}; };
$scope.loadSettlementLogs(1); $scope.loadSettlementLogs(1);
var getClientUnClearedAmount = function () { var getClientUnClearedAmount = function () {
$http.get('/client/trans_flow/settlement/unclear').then(function (resp) { $http.get('/client/trans_flow/settlement/unclear').then(function (resp) {
$scope.unclear = resp.data; $scope.unclear = resp.data;
@ -111,8 +111,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.loadSettlementLogs(); $scope.loadSettlementLogs();
}; };
$scope.getClearingTransactions = function (client_id,clearData) { $scope.getClearingTransactions = function (client_id, detailId) {
clearingDetailService.clientClearingDetail(client_id,clearData,true) clearingDetailService.clientClearingDetail(client_id, detailId, true)
} }
}]); }]);
return app; return app;

4
src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
Unescape View File

@ -126,10 +126,10 @@
<td ng-bind="log.fee"></td> <td ng-bind="log.fee"></td>
<!--<td ng-bind="log.rate"></td>--> <!--<td ng-bind="log.rate"></td>-->
<td> <td>
<a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,(log.clearing_time|limitTo:10))" title="Detail"> <a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,log.clear_detail_id)" title="Detail">
<i class="fa fa-list-alt"></i> <i class="fa fa-list-alt"></i>
</a> </a>
<a ng-href="/client/clean_logs/{{currentUser.client.client_id}}/{{log.clearing_time|limitTo:10}}/export" target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" href="/client/clean_logs/{{currentUser.client.client_id}}/{{log.clearing_time|limitTo:10}}/export" title="Download"> <a ng-href="/client/clean_logs/{{currentUser.client.client_id}}/settlement_logs/{{log.clear_detail_id}}/export" target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" title="Download">
<i class="fa fa-download"></i> <i class="fa fa-download"></i>
</a> </a>
</td> </td>

Write Preview
Loading…
Cancel
Save