From 4dc5a1ece2a58f768dea5c829bff9da842a6de95 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期六, 15 六月 2024 15:02:22 +0800
Subject: [PATCH] zjh 本地 2024/06/15 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 28 ++++++++++++++++++----------
1 files changed, 18 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 1a1cc31..786e79c 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
@@ -147,7 +147,7 @@
LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper = new LambdaQueryWrapper<>();
customerLambdaQueryWrapper.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomerServiceOne = tjCustomerService.getOne(customerLambdaQueryWrapper);
- if(null ==tjCustomerServiceOne){
+ if (null == tjCustomerServiceOne) {
return AjaxResult.error("璇ヤ汉鍛樹俊鎭笉瀛樺湪璇峰厛杩涜鐧昏!!!");
}
final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
@@ -235,8 +235,10 @@
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
- tjCustomerServiceOne.setCardId(hisRegistrationId);
- tjCustomerService.updateById(tjCustomerServiceOne);
+// tjCustomerServiceOne.setCardId(hisRegistrationId);
+// tjCustomerServiceOne.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomerServiceOne.getCusIdcard()),"yyyy-MM-dd"));
+// tjCustomerService.updateById(tjCustomerServiceOne);
+ tjCustomerService.updateCardId(tjCustomerServiceOne.getCusId(),hisRegistrationId);
}
}
}
@@ -346,7 +348,11 @@
tjCustomer.setDiscount(tjReservation.getDiscount());
tjCustomer.setGroupingId(tjReservation.getGroupingId());
return success(tjCustomer);
- }else {
+ } else {
+ LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+ customerLambdaQueryWrapper1.eq(TjCustomer::getCusIdcard, cusIdcard);
+ TjCustomer one = tjCustomerService.getOne(customerLambdaQueryWrapper1);
+ System.out.println("------------------"+one.getCusBrithday());
return AjaxResult.success("鏆傛棤棰勭害淇℃伅", tjCustomerServiceOne);
}
}
@@ -475,20 +481,20 @@
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
// if (tjCustomer.getIdType().equals("1")) {
-// tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
// }
tjCustomer.setCusNumber(0L);
String config = sysConfigService.selectConfigByKey("sfkqdyhis");
- if(null !=config && config.equals("Y")){
+ if (null != config && config.equals("Y")) {
AjaxResult tjCustomer1 = suijieHisXinXi(tjCustomer, date);
if (tjCustomer1 != null) return tjCustomer1;
- }else {
+ } else {
if (tjCustomerService.save(tjCustomer)) {
return AjaxResult.success(tjCustomer);
}
}
return AjaxResult.error();
-}
+ }
private AjaxResult suijieHisXinXi(TjCustomer tjCustomer, String date) {
AjaxResult result = controller.Outpincreateapply(tjCustomer);
@@ -501,9 +507,11 @@
if (null != resultData && resultData.size() > 0) {
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
+
+ tjCustomer.setPationId(pationid);
+// tjCustomerService.updateById(tjCustomer);
OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
outpinregapplyDto.setPationid(pationid);
-// outpinregapplyDto.setHisRegistrationId(pationid);
outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
outpinregapplyDto.setMzksbm("0101");
outpinregapplyDto.setCzybm("00029");
@@ -538,7 +546,7 @@
}
}
}
- }
+ }
}
if (tjCustomerService.save(tjCustomer)) {
--
Gitblit v1.8.0