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/system/TjCustomerController.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 4b108b7..8ec252f 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
@@ -151,6 +151,7 @@
     @PostMapping(value = "/cusIdcard")
     @ApiOperation(value = "鏍规嵁韬唤璇佸彿鑾峰彇鐢ㄦ埛淇℃伅")
 //    @Log(title = "瀹㈡埛韬唤淇℃伅", businessType = BusinessType.EXPORT)
+    @RepeatSubmit
     public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "瀹㈡埛韬唤璇佸彿") String cusIdcard) {
         if (!"".equals(cusIdcard) && cusIdcard != null) {
 
@@ -229,9 +230,7 @@
                     tjReservationService.updateById(tjReservation);
                     return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
                 }
-                LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
-                qw.eq(TjCustomer::getCusIdcard, cusIdcard);
-                TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
+                TjCustomer tjCustomer1 = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
                 if (tjCustomer1 != null) {
 //                    if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
 //                    if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
@@ -282,8 +281,8 @@
                     tjCustomer.setCusPhone(tjReservation.getPhoe());
                     tjCustomer.setCusEmail(tjReservation.getEmail());
                     tjCustomer.setCusAddr(tjReservation.getAddress());
-                    tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
-                    tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
+                    tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage())==null ?"0": tjReservation.getMarriage().toString());
+                    tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()) ==null ? "0": tjReservation.getNation().toString());
 
                     tjCustomer.setIdType(tjReservation.getIdType());
                     tjCustomer.setAge(tjReservation.getAge());
@@ -313,7 +312,7 @@
                                 String pationid = resultData.get("PationId").toString();
                                 if (null != pationid) {
                                     tjCustomer.setPationId(pationid);
-                                    tjCustomerService.save(tjCustomer);
+//                                    tjCustomerService.save(tjCustomer);
                                     //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
                                     resultData.put("cardId",pationid);
                                     JSONObject object4 = JSONUtil.parseObj(resultData);
@@ -327,14 +326,15 @@
                     } else if(null != s && s.equalsIgnoreCase("Y")) {
                         tjCustomer = isRequestCommonHisApi(tjCustomer);
                     }
-                    if(null != tjCustomer){
-                        tjCustomerService.save(tjCustomer);
+//                    TjCustomer tjCustomerByCusIdCard = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
+//                    if(null != tjCustomerByCusIdCard)
+                    tjCustomerService.save(tjCustomer);
                         tjCustomer.setTeamNo(tjReservation.getTeamNo());
                         tjCustomer.setCompId(tjReservation.getCompanyId());
                         tjCustomer.setReservationId(tjReservation.getId());
                         tjCustomer.setDiscount(tjReservation.getDiscount());
                         tjCustomer.setGroupingId(tjReservation.getGroupingId());
-                    }
+
                     return success(tjCustomer);
                 }
 
@@ -456,7 +456,7 @@
     @PostMapping
     @ApiOperation(value = "鏂板瀹㈡埛")
     @Transactional
-//    @RepeatSubmit
+    @RepeatSubmit
     @Log(title = "鏂板瀹㈡埛淇℃伅", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
         if (null == tjCustomer.getCusIdcard() || null == tjCustomer.getCusPhone()) {

--
Gitblit v1.8.0