From 626feb32d22db5762a63ab56b079ee6cbefa4d86 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 15:49:04 +0800
Subject: [PATCH] refactor(mall): 优化会员信息接口返回内容
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 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 49a765d..026eaba 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
@@ -2,10 +2,10 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
@@ -80,20 +80,6 @@
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember);
-// if(CollUtil.isNotEmpty(mallMembers.getRecords())){
-// for(MallMember mallMemberTeam : mallMembers.getRecords()){
-// Long salesmansId = mallMemberTeam.getSalesmansId();
-// MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
-// if(ObjectUtil.isNotEmpty(mallSalesman)){
-// StringBuffer salesmanName = new StringBuffer();
-// salesmanName.append(mallSalesman.getName());
-// if(2 == mallSalesman.getState()){
-// salesmanName.append("（禁用）");
-// }
-// mallMemberTeam.setSalesmansName(salesmanName.toString());
-// }
-// }
-// }
return mallMembers;
}
@@ -104,7 +90,7 @@
if(ObjectUtil.isEmpty(mallMember)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
+ mallMember.setAccountStatus(YesOrNoEnum.NO.getValue());
mallMemberMapper.updateById(mallMember);
return new FebsResponse().success();
}
@@ -116,7 +102,7 @@
if(ObjectUtil.isEmpty(mallMember)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
+ mallMember.setAccountStatus(YesOrNoEnum.YES.getValue());
mallMemberMapper.updateById(mallMember);
return new FebsResponse().success();
}
@@ -360,7 +346,7 @@
if(ObjectUtil.isEmpty(mallMember)){
throw new FebsException("请刷新页面");
}
- String redisKey = AppContants.XCX_LOGIN_PREFIX + mallMember.getId();
+ String redisKey = AppContants.APP_LOGIN_PREFIX + mallMember.getId();
String existToken = redisUtils.getString(redisKey);
if (StrUtil.isNotBlank(existToken)) {
Object o = redisUtils.get(existToken);
@@ -368,7 +354,7 @@
redisUtils.del(existToken);
}
}
- redisUtils.del(AppContants.XCX_LOGIN_PREFIX + id);
+ redisUtils.del(AppContants.APP_LOGIN_PREFIX + id);
redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + id);
this.baseMapper.deleteById(mallMember);
return new FebsResponse().success().message("操作成功");
@@ -515,27 +501,46 @@
}
Integer type = mallSystemPayDto.getType();
+ Integer flowType = 0;
+ Integer moneyType = 0;
+ String moneyTypeDec = "";
String filedType = "";
if (type == 1) {
filedType = "balance";
+ flowType = FlowTypeEnum.BALANCE.getValue();
+ moneyType = RunVipMoneyFlowTypeEnum.SYS_BALANCE.getValue();
+ moneyTypeDec = RunVipMoneyFlowTypeEnum.SYS_BALANCE.getDescription();
} else if (type == 2) {
filedType = "score";
+ flowType = FlowTypeEnum.SCORE.getValue();
+ moneyType = RunVipMoneyFlowTypeEnum.SYS_SCORE.getValue();
+ moneyTypeDec = RunVipMoneyFlowTypeEnum.SYS_SCORE.getDescription();
} else if (type == 3) {
filedType = "prizeScore";
} else {
- throw new FebsException("参数错误");
+ throw new FebsException("操作失败");
}
if (isReduce) {
int i = iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);
if (i == 2) {
- throw new FebsException("剩余数量不足");
+ throw new FebsException("操作失败");
}
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
- mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
+ String orderNo = MallUtils.getOrderNum("SYS");
+ mallMoneyFlowService.runVipMoneyFlowAdd(
+ mallMember.getId(),
+ mallMember.getId(),
+ orderNo,
+ flowType,
+ moneyType,
+ bigDecimal,
+ StrUtil.format(moneyTypeDec,bigDecimal),
+ YesOrNoEnum.YES.getValue()
+ );
return new FebsResponse().success();
}
@@ -585,7 +590,7 @@
// 重置交易密码
if (type == 1) {
- String payPwd = SecureUtil.md5("654321");
+ String payPwd = SecureUtil.md5("123456");
member.setTradePassword(payPwd);
// 重置登录密码
} else {
--
Gitblit v1.9.1