From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 06d11c7..d0b0c52 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -16,8 +16,11 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.mapper.TjCustomerMapper;
import com.ltkj.hosp.service.IDictHospService;
import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysRoleMenu;
import com.ltkj.system.domain.SysUserPost;
@@ -51,13 +54,10 @@
public class SysLoginController {
@Autowired
private SysLoginService loginService;
-
@Autowired
private ISysMenuService menuService;
-
@Autowired
private SysPermissionService permissionService;
-
@Resource
private ITjCustomerService customerService;
@Resource
@@ -77,6 +77,10 @@
private boolean secretKeyLogin;
@Autowired
private RedisCache redisCache;
+ @Autowired
+ private ITjOrderService tjOrderService;
+ @Autowired
+ private TjCustomerMapper tjCustomerMapper;
/**
* 鐧诲綍鏂规硶
@@ -95,6 +99,11 @@
token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
} else {
token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjCustomer::getCusPhone, loginBody.getUsername());
+ TjCustomer tjCustomer = customerService.getOne(wq);
+ List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(tjCustomer.getCusIdcard(),tjCustomer.getCusName());
+ ajax.put("orderList",customer);
}
if (null == token) {
return success("璇ヨ处鍙锋鍦ㄤ娇鐢ㄤ腑");
--
Gitblit v1.8.0