diff --git a/pom.xml b/pom.xml index 9b00b9c2a..b56a3a2be 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.1 + 1.2.3 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java index 9fadea1d5..7780b2e72 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java @@ -198,7 +198,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService { List bdSaleList = bdAnalysisMapper.getOneDayBDSaleList(params); if (bdSaleList.size() != 0) { 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){ JSONObject object = new JSONObject(item); object.put("log_id", UUID.randomUUID().toString()); @@ -216,7 +216,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService { List orgSaleList= transactionAnalysisMapper.getOneDayOrgMerchantSaleList(params); if (orgSaleList.size() != 0) { 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){ JSONObject object = new JSONObject(item); object.put("log_id", UUID.randomUUID().toString()); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java index 35b7c4693..8c268d83c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java @@ -22,7 +22,7 @@ public interface StatisticsBDSalesReportMapper { List 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) void update(JSONObject existBDSalesReport); diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java index 912a76170..19b29415f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java @@ -792,6 +792,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo ctx.setVariable("order_type", event.getIntValue("order_type")); ctx.setVariable("bdNamesStr", bdNamesStr); 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("client", client); ctx.setVariable("uploadUrl", uploadUrl); diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 5dd530b90..5b08eaac6 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml @@ -1044,10 +1044,10 @@ AND org.org_id = #{org_id} - AND trans.create_time >= #{begin} + AND trans.transaction_time >= #{begin} - AND trans.create_time < #{end} + AND trans.transaction_time < #{end} diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml index f92f48fae..62c910a28 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml @@ -79,7 +79,10 @@ create_time, clearing_amount 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} + AND bd_id = #{bd_id} \ No newline at end of file diff --git a/src/main/resources/templates/mail/risk_urge_mail.html b/src/main/resources/templates/mail/risk_urge_mail.html index 482cb7858..f20084d1d 100644 --- a/src/main/resources/templates/mail/risk_urge_mail.html +++ b/src/main/resources/templates/mail/risk_urge_mail.html @@ -1,7 +1,13 @@ Dear RoyalPay Merchant/BD : -

您好，您的风控材料— 【】提交期限即将于到期，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。

-

Your deadline for submission of risk materials for 【】 is about to expire by , 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.

+

您好，您的风控材料— 【】 + 已逾期 + 提交期限即将于到期 + ，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。

+

Your deadline for submission of risk materials for 【】 + has expired + is about to expire by + , 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.

Best Regards

Email:
info@royalpay.com.au
- Tel:
+ Tel:
与调查交易金额对应的购物小票/发票存根照片 要求：照片应清晰 1300 10 77 50

Service WeChat Account:
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 97aaaeb7a..80fd87ec4 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -121,12 +121,12 @@ margin-bottom: 10%;"/> ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">

- + - + @@ -664,11 +664,11 @@ margin-bottom: 10%;"/> - + - + - - - + + + - - - + + +

  • diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index af3a2fca3..34e7532e2 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -107,7 +107,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], templateUrl: '/static/analysis/templates/risk_business_bd.html', cache: false, controller: 'riskBusinessCtrl' - }).state('analysis_monitoring.riskEvent_detail', { + }).state('analysis_monitoring.risk_business.riskEvent_detail', { url: '/{risk_id}/detail', templateUrl: '/static/analysis/templates/riskEvent_detail.html', controller: 'riskEventDetailCtrl', @@ -116,6 +116,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], 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', { url: '/{risk_id}/bd/detail', templateUrl: '/static/analysis/templates/riskEvent_detail_bd.html', @@ -129,10 +133,6 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], url: '/new_riskEvent', templateUrl: '/static/analysis/templates/new_riskEvent.html', 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('未知行业'); + $scope.$watch('params',function (newVal) { + console.log('params changed--->',newVal) + }); + console.log('riskBusinessCtrl loaded') // console.log(industries); // 加载风险注册事件 $scope.loadRiskEvents = function (page) { @@ -423,7 +427,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], content: 'Update riskEvent successfully', type: 'success' }); - $state.reload('analysis_monitoring.riskEvent_detail'); + $state.reload('analysis_monitoring.risk_business.riskEvent_detail'); }, function (resp) { commonDialog.alert({ title: 'Error', @@ -451,7 +455,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], content: 'Are you sure?' }).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) { commonDialog.alert({ title: 'Failed to change ' + channel + ' channel permission status', @@ -470,7 +474,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], content: 'Are you sure?' }).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) { commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); }) @@ -738,20 +742,20 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], $scope.increase = function ($index) { $scope.materials.splice($index + 1, 0, - {key: new Date().getTime(), value: ""}); // 用时间戳作为每个item的key - // 增加新的input后允许删除 + {key: new Date().getTime(), value: ""}); // 用时间戳作为每个item的key + // 增加新的input后允许删除 $scope.canMinus = true; }; $scope.decrease = function($index) { // 如果input大于1，删除 - if ($scope.materials.length > 1) { - $scope.materials.splice($index, 1); - } - // 如果回复数为1，不允许删除 - if ($scope.materials.length == 1) { - $scope.canMinus = false; - } + if ($scope.materials.length > 1) { + $scope.materials.splice($index, 1); + } + // 如果回复数为1，不允许删除 + if ($scope.materials.length == 1) { + $scope.canMinus = false; + } }; var array=new Array(); var validIndex = 0; diff --git a/src/main/ui/static/analysis/templates/audit_material.html b/src/main/ui/static/analysis/templates/audit_material.html index 2215d25dd..f070b8f28 100644 --- a/src/main/ui/static/analysis/templates/audit_material.html +++ b/src/main/ui/static/analysis/templates/audit_material.html @@ -83,8 +83,8 @@

    - 返回 diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index 72a762d17..56cc960e9 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -18,10 +18,10 @@
    @@ -464,11 +465,11 @@
    @@ -607,17 +608,17 @@