From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 e626a91..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,6 +6,7 @@
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.*;
import com.dsh.account.util.ResultUtil;
@@ -24,7 +25,7 @@
*/
public interface TAppUserService extends IService<TAppUser> {
- ClassInfoVo queryUserOfStus(Integer id,String longitude,String latitude);
+ ClassInfoVo queryUserOfStus(Integer id);
/**
@@ -110,7 +111,7 @@
* @param recordId 记录
* @return
*/
- BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
+ List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
/**
* 注销账号
@@ -120,7 +121,7 @@
List<RechargeCentVo> getSysRechargeConfig(Integer appUserId);
- PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis);
+ List<Goods> queryAppUserIntegral(MallRequest request);
ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request);
@@ -128,9 +129,11 @@
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);
+ 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