add 商户端新增kyc相关接口,商户端新增确认弹框

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -15,6 +15,8 @@ import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
 import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientKycFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientUpdateInfo;
+import au.com.royalpay.payment.manage.merchants.core.ClientManager;
+import au.com.royalpay.payment.manage.permission.manager.PartnerMapping;
 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.RiskUploadService;
@@ -30,6 +32,7 @@ import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 import au.com.royalpay.payment.tools.merchants.beans.QRCodeConfig;
+import au.com.royalpay.payment.tools.permission.enums.PartnerRole;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.time.DateUtils;
@@ -85,6 +88,9 @@ public class RetailAppController {
     @Resource
     private ClientAccountMapper clientAccountMapper;
 
+    @Resource
+    private ClientManager clientManager;
+
 
     @Autowired
     private RiskBusinessService riskBusinessService;
@@ -686,6 +692,7 @@ public class RetailAppController {
     public JSONObject getRiskEventMaterialsRemark(@PathVariable("risk_id") String riskId) {
         return riskBusinessService.getRiskEventMaterialsRemark(riskId);
     }
+
     /**
      * app端获取风控事件上传的材料信息
      *
@@ -709,6 +716,7 @@ public class RetailAppController {
 
     /**
      * 提交邮件截图
+     *
      * @param material
      * @param device
      */
@@ -1007,4 +1015,14 @@ public class RetailAppController {
         return retailAppService.getAccountBindInfos(device);
     }
 
+    @GetMapping(value = "/{clientMoniker}/aps_kyc")
+    public JSONObject getApsKycClient(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @PathVariable("clientMoniker") String clientMoniker) {
+        return clientManager.getApsKycClient(account, clientMoniker);
+    }
+
+    @PutMapping(value = "/aps_kyc")
+    public void updateApsKycClient(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @RequestBody JSONObject item) {
+        clientManager.updateApsKycClient(account, item);
+    }
+
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -40,6 +40,7 @@ import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
 import au.com.royalpay.payment.manage.appclient.beans.RSvcMchBean;
 import au.com.royalpay.payment.manage.appclient.core.RetailRSvcService;
 import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService;
+import au.com.royalpay.payment.manage.apsKYC.domain.entity.ApsNoticeClient;
 import au.com.royalpay.payment.manage.complianceAudit.core.ClientComplianceApply;
 import au.com.royalpay.payment.manage.dev.bean.TestMerchantAccountInfo;
 import au.com.royalpay.payment.manage.device.core.DeviceManager;
@@ -7167,7 +7168,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
     @Override
     public void updateApsKycClient(JSONObject account, JSONObject item) {
-        if (item.getIntValue("status") == 1) {
+        ApsNoticeClient apsNoticeClientById = apsNoticeClientMapper.getApsNoticeClientById(item.getString("id"));
+        if (item.getIntValue("status") == 1 && apsNoticeClientById.getReadTime() == null) {
             item.put("read_time", new Date());
         }
         item.put("status_time", new Date());

src/main/ui/static/boot/indexMainApp.js

@@ -15,7 +15,6 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     }]);
     app.controller('indexCtrl', ['$scope', '$rootScope', '$http', '$log', '$timeout', '$interval', '$q', '$uibModal', 'commonDialog', 'myLoginLogView',
         function ($scope, $rootScope, $http, $log, $timeout, $interval, $q, $uibModal, commonDialog, myLoginLogView) {
-
             var stompClient = null;
             var newPartnerGuide_counts = 0;
             var pwdcount = 0;
@@ -44,15 +43,42 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                         })
                         pwdcount++;
                     }
+
+                    $http.get("/client/partner_info/PINE/aps_kyc").then(function (resp) {
+                        if (resp.data != null && resp.data != "") {
+                            $uibModal.open({
+                                templateUrl: '/static/payment/partner/templates/aps_kyc.html',
+                                size: 'lg',
+                                backdrop: false,
+                                controller: ['$http', '$scope', function ($http, $scope) {
+                                    $http.get("/client/partner_info/PINE/aps_kyc").then(function (resp) {
+                                        $scope.item = resp.data
+                                        document.getElementById("aps_kyc_info").innerHTML = resp.data.content
+                                    });
+                                    $scope.updateApsKyc = function (status) {
+                                        var item = {};
+                                        item.id = $scope.item.id;
+                                        item.status = status;
+                                        $http.put("/client/partner_info/aps_kyc", item).then(function () {
+                                            $scope.$close();
+                                        });
+                                    }
+                                }],
+                            })
+                        } else {
+                            console.log("wuwuwuuwuw:", resp.data)
+                        }
+                    })
+
                     $scope.ComplianceToperfect = function () {
                         $uibModal.open({
                             templateUrl: '/static/payment/partner/templates/compliance_files_advice.html',
                             size: 'lg',
                             controller: 'partnerFilesCtrl',
                             resolve: {
-                                 file: ['$http', function ($http) {
+                                file: ['$http', function ($http) {
-                                     return $http.get('/client/partner_info/compliance/clientViewFiles');
+                                    return $http.get('/client/partner_info/compliance/clientViewFiles');
-                                 }],
+                                }],
                                 kycFile: ['$http', function ($http) {
                                     return $http.get('/client/partner_info/kyc/clientViewFiles');
                                 }]
@@ -61,7 +87,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
 
                         })
                     };
-                    if(($scope.currentUser.lessComplianceFiles ||$scope.currentUser.lessKycFiles) && complianceNoticeCount==0 && $scope.currentUser.role!=3) {
+                    if (($scope.currentUser.lessComplianceFiles || $scope.currentUser.lessKycFiles) && complianceNoticeCount == 0 && $scope.currentUser.role != 3) {
                         $scope.ComplianceToperfect();
                         complianceNoticeCount++;
                     }
@@ -478,7 +504,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             })
         }
     }]);
-    app.controller('partnerFilesCtrl', ['$scope', '$http', '$sce', 'file', 'kycFile', function ($scope, $http, $sce, file , kycFile) {
+    app.controller('partnerFilesCtrl', ['$scope', '$http', '$sce', 'file', 'kycFile', function ($scope, $http, $sce, file, kycFile) {
         $scope.file = angular.copy(file.data);
         $scope.kycFile = angular.copy(kycFile.data);
         var lang = navigator.language || navigator.userLanguage; //常规浏览器语言和IE浏览器

src/main/ui/static/payment/partner/templates/aps_kyc.html

@@ -0,0 +1,31 @@
+<div class="modal-header bg-green">
+    <div></div>
+    <h4 style="text-align: center">{{ item.title }}</h4>
+</div>
+<div class="modal-body" style="padding: 20px">
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="form-horizontal">
+                <div class="form-group">
+                    <div class="col-xs-12">
+                        <div id="aps_kyc_info"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <br/>
+    <br/>
+</div>
+
+<div class="modal-footer">
+    <div style="display: flex;justify-content: space-between">
+        <div>
+            <button style="text-align: right" class="btn btn-warning" ng-click="updateApsKyc(1)" type="button">忽略</button>
+        </div>
+        <div>
+            <button class="btn btn-danger" ng-click="updateApsKyc(3)" type="button">拒绝</button>
+            <button class="btn btn-success" ng-click="updateApsKyc(2)" type="button">同意</button>
+        </div>
+    </div>
+</div>