From e8069ecbe01fdfb4c975b88fa8cca7a233ccbe48 Mon Sep 17 00:00:00 2001 From: Todking Date: Mon, 10 Jan 2022 15:25:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=20a+kyc=E9=80=9A=E7=9F=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?bd=E6=98=BE=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ApsNoticeClientRepository.java | 2 +- .../service/ApsNoticeClientsService.java | 2 +- .../Impl/ApsNoticeClientsServiceImpl.java | 23 ++++++++++++++++-- .../ApsNoticeClientRepositoryImpl.java | 4 ++-- .../apsKYC/web/RestApsKYCController.java | 4 ++-- .../mappers/apskyc/ApsNoticeClientMapper.java | 2 +- .../mappers/apskyc/ApsNoticeClientMapper.xml | 4 ++++ src/main/ui/static/apsKYC/aps_kyc.js | 17 +++++++++++++ .../ui/static/apsKYC/templates/aps_kyc.html | 24 +++++++++++++------ 9 files changed, 66 insertions(+), 16 deletions(-) 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 cb604586e..b15062316 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 @@ -12,7 +12,7 @@ public interface ApsNoticeClientRepository { void updateApsNoticeClient(ApsNoticeClient apsNoticeClient); - PageList getApsNoticeClients(String id, PageBounds pageBounds); + PageList getApsNoticeClients(String id, String clientStatus, PageBounds pageBounds); void updateApsNoticeClientByPartnerCode(Date modifyTime, String modifier, String partnerCode); diff --git a/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/ApsNoticeClientsService.java b/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/ApsNoticeClientsService.java index e33df75a7..9722b87d9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/ApsNoticeClientsService.java +++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/ApsNoticeClientsService.java @@ -5,5 +5,5 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; public interface ApsNoticeClientsService { - PageList getApsNoticeClients(String id, PageBounds pageBounds); + PageList getApsNoticeClients(String id, String clientStatus, PageBounds pageBounds); } diff --git a/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/Impl/ApsNoticeClientsServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/Impl/ApsNoticeClientsServiceImpl.java index b2199054e..a495bd6ba 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/Impl/ApsNoticeClientsServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/service/Impl/ApsNoticeClientsServiceImpl.java @@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.apsKYC.domain.service.Impl; import au.com.royalpay.payment.manage.apsKYC.domain.repository.ApsNoticeClientRepository; import au.com.royalpay.payment.manage.apsKYC.domain.service.ApsNoticeClientsService; import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.manage.mappers.system.ManagerMapper; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; @@ -11,6 +12,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + @Service public class ApsNoticeClientsServiceImpl implements ApsNoticeClientsService { @@ -20,12 +24,15 @@ public class ApsNoticeClientsServiceImpl implements ApsNoticeClientsService { @Autowired private ManagerMapper managerMapper; + @Autowired + private ClientMapper clientMapper; + @Autowired private ClientAccountMapper clientAccountMapper; @Override - public PageList getApsNoticeClients(String id, PageBounds pageBounds) { - PageList apsNoticeClients = apsNoticeClientRepository.getApsNoticeClients(id, pageBounds); + public PageList getApsNoticeClients(String id, String clientStatus, PageBounds pageBounds) { + PageList apsNoticeClients = apsNoticeClientRepository.getApsNoticeClients(id, clientStatus, pageBounds); for (JSONObject apsNoticeClient : apsNoticeClients) { if (apsNoticeClient.containsKey("modifier") && StringUtils.isNotBlank(apsNoticeClient.getString("modifier"))) { JSONObject modifier = managerMapper.findDetail(apsNoticeClient.getString("modifier")); @@ -43,6 +50,18 @@ public class ApsNoticeClientsServiceImpl implements ApsNoticeClientsService { } } } + JSONObject clinet = clientMapper.findClientByMoniker(apsNoticeClient.getString("partner_code")); + if (clinet != null && clinet.containsKey("bd_user") && StringUtils.isNotBlank(clinet.getString("bd_user"))) { + String[] bd_users = clinet.getString("bd_user").split(","); + List bdUserName = new ArrayList<>(); + for (String bd_user : bd_users) { + JSONObject bdUser = managerMapper.findDetail(bd_user); + if (bdUser != null && bdUser.containsKey("username") && StringUtils.isNotBlank(bdUser.getString("username"))) { + bdUserName.add(bdUser.getString("username")); + } + } + apsNoticeClient.put("bd_name", bdUserName); + } } return apsNoticeClients; } 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 d88d3cf13..7ec2184a6 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 @@ -28,8 +28,8 @@ public class ApsNoticeClientRepositoryImpl implements ApsNoticeClientRepository } @Override - public PageList getApsNoticeClients(String id, PageBounds pageBounds) { - return mapper.getApsNoticeClients(id, pageBounds); + public PageList getApsNoticeClients(String id, String clientStatus, PageBounds pageBounds) { + return mapper.getApsNoticeClients(id, clientStatus, pageBounds); } @Override 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 c9ceab6e5..af25f4059 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 @@ -74,9 +74,9 @@ public class RestApsKYCController { @ManagerMapping(value = "/notice/clients", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.SALES_MANAGER}) public JSONObject getApsNoticeClients(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize, - @RequestParam String id) { + @RequestParam String id, @RequestParam(required = false) String clientStatus) { PageBounds pageBounds = new PageBounds(page, pageSize); - PageList apply = apsNoticeClientsService.getApsNoticeClients(id, pageBounds); + PageList apply = apsNoticeClientsService.getApsNoticeClients(id, clientStatus, pageBounds); return PageListUtils.buildPageListResult(apply); } 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 fe0e7fd68..d761dc23b 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 @@ -20,7 +20,7 @@ public interface ApsNoticeClientMapper { @AutoSql(SqlType.UPDATE) void updateApsNoticeClient(ApsNoticeClient apsNoticeClient); - PageList getApsNoticeClients(String id, PageBounds pageBounds); + PageList getApsNoticeClients(String id,String clientStatus, PageBounds pageBounds); void updateApsNoticeClientByPartnerCode(@Param("modify_time") Date modifyTime, @Param("modifier") String modifier, @Param("partner_code") String partnerCode); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.xml index 49e4e245d..5f387d033 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.xml @@ -14,6 +14,10 @@ SELECT * FROM sys_aps_notice_clients where notice_id = #{id} + + and `status` = #{clientStatus} + + ORDER BY status_time DESC + + + 运营操作状态 操作 @@ -104,14 +113,15 @@ {{item.partner_code}} + {{item.bd_name ? item.bd_name : "未绑定BD"}} 未读 - 已读({{item.user_name}} {{ item.read_time - }}) - 同意({{item.user_name}} {{ item.status_time - }}) - 拒绝({{item.user_name}} {{ item.status_time - }}) + 已读({{item.user_name}} {{ item.read_time}}) + 同意({{item.user_name}} {{ item.status_time}}) + 拒绝({{item.user_name}} {{ item.status_time}}) 未处理