From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 100 insertions(+), 9 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 4d2dce7..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;
@@ -36,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);
+
/**
* 更新绑定
@@ -100,7 +95,7 @@
* @description 通过ids获取用户简易返回
* @author jqs
* @date 2023/6/16 11:05
- * @param userIds
+ * @param mgtBaseBathDto
* @return R<List<MgtSimpleMemberVo>>
*/
@PostMapping("/member/listSimpleVoByIds")
@@ -133,6 +128,102 @@
* @param mgtActivityAgeDto
* @return R<List<Long>>
*/
- @PostMapping("/listUserIdByAge")
+ @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("/member/listOrderAgeUser")
+ public R<List<MerOrderAgeUserVo>> listOrderAgeUser(@RequestBody MerTotalDto merTotalDto);
+
+ /**
+ * @description 获取未回复数量
+ * @author jqs
+ * @date 2023/7/5 12:49
+ * @param
+ * @return R<Integer>
+ */
+ @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