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

Merge branch 'develop'

Browse Source 
# Conflicts:
#	pom.xml
master
duLingLing 7 years ago
parent 1225633ce2 585c9d5dcd
commit b4c0724b3d
13 changed files with 150 additions and 135 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.2.1</version> <version>1.2.3</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

4
src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java
Unescape View File

@ -198,7 +198,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
List<JSONObject> bdSaleList = bdAnalysisMapper.getOneDayBDSaleList(params); List<JSONObject> bdSaleList = bdAnalysisMapper.getOneDayBDSaleList(params);
if (bdSaleList.size() != 0) { if (bdSaleList.size() != 0) {
for (JSONObject item : bdSaleList) { for (JSONObject item : bdSaleList) {
JSONObject existBDSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime,0); JSONObject existBDSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("org_id"),item.getString("bd_id"),beginTime,0);
if(existBDSalesReport==null){ if(existBDSalesReport==null){
JSONObject object = new JSONObject(item); JSONObject object = new JSONObject(item);
object.put("log_id", UUID.randomUUID().toString()); object.put("log_id", UUID.randomUUID().toString());
@ -216,7 +216,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
List<JSONObject> orgSaleList= transactionAnalysisMapper.getOneDayOrgMerchantSaleList(params); List<JSONObject> orgSaleList= transactionAnalysisMapper.getOneDayOrgMerchantSaleList(params);
if (orgSaleList.size() != 0) { if (orgSaleList.size() != 0) {
for (JSONObject item : orgSaleList) { for (JSONObject item : orgSaleList) {
JSONObject existOrgSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime,1); JSONObject existOrgSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("org_id"),item.getString("bd_id"),beginTime,1);
if(existOrgSalesReport==null){ if(existOrgSalesReport==null){
JSONObject object = new JSONObject(item); JSONObject object = new JSONObject(item);
object.put("log_id", UUID.randomUUID().toString()); object.put("log_id", UUID.randomUUID().toString());

2
src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java
Unescape View File

@ -22,7 +22,7 @@ public interface StatisticsBDSalesReportMapper {
List<JSONObject> getPartnerAmountList(JSONObject params); List<JSONObject> getPartnerAmountList(JSONObject params);
JSONObject findByBDIdAndLogDate(@Param("bd_id") String bd_id, @Param("log_date")Date beginTime,@Param("isOrg") int isOrg); JSONObject findByBDIdAndLogDate(@Param("org_id") String org_id,@Param("bd_id") String bd_id, @Param("log_date")Date beginTime,@Param("isOrg") int isOrg);
@AutoSql(type = SqlType.UPDATE) @AutoSql(type = SqlType.UPDATE)
void update(JSONObject existBDSalesReport); void update(JSONObject existBDSalesReport);

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

@ -792,6 +792,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
ctx.setVariable("order_type", event.getIntValue("order_type")); ctx.setVariable("order_type", event.getIntValue("order_type"));
ctx.setVariable("bdNamesStr", bdNamesStr); ctx.setVariable("bdNamesStr", bdNamesStr);
ctx.setVariable("reply_date", reply_date); ctx.setVariable("reply_date", reply_date);
ctx.setVariable("is_resend",new Date().compareTo(event.getDate("reply_email_date")) < 0);
ctx.setVariable("reply_date_english", reply_date_english); ctx.setVariable("reply_date_english", reply_date_english);
ctx.setVariable("client", client); ctx.setVariable("client", client);
ctx.setVariable("uploadUrl", uploadUrl); ctx.setVariable("uploadUrl", uploadUrl);

4
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
Unescape View File

@ -1044,10 +1044,10 @@
AND org.org_id = #{org_id} AND org.org_id = #{org_id}
</if> </if>
<if test="begin != null"> <if test="begin != null">
AND trans.create_time &gt;= #{begin} AND trans.transaction_time &gt;= #{begin}
</if> </if>
<if test="end != null"> <if test="end != null">
AND trans.create_time &lt; #{end} AND trans.transaction_time &lt; #{end}
</if> </if>

5
src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml
Unescape View File

@ -79,7 +79,10 @@
create_time, create_time,
clearing_amount clearing_amount
FROM statistics_bd_sales FROM statistics_bd_sales
WHERE bd_id = #{bd_id} AND log_date = #{log_date} AND isOrg = #{isOrg} WHERE org_id = #{org_id}
AND log_date = #{log_date}
AND isOrg = #{isOrg}
<if test="bd_id != null"> AND bd_id = #{bd_id}</if>
</select> </select>
</mapper> </mapper>

12
src/main/resources/templates/mail/risk_urge_mail.html
Unescape View File

@ -1,7 +1,13 @@
<html xmlns:th="http://www.thymeleaf.org" lang="zh"> <html xmlns:th="http://www.thymeleaf.org" lang="zh">
<b>Dear RoyalPay Merchant/BD :</b> <b>Dear RoyalPay Merchant/BD :</b>
<p>您好，您的风控材料—<span th:text="${client.company_name}"></span> 【<span th:text="${client.client_moniker}"></span>】提交期限即将于<span style="background: #FCE824" th:text="${reply_date}"></span>到期，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。</p> <p>您好，您的风控材料—<span th:text="${client.company_name}"></span> 【<span th:text="${client.client_moniker}"></span>】
<p>Your deadline for submission of risk materials for <span th:text="${client.company_name}"></span>【<span th:text="${client.client_moniker}"></span>】 is about to expire by <span th:text="${reply_date_english}" style="background: #FCE824"></span>, please submit the risk materials in time.If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.</p> <span th:text="${!client.is_resend}">已逾期</span>
<span th:text="${client.is_resend}">提交期限即将于<span style="background: #FCE824" th:text="${reply_date}"></span>到期</span>
，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。</p>
<p>Your deadline for submission of risk materials for <span th:text="${client.company_name}"></span>【<span th:text="${client.client_moniker}"></span>】
<span th:text="${!client.is_resend}">has expired</span>
<span th:text="${client.is_resend}">is about to expire by <span th:text="${reply_date_english}" style="background: #FCE824"></span></span>
, please submit the risk materials in time.If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.</p>
<h4>Best Regards</h4> <h4>Best Regards</h4>
<p> <p>
<img style="width: 120px;height: 120px" <img style="width: 120px;height: 120px"
@ -9,7 +15,7 @@
Contact Us<br> Contact Us<br>
Email:<br> Email:<br>
<a href="mailto:info@royalpay.com.au">info@royalpay.com.au</a> <br> <a href="mailto:info@royalpay.com.au">info@royalpay.com.au</a> <br>
Tel:<br> Tel:<br>与调查交易金额对应的购物小票/发票存根照片 要求：照片应清晰
1300 10 77 50<br> 1300 10 77 50<br>
<br> <br>
Service WeChat Account:<br> Service WeChat Account:<br>

8
src/main/ui/manage.html
Unescape View File

@ -180,9 +180,9 @@ margin-bottom: 10%;"/>
<span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span> <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<!-- <!--
<li class="header">System notifications,please resolve it!</li> <li class="header">System notifications,please resolve it!</li>
--> -->
<li> <li>
<!--inner menu: contains the actual data--> <!--inner menu: contains the actual data-->
<div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;"> <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
@ -203,9 +203,9 @@ margin-bottom: 10%;"/>
</ul> </ul>
</li> </li>
<!-- <!--
User Account: style can be found in dropdown.less User Account: style can be found in dropdown.less
--> -->
<li class="dropdown user user-menu" uib-dropdown> <li class="dropdown user user-menu" uib-dropdown>
<a href class="dropdown-toggle" uib-dropdown-toggle> <a href class="dropdown-toggle" uib-dropdown-toggle>
<img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"

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

@ -107,7 +107,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
templateUrl: '/static/analysis/templates/risk_business_bd.html', templateUrl: '/static/analysis/templates/risk_business_bd.html',
cache: false, cache: false,
controller: 'riskBusinessCtrl' controller: 'riskBusinessCtrl'
}).state('analysis_monitoring.riskEvent_detail', { }).state('analysis_monitoring.risk_business.riskEvent_detail', {
url: '/{risk_id}/detail', url: '/{risk_id}/detail',
templateUrl: '/static/analysis/templates/riskEvent_detail.html', templateUrl: '/static/analysis/templates/riskEvent_detail.html',
controller: 'riskEventDetailCtrl', controller: 'riskEventDetailCtrl',
@ -116,6 +116,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
return $http.get('/risk/business/events/' + $stateParams.risk_id); return $http.get('/risk/business/events/' + $stateParams.risk_id);
}] }]
} }
}).state('analysis_monitoring.risk_business.riskEvent_detail.audit_material', {
url: '/audit_material',
templateUrl: '/static/analysis/templates/audit_material.html',
controller: 'auditMaterialCtrl'
}).state('analysis_monitoring.riskEvent_detail_bd', { }).state('analysis_monitoring.riskEvent_detail_bd', {
url: '/{risk_id}/bd/detail', url: '/{risk_id}/bd/detail',
templateUrl: '/static/analysis/templates/riskEvent_detail_bd.html', templateUrl: '/static/analysis/templates/riskEvent_detail_bd.html',
@ -129,10 +133,6 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
url: '/new_riskEvent', url: '/new_riskEvent',
templateUrl: '/static/analysis/templates/new_riskEvent.html', templateUrl: '/static/analysis/templates/new_riskEvent.html',
controller: 'newRiskEventCtrl' controller: 'newRiskEventCtrl'
}).state('analysis_monitoring.riskEvent_detail.audit_material', {
url: '/audit_material',
templateUrl: '/static/analysis/templates/audit_material.html',
controller: 'auditMaterialCtrl'
}); });
}]); }]);
@ -153,6 +153,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
industries.push(industry.label); industries.push(industry.label);
}); });
industries.push('未知行业'); industries.push('未知行业');
$scope.$watch('params',function (newVal) {
console.log('params changed--->',newVal)
});
console.log('riskBusinessCtrl loaded')
// console.log(industries); // console.log(industries);
// 加载风险注册事件 // 加载风险注册事件
$scope.loadRiskEvents = function (page) { $scope.loadRiskEvents = function (page) {
@ -423,7 +427,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
content: 'Update riskEvent successfully', content: 'Update riskEvent successfully',
type: 'success' type: 'success'
}); });
$state.reload('analysis_monitoring.riskEvent_detail'); $state.reload('analysis_monitoring.risk_business.riskEvent_detail');
}, function (resp) { }, function (resp) {
commonDialog.alert({ commonDialog.alert({
title: 'Error', title: 'Error',
@ -451,7 +455,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
content: 'Are you sure?' content: 'Are you sure?'
}).then(function () { }).then(function () {
$http.put('/risk/business/channel/' + channel + '/permission/' + channelFlag, $scope.riskEvent).then(function () { $http.put('/risk/business/channel/' + channel + '/permission/' + channelFlag, $scope.riskEvent).then(function () {
$state.reload('analysis_monitoring.riskEvent_detail'); $state.reload('analysis_monitoring.risk_business.riskEvent_detail');
}, function (resp) { }, function (resp) {
commonDialog.alert({ commonDialog.alert({
title: 'Failed to change ' + channel + ' channel permission status', title: 'Failed to change ' + channel + ' channel permission status',
@ -470,7 +474,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
content: 'Are you sure?' content: 'Are you sure?'
}).then(function () { }).then(function () {
$http.put('/risk/business/partner/' + isValid, $scope.riskEvent).then(function () { $http.put('/risk/business/partner/' + isValid, $scope.riskEvent).then(function () {
$state.reload('analysis_monitoring.riskEvent_detail'); $state.reload('analysis_monitoring.risk_business.riskEvent_detail');
}, function (resp) { }, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
}) })

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

@ -83,8 +83,8 @@
</form> </form>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<a role="button" <a role="button" id="test-btn"
ui-sref="analysis_monitoring.risk_business" ui-sref="^.^"
class="btn btn-info">返回 class="btn btn-info">返回
</a> </a>

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

@ -18,10 +18,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" ui-sref-opts="{reload:true}">Risk Detail</a> <a ui-sref="analysis_monitoring.risk_business.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" ui-sref-opts="{reload:true}">Audit material</a> <a ui-sref=".audit_material">Audit material</a>
</li> </li>
<li> <li>
<div class="btn-group pull-right" role="group" aria-label="..." ng-if="('10000000000'|withRole) && (riskEvent.result_type==1 || riskEvent.result_type==4)"> <div class="btn-group pull-right" role="group" aria-label="..." ng-if="('10000000000'|withRole) && (riskEvent.result_type==1 || riskEvent.result_type==4)">
@ -367,6 +367,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<p ng-if="tradeLogs.length != 0" style="text-align: center;margin: 5px 9px">共计<span>{{tradeLogs.length}}</span>条</p>
</div> </div>
</div> </div>

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

@ -265,7 +265,7 @@
<a class="text-primary" <a class="text-primary"
role="button" role="button"
title="Detail" title="Detail"
ui-sref="analysis_monitoring.riskEvent_detail({risk_id:riskEvent.risk_id})"> ui-sref="analysis_monitoring.risk_business.riskEvent_detail({risk_id:riskEvent.risk_id})">
<i class="fa fa-search"></i> Detail <i class="fa fa-search"></i> Detail
</a> </a>
</td> </td>

2
src/main/ui/static/analysis/templates/risk_business_bd.html
Unescape View File

@ -152,7 +152,7 @@
<a class="text-primary" <a class="text-primary"
role="button" role="button"
title="Detail" title="Detail"
ui-sref="analysis_monitoring.riskEvent_detail_bd({risk_id:riskEvent.risk_id})"> ui-sref="analysis_monitoring.risk_business.riskEvent_detail_bd({risk_id:riskEvent.risk_id})">
<i class="fa fa-search"></i> Detail <i class="fa fa-search"></i> Detail
</a> </a>
</td> </td>

Write Preview
Loading…
Cancel
Save