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

Merge remote-tracking branch 'origin/develop_risk' into develop_risk

Browse Source
master
james.zhao 6 years ago
parent 6ec6235ce0 2efd7a04a7
commit 76d20b07a0
4 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java
Unescape View File

@ -41,6 +41,8 @@ public class RiskEventQuery {
// 邮件回复截止日期 // 邮件回复截止日期
private String replyEmailDate; private String replyEmailDate;
private Integer page = 1;
public Integer getOrderType() { public Integer getOrderType() {
return orderType; return orderType;
} }
@ -113,6 +115,14 @@ public class RiskEventQuery {
this.replyEmailDate = replyEmailDate; this.replyEmailDate = replyEmailDate;
} }
public Integer getPage() {
return page;
}
public void setPage(Integer page) {
this.page = page;
}
public JSONObject toJSON() { public JSONObject toJSON() {
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
@ -154,6 +164,10 @@ public class RiskEventQuery {
params.put("reply_email_date", replyEmailDate); params.put("reply_email_date", replyEmailDate);
} }
if (page != null && page > 0) {
params.put("page", page);
}
return params; return params;
} }
} }

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

@ -87,7 +87,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
@Override @Override
public JSONObject getRiskEventsByPage(JSONObject params) { public JSONObject getRiskEventsByPage(JSONObject params) {
PageList<JSONObject> riskEvents = riskEventMapper.listRisksByPage(params, new PageBounds(1, 10, Order.formString("create_time.desc"))); PageList<JSONObject> riskEvents = riskEventMapper.listRisksByPage(params, new PageBounds(params.getInteger("page"), 10, Order.formString("create_time.desc")));
return PageListUtils.buildPageListResult(riskEvents); return PageListUtils.buildPageListResult(riskEvents);
} }

15
src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java
Unescape View File

@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.merchants.core.ClientManager;
import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
import au.com.royalpay.payment.manage.riskbusiness.bean.RiskEventQuery; import au.com.royalpay.payment.manage.riskbusiness.bean.RiskEventQuery;
import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum;
import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -99,6 +100,9 @@ public class RiskBusinessController {
@PathVariable("channel") String channel, @PathVariable("channel") String channel,
@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
clientManager.switchChannelPermission(manager, params.getString("client_moniker"), channel, channelFlag); clientManager.switchChannelPermission(manager, params.getString("client_moniker"), channel, channelFlag);
if (channelFlag)
params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType());
riskBusinessService.updateRiskEvent(params); riskBusinessService.updateRiskEvent(params);
} }
@ -107,10 +111,17 @@ public class RiskBusinessController {
@PathVariable("isValid") Boolean isValid, @PathVariable("isValid") Boolean isValid,
@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
String clientMoniker = params.getString("client_moniker"); String clientMoniker = params.getString("client_moniker");
if (isValid) if (isValid) {
clientManager.disableClient(clientMoniker, manager); clientManager.disableClient(clientMoniker, manager);
else Integer temporaryCloseMerchant = params.getInteger("temporary_close_merchant");
if (temporaryCloseMerchant != 1) {
params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType());
}
}
else {
clientManager.revertClient(clientMoniker, manager); clientManager.revertClient(clientMoniker, manager);
params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType());
}
riskBusinessService.updateRiskEvent(params); riskBusinessService.updateRiskEvent(params);
} }

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

@ -8,10 +8,10 @@
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li ui-sref-active-eq="active"> <li ui-sref-active-eq="active">
<a ui-sref="analysis_monitoring.riskEvent_detail">Risk Detail</a> <a ui-sref="analysis_monitoring.riskEvent_detail" ui-sref-opts="{reload:true}">Risk Detail</a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref=".audit_material">Audit material</a> <a ui-sref=".audit_material" ui-sref-opts="{reload:true}">Audit material</a>
</li> </li>
</ul> </ul>
<div class="tab-content" ui-view> <div class="tab-content" ui-view>
@ -50,8 +50,9 @@
<div class="form-group" ng-if="riskEvent.order_type == 1 || riskEvent.order_type == 5"> <div class="form-group" ng-if="riskEvent.order_type == 1 || riskEvent.order_type == 5">
<label class="control-label col-sm-2">Sub Merchant ID</label> <label class="control-label col-sm-2">Sub Merchant ID</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" <p class="form-control-static">
ng-bind="clientInfo.sub_merchant_id"></p> {{clientInfo.sub_merchant_id || riskEvent.sub_merchant_id}}
</p>
</div> </div>
</div> </div>
@ -223,9 +224,9 @@
</span> </span>
<span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span> <span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span>
</td> </td>
<td ng-bind="trade.status | tradeStatus"></td> <td ng-bind="trade.status"></td>
<td ng-bind="trade.create_time"></td> <td ng-bind="trade.create_time"></td>
<td ng-bind="trade.gateway | tradeGateway"></td> <td ng-bind="trade.gateway"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -233,7 +234,7 @@
</div> </div>
<a role="button" <a role="button"
ng-if="riskEvent.order_type <= 1" ng-if="riskEvent.result_type <= 1"
class="btn btn-info" class="btn btn-info"
ng-click="resendUploadEmail()">Send Email {{riskEvent.result_type == 1 ? 'again' : ''}} ng-click="resendUploadEmail()">Send Email {{riskEvent.result_type == 1 ? 'again' : ''}}
</a> </a>
@ -258,6 +259,31 @@
<div class="panel-heading">RiskEvent Basic Information</div> <div class="panel-heading">RiskEvent Basic Information</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"
ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
<label class="control-label col-sm-2"
for="order-type-input">Order Type
</label>
<div class="col-sm-8">
<select class="form-control"
name="order_type"
disabled
ng-model="riskEventEdit.order_type"
id="order-type-input"
required
ng-options="key as value for (key, value) in orderTypes">
<option value="">Please Choose</option>
</select>
<div ng-messages="riskEventForm.order_type.$error"
ng-if="riskEventForm.order_type.$dirty">
<p class="small text-danger"
ng-message="required">required field
</p>
</div>
</div>
</div>
<div class="form-group" <div class="form-group"
ng-if="riskEventEdit.order_type != 5" ng-if="riskEventEdit.order_type != 5"
ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}"> ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
@ -289,30 +315,6 @@
</div> </div>
</div> </div>
<div class="form-group"
ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
<label class="control-label col-sm-2"
for="order-type-input">Order Type
</label>
<div class="col-sm-8">
<select class="form-control"
name="order_type"
ng-model="riskEventEdit.order_type"
id="order-type-input"
required
ng-options="key as value for (key, value) in orderTypes">
<option value="">Please Choose</option>
</select>
<div ng-messages="riskEventForm.order_type.$error"
ng-if="riskEventForm.order_type.$dirty">
<p class="small text-danger"
ng-message="required">required field
</p>
</div>
</div>
</div>
<div class="form-group" <div class="form-group"
ng-if="riskEventEdit.order_type != 4" ng-if="riskEventEdit.order_type != 4"
ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}"> ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">

Write Preview
Loading…
Cancel
Save