From fd05507e8595739c80f485d67fdeeed91708f746 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 21 十二月 2023 16:32:14 +0800
Subject: [PATCH] zjh 本地 2023/12/21 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 4decfe3..eb904c8 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
@@ -65,7 +65,7 @@
*/
@PostMapping(value = "/cusIdcard")
@ApiOperation(value = "鏍规嵁韬唤璇佸彿鑾峰彇鐢ㄦ埛淇℃伅")
- @Log(title = "瀹㈡埛韬唤淇℃伅", businessType = BusinessType.EXPORT)
+// @Log(title = "瀹㈡埛韬唤淇℃伅", businessType = BusinessType.EXPORT)
public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "瀹㈡埛韬唤璇佸彿") String cusIdcard) {
if (!"".equals(cusIdcard) && cusIdcard != null) {
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
@@ -85,18 +85,23 @@
if ("Y".equals(getInfoFromSqlData)){
//鏍规嵁韬唤璇佸ソ鏌ヤ俊鎭�
LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
- //List<LtkjTjPat> list = testMapper.getTjPat();
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// for (LtkjTjPat ltkjTjPat : list) {
-// final boolean save = tjvLtkjvtjpatService.save(ltkjTjPat);
-// }
- //涓嶄负绌轰繚瀛樺埌涓存椂琛�
if(null != tjPatByIdCard){
- tjvLtkjvtjpatService.save(tjPatByIdCard);
+ String fcardNo = tjPatByIdCard.getFcardNo();
+ if(null !=fcardNo){
+ fcardNo=fcardNo.trim();
+ tjPatByIdCard.setFcardNo(fcardNo);
+ }
+ LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(cusIdcard);
+ if(null==ltkjTjPat){
+ tjvLtkjvtjpatService.save(tjPatByIdCard);
+ }
}
DynamicDataSourceContextHolder.clearDataSourceType();
- //鍐嶆牴鎹韩浠借瘉鍙峰啓杩涢绾﹁〃
- testMapper.getTjPatByCusId(cusIdcard);
+ //鍐嶆牴鎹韩浠借瘉鍙峰啓customer琛�
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
+ if(null == tjCustomer){
+ testMapper.getTjPatByCusId(cusIdcard);
+ }
}
//end====2023.12.12
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -137,7 +142,6 @@
tjCustomer1.setReservationId(tjReservation.getId());
tjCustomer1.setDiscount(tjReservation.getDiscount());
tjCustomer1.setGroupingId(tjReservation.getGroupingId());
-
return success(tjCustomer1);
}
--
Gitblit v1.8.0