From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期日, 06 八月 2023 11:29:10 +0800 Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 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 7749d9b..5d6de2b 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 @@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.poji.member.Member; +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; @@ -169,7 +170,7 @@ * @param merTotalDto * @return R<MerOrderAgeUserVo> */ - @PostMapping("/listOrderAgeUser") + @PostMapping("/member/listOrderAgeUser") public R<List<MerOrderAgeUserVo>> listOrderAgeUser(@RequestBody MerTotalDto merTotalDto); /** @@ -179,6 +180,50 @@ * @param * @return R<Integer> */ - @PostMapping("/getUnReplaySuggestVo") + @PostMapping("/member/getUnReplaySuggestVo") public R<Integer> getUnReplaySuggestVo(); + + + /** + * @description 获取核销奖品 + * @author jqs + * @date 2023/7/8 17:43 + * @param verifyPrize + * @return R<MemberGiftRecord> + */ + @PostMapping("/member/getVerifyPrize") + public R<MemberGiftRecord> getVerifyPrize(@RequestBody String verifyPrize); + + + /** + * @description 积分变动 + * @author jqs + * @date 2023/7/12 17:04 + * @param integralChangeDto + * @return R + */ + @PostMapping("/member/changeIntegral") + public R signShare(@RequestBody IntegralChangeDto integralChangeDto); + + + /** + * @description 统计商户今日新增会员 + * @author jqs + * @date 2023/7/14 20:00 + * @param shopIdList + * @return R<Integer> + */ + @PostMapping("/member/getAreaNewMember") + public R<Integer> getAreaNewMember(@RequestBody List<Long> shopIdList); + + + /** + * @description 更新会员绑定商户名 + * @author jqs + * @date 2023/7/26 17:07 + * @param mgtMemberShopNameDto + * @return R + */ + @PostMapping("/member/updateMemberShopName") + public R updateMemberShopName(@RequestBody MgtMemberShopNameDto mgtMemberShopNameDto); } -- Gitblit v1.7.1