From 23cbab8e322e7aa6fda98dde4540b01ecf3c4fd1 Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期三, 28 二月 2024 12:18:18 +0800 Subject: [PATCH] 1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java index 9b89654..767bb19 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java @@ -80,7 +80,6 @@ public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "瀹㈡埛韬唤璇佸彿") String cusIdcard) { if (!"".equals(cusIdcard) && cusIdcard != null) { //鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝g‘ - // TODO: 2023/2/10 鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝g‘ // if(cusIdcard.length()==18){ // if (! MatchUtils.isIdCard(cusIdcard)) { // return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�"); @@ -98,8 +97,11 @@ LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard); if(null != tjPatByIdCard){ String fcardNo = tjPatByIdCard.getFcardNo(); - if(null !=fcardNo){ + if(null !=fcardNo && !fcardNo.equals("")){ fcardNo=fcardNo.trim(); + tjPatByIdCard.setFcardNo(fcardNo); + }else { + fcardNo=cusIdcard.trim(); tjPatByIdCard.setFcardNo(fcardNo); } //鏍规嵁韬唤璇佸彿浠庢暟鎹簱鎷夸俊鎭� 娌℃湁鐨勮瘽淇濆瓨 @@ -293,9 +295,10 @@ if(null !=tjCustomer.getIdType()){ if(tjCustomer.getIdType().equals("1")){ b = MatchUtils.isIdCard(cusIdcard); - }else { - b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType()); } +// else { +// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType()); +// } }else { return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷"); } @@ -320,7 +323,9 @@ String substring = cusIdcard.substring(cusIdcard.length() - 6); substring = DigestUtils.md5DigestAsHex(substring.getBytes()); tjCustomer.setCusPassword(substring); - tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd")); + if(tjCustomer.getIdType().equals("1")){ + tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd")); + } tjCustomer.setCusNumber(0L); if (tjCustomerService.save(tjCustomer)) { return AjaxResult.success(tjCustomer); -- Gitblit v1.8.0