add aps kyc 通知

4 years ago · f30c805fd0
parent fc2b79067a
commit f30c805fd0
10 changed files with 59 additions and 21 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/entity/ApsNoticeClient.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/entity/ApsNoticeClient.java
@ -47,7 +47,7 @@ public class ApsNoticeClient {
     * 2；同意
     * 3；拒绝
     */
-    private Integer status = 0;
+    private Integer status;

    /**
     * 用户操作时间
@ -59,10 +59,10 @@ public class ApsNoticeClient {
     * 0；未处理
     * 1；已处理
     */
-    private Integer handle = 0;
+    private Integer handle;

    /**
     * 是否失效
     */
-    private Integer isValid = 0;
+    private Integer isValid;
 }
--- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/repository/ApsNoticeClientRepository.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/repository/ApsNoticeClientRepository.java
@ -15,4 +15,6 @@ public interface ApsNoticeClientRepository {
    PageList<JSONObject> getApsNoticeClients(String id, PageBounds pageBounds);

    void updateApsNoticeClientByPartnerCode(Date modifyTime, String modifier, String partnerCode);
+
+    ApsNoticeClient getApsNoticeClientById(String id);
 }
--- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/Impl/ApsNoticeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/Impl/ApsNoticeServiceImpl.java
@ -55,9 +55,16 @@ public class ApsNoticeServiceImpl implements ApsNoticeService {

    @Override
    public void updateApsNoticeClient(JSONObject manager, ApsNoticeClient apsNoticeClient) {
-        apsNoticeClient.setModifier(manager.getString("manager_id"));
-        apsNoticeClient.setModifyTime(new Date());
-        apsNoticeClientRepository.updateApsNoticeClient(apsNoticeClient);
+        ApsNoticeClient apsNoticeClientById = apsNoticeClientRepository.getApsNoticeClientById(apsNoticeClient.getId());
+        apsNoticeClientById.setModifier(manager.getString("manager_id"));
+        apsNoticeClientById.setModifyTime(new Date());
+        if (apsNoticeClient.getHandle() != null) {
+            apsNoticeClientById.setHandle(apsNoticeClient.getHandle());
+        }
+        if (apsNoticeClient.getIsValid() != null) {
+            apsNoticeClientById.setIsValid(apsNoticeClient.getIsValid());
+        }
+        apsNoticeClientRepository.updateApsNoticeClient(apsNoticeClientById);
    }

    @Override
--- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/infrastructure/repository/ApsNoticeClientRepositoryImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/infrastructure/repository/ApsNoticeClientRepositoryImpl.java
@ -36,4 +36,9 @@ public class ApsNoticeClientRepositoryImpl implements ApsNoticeClientRepository
    public void updateApsNoticeClientByPartnerCode(Date modifyTime, String modifier, String partnerCode) {
        mapper.updateApsNoticeClientByPartnerCode(modifyTime, modifier, partnerCode);
    }
+
+    @Override
+    public ApsNoticeClient getApsNoticeClientById(String id) {
+        return mapper.getApsNoticeClientById(id);
+    }
 }
--- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java
@ -86,7 +86,7 @@ public class RestApsKYCController {
    }

    /**
-     * 停用商户
+     * 修改商户数据
     *
     * @param manager         运营数据
     * @param apsNoticeClient 消息关联商户数据
--- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/command/AddNoticeCommand.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/command/AddNoticeCommand.java
@ -30,11 +30,14 @@ public class AddNoticeCommand {
                .setContent(addNoticeDescriptor.getContent());
    }

-    public ApsNoticeClient saveApsNoticeClient(String partnerCode,JSONObject manager,String noticeId){
+    public ApsNoticeClient saveApsNoticeClient(String partnerCode, JSONObject manager, String noticeId) {
        return new ApsNoticeClient()
                .setCreateTime(new Date())
                .setCreator(manager.getString("manager_id"))
                .setNoticeId(noticeId)
-                .setPartnerCode(partnerCode);
+                .setPartnerCode(partnerCode)
+                .setIsValid(0)
+                .setHandle(0)
+                .setStatus(0);
    }
 }
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.java
@ -23,4 +23,7 @@ public interface ApsNoticeClientMapper {
    PageList<JSONObject> getApsNoticeClients(String id, PageBounds pageBounds);

    void updateApsNoticeClientByPartnerCode(@Param("modify_time") Date modifyTime, @Param("modifier") String modifier, @Param("partner_code") String partnerCode);
+
+    @AutoSql(SqlType.SELECT)
+    ApsNoticeClient getApsNoticeClientById(String id);
 }
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@ -2,13 +2,13 @@ spring:
  datasource:
    master:
      host: 192.168.0.92:3306
-      jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+      jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
      password: SuTUUxyvzS0cLETi6Rzm
      schema-name: royalpay
      username: rpaydev
    slave:
      host: 192.168.0.92:3306
-      jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+      jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
      password: SuTUUxyvzS0cLETi6Rzm
      schema-name: royalpay
      username: rpaydev
--- a/src/main/ui/static/apsKYC/aps_kyc.js
+++ b/src/main/ui/static/apsKYC/aps_kyc.js
@ -28,20 +28,21 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
        that.loadApsNotice(1);
        that.stopNotice = function (id) {
            $http.put('/aps/kyc/notice', id).then(function () {
-                that.loadApsNotice(1);
+                that.loadApsNotice(null);
            });
        };
        that.getNoticeClients = function (title, id, page) {
            that.showClients = true
            that.clientTitle = title
+            that.clientId = id;
            if (that.showClients) {
-                that.loadApsNoticeClients(id, page);
+                that.loadApsNoticeClients(page);
            }
        };
-        that.loadApsNoticeClients = function (id, page) {
+        that.loadApsNoticeClients = function (page) {
            var params = angular.copy(that.params);
            params.page = page || that.clientPagination.page || 1;
-            params.id = id;
+            params.id = that.clientId;
            $http.get('/aps/kyc/notice/clients', {params: params}).then(function (resp) {
                that.noticeClients = resp.data.data;
                that.clientPagination = resp.data.pagination;
@ -55,7 +56,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                    size: 'lg',
                    controller: 'addApsNoticeCtrl',
                }).result.then(function () {
-                that.loadApsNotice(1)
+                that.showClients = false
+                that.loadApsNotice(null)
            });
        };
        that.catNotice = function (id) {
@ -74,8 +76,23 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                    }],
                });
        };
-        that.setHandle = function (id) {
-
+        that.setHandle = function (noticeId, id) {
+            that.item = {};
+            that.item.id = id;
+            that.item.handle = 1;
+            $http.put('/aps/kyc/notice/client', that.item).then(function () {
+                that.loadApsNoticeClients()
+                that.loadApsNotice()
+            });
+        };
+        that.stopNoticeClient = function (noticeId, id) {
+            that.item = {};
+            that.item.id = id;
+            that.item.isValid = 1;
+            $http.put('/aps/kyc/notice/client', that.item).then(function () {
+                that.loadApsNoticeClients()
+                that.loadApsNotice()
+            });
        }
    }]);
    app.controller('addApsNoticeCtrl', ['$scope', '$http', function ($scope, $http) {
--- a/src/main/ui/static/apsKYC/templates/aps_kyc.html
+++ b/src/main/ui/static/apsKYC/templates/aps_kyc.html
@ -112,13 +112,14 @@
                    </td>
                    <td style="text-align: center">
                        <a href="" type="button"><span ng-if="item.handle == 0">未处理 | <i class="fa fa-check"
-                                                                                         aria-hidden="true"></i></span></a>
-                        <span ng-if="item.handle == 1" style="color: #00a65a" ng-click="setHandle(item.id)">已处理</span>
+                                                                                         aria-hidden="true"
+                                                                                         ng-click="setHandle(item.notice_id,item.id)"></i></span></a>
+                        <span ng-if="item.handle == 1" style="color: #00a65a">已处理</span>
                    </td>
                    <td style="text-align: center">
                        <a href="" type="button">
                            <i ng-if="item.is_valid == 0" class="fa fa-times" style="color: red"
-                               ng-click="stopNoticeClient(item.id)">禁用</i>
+                               ng-click="stopNoticeClient(item.notice_id,item.id)">禁用</i>
                        </a>
                        <i ng-if="item.is_valid == 1" readonly class="fa fa-times"
                           style="color: #727272">已禁用</i>