From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 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 138a47f..c35a746 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
@@ -6,10 +6,14 @@
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.CourseVenue;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
-import com.dsh.account.model.vo.userBenefitDetail.BillingDetailsVo;
-import com.dsh.account.model.vo.userBenefitDetail.IndexOfUserBenefirVo;
+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;
/**
* <p>
@@ -21,7 +25,7 @@
*/
public interface TAppUserService extends IService<TAppUser> {
- ClassInfoVo queryUserOfStus(Integer id,String longitude,String latitude);
+ ClassInfoVo queryUserOfStus(Integer id);
/**
@@ -104,10 +108,10 @@
/**
* 获取用户账单列表
* @param yearMonth 年月
- * @param recordId 记录id
+ * @param recordId 记录
* @return
*/
- BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId);
+ List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
/**
* 注销账号
@@ -115,4 +119,21 @@
*/
void cancellation(Integer appUserId);
+ List<RechargeCentVo> getSysRechargeConfig(Integer appUserId);
+
+ 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 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);
}
--
Gitblit v1.7.1