From ca08c1252a57544c56d75e4492cb7a846d6880d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 17:11:45 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 d446b78..0ff708d 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
@@ -398,13 +398,32 @@
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
- mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
+
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ null,
+ bigDecimal,
+ MallMoneyFlowTypeEnum.SYSTEM_CHARGE.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_Y,
+ memberId,
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.SYSTEM_CHARGE.getName()
+ );
return new FebsResponse().success();
}
@Override
public AdminAgentLevelSetInfoVo getAgentLevelSetInfoByMemberId(long id) {
- AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id);
+ AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = new AdminAgentLevelSetInfoVo();
+ AdminAgentLevelSetInfoVo adminAgentLevelSetInfo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id);
+ if(ObjectUtil.isEmpty(adminAgentLevelSetInfo)){
+ adminAgentLevelSetInfoVo.setId(id);
+ adminAgentLevelSetInfoVo.setLevelCode(MemberAgentLevelEnum.AGENT.getCodeByName(MemberAgentLevelEnum.AGENT.getName()));
+ }else{
+ adminAgentLevelSetInfoVo.setId(id);
+ adminAgentLevelSetInfoVo.setLevelCode(MemberAgentLevelEnum.AGENT.getCodeByName(adminAgentLevelSetInfo.getLevelCode()));
+ }
return adminAgentLevelSetInfoVo;
}
@@ -417,8 +436,7 @@
}
String levelCode = agentLevelSetUpdateDto.getLevelCode();
String nameByCode = MemberAgentLevelEnum.AGENT.getNameByCode(levelCode);
- mallMember.setLevelStatus(1);
- mallMemberMapper.updateById(mallMember);
+ mallMemberMapper.updateLevelStatusById(1,memberId);
mallMemberMapper.updateLevelById(nameByCode,memberId);
return new FebsResponse().success();
}
--
Gitblit v1.9.1