From 70ae3a3420e2ae397d26ad0ad71e7b00a8ec1777 Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Tue, 13 Jun 2023 17:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E5=94=AF=E4=B8=80=E6=80=A7?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E8=BF=9B=E4=BB=B6=E5=BE=AE=E5=B0=8F?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/pluss/platform/controller/UserAppController.java | 2 -- .../src/main/java/cn/pluss/platform/util/TokenUtil.java | 2 +- .../main/java/cn/pluss/platform/mapper/IdCardMapper.java | 2 ++ pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml | 6 ++++++ .../controller/merchantStore/MerchantStoreController.java | 2 +- .../src/main/java/cn/pluss/platform/IdCardService.java | 4 +++- .../platform/merchant/impl/account/AccountServiceImpl.java | 6 +++++- .../cn/pluss/platform/userApp/impl/UserAppServiceImpl.java | 2 ++ 8 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java index 45d10b5..faab7aa 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java @@ -263,9 +263,7 @@ public class UserAppController { @RequestBody @Valid CertificationDTO certificationDTO) { if (Pattern.matches("^[1-9]\\d{5}(?:18|19|20)\\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\\d|30|31)\\d{3}[\\dXx]$", certificationDTO.getCertnum())){ - System.out.println("身份证无误"); } else { - System.out.println("身份证有误"); return ResultGenerator.genFailResult("身份证号码错误"); } try { diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java index d663f5f..0043393 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java @@ -109,7 +109,7 @@ public class TokenUtil { System.out.println(s); String s1 = UUID.randomUUID().toString(); System.out.println(s1); - String param = "{\"type\":\"4\",\"consumeFee\":\"0.01\",\"authCode\":\"286272579674870782\",\"sn\":\"BSJQG01YJ0001\",\"mercOrderNo\":\"\",\"remark\":\"\"}"; + String param = "{\"orderNumber\":\"LKL_Z_20230612170005985\"}"; Map token = getToken(s,s1 , APP_ID,param); System.out.println(token); diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java index 9efd1a6..eed83cb 100644 --- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java @@ -53,6 +53,8 @@ public interface IdCardMapper extends BaseMapper { */ int selectAgentCount(@Param("certNo") String certNo, @Param("userId") String userId); + Integer getCountIdCard(@Param("certNo") String certNo); + /** * 获取未关联结算信息的对私结算身份证信息 * diff --git a/pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml index c06653d..924de3a 100644 --- a/pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml +++ b/pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml @@ -70,4 +70,10 @@ AND ua.`userId` != #{userId} AND t1.`userType` = '01' + diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java index 6c55057..8a70387 100644 --- a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java +++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java @@ -395,7 +395,7 @@ public class MerchantStoreController extends BaseNoModelController { /** - * 手动后台发起进件 + * 手动进件后台发起 */ @PassToken @GetMapping(value = "/manualMerchantIncom/{userId}/{id}/{merchantCode}") diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardService.java index 0797642..d077b8c 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardService.java @@ -20,7 +20,9 @@ public interface IdCardService extends IService { default int getAgentCount(String certNo, String userId) { return ((IdCardMapper) getBaseMapper()).selectAgentCount(certNo, userId); } - + default Integer getCountIdCard(String certNo){ + return ((IdCardMapper) getBaseMapper()).getCountIdCard(certNo); + } /** * 获取实名的身份证信息 * @param userId 用户id diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java index be7a610..d220ce0 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java @@ -416,6 +416,11 @@ public class AccountServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void realNameAudit(CertificationDTO certificationDTO) { + //验证唯一性 + Integer countIdCard = idCardService.getCountIdCard(certificationDTO.getCertnum()); + if (countIdCard > 0){ + throw new MsgException("身份证已注册"); + } UserApp tokenUa = uaService.queryUserAppByToken(); if ("agent".equals(tokenUa.getUserType()) && "ZY_BST".equals(tokenUa.getRoleCode())) { IdCard condition = new IdCard().setCertNo(certificationDTO.getCertnum()); @@ -445,7 +450,6 @@ public class AccountServiceImpl extends ServiceImpl impl userApp.setMerchantCode(merchantCode); uaService.updateById(userApp); } - if (Objects.equals(userApp.getStatus(), 1) || Objects.equals(userApp.getStatus(), 3)) { throw new MsgException("当前状态不允许修改实名认证信息"); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java index 30ed18b..0ca0967 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java @@ -807,6 +807,8 @@ public class UserAppServiceImpl extends ServiceImpl impl case "5": laKalaInterface.createTuoKeInfo(userId); break; + case "6": + ysAuditServiceV3.merchantAuditV3(userId, false); default: MsgException.throwException("未知的进件通道"); }