From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 14 七月 2023 09:30:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 19 +++++++++++++++---- 1 files changed, 15 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 138a47f..b8cf145 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 @@ -7,9 +7,12 @@ 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.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> @@ -104,10 +107,10 @@ /** * 获取用户账单列表 * @param yearMonth 年月 - * @param recordId 记录id + * @param recordId 记录 * @return */ - BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId); + BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId); /** * 注销账号 @@ -115,4 +118,12 @@ */ void cancellation(Integer appUserId); + List<RechargeCentVo> getSysRechargeConfig(Integer appUserId); + + PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis); + + ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request); + + ProductDetailsVo productDetails(Integer goodId, Integer goodsType ); + } -- Gitblit v1.7.1