From 1baa968ec54ff2a0f08bdeb6e8cebd987754ed74 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 11 三月 2025 18:06:27 +0800
Subject: [PATCH] 修改门店添加订单使用优惠券无效的bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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 a28c80f..7bea543 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,9 +10,11 @@
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;
@@ -21,6 +23,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/member")
@@ -37,6 +40,13 @@
@Resource
private BirthdayCardService birthdayCardService;
+
+ @Resource
+ private RemoteShopService remoteShopService;
+
+
+
+
/**
* @description: getMember
@@ -167,9 +177,8 @@
* @return R<List<MgtSimpleMemberVo>>
*/
@PostMapping("/listSimpleVoByIds")
- public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto)
- {
- List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(mgtBaseBathDto.getIds());
+ public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody String userIds)
+ {List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(userIds);
return R.ok(simpleMemberVoList);
}
@@ -195,9 +204,11 @@
* @date 2023/6/18 16:45
*/
@PostMapping("/boardMemberTotal")
- public R<MgtBulletinBoardVo> boardMemberTotal()
+ public R<MgtBulletinBoardVo> boardMemberTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto)
{
- MgtBulletinBoardVo bulletinBoardVo = memberService.boardMemberTotal();
+ 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);
}
@@ -300,6 +311,20 @@
}
/**
+ * @description 核销奖品
+ * @author jqs
+ * @date 2023/8/10 11:56
+ * @param merVerifyPrizeFinalDto
+ * @return R
+ */
+ @PostMapping("/verifyPrize")
+ public R verifyPrize(@RequestBody MerVerifyPrizeFinalDto merVerifyPrizeFinalDto)
+ {
+ memberGiftRecordService.verifyPrize(merVerifyPrizeFinalDto);
+ return R.ok();
+ }
+
+ /**
* @description 积分变动
* @author jqs
* @date 2023/7/12 17:04
@@ -346,4 +371,10 @@
BirthdayCard birthdayCard = birthdayCardService.getBirthdayCard();
return R.ok(birthdayCard);
}
+
+ @PostMapping("/listUserIdByAgeType")
+ public R<List<Long>> listUserIdByAgeType(@RequestBody Integer ageType){
+ List<Long> userIdList = memberService.listUserIdByAgeType(ageType);
+ return R.ok(userIdList);
+ }
}
--
Gitblit v1.7.1