From fb2f11d7d502ceacbe7fbed176bea4ab0f152f69 Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@88.com>
Date: 星期四, 03 七月 2025 18:17:59 +0800
Subject: [PATCH] 添加mqtt

---
 src/main/java/com/lunhan/water/service/UserLoginService.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lunhan/water/service/UserLoginService.java b/src/main/java/com/lunhan/water/service/UserLoginService.java
index c530828..274fdb1 100644
--- a/src/main/java/com/lunhan/water/service/UserLoginService.java
+++ b/src/main/java/com/lunhan/water/service/UserLoginService.java
@@ -33,9 +33,14 @@
 import com.lunhan.water.entity.enums.EUserType;
 import com.lunhan.water.entity.request.ReqChangePassword;
 import com.lunhan.water.entity.request.ReqUserLogin;
+import com.lunhan.water.repository.impl.PaymentRecordsMapperImpl;
+import com.lunhan.water.repository.impl.RechargeRecordsMapperImpl;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import com.lunhan.water.repository.impl.UserLoginMapperImpl;
@@ -54,6 +59,10 @@
 public class UserLoginService extends BaseService {
     @Autowired
     private UserLoginMapperImpl mapper;
+    @Autowired
+    private RechargeRecordsMapperImpl rechargeRecordsMapper;
+    @Autowired
+    private PaymentRecordsMapperImpl paymentRecordsMapper;
 
     public ExecutedResult<Long> create(ReqCreateUserLogin request) {
         // 转换po
@@ -78,12 +87,15 @@
         if (checkExists.isFailed()) {
             return ExecutedResult.failed(checkExists.getMsg());
         }
+        //UserLoginPO data = checkExists.getData();
         // 转换po
-        UserLoginPO item = UserLoginConvert.INSTANCE.toModify(request);
-
+        UserLoginPO item =new UserLoginPO();
+        item.setId( checkExists.getData().getId());
+        item.setNickName(request.getNickName());
+        item.setHeadImg(request.getHeadImg());
         int rowCount = mapper.updateById(item);
         if (rowCount != 1) {
-            return ExecutedResult.failed("编辑[null]失败。");
+            return ExecutedResult.failed("编辑用户信息失败。");
         }
         return ExecutedResult.success();
     }
@@ -98,7 +110,22 @@
         }
         return ExecutedResult.success(result);
     }
+    public ExecutedResult<UserLoginVO> getUser(LoginUserDTO loginUser){
+        UserLoginPO userLoginPO = mapper.get4Openid(loginUser.getUserId());
+        if(Objects.isNull(userLoginPO)){
+            return ExecutedResult.failed("未获取到用户信息!");
+        }
+        UserLoginVO userLoginVO = CopierUtil.mapTo(userLoginPO, UserLoginVO.class);
+        //查询总够水量
+        BigDecimal sumBuyCount = rechargeRecordsMapper.getSumBuyCount(userLoginPO.getId());
+        //查询总用水量
+        BigDecimal sumUseCount = paymentRecordsMapper.getSumUseCount(userLoginPO.getId());
+        userLoginVO.setSumBuyCount(sumBuyCount);
+        userLoginVO.setSumUseCount(sumUseCount);
 
+
+        return ExecutedResult.success(userLoginVO);
+    }
 //    public ExecutedResult<String> stop(Long id) {
 //        // 验证记录是否存在
 //        ExecutedResult<UserLoginPO> checkExists = this.check4Id(id);

--
Gitblit v1.9.3