From 9cf381f93354a5f0fcaf14bd3ab118886d589f80 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 八月 2025 13:38:01 +0800
Subject: [PATCH] zjh20250806

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index d38bd36..73cc774 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -92,7 +92,7 @@
         wq.eq(TjCustomer::getCusPhone, tjCustomer.getCusPhone());
         wq.eq(TjCustomer::getCusName, tjCustomer.getCusName());
         final TjCustomer one = customerService.getOne(wq);
-        one.setConnect("");
+        one.setConnect(null);
         final boolean b = customerService.updateById(one);
         if (b) {
             return AjaxResult.success();
@@ -121,32 +121,37 @@
         if (!MatchUtils.isMobileNO(tjCustomer.getCusPhone()))
             return AjaxResult.error("鎵嬫満鍙烽敊璇�");
 
-        if (cusIdcard.length() == 18) {
+        if (tjCustomer.getIdType().equals("1")) {
             if (!MatchUtils.isIdCard(cusIdcard)) {
                 return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
             }
         }
-        if (cusIdcard.length() == 9) {
-            if (!MatchUtils.cardValidates(cusIdcard)) {
-                return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
-            }
-        }
+//        if (cusIdcard.length() == 9) {
+//            if (!MatchUtils.cardValidates(cusIdcard)) {
+//                return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+//            }
+//        }
 
-        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
-        wq.eq(TjCustomer::getCusIdcard, cusIdcard);
-        TjCustomer customer = customerService.getOne(wq);
+
+        TjCustomer customer = customerService.getTjCustomerByCusIdCard(cusIdcard);
 
         String key = sysConfigService.selectConfigByKey("sfkqdyhis");
 
         if (customer != null) {
             customer.setConnect(tjCustomer.getConnect());
+            customer.setCusPhone(tjCustomer.getCusPhone());
+            customer.setCusMarryStatus(tjCustomer.getCusMarryStatus());
             customerService.updateById(customer);
             return AjaxResult.success(customer);
         }
         String substring = cusIdcard.substring(cusIdcard.length() - 6);
         substring = DigestUtils.md5DigestAsHex(substring.getBytes());
         tjCustomer.setCusPassword(substring);
-        tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(cusIdcard), "yyyy-MM-dd"));
+        try {
+            tjCustomer.setCusBrithday(MatchUtils.getBirthDayByIdCard(cusIdcard));
+        } catch (Exception e) {
+            return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
+        }
         tjCustomer.setCusSex(Long.valueOf(MatchUtils.getSexByIdCard(cusIdcard)));
         tjCustomer.setAge(String.valueOf(MatchUtils.getAgeByIdCard(cusIdcard)));
         tjCustomer.setIdType("1");
@@ -257,7 +262,7 @@
             LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
             qw.eq(TjCustomer::getCusPhone, phone);
             List<TjCustomer> tjCustomer1 = customerService.list(qw);
-            if (tjCustomer1 != null && tjCustomer1.size() > 0) {
+            if (tjCustomer1 != null && !tjCustomer1.isEmpty()) {
                 List<String> num = new ArrayList<>();
                 for (TjCustomer tjCustomer : tjCustomer1) {
                     num.add(tjCustomer.getCusIdcard());

--
Gitblit v1.8.0