From c71055635df3d75e5dc838a9b66036c591913a13 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期六, 08 七月 2023 18:37:12 +0800 Subject: [PATCH] 管理台bug和用户端 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java | 106 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 89 insertions(+), 17 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java index 4bca511..d75f150 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java @@ -2,15 +2,10 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.dto.AppMemberBindingDto; -import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto; -import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto; -import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto; +import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.poji.member.Member; -import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo; -import com.ruoyi.system.api.domain.vo.AppMemberCouponVo; -import com.ruoyi.system.api.domain.vo.MgtSimpleMemberVo; -import com.ruoyi.system.api.domain.vo.MgtUserIdByKeywordVo; +import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord; +import com.ruoyi.system.api.domain.vo.*; import com.ruoyi.system.api.factory.RemoteMemberFallbackFactory; import com.ruoyi.system.api.model.AppMiniLoginDto; import com.ruoyi.system.api.model.AppMiniLoginVo; @@ -42,13 +37,7 @@ @PostMapping("/member/miniRegister") public R<AppMiniRegisterVo> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto); - /** - * 通过userid获取用户优惠 - * @param userId - * @return - */ - @PostMapping("/member/listVoMemberCouponByUserId") - public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId); + /** * 更新绑定 @@ -106,11 +95,11 @@ * @description 通过ids获取用户简易返回 * @author jqs * @date 2023/6/16 11:05 - * @param userIds + * @param mgtBaseBathDto * @return R<List<MgtSimpleMemberVo>> */ @PostMapping("/member/listSimpleVoByIds") - public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody String userIds); + public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto); /** * @description @@ -121,4 +110,87 @@ */ @PostMapping("/member/getUserIdByKeyword") public R<MgtUserIdByKeywordVo> getUserIdByKeyword(@RequestBody MgtUserIdByKeywordDto mgtUserIdByKeywordDto); + + /** + * @description boardMemberTotal + * @param + * @return R<MgtBulletinBoardVo> + * @author jqs34 + * @date 2023/6/18 16:45 + */ + @PostMapping("/member/boardMemberTotal") + public R<MgtBulletinBoardVo> boardMemberTotal(); + + /** + * @description 筛选userId年龄段 + * @author jqs + * @date 2023/6/20 14:31 + * @param mgtActivityAgeDto + * @return R<List<Long>> + */ + @PostMapping("/member/listUserIdByAge") + public R<List<Long>> listUserIdByAge(@RequestBody MgtActivityAgeDto mgtActivityAgeDto); + + + /** + * @description 通过shopId获取userId + * @author jqs + * @date 2023/6/21 17:11 + * @param shopIdlist + * @return R<List<Long>> + */ + @PostMapping("/member/listUserIdByShopId") + public R<List<Long>> listUserIdByShopId(@RequestBody List<Long> shopIdlist); + + /** + * @description 通过shopId获取user统计 + * @author jqs + * @date 2023/6/21 17:22 + * @param shopIdlist + * @return R<MgtShopTotalMemberVo> + */ + @PostMapping("/member/getUserTotalByShopId") + public R<MgtShopTotalMemberVo> getUserTotalByShopId(@RequestBody List<Long> shopIdlist); + + /** + * @description 更新会员统计 + * @author jqs + * @date 2023/6/28 17:52 + * @param memberTotalChangeDto + * @return R + */ + @PostMapping("/member/changeMemberTotal") + public R changeMemberTotal(@RequestBody MemberTotalChangeDto memberTotalChangeDto); + + + /** + * @description 获取各年龄层userId + * @author jqs + * @date 2023/7/4 9:49 + * @param merTotalDto + * @return R<MerOrderAgeUserVo> + */ + @PostMapping("/listOrderAgeUser") + public R<List<MerOrderAgeUserVo>> listOrderAgeUser(@RequestBody MerTotalDto merTotalDto); + + /** + * @description 获取未回复数量 + * @author jqs + * @date 2023/7/5 12:49 + * @param + * @return R<Integer> + */ + @PostMapping("/getUnReplaySuggestVo") + public R<Integer> getUnReplaySuggestVo(); + + + /** + * @description 获取核销奖品 + * @author jqs + * @date 2023/7/8 17:43 + * @param verifyPrize + * @return R<MemberGiftRecord> + */ + @PostMapping("/getVerifyPrize") + public R<MemberGiftRecord> getVerifyPrize(@RequestBody String verifyPrize); } -- Gitblit v1.7.1