From 3982f0bc9ee436235ba546d356c5554250ed9963 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 七月 2025 15:46:16 +0800
Subject: [PATCH] zjh20250711
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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 7244ec4..86bb882 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
@@ -330,18 +330,16 @@
}
}
} else if(null != s && s.equalsIgnoreCase("Y")) {
- TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
- if (null !=requestCommonHisApi){
- tjCustomerService.save(requestCommonHisApi);
- }
- }else {
- tjCustomerService.save(tjCustomer);
+ tjCustomer = isRequestCommonHisApi(tjCustomer);
}
- tjCustomer.setTeamNo(tjReservation.getTeamNo());
- tjCustomer.setCompId(tjReservation.getCompanyId());
- tjCustomer.setReservationId(tjReservation.getId());
- tjCustomer.setDiscount(tjReservation.getDiscount());
- tjCustomer.setGroupingId(tjReservation.getGroupingId());
+ 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);
}
@@ -354,16 +352,7 @@
if (null == tjCustomerServiceOne) {
return AjaxResult.error("璇ヤ汉鍛樹俊鎭笉瀛樺湪璇峰厛杩涜鐧昏!!!");
}
-// if (null != key && key.equals("Y")) {
- String cardId = tjCustomerServiceOne.getCardId();
- if (null != cardId && !cardId.equals("0")) {
-// int i = tjOrderService.selectTjOrderByCardId(cardId);
-// if (i > 0) {
-// return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
-// }
- }
-// }
if(!tjCustomerServiceOne.getAge().equals(String.valueOf(DateUtil.ageOfNow(tjCustomerServiceOne.getCusBrithday())))){
tjCustomerServiceOne.setAge(String.valueOf(DateUtil.ageOfNow(tjCustomerServiceOne.getCusBrithday())));
tjCustomerService.updateById(tjCustomerServiceOne);
--
Gitblit v1.8.0