From bd6c1c1c6642d57c85816a62d77c25c4e1a66a76 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 一月 2024 09:38:46 +0800
Subject: [PATCH] zjh 2024/01/02--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 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 52c8688..3007a46 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
@@ -5,7 +5,6 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.enums.DataSourceType;
-import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjReservation;
@@ -18,19 +17,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
-import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.common.enums.BusinessType;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
-
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -63,6 +56,8 @@
private LtkjMiddleHeadService headService;
@Resource
private LtkjMiddleDetailService middleDetailService;
+ @Resource
+ private ITjOrderService tjOrderService;
@GetMapping("/newGetTjPat")
@ApiOperation(value = "鏌ヨhis鏁版嵁搴撹繑鍥炴柊鐨勬暟鎹�")
@@ -85,7 +80,6 @@
public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "瀹㈡埛韬唤璇佸彿") String cusIdcard) {
if (!"".equals(cusIdcard) && cusIdcard != null) {
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
- // TODO: 2023/2/10 鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
// if(cusIdcard.length()==18){
// if (! MatchUtils.isIdCard(cusIdcard)) {
// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
@@ -125,9 +119,13 @@
extracted(customer);
return success(customer);
}else {
- String cardId = tjCustomer.getCardId();
- if(null !=cardId && cardId.equals(tjPatByIdCard.getFcardId())){
- return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ String cardId = tjPatByIdCard.getFcardId();
+ if(null !=cardId && !cardId.equals("0")){
+ int i = tjOrderService.selectTjOrderByCardId(cardId);
+ if(i>0){
+ return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ }
+
}
tjCustomer.setReservationId(tjCustomer.getCardId());
tjCustomer.setCardId(tjPatByIdCard.getFcardId());
@@ -294,9 +292,10 @@
if(null !=tjCustomer.getIdType()){
if(tjCustomer.getIdType().equals("1")){
b = MatchUtils.isIdCard(cusIdcard);
- }else {
- b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
}
+// else {
+// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
+// }
}else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
@@ -321,7 +320,9 @@
String substring = cusIdcard.substring(cusIdcard.length() - 6);
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
- tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ if(tjCustomer.getIdType().equals("1")){
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ }
tjCustomer.setCusNumber(0L);
if (tjCustomerService.save(tjCustomer)) {
return AjaxResult.success(tjCustomer);
--
Gitblit v1.8.0