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

[fix]风控需求修改

Browse Source
master
lujian 6 years ago
parent eae6ff652d
commit 285a436a91
7 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
Unescape View File

@ -204,14 +204,17 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
for (int i = 0; i < orderIdArray.length; i++) {
JSONObject orderInfo = orderMapper.findOrderById(orderIdArray[i],client.getIntValue("client_id"));
// 判断该笔订单是否存在，是否属于该商户
// 由于查询订单时已经关联商户了，所以只会抛出订单不匹配的异常
if (orderInfo == null)
throw new OrderNotExistsException();
throw new OrderNotMatchException();
/*
else {
if (!clientMoniker.equals(orderInfo.getString("partner_code"))) {
if (!clientMoniker.equals(orderInfo.getString("client_moniker"))) {
throw new OrderNotMatchException();
}
orderAmountList.add(orderInfo.getString("total_amount"));
}
*/
}
params.put("order_amounts", StringUtils.join(orderAmountList, ","));
}
@ -444,6 +447,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
ctx.setVariable("uploadUrl", uploadUrl);
ctx.setVariable("royalpay_order_type", event.getIntValue("royalpay_order_type"));
ctx.setVariable("warning_order_type", event.getIntValue("warning_order_type"));
ctx.setVariable("description", event.getString("description"));
String[] orderIds = event.getString("order_ids").split(",");
List<JSONObject> orders = new ArrayList();
switch (event.getIntValue("order_type")){

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

@ -750,6 +750,7 @@
<select id="findOrderById" resultType="com.alibaba.fastjson.JSONObject">
SELECT
o.order_id order_id,
t.system_transaction_id,
o.currency,
o.channel,
o.create_time,
@ -808,7 +809,7 @@
WHEN 14
THEN '账单链接'
END AS gateway,
p.client_moniker partner_code,
p.client_moniker client_moniker,
p.short_name partner_name,
format(t.clearing_amount,2) clearing_amount
FROM pmt_orders o

1
src/main/resources/templates/mail/risk_upload_mail.html
Unescape View File

@ -35,6 +35,7 @@
</tr>
</tbody>
</table>
<p th:if="${description != null}">2、<span th:text="${description}"></span></p>
<p>如果提交的材料不齐， 则有关停支付的风险。<!--还请按时提供商户材料并直接回复该邮件， -->感谢，辛苦。</p>
<!--<p>请点击此链接上传所需材料<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a></p>-->
<p><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>

9
src/main/ui/static/analysis/risk_business.js
Unescape View File

@ -161,8 +161,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
}
]);
app.controller('riskEventDetailCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'Upload', 'commonDialog', 'riskEvent',
function ($scope, $state, $http, $uibModal, $filter, Upload, commonDialog, riskEvent) {
app.controller('riskEventDetailCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'Upload', 'commonDialog', 'riskEvent', 'orderService',
function ($scope, $state, $http, $uibModal, $filter, Upload, commonDialog, riskEvent, orderService) {
$scope.orderTypes = orderTypesMap;
$scope.resultTypes = resultTypesMap;
@ -279,6 +279,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
})
};
// 发送email
$scope.resendUploadEmail = function () {
commonDialog.confirm({
title: 'Warning',
@ -295,6 +296,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
})
};
// 订单详情
$scope.showTradeDetail = function (order) {
orderService.managerOrderDetail(order)
};
// 以下为BD上传材料相关
$scope.material={};

8
src/main/ui/static/analysis/templates/new_riskEvent.html
Unescape View File

@ -158,15 +158,17 @@
ng-if="riskEvent.order_type != 4"
ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
<label class="control-label col-sm-2"
for="order-ids-input">Order IDs</label>
for="order-ids-input">Platform Transaction IDs</label>
<div class="col-sm-8">
<input class="form-control"
<textarea class="form-control"
ng-model="riskEvent.order_ids"
type="text"
rows="2"
name="order_ids"
id="order-ids-input"
placeholder="order id1,order id2,order id3..."
placeholder="多个id请用半角逗号 ',' 隔开"
required>
</textarea>
<div ng-messages="riskEventForm.order_ids.$error"
ng-if="riskEventForm.order_ids.$dirty">
<p class="small text-danger"

22
src/main/ui/static/analysis/templates/riskEvent_detail.html
Unescape View File

@ -53,7 +53,7 @@
</div>
<div class="form-group" ng-if="riskEvent.order_ids != null">
<label class="control-label col-sm-2">Order IDs</label>
<label class="control-label col-sm-2">Platform Transaction IDs</label>
<div class="col-sm-10">
<p class="form-control-static"
ng-bind="riskEvent.order_ids">
@ -227,8 +227,8 @@
<thead>
<tr>
<th>Partner</th>
<th>Order ID</th>
<th>Platform Transaction ID</th>
<th>Order ID</th>
<th>Order Description</th>
<th>Customer ID</th>
<th>IP</th>
@ -247,8 +247,8 @@
<tbody>
<tr ng-repeat="trade in tradeLogs">
<td>{{trade.client.short_name}}({{trade.client.client_moniker}})</td>
<td>{{trade.order_id}}</td>
<td>{{trade.system_transaction_id}}</td>
<td>{{trade.order_id}}</td>
<td>{{trade.order_description}}</td>
<td>{{trade.customer_id}}</td>
<td>{{trade.customer_ip}}</td>
@ -267,6 +267,7 @@
<table class="table table-bordered table-hover table-striped" ng-if="riskEvent.order_type != 3">
<thead>
<tr>
<th>Platform Transaction ID</th>
<th>Order ID</th>
<th>Amount</th>
<th>Input Amount</th>
@ -275,24 +276,31 @@
<th>Status</th>
<th>Create Time</th>
<th>Gateway</th>
<th>Operation</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="trade in tradeLogs"
ng-class="{warning:trade.clearing_status==2}">
<td>{{trade.system_transaction_id}}</td>
<td>{{trade.order_id}}</td>
<td>{{trade.currency}} {{trade.total_amount}}</td>
<td>{{trade.currency}} {{trade.display_amount}}</td>
<td>AUD {{trade.clearing_amount}}</td>
<td>
<span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')"
ng-bind="trade.exchange_rate">
</span>
<span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')"
ng-bind="trade.exchange_rate">
</span>
<span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span>
</td>
<td ng-bind="trade.status"></td>
<td ng-bind="trade.create_time"></td>
<td ng-bind="trade.gateway"></td>
<td>
<a role="button" class="text-bold" ng-click="showTradeDetail(trade)" title="Detail">
<i class="fa fa-list-alt"></i>
</a>
</td>
</tr>
</tbody>
</table>
@ -389,7 +397,7 @@
ng-if="riskEventEdit.order_type != 4"
ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
<label class="control-label col-sm-2"
for="order-ids-input">Order IDs
for="order-ids-input">Platform Transaction IDs
</label>
<div class="col-sm-8">
<input class="form-control"

4
src/main/ui/static/analysis/templates/risk_business.html
Unescape View File

@ -56,10 +56,10 @@
</div>
</div>
<!--Order IDs-->
<!--Platform Transaction IDs-->
<div class="form-group col-sm-6">
<label class="control-label col-xs-4 col-sm-4"
for="order-ids-input">Order IDs
for="order-ids-input">Platform Transaction IDs
</label>
<div class="col-xs-6">
<input class="form-control"

Write Preview
Loading…
Cancel
Save