From 9cf381f93354a5f0fcaf14bd3ab118886d589f80 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 八月 2025 13:38:01 +0800
Subject: [PATCH] zjh20250806
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 24 ++++++++++++++++++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 9 +++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java | 11 ++++++-----
5 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index f0a20b5..4293cb5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -9,10 +9,8 @@
import com.itextpdf.text.Paragraph;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.framework.config.MatchUtils;
-import com.ltkj.hosp.domain.DictHosp;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjOrder;
-import com.ltkj.hosp.domain.TjOrderYcxm;
+import com.ltkj.framework.config.UserHoder;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TjCustomerMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
@@ -481,6 +479,24 @@
}
+
+// @PostMapping("/wx/bindPhoneV2")
+// public AjaxResult bindPhoneV2(@RequestBody String json) {
+// cn.hutool.json.JSONObject entries = JSONUtil.parseObj(json);
+// String phone = entries.getStr("phone");
+// Wxuser wxuser = UserHoder.getWxuser();
+// LambdaQueryWrapper<Wxuser> wq = new LambdaQueryWrapper<>();
+// wq.eq(Wxuser::getOpenid, wxuser.getOpenid());
+// Wxuser one = wxuserService.getOne(wq);
+// System.out.println("缁戝畾 ->"+wxuser.getOpenid()+",json = "+json);
+// if (one != null){
+// one.setPhone(phone);
+// wxuserService.updateById(one);
+// return AjaxResult.success();
+// }
+// return AjaxResult.error();
+// }
+
public static void removeNullFields(JSONObject jsonObject) {
ArrayList<String> strings = new ArrayList<>();
strings.add("orderId");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index 563370b..73cc774 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -92,7 +92,7 @@
wq.eq(TjCustomer::getCusPhone, tjCustomer.getCusPhone());
wq.eq(TjCustomer::getCusName, tjCustomer.getCusName());
final TjCustomer one = customerService.getOne(wq);
- one.setConnect("");
+ one.setConnect(null);
final boolean b = customerService.updateById(one);
if (b) {
return AjaxResult.success();
@@ -132,14 +132,15 @@
// }
// }
- LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer customer = customerService.getOne(wq);
+
+ TjCustomer customer = customerService.getTjCustomerByCusIdCard(cusIdcard);
String key = sysConfigService.selectConfigByKey("sfkqdyhis");
if (customer != null) {
customer.setConnect(tjCustomer.getConnect());
+ customer.setCusPhone(tjCustomer.getCusPhone());
+ customer.setCusMarryStatus(tjCustomer.getCusMarryStatus());
customerService.updateById(customer);
return AjaxResult.success(customer);
}
@@ -261,7 +262,7 @@
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusPhone, phone);
List<TjCustomer> tjCustomer1 = customerService.list(qw);
- if (tjCustomer1 != null && tjCustomer1.size() > 0) {
+ if (tjCustomer1 != null && !tjCustomer1.isEmpty()) {
List<String> num = new ArrayList<>();
for (TjCustomer tjCustomer : tjCustomer1) {
num.add(tjCustomer.getCusIdcard());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index c4ec1cf..17af177 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -104,7 +104,7 @@
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusPhone, cusPhone);
List<TjCustomer> list1 = customerService.list(wq1);
- if (list1.size() != 0) {
+ if (null != list1 && !list1.isEmpty()) {
for (TjCustomer tjCustomer : list1) {
Map<String, Object> map = new HashMap<>();
QueryWrapper<TjOrder> wq2 = new QueryWrapper<>();
@@ -113,7 +113,7 @@
wq2.isNotNull("finish_time");
wq2.orderByDesc("finish_time");
List<TjOrder> list = orderService.list(wq2);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
TjOrder tjOrder = orderService.list(wq2).get(0);
map.put("report", tjOrder);
map.put("customer", tjCustomer);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
index 9e6abc8..248de0f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
@@ -388,7 +388,7 @@
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusPhone, phone);
List<TjCustomer> tjCustomer1 = customerService.list(qw);
- if (tjCustomer1 != null && tjCustomer1.size()>0) {
+ if (tjCustomer1 != null && !tjCustomer1.isEmpty()) {
for (TjCustomer tjCustomer : tjCustomer1) {
tjCustomer.setConnect(openId);
customerService.updateById(tjCustomer);
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 855bbd2..8ec252f 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
@@ -151,6 +151,7 @@
@PostMapping(value = "/cusIdcard")
@ApiOperation(value = "鏍规嵁韬唤璇佸彿鑾峰彇鐢ㄦ埛淇℃伅")
// @Log(title = "瀹㈡埛韬唤淇℃伅", businessType = BusinessType.EXPORT)
+ @RepeatSubmit
public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "瀹㈡埛韬唤璇佸彿") String cusIdcard) {
if (!"".equals(cusIdcard) && cusIdcard != null) {
@@ -229,9 +230,7 @@
tjReservationService.updateById(tjReservation);
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}
- LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
- qw.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
+ TjCustomer tjCustomer1 = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
if (tjCustomer1 != null) {
// if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
// if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
@@ -327,7 +326,9 @@
} else if(null != s && s.equalsIgnoreCase("Y")) {
tjCustomer = isRequestCommonHisApi(tjCustomer);
}
- tjCustomerService.save(tjCustomer);
+// TjCustomer tjCustomerByCusIdCard = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
+// if(null != tjCustomerByCusIdCard)
+ tjCustomerService.save(tjCustomer);
tjCustomer.setTeamNo(tjReservation.getTeamNo());
tjCustomer.setCompId(tjReservation.getCompanyId());
tjCustomer.setReservationId(tjReservation.getId());
--
Gitblit v1.8.0