Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

 cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java

@@ -2,21 +2,26 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.account.dto.SelectDto;
import com.dsh.account.dto.UserInfoQueryDTO;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.model.AddAppUserVo;
import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
import com.dsh.account.model.LoginWeChatVo;
import com.dsh.account.model.*;
import com.dsh.account.model.query.appUserQuery.QueryAppUser;
import com.dsh.account.model.vo.DetailsListVo;
import com.dsh.account.model.vo.QueryAppUserVO;
import com.dsh.account.model.vo.classDetails.CourseVenue;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.account.model.vo.userBenefitDetail.*;
import com.dsh.account.util.ResultUtil;
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.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -141,5 +146,26 @@

    List<QueryAppUserVO> listAll(QueryAppUser query);

    Map<String,Object> weeksOfCourseDetailsList(Integer appUserId, Integer stuId, String time, Integer storeId,String lon,String lat);


    List<SelectDto> getSelects(List<Integer> studentIds);

    Object changeState(AdvertisementChangeStateDTO dto);

    List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto);


    List<YearData> getYearUserCount(UserInfoQueryDTO dto);

    List<MonthData> getMonthUserCount(UserInfoQueryDTO dto);

    WeekData getWeekUserCount4(UserInfoQueryDTO dto);
    WeekData getWeekUserCount3(UserInfoQueryDTO dto);
    WeekData getWeekUserCount2(UserInfoQueryDTO dto);
    WeekData getWeekUserCount1(UserInfoQueryDTO dto);

    List<DayData> getDayUserCount(UserInfoQueryDTO dto);

    List<GroupCityInfoVO> groupCityInfo(UserInfoQueryDTO dto);
}