From ce983cb64cd6d7c90b05583425717908c6743b51 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 15 Jul 2023 11:11:22 +0800
Subject: [PATCH] 正式环境
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 fdabd12..6b6f524 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,7 @@
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.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MemberLevelEnum;
-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.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
@@ -112,6 +109,8 @@
mallMember.setDirector(value);
} else if (type == 2){
mallMember.setStoreMaster(value);
+ }else if (type == 3){
+ mallMember.setPartner(value);
} else {
throw new FebsException("参数错误");
}
@@ -174,6 +173,7 @@
mallMoneyFlow.setStatus(2);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
}
+
/**
* 调用汇聚代付
*/
@@ -287,10 +287,10 @@
adminAgentLevelOptionTreeVo.setId(MemberLevelEnum.NORMAL.getType());
adminAgentLevelOptionTreeVo.setName("普通会员");
agentLevelOption.add(adminAgentLevelOptionTreeVo);
- AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVos = new AdminAgentLevelOptionTreeVo();
- adminAgentLevelOptionTreeVos.setId(MemberLevelEnum.V_DIRECTOR.getType());
- adminAgentLevelOptionTreeVos.setName("董事");
- agentLevelOption.add(adminAgentLevelOptionTreeVos);
+// AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVos = new AdminAgentLevelOptionTreeVo();
+// adminAgentLevelOptionTreeVos.setId(MemberLevelEnum.V_DIRECTOR.getType());
+// adminAgentLevelOptionTreeVos.setName("董事");
+// agentLevelOption.add(adminAgentLevelOptionTreeVos);
return dataDictionaryCustomMapper.getAgentLevelOption();
}
@@ -638,7 +638,9 @@
AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
if(ObjectUtil.isNotEmpty(mallMemberBank)){
adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
- adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
+ adminMallMemberPaymentVo.setName(mallMemberBank.getName());
+ adminMallMemberPaymentVo.setBankName(mallMemberBank.getBankName());
+ adminMallMemberPaymentVo.setBankNameS(mallMemberBank.getBankNameS());
}
return adminMallMemberPaymentVo;
}
--
Gitblit v1.9.1