From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index 6dc643d..c33df21 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -1,19 +1,27 @@
package com.dsh.account.service;
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>
@@ -111,7 +119,7 @@
* @param recordId 记录
* @return
*/
- BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
+ List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
/**
* 注销账号
@@ -121,19 +129,43 @@
List<RechargeCentVo> getSysRechargeConfig(Integer appUserId);
- PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis);
+ List<Goods> queryAppUserIntegral(MallRequest request);
- ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request);
ProductDetailsVo productDetails(Integer goodId, Integer goodsType );
StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis ,Integer pointsMerId, String lat, String lon,Integer isCourse);
- ResultUtil productRedemptionOperation(Integer userIdFormRedis, Integer goodId, Integer goodsType,Integer nums,Integer exchangeType,Integer payType,List<Integer> stuIds);
+ ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeVo);
ResultUtil exchangeAddPaymentCallback(String code, String orderNumber,Integer payType);
List<StoreResponse> queryStoresOfExchange(Integer goodsType,Integer pointsMerId);
List<CourseVenue> queryWeekOfCourseDetails(Integer appUserId ,Integer stuId, String time, String longitude, String latitude);
+
+ 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);
}
--
Gitblit v1.7.1