From ade617c7bd6899c0e9367e30303137bd6fc3dd81 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 31 Jan 2024 11:42:16 +0800
Subject: [PATCH] 会员列表增加波卷功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 3787c52..a448dca 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -48,6 +48,7 @@
public class AdminMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IAdminMallMemberService {
private final MallMemberMapper mallMemberMapper;
+ private final MallRollPerkMapper mallRollPerkMapper;
private final MallMemberWalletMapper mallMemberWalletMapper;
@@ -70,6 +71,8 @@
private final MallAgentRecordMapper mallAgentRecordMapper;
private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallMemberHouseMapper mallMemberHouseMapper;
+ private final MallOrderInfoMapper mallOrderInfoMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -186,10 +189,10 @@
memberWithdrawalDto.setOpenid(mallMember.getOpenId());
memberWithdrawalDto.setTotalFee(mallMemberWithdraw.getAmount());
memberWithdrawalDto.setOutTradeNo(mallMoneyFlow.getOrderNo());
- Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto);
- if(!aBoolean){
- return new FebsResponse().fail().message("微信提现失败，请查看微信商户状态");
- }
+// Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto);
+// if(!aBoolean){
+// return new FebsResponse().fail().message("微信提现失败，请查看微信商户状态");
+// }
mallMemberWithdraw.setStatus(2);
mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
mallMoneyFlow.setStatus(2);
@@ -285,6 +288,11 @@
return dataDictionaryCustomMapper.getAgentLevelOption();
}
+ @Override
+ public List<AdminAgentLevelOptionTreeVo> getRollperkOption() {
+ return dataDictionaryCustomMapper.getRollperkOption();
+ }
+
@Override
public List<AdminAgentLevelOptionTreeVo> agentLevelOption() {
@@ -301,12 +309,35 @@
if(BigDecimal.ZERO.compareTo(amount) >= 0){
throw new FebsException("请输入正确的金额");
}
- if(StrUtil.isEmpty(adminAgentVerifyVo.getLevelCode())){
- throw new FebsException("请选择代理级别");
- }
- mallAgentRecord.setAgentLevel(adminAgentVerifyVo.getLevelCode());
+// if(StrUtil.isEmpty(adminAgentVerifyVo.getLevelCode())){
+// throw new FebsException("请选择代理级别");
+// }
+// mallAgentRecord.setAgentLevel(adminAgentVerifyVo.getLevelCode());
mallAgentRecord.setAmount(adminAgentVerifyVo.getAmount());
mallAgentRecordMapper.updateById(mallAgentRecord);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public IPage<MallMemberHouse> getMallRollHouseList(MallMemberHouse mallMemberHouse, QueryRequest request) {
+ Page<MallMemberHouse> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MallMemberHouse> mallMemberHouseIPage = this.baseMapper.getMallRollHouseListInPage(page, mallMemberHouse);
+ return mallMemberHouseIPage;
+ }
+
+ @Override
+ public FebsResponse rollHouseCheck(AdminRollHouseCheckDto rollHouseCheckDto) {
+ MallMemberHouse mallMemberHouse = mallMemberHouseMapper.selectById(rollHouseCheckDto.getId());
+ String takeCode = rollHouseCheckDto.getTakeCode();
+
+ Long orderId = mallMemberHouse.getOrderId();
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
+ String takeCode1 = mallOrderInfo.getTakeCode();
+ if(!takeCode1.equals(takeCode)){
+ throw new FebsException("核销码不正确");
+ }
+ mallMemberHouse.setState(2);
+ mallMemberHouseMapper.updateById(mallMemberHouse);
return new FebsResponse().success().message("操作成功");
}
@@ -463,6 +494,22 @@
}
@Override
+ public FebsResponse rollperkSetUpdate(AgentLevelSetUpdateDto agentLevelSetUpdateDto) {
+ Long memberId = agentLevelSetUpdateDto.getId();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(ObjectUtil.isEmpty(mallMember)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ MallRollPerk mallRollPerk = new MallRollPerk();
+ mallRollPerk.setMemberId(memberId);
+ mallRollPerk.setState(1);
+ long rollId = Long.parseLong(agentLevelSetUpdateDto.getLevelCode());
+ mallRollPerk.setRollId(rollId);
+ mallRollPerkMapper.insert(mallRollPerk);
+ return new FebsResponse().success();
+ }
+
+ @Override
public FebsResponse resetPwd(Long id) {
MallMember mallMember = this.baseMapper.selectById(id);
if (mallMember == null) {
--
Gitblit v1.9.1