diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java index f37bd20a..8c73f2c0 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java @@ -96,13 +96,6 @@ public interface IMemberServiceApi { */ R> querySponsorOnUmbrella(Long memberId, String memberCode, String phone); - /** - * 查找安置人伞上会员信息 - * - * @param memberId 编号、安置人 - */ - R> querySponsorOnUmbrella(Long memberId, List memberCodeList); - /** * 查找安置人伞下 * @@ -268,15 +261,6 @@ public interface IMemberServiceApi { */ R updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel); - /** - * 校验是否血缘关系(返回true则有血缘关系) - * - * @param topCode 顶点编号 - * @param userId 当前会员 - * @return - */ - R checkParent(String topCode, Long userId); - /** * 获取奖衔的翻译KEY值 **/ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index dd00aec6..4cae502a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -50,13 +50,6 @@ public interface CuMemberMapper extends BaseMapper { @Param("memberCode") String memberCode, @Param("phone") String phone); - /** - * 查找安置人伞上会员信息 - * - * @param memberId 编号、安置人 - */ - List querySponsorOnUmbrella(@Param("memberId") Long memberId, @Param("memberCodeList") List memberCodeList); - /** * 查找安置人伞下 * @@ -277,15 +270,6 @@ public interface CuMemberMapper extends BaseMapper { */ List parentList(@Param("pkParent") Long pkParent, @Param("memberCode") String memberCode, @Param("memberName") String memberName, @Param("startCreateTime") Date startCreateTime, @Param("endCreateTime") Date endCreateTime, @Param("memberInfo") String memberInfo); - /** - * 校验是否血缘关系 - * - * @param topCode 顶点编号 - * @param pkMember 当前会员 - * @return - */ - int checkParent(@Param("topCode") String topCode, @Param("pkMember") Long pkMember); - /** * 校验会员编号是否存在 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java index 1f454eb5..23fc9763 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java @@ -130,11 +130,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.queryPlaceSponsorOnUmbrella(memberId, memberCode, phone)); } - @Override - public R> querySponsorOnUmbrella(Long memberId, List memberCodeList) { - return R.ok(iCuMemberService.querySponsorOnUmbrella(memberId, memberCodeList)); - } - @Override public R> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList) { return R.ok(iCuMemberService.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList)); @@ -273,11 +268,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberBusinessService.updateMemberLevel(cuMember, saOrder, pkOldLevel)); } - @Override - public R checkParent(String topCode, Long userId) { - return R.ok(iCuMemberService.checkParent(topCode, userId) > 0); - } - @Override public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) { return iCuMemberService.getAwardsTranslateValue(pkCountry, pkId); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 2540521c..1ae584cd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -108,13 +108,6 @@ public interface ICuMemberService extends IService { */ List queryPlaceSponsorOnUmbrella(Long memberId, String memberCode, String phone); - /** - * 查找安置人伞上会员信息 - * - * @param memberId 编号、安置人 - */ - List querySponsorOnUmbrella(Long memberId, List memberCodeList); - /** * 查找安置人伞下 * @@ -483,15 +476,6 @@ public interface ICuMemberService extends IService { */ List parentList(Long pkParent, String memberCode, String memberName, Date startCreateTime, Date endCreateTime, String memberInfo); - /** - * 校验是否血缘关系 - * - * @param topCode 顶点编号 - * @param pkMember 当前会员 - * @return - */ - int checkParent(String topCode, Long pkMember); - /** * 校验会员编号是否存在 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index fff0f175..f16bdcbc 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -648,14 +648,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { return true; } - - /** - * @description: 自助服务-生成订单 - * @author: zhang jing - * @date: 2023/4/18 17:13 - * @param: [pkApprove, saOrder, payMemberAccount] - * @return: void - **/ @Transactional(rollbackFor = Exception.class) @Override public void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount) { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index e1808173..4a519ae5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -202,11 +202,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.selectPlaceSponsorOnUmbrella(memberId, memberCode, phone); } - @Override - public List querySponsorOnUmbrella(Long memberId, List memberCodeList) { - return baseMapper.querySponsorOnUmbrella(memberId, memberCodeList); - } - @Override public List selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList) { return baseMapper.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList); @@ -2390,11 +2385,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.selectRegList(marketNewsParam); } - @Override - public int checkParent(String topCode, Long pkMember) { - return baseMapper.checkParent(topCode, pkMember); - } - @Override public Map checkMemberCodeExist(Collection codeList, Boolean checkEmpty, Long excludeMemberEmpty) { Map resultMap = new HashMap<>(); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 5483a80e..fe0f02b6 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -1528,15 +1528,6 @@ - - - - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java index 09fb0c6a..1acf9c44 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java @@ -1,13 +1,10 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; /** * 撤销订单类型 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java index 7e7dab59..1e769293 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java @@ -10,9 +10,6 @@ import lombok.experimental.Accessors; /** * 发货单明细表 - * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = true)