diff --git 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 index b699ad09f..b682aa059 100644 --- 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; } diff --git 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 index 54ab1ceb6..cb604586e 100644 --- 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 getApsNoticeClients(String id, PageBounds pageBounds); void updateApsNoticeClientByPartnerCode(Date modifyTime, String modifier, String partnerCode); + + ApsNoticeClient getApsNoticeClientById(String id); } diff --git 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 index e3878333f..fd9ed6ec1 100644 --- 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 diff --git 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 index 19758cce6..d88d3cf13 100644 --- 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); + } } diff --git 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 index 6f6ceef5c..fc837744b 100644 --- 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 消息关联商户数据 diff --git 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 index f6300a3dc..0b506673c 100644 --- 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); } } diff --git 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 index 073148945..86bb3545f 100644 --- 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 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); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 533a120dd..82aa7edc2 100644 --- 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 diff --git a/src/main/ui/static/apsKYC/aps_kyc.js b/src/main/ui/static/apsKYC/aps_kyc.js index 7d9261921..0ddae480c 100644 --- 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) { diff --git a/src/main/ui/static/apsKYC/templates/aps_kyc.html b/src/main/ui/static/apsKYC/templates/aps_kyc.html index f95a1ba10..d4e5e407f 100644 --- a/src/main/ui/static/apsKYC/templates/aps_kyc.html +++ b/src/main/ui/static/apsKYC/templates/aps_kyc.html @@ -112,13 +112,14 @@ 未处理 | - 已处理 + aria-hidden="true" + ng-click="setHandle(item.notice_id,item.id)"> + 已处理 禁用 + ng-click="stopNoticeClient(item.notice_id,item.id)">禁用 已禁用