From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 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 58f08bf..2975b15 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,13 +1,21 @@
package com.dsh.account.service;
-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.vo.classDetails.classInsVo.ClassInfoVo;
-import com.dsh.account.util.ResultUtil;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.dto.SelectDto;
+import com.dsh.account.entity.TAppUser;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -19,7 +27,7 @@
*/
public interface TAppUserService extends IService<TAppUser> {
- ClassInfoVo queryUserOfStus(Integer id,String longitude,String latitude);
+ ClassInfoVo queryUserOfStus(Integer id);
/**
@@ -91,4 +99,53 @@
* @throws Exception
*/
JoinPlayPaiVo queryJoinPlayPai(Integer uid, String lon, String lat) throws Exception;
+
+ /**
+ * 获取使用福利首页数据
+ * @param appUserId
+ * @return
+ */
+ IndexOfUserBenefirVo queryBenefitDetails(Integer appUserId);
+
+ /**
+ * 获取用户账单列表
+ * @param yearMonth 年月
+ * @param recordId 记录
+ * @return
+ */
+ List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
+
+ /**
+ * 注销账号
+ * @param appUserId
+ */
+ void cancellation(Integer appUserId);
+
+ List<RechargeCentVo> getSysRechargeConfig(Integer appUserId);
+
+ List<Goods> queryAppUserIntegral(MallRequest 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);
+
+ Object changeState(AdvertisementChangeStateDTO dto);
+
+ List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto);
}
--
Gitblit v1.7.1