From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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 3669462..1d4aa55 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,11 +1,16 @@
package com.dsh.account.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.dto.SelectDto;
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.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;
@@ -13,6 +18,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -24,7 +30,7 @@
*/
public interface TAppUserService extends IService<TAppUser> {
- ClassInfoVo queryUserOfStus(Integer id,String longitude,String latitude);
+ ClassInfoVo queryUserOfStus(Integer id);
/**
@@ -107,10 +113,10 @@
/**
* 获取用户账单列表
* @param yearMonth 年月
- * @param recordId 记录id
+ * @param recordId 记录
* @return
*/
- BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
+ List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
/**
* 注销账号
@@ -120,8 +126,25 @@
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, 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);
}
--
Gitblit v1.7.1