From 49cc6573ad891bd42e481d7c8674c6c35c54c872 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 01 八月 2025 15:57:10 +0800
Subject: [PATCH] zjh20250801
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 9 ++++-----
1 files changed, 4 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 881388e..855bbd2 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
@@ -282,8 +282,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 +313,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 +327,13 @@
} else if(null != s && s.equalsIgnoreCase("Y")) {
tjCustomer = isRequestCommonHisApi(tjCustomer);
}
- if(null != tjCustomer){
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);
}
--
Gitblit v1.8.0