From 380efb1e727d51c9080a91bd7aad6a063081bb45 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 09 四月 2025 12:31:25 +0800
Subject: [PATCH] feat: 1.修改统计跟随查询变化 2.修改账单分页查询排序，新增按状态排序权重表 3.新增修改账单金额接口
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 562b8fe..17b3fba 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -118,8 +118,8 @@
appletUserDecodeData.setOpenId(openid);
// 先使用openId和当前手机号进行查询
TTenant tenant = tTenantService.getOne(Wrappers.lambdaQuery(TTenant.class)
- .eq(TTenant::getOpenId, appletUserDecodeData.getOpenId())
- .eq(TTenant::getPhone, appletUserDecodeData.getPhoneNumber()));
+ .and(e->e.eq(TTenant::getOpenId, appletUserDecodeData.getOpenId()).or()
+ .eq(TTenant::getPhone, appletUserDecodeData.getPhoneNumber())));
if (tenant==null){
// appUser.setTenantAttributes();
// appUser.setTenantType();
@@ -135,8 +135,9 @@
LoginUserApplet loginUserApplet = new LoginUserApplet();
TTenantResp tTenantResp = new TTenantResp();
BeanUtils.copyProperties(tenant, tTenantResp);
+ tTenantResp.setResidentName(appletUserDecodeData.getPhoneNumber());
loginUserApplet.setUser(tTenantResp);
- loginUserApplet.setUserId(Long.valueOf(tenant.getId()));
+ loginUserApplet.setUserId(tenant.getId());
Map<String, Object> tokenInfos = new HashMap<>();
tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
tokenInfos.put("info",loginUserApplet);
--
Gitblit v1.7.1