From e0cfe53794b2c90d9f42e5ec821dd5775758d737 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 09 十月 2023 12:00:53 +0800
Subject: [PATCH] update

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java |   76 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 599d6d4..5b2a892 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsh.account.dto.SelectDto;
+import com.dsh.account.dto.UserInfoQueryDTO;
 import com.dsh.account.entity.*;
 import com.dsh.account.enums.RechargeRecordEnum;
 import com.dsh.account.feignclient.activity.IntroduceRewardsClient;
@@ -44,6 +45,11 @@
 import com.dsh.account.service.TAppUserService;
 import com.dsh.account.util.*;
 import com.dsh.account.util.akeylogin.Md5Util;
+import com.dsh.account.vo.GroupCityInfoVO;
+import com.dsh.account.vo.entity.DayData;
+import com.dsh.account.vo.entity.MonthData;
+import com.dsh.account.vo.entity.WeekData;
+import com.dsh.account.vo.entity.YearData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -60,6 +66,7 @@
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -177,7 +184,62 @@
     public List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto) {
         return appUserMapper.queryAPPUserByNameAndPhone(dto);
     }
+    @Override
+    public List<YearData> getYearUserCount(UserInfoQueryDTO dto) {
+        return appUserMapper.getYearUserCount(dto);
+    }
 
+    @Override
+    public List<MonthData> getMonthUserCount(UserInfoQueryDTO dto) {
+        List<MonthData> monthUserCount = appUserMapper.getMonthUserCount(dto);
+        for (int i = 1; i <= 12; i++) {
+            String time = String.valueOf(i);
+            if (i < 10) {
+                time = "0" + time;
+            }
+            monthUserCount.add(Optional.ofNullable(monthUserCount.get(i)).orElse(new MonthData(time, 0)));
+        }
+        return monthUserCount.stream().sorted(Comparator.comparing(MonthData::getMonth)).collect(Collectors.toList());
+    }
+
+    @Override
+    public WeekData getWeekUserCount4(UserInfoQueryDTO dto) {
+        return appUserMapper.getWeekUserCount4(dto);
+    }
+    @Override
+    public WeekData getWeekUserCount3(UserInfoQueryDTO dto) {
+        return appUserMapper.getWeekUserCount3(dto);
+    }
+    @Override
+    public WeekData getWeekUserCount2(UserInfoQueryDTO dto) {
+        return appUserMapper.getWeekUserCount2(dto);
+    }
+    @Override
+    public WeekData getWeekUserCount1(UserInfoQueryDTO dto) {
+        return appUserMapper.getWeekUserCount1(dto);
+    }
+
+    @Override
+    public List<DayData> getDayUserCount(UserInfoQueryDTO dto) {
+        List<DayData> dayUserCount = appUserMapper.getDayUserCount(dto);
+        if(dayUserCount.size()<7){
+            for (int i = 1; i <= 6; i++) {
+                String time = LocalDate.now().minusDays(i).toString();
+                for (DayData dayData : dayUserCount) {
+                    if(!time.equals(dayData.getDay())){
+                        dayUserCount.add(new DayData(time,0));
+                    }
+                }
+            }
+        }
+        dayUserCount.forEach(dayData->dayData.setDay(dayData.getDay().split("-")[2]));
+        return dayUserCount.stream().sorted(Comparator.comparing(DayData::getDay)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<GroupCityInfoVO> groupCityInfo(UserInfoQueryDTO dto) {
+        return appUserMapper.groupCityInfo(dto);
+    }
     @Override
     public ClassInfoVo queryUserOfStus(Integer id) {
         TAppUser tAppUser = this.baseMapper.selectById(id);
@@ -421,6 +483,7 @@
     @Override
     public ResultUtil loginWechat(LoginWeChatVo loginWechatVo) throws Exception {
         TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("openid", loginWechatVo.getOpenId()).ne("state", 3));
+
         if(null == tAppUser){
             tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", loginWechatVo.getPhone()).ne("state", 3));
             if(null == tAppUser){
@@ -430,6 +493,9 @@
                 tAppUser.setPhone(loginWechatVo.getPhone());
                 tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
                 tAppUser.setIsVip(0);
+                tAppUser.setName(loginWechatVo.getNickname());
+                tAppUser.setHeadImg(loginWechatVo.getHeadimgurl());
+                tAppUser.setGender(loginWechatVo.getSex());
                 tAppUser.setState(1);
                 tAppUser.setInsertTime(new Date());
                 this.baseMapper.insert(tAppUser);
@@ -448,7 +514,15 @@
         this.updateById(tAppUser);
 
         String token = getToken(tAppUser);
-        return ResultUtil.success(token);
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("token",token);
+        if(ToolUtil.isEmpty(tAppUser.getPhone())){
+            map.put("isBind","0");
+        }else {
+            map.put("isBind","1");
+        }
+        return ResultUtil.success(map);
     }
 
 

--
Gitblit v1.7.1