From ea1a62ba6484d6c6cb1ca67dcea938a95ba18fc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 18:26:26 +0800
Subject: [PATCH] 新增加用户端接口
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 6ca20f8..8dd6dda 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
@@ -10,17 +10,17 @@
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
+import com.ruoyi.system.api.service.RemoteShopService;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/member")
@@ -37,6 +37,13 @@
@Resource
private BirthdayCardService birthdayCardService;
+
+ @Resource
+ private RemoteShopService remoteShopService;
+
+
+
+
/**
* @description: getMember
@@ -194,9 +201,11 @@
* @date 2023/6/18 16:45
*/
@PostMapping("/boardMemberTotal")
- public R<MgtBulletinBoardVo> boardMemberTotal(@RequestBody List<Long> userIds)
+ public R<MgtBulletinBoardVo> boardMemberTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto)
{
- MgtBulletinBoardVo bulletinBoardVo = memberService.boardMemberTotal(userIds);
+ List<Shop> shopList = remoteShopService.getShopBySysUserIds(boardMemberTotalDto);
+ List<Long> shopIds = shopList.stream().map(Shop::getShopId).collect(Collectors.toList());
+ MgtBulletinBoardVo bulletinBoardVo = memberService.boardMemberTotal(shopIds);
return R.ok(bulletinBoardVo);
}
@@ -352,17 +361,29 @@
memberService.updateMemberShopName(mgtMemberShopNameDto);
return R.ok();
}
-
+
@PostMapping("/getBirthdayCard")
- public R<BirthdayCard> getBirthdayCard()
- {
+ public R<BirthdayCard> getBirthdayCard() {
BirthdayCard birthdayCard = birthdayCardService.getBirthdayCard();
return R.ok(birthdayCard);
}
-
+
@PostMapping("/listUserIdByAgeType")
- public R<List<Long>> listUserIdByAgeType(@RequestBody Integer ageType){
+ public R<List<Long>> listUserIdByAgeType(@RequestBody Integer ageType) {
List<Long> userIdList = memberService.listUserIdByAgeType(ageType);
return R.ok(userIdList);
}
+
+
+ /**
+ * 手动添加用户积分
+ *
+ * @param integral
+ * @param userId
+ * @return
+ */
+ @PostMapping("/addIntegralRecord")
+ public R addIntegralRecord(@RequestParam("integral") Integer integral, @RequestParam("userId") Long userId, @RequestParam("orderId") String orderId) {
+ return memberService.addIntegralRecord(integral, userId, orderId);
+ }
}
--
Gitblit v1.7.1