From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index 627d0fc..57653aa 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -2,13 +2,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.MemberSuggestService;
-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.member.service.member.MemberTotalService;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AppMiniLoginDto;
@@ -30,11 +27,10 @@
private MemberService memberService;
@Resource
- private MemberCouponService memberCouponService;
-
- @Resource
private MemberSuggestService memberSuggestService;
+ @Resource
+ private MemberTotalService memberTotalService;
/**
* @description: getMember
@@ -78,17 +74,7 @@
return R.ok(appUserRegisterVo);
}
- /**
- * @description: 获取用户优惠券
- * @author jqs34
- * @date 2023/5/3 1:45
- * @version 1.0
- */
- @PostMapping("/listVoMemberCouponByUserId")
- public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId){
- List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(userId);
- return R.ok(appMemberCouponVoList);
- }
+
/**
* 更新会员绑定商户
@@ -171,13 +157,13 @@
* @description 通过ids获取用户简易返回
* @author jqs
* @date 2023/6/16 11:05
- * @param userIds
+ * @param mgtBaseBathDto
* @return R<List<MgtSimpleMemberVo>>
*/
@PostMapping("/listSimpleVoByIds")
- public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody String userIds)
+ public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto)
{
- List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(userIds);
+ List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(mgtBaseBathDto.getIds());
return R.ok(simpleMemberVoList);
}
@@ -209,4 +195,59 @@
return R.ok(bulletinBoardVo);
}
+ /**
+ * @description 筛选userId年龄段
+ * @author jqs
+ * @date 2023/6/20 14:31
+ * @param mgtActivityAgeDto
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listUserIdByAge")
+ public R<List<Long>> listUserIdByAge(@RequestBody MgtActivityAgeDto mgtActivityAgeDto)
+ {
+ List<Long> userIdList = memberService.listUserIdByAge(mgtActivityAgeDto);
+ return R.ok(userIdList);
+ }
+
+ /**
+ * @description 通过shopId获取userId
+ * @author jqs
+ * @date 2023/6/21 17:11
+ * @param shopIdlist
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listUserIdByShopId")
+ public R<List<Long>> listUserIdByShopId(@RequestBody List<Long> shopIdlist)
+ {
+ List<Long> userIdList = memberService.listUserIdByShopId(shopIdlist);
+ return R.ok(userIdList);
+ }
+
+ /**
+ * @description 通过shopId获取user统计
+ * @author jqs
+ * @date 2023/6/21 17:22
+ * @param shopIdlist
+ * @return R<MgtShopTotalMemberVo>
+ */
+ @PostMapping("/getUserTotalByShopId")
+ public R<MgtShopTotalMemberVo> getUserTotalByShopId(@RequestBody List<Long> shopIdlist)
+ {
+ MgtShopTotalMemberVo shopTotalMemberVo = memberService.getUserTotalByShopId(shopIdlist);
+ return R.ok(shopTotalMemberVo);
+ }
+
+ /**
+ * @description 更新会员统计
+ * @author jqs
+ * @date 2023/6/28 17:52
+ * @param memberTotalChangeDto
+ * @return R
+ */
+ @PostMapping("/changeMemberTotal")
+ public R changeMemberTotal(@RequestBody MemberTotalChangeDto memberTotalChangeDto)
+ {
+ memberService.changeMemberTotal(memberTotalChangeDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1