diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java index d42690dd..36978f7f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java @@ -1,19 +1,12 @@ package com.hzs.member.self.controller.api; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.self.service.ICuSelfServiceLogService; import com.hzs.member.self.vo.SelfVO; -import com.hzs.system.config.IGradeServiceApi; -import com.hzs.system.config.dto.GradeDTO; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,42 +21,22 @@ import org.springframework.web.bind.annotation.RestController; public class ApiSelfController extends BaseController { @Autowired - private ICuMemberService cuMemberService; - @Autowired - private ICuSelfServiceLogService cuSelfServiceLogService; - - @DubboReference - IGradeServiceApi iGradeServiceApi; + private ICuSelfServiceLogService iCuSelfServiceLogService; /** * 自助权限查询 */ @GetMapping("/authority") public AjaxResult validateSelfAuthority() { - CuMemberExt cuMember = cuMemberService.getMenuMember(SecurityUtils.getUserId()); - - // 获取等级 - GradeDTO gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); - if (EGrade.START_UP.getValue() == gradeDTO.getGradeValue()) { - // 会员等级,需要【实名认证】 - return AjaxResult.success(SelfVO.builder() - .existRealName(EYesNo.YES.getIntValue()) - .build()); - } - + Long userId = SecurityUtils.getUserId(); Integer pkCountry = SecurityUtils.getPkCountry(); - Integer showAddress = cuSelfServiceLogService.showHiddenAddress(cuMember.getPkId(), pkCountry); + Integer showAddress = iCuSelfServiceLogService.showHiddenAddress(userId, pkCountry); SelfVO selfVO = SelfVO.builder() .existAddress(showAddress) - .existOrderSelf(showAddress) .selfRevokeOrder(showAddress) - .existDomicile(cuSelfServiceLogService.showIndexDomicile(pkCountry, cuMember.getPkId())) + .existDomicile(iCuSelfServiceLogService.showIndexDomicile(pkCountry, userId)) .existRealName(EYesNo.YES.getIntValue()) - .existMemberMonth(EYesNo.YES.getIntValue()) .build(); - if (!pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - selfVO.setSelfRevokeOrder(EYesNo.NO.getIntValue()); - } return AjaxResult.success(selfVO); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java index 47d22130..e2aa1b85 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java @@ -17,24 +17,15 @@ import java.io.Serializable; public class SelfVO implements Serializable { /** - * 存在收货地址 0 存在 1不存在 + * 存在修改收货地址 0 存在 1不存在 */ private Integer existAddress; - /** - * 存在订单自提 - */ - private Integer existOrderSelf; - /** * 存在户籍变更 */ private Integer existDomicile; - /** - * 存在月统计数据 - */ - private Integer existMemberMonth; /** * 存在自助撤单 0 存在 1不存在 */ diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml index 8ad014f8..2b72822e 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml @@ -215,7 +215,7 @@ order by css.creation_time desc - +