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 | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 204 insertions(+), 25 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 e911272..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
@@ -2,20 +2,19 @@
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.birthday.BirthdayCardService;
+import com.ruoyi.member.service.member.MemberGiftRecordService;
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.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
-import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
-import com.ruoyi.system.api.domain.vo.MgtSimpleMemberVo;
-import com.ruoyi.system.api.domain.vo.MgtUserIdByKeywordVo;
+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;
@@ -24,6 +23,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/member")
@@ -33,10 +33,19 @@
private MemberService memberService;
@Resource
- private MemberCouponService memberCouponService;
+ private MemberSuggestService memberSuggestService;
@Resource
- private MemberSuggestService memberSuggestService;
+ private MemberGiftRecordService memberGiftRecordService;
+
+ @Resource
+ private BirthdayCardService birthdayCardService;
+
+ @Resource
+ private RemoteShopService remoteShopService;
+
+
+
/**
@@ -81,17 +90,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);
- }
+
/**
* 更新会员绑定商户
@@ -174,13 +173,12 @@
* @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)
- {
- List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(userIds);
+ {List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(userIds);
return R.ok(simpleMemberVoList);
}
@@ -198,4 +196,185 @@
return R.ok(mgtUserIdByKeywordVo);
}
+ /**
+ * @description boardMemberTotal
+ * @param
+ * @return R<MgtBulletinBoardVo>
+ * @author jqs34
+ * @date 2023/6/18 16:45
+ */
+ @PostMapping("/boardMemberTotal")
+ public R<MgtBulletinBoardVo> boardMemberTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto)
+ {
+ 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);
+ }
+
+ /**
+ * @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();
+ }
+
+ /**
+ * @description 获取各年龄层userId
+ * @author jqs
+ * @date 2023/7/4 9:49
+ * @param merTotalDto
+ * @return R<MerOrderAgeUserVo>
+ */
+ @PostMapping("/listOrderAgeUser")
+ public R<List<MerOrderAgeUserVo>> listOrderAgeUser(@RequestBody MerTotalDto merTotalDto)
+ {
+ List<MerOrderAgeUserVo> orderAgeUserVoList = memberService.listOrderAgeUser(merTotalDto);
+ return R.ok(orderAgeUserVoList);
+ }
+
+ /**
+ * @description 获取未回复数量
+ * @author jqs
+ * @date 2023/7/5 12:49
+ * @param
+ * @return R<Integer>
+ */
+ @PostMapping("/getUnReplaySuggestVo")
+ public R<Integer> getUnReplaySuggestVo()
+ {
+ Integer count = memberSuggestService.getUnReplaySuggestVo();
+ return R.ok(count);
+ }
+
+ /**
+ * @description 获取核销奖品
+ * @author jqs
+ * @date 2023/7/8 17:43
+ * @param verifyPrize
+ * @return R<MemberGiftRecord>
+ */
+ @PostMapping("/getVerifyPrize")
+ public R<MemberGiftRecord> getVerifyPrize(@RequestBody String verifyPrize)
+ {
+ MemberGiftRecord memberGiftRecord = memberGiftRecordService.getById(verifyPrize);
+ return R.ok(memberGiftRecord);
+ }
+
+ /**
+ * @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
+ * @param integralChangeDto
+ * @return R
+ */
+ @PostMapping("/changeIntegral")
+ public R changeIntegral(@RequestBody IntegralChangeDto integralChangeDto) {
+ memberService.changeIntegral(integralChangeDto);
+ return R.ok();
+ }
+
+ /**
+ * @description 统计商户今日新增会员
+ * @author jqs
+ * @date 2023/7/14 20:00
+ * @param shopIdList
+ * @return R<Integer>
+ */
+ @PostMapping("/getAreaNewMember")
+ public R<Integer> getAreaNewMember(@RequestBody List<Long> shopIdList)
+ {
+ Integer count = memberService.getAreaNewMember(shopIdList);
+ return R.ok(count);
+ }
+
+
+ /**
+ * @description 更新会员绑定商户名
+ * @author jqs
+ * @date 2023/7/26 17:07
+ * @param mgtMemberShopNameDto
+ * @return R
+ */
+ @PostMapping("/updateMemberShopName")
+ public R updateMemberShopName(@RequestBody MgtMemberShopNameDto mgtMemberShopNameDto) {
+ memberService.updateMemberShopName(mgtMemberShopNameDto);
+ return R.ok();
+ }
+
+ @PostMapping("/getBirthdayCard")
+ public R<BirthdayCard> getBirthdayCard()
+ {
+ 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