From ddcd1e3b0a6c4a426b81cdae021e7bb3be910534 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期六, 23 十二月 2023 19:50:16 +0800
Subject: [PATCH] zjh 本地 2023/12/23 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 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 f49efda..52c8688 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
@@ -18,6 +18,7 @@
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.*;
@@ -65,8 +66,10 @@
@GetMapping("/newGetTjPat")
@ApiOperation(value = "鏌ヨhis鏁版嵁搴撹繑鍥炴柊鐨勬暟鎹�")
- public AjaxResult newGetTjPat() {
- List<Map<String, Object>> maps = testMapper.newGetTjPat();
+ public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
+ @RequestParam(required = false)String pacName,
+ @RequestParam(required = false)String pacRemark) {
+ List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
return AjaxResult.success(maps);
}
@@ -83,49 +86,57 @@
if (!"".equals(cusIdcard) && cusIdcard != null) {
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
// TODO: 2023/2/10 鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
- if(cusIdcard.length()==18){
- if (! MatchUtils.isIdCard(cusIdcard)) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
- if(cusIdcard.length()==9){
- if (!MatchUtils.cardValidates(cusIdcard)) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if(cusIdcard.length()==18){
+// if (! MatchUtils.isIdCard(cusIdcard)) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
+// if(cusIdcard.length()==9){
+// if (!MatchUtils.cardValidates(cusIdcard)) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
if ("Y".equals(getInfoFromSqlData)){
- //鏍规嵁韬唤璇佸ソ鏌ヤ俊鎭�
- LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
+ //鏍规嵁韬唤璇佸彿浠巋is鏌ヤ俊鎭�
+ LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
if(null != 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();
- //鍐嶆牴鎹韩浠借瘉鍙峰啓customer琛�
- TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
- if(null == tjCustomer){
- testMapper.getTjPatByCusId(cusIdcard);
- LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
- qw.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer customer = tjCustomerService.getOne(qw);
- customer.setReservationId(customer.getCardId());
- extracted(customer);
- return success(customer);
- }else {
- tjCustomer.setReservationId(tjCustomer.getCardId());
- extracted(tjCustomer);
- return success(tjCustomer);
- }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ //鍐嶆牴鎹韩浠借瘉鍙峰啓customer琛�
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(tjPatByIdCard.getFcardNo());
+ if(null == tjCustomer){
+ //涓虹┖鐨勮瘽鎺夊瓨鍌ㄨ繃绋嬩繚瀛樺埌瀹㈡埛琛�
+ testMapper.getTjPatByCusId(cusIdcard);
+ LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
+ qw.eq(TjCustomer::getCusIdcard, tjPatByIdCard.getFcardNo());
+ TjCustomer customer = tjCustomerService.getOne(qw);
+ customer.setReservationId(customer.getCardId());
+ extracted(customer);
+ return success(customer);
+ }else {
+ String cardId = tjCustomer.getCardId();
+ if(null !=cardId && cardId.equals(tjPatByIdCard.getFcardId())){
+ return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ }
+ tjCustomer.setReservationId(tjCustomer.getCardId());
+ tjCustomer.setCardId(tjPatByIdCard.getFcardId());
+ tjCustomerService.updateById(tjCustomer);
+ extracted(tjCustomer);
+ return success(tjCustomer);
+ }
+ }
}
//end====2023.12.12
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -166,7 +177,6 @@
tjCustomer1.setReservationId(tjReservation.getId());
tjCustomer1.setDiscount(tjReservation.getDiscount());
tjCustomer1.setGroupingId(tjReservation.getGroupingId());
-
return success(tjCustomer1);
}
TjCustomer tjCustomer = new TjCustomer();
@@ -210,6 +220,7 @@
}
private void extracted(TjCustomer customer) {
+ //浠巋is琛ㄦ姄鏁版嵁
LtkjMiddleHead pat = testMapper.getMiddleHeadByPartId(customer.getCardId());
if (null != pat) {
List<LtkjMiddleDetail> list = testMapper.getMiddleDetailByFeadId(pat.getFeadId());
@@ -220,7 +231,6 @@
for (LtkjMiddleDetail ltkjMiddleDetail : list) {
middleDetailService.save(ltkjMiddleDetail);
}
- testMapper.saveTjProByCusId(customer.getCardId(), customer.getCusIdcard());
}
testMapper.saveTjProByCusId(customer.getCardId(), customer.getCusIdcard());
}
--
Gitblit v1.8.0