From 4115c6fcd6ae0ef111e1b20a14e79807bd8f7a83 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 12 May 2025 13:50:56 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E5=AE=89=E7=BD=AE?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=BF=85=E9=A1=BB=E8=BE=93=E5=85=A5=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=89=8D=E8=BF=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/MemberStructureController.java | 89 ++++++------------- .../core/constant/msg/ConfigMsgConstants.java | 6 -- 2 files changed, 26 insertions(+), 69 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java index 6b3dfba0..2fa67d85 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java @@ -14,7 +14,6 @@ import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.MemberConstants; import com.hzs.common.core.constant.MemberFrameworkConstants; import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EPlaceDept; @@ -26,7 +25,6 @@ import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.security.utils.SecurityUtils; @@ -77,48 +75,34 @@ public class MemberStructureController extends BaseController { */ @AccessPermissions("Arcgurecture") @GetMapping("/az-framework") - public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { + public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level) { if (level == null) { level = 7; } // 体系 UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); List vertexIdList = userAuthorityDTO.getVertexIdList(); - List userVertexList = userAuthorityDTO.getUserVertexList(); Date date = new Date(); String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); - Long pkMember = null; + Long pkMember; if (StringUtils.isNotBlank(memberCode)) { CuMember member = iCuMemberService.getMemberByCode(memberCode); - if (member == null) { + if (null == member) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); } pkMember = member.getPkId(); } else { - if (userVertexList != null && userVertexList.size() > 0) { - CuMember member = iCuMemberService.getMemberById(userVertexList.get(0)); - pkMember = member.getPkId(); - memberCode = member.getMemberCode(); - } else { - R> allCountryMap = iCountryServiceApi.getAllCountryMap(); - for (Map.Entry be : allCountryMap.getData().entrySet()) { - if (be.getKey().equals(SecurityUtils.getPkCountry())) { - memberCode = be.getValue().getCode() + "30720201"; - CuMember member = iCuMemberService.getMemberByCode(memberCode); - pkMember = member.getPkId(); - } - } - } + return AjaxResult.error("请输入会员编号"); } - if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { - // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 - List memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); - if (memberExtList.size() == 0) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); - } - } +// if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { +// // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 +// List memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); +// if (memberExtList.size() == 0) { +// return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); +// } +// } Integer period = null; Date settleDate = null; @@ -134,8 +118,8 @@ public class MemberStructureController extends BaseController { } } // 查询当天 (秒结) - if (settleDate != null && - DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { + if (settleDate != null + && DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { // 会员结算秒结表 String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; // 查询所有用户表数据 id @@ -363,8 +347,7 @@ public class MemberStructureController extends BaseController { // 体系 UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); List vertexIdList = userAuthorityDTO.getVertexIdList(); - List userVertexList = userAuthorityDTO.getUserVertexList(); - Long pkMember = null; + Long pkMember; if (StringUtils.isNotBlank(memberCode)) { CuMember member = iCuMemberService.getMember(memberCode); if (member == null) { @@ -372,20 +355,7 @@ public class MemberStructureController extends BaseController { } pkMember = member.getPkId(); } else { - - if (userVertexList != null && userVertexList.size() > 0) { - CuMember member = iCuMemberService.getMember(userVertexList.get(0)); - pkMember = member.getPkId(); - } else { - R> allCountryMap = iCountryServiceApi.getAllCountryMap(); - for (Map.Entry be : allCountryMap.getData().entrySet()) { - if (be.getKey().equals(SecurityUtils.getPkCountry())) { - memberCode = be.getValue().getCode() + "30720201"; - CuMember member = iCuMemberService.getMember(memberCode); - pkMember = member.getPkId(); - } - } - } + return AjaxResult.error("请输入会员编号"); } Integer period = null; @@ -506,7 +476,7 @@ public class MemberStructureController extends BaseController { * @return */ @GetMapping("/az-framework-five") - public AjaxResult azFrameWorkFive(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { + public AjaxResult azFrameWorkFive(String memberCode, Integer level) { if (level == null) { level = 10; } @@ -514,7 +484,7 @@ public class MemberStructureController extends BaseController { UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); List vertexIdList = userAuthorityDTO.getVertexIdList(); List userVertexList = userAuthorityDTO.getUserVertexList(); - Long pkMember = null; + Long pkMember; if (StringUtils.isNotBlank(memberCode)) { CuMember member = iCuMemberService.getMemberByCode(memberCode); if (member == null) { @@ -525,26 +495,19 @@ public class MemberStructureController extends BaseController { if (userVertexList != null && userVertexList.size() > 0) { CuMember member = iCuMemberService.getMemberById(userVertexList.get(0)); pkMember = member.getPkId(); - memberCode = member.getMemberCode(); +// memberCode = member.getMemberCode(); } else { - R> allCountryMap = iCountryServiceApi.getAllCountryMap(); - for (Map.Entry be : allCountryMap.getData().entrySet()) { - if (be.getKey().equals(SecurityUtils.getPkCountry())) { - memberCode = be.getValue().getCode() + "30720201"; - CuMember member = iCuMemberService.getMemberByCode(memberCode); - pkMember = member.getPkId(); - } - } + return AjaxResult.error("请输入会员编号"); } } - if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { - // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 - List memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); - if (memberExtList.size() == 0) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); - } - } +// if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { +// // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 +// List memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); +// if (memberExtList.size() == 0) { +// return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); +// } +// } // 查询当天 (秒结) // 会员结算秒结表 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java index f4fbbd79..399a19f1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java @@ -398,10 +398,6 @@ public class ConfigMsgConstants { */ public static final String PK_GRADE_NOT_NULL = "等级不能为空"; - /** - * 只能查询伞下体系会员编号 - */ - public static final String QUERY_VERTEX_CODE = "只能查询伞下体系会员编号"; /** * 修改后推荐编号不能是本身或者血缘伞下 */ @@ -1273,11 +1269,9 @@ public class ConfigMsgConstants { */ public static final String MEMBER_EXIST = "会员已存在"; - /** * 请选择要删除的信息 */ public static final String DELETE_INFO = "请选择要删除的信息"; - }