diff --git a/hzs-api/hzs-api-bonus/pom.xml b/bd-api/bd-api-activity/pom.xml
similarity index 66%
rename from hzs-api/hzs-api-bonus/pom.xml
rename to bd-api/bd-api-activity/pom.xml
index 8bd1c21..e2970b5 100644
--- a/hzs-api/hzs-api-bonus/pom.xml
+++ b/bd-api/bd-api-activity/pom.xml
@@ -5,22 +5,22 @@
4.0.0
- com.hzs.africa
- hzs-api
+ com.bd.africa
+ bd-api
1.0.0-SNAPSHOT
- hzs-api-bonus
+ bd-api-activity
- hzs-api-bonus奖金服务
+ bd-api-activity活动服务
- com.hzs.africa
- hzs-api-system
+ com.bd.africa
+ bd-api-system
diff --git a/hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java b/bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java
rename to bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java
diff --git a/hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/base/IActivityServiceApi.java b/bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/base/IActivityServiceApi.java
rename to bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityServiceApi.java
diff --git a/hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java b/bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java
similarity index 100%
rename from hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java
rename to bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java
diff --git a/hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java b/bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java
similarity index 100%
rename from hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java
rename to bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java
diff --git a/hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java b/bd-api/bd-api-activity/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java
rename to bd-api/bd-api-activity/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java
diff --git a/hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java b/bd-api/bd-api-activity/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java
rename to bd-api/bd-api-activity/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java
diff --git a/hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java b/bd-api/bd-api-activity/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-activity/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java
rename to bd-api/bd-api-activity/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java
diff --git a/hzs-api/hzs-api-sale/pom.xml b/bd-api/bd-api-bonus/pom.xml
similarity index 66%
rename from hzs-api/hzs-api-sale/pom.xml
rename to bd-api/bd-api-bonus/pom.xml
index 3559d6f..8891fde 100644
--- a/hzs-api/hzs-api-sale/pom.xml
+++ b/bd-api/bd-api-bonus/pom.xml
@@ -5,22 +5,22 @@
4.0.0
- com.hzs.africa
- hzs-api
+ com.bd.africa
+ bd-api
1.0.0-SNAPSHOT
- hzs-api-sale
+ bd-api-bonus
- hzs-api-sale销售服务
+ bd-api-bonus奖金服务
- com.hzs.africa
- hzs-api-system
+ com.bd.africa
+ bd-api-system
diff --git a/hzs-api/hzs-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java b/bd-api/bd-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java
similarity index 100%
rename from hzs-api/hzs-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java
rename to bd-api/bd-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java
diff --git a/hzs-api/hzs-api-member/pom.xml b/bd-api/bd-api-member/pom.xml
similarity index 66%
rename from hzs-api/hzs-api-member/pom.xml
rename to bd-api/bd-api-member/pom.xml
index f6ea3cc..d72c4ed 100644
--- a/hzs-api/hzs-api-member/pom.xml
+++ b/bd-api/bd-api-member/pom.xml
@@ -5,22 +5,22 @@
4.0.0
- com.hzs.africa
- hzs-api
+ com.bd.africa
+ bd-api
1.0.0-SNAPSHOT
- hzs-api-member
+ bd-api-member
- hzs-api-member会员服务
+ bd-api-member会员服务
- com.hzs.africa
- hzs-api-system
+ com.bd.africa
+ bd-api-system
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/ICuActiveMemberCensusServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuActiveMemberCensusServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/ICuActiveMemberCensusServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuActiveMemberCensusServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java
diff --git a/hzs-api/hzs-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
similarity index 74%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java
index 860c08f..2dfbaf0 100644
--- a/hzs-api/hzs-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
@@ -23,12 +23,6 @@ import java.util.Map;
/**
* 会员服务接口
- *
- * @Description:
- * @Author:
- * @Time: 2022/8/29 11:41
- * @Classname: IMemberServiceApi
- * @PackageName: com.hzs.member
*/
public interface IMemberServiceApi {
@@ -44,28 +38,14 @@ public interface IMemberServiceApi {
* 前台查询会员的方法,通过传输不同的参数,查询不同的会员
*
* @param cuMember 会员编号的传输值
- * @return: R
- * @Author: sui q
- * @Date: 2022/8/29 11:46
*/
R> getMemberInfo(CuMember cuMember);
- /*
- * @description: 查询三方需要同步的会员
- * @author: sui q
- * @date: 2023/6/17 15:52
- * @param: null null
- **/
- R> queryCollegeMemberByCondition(Integer pageNum, Integer pageSize, Integer pkCountry, Date startDate, Date endDate);
-
/**
* 撤销注册订单,需要更新会员,单点撤单,更新为死点
*
* @param pkApprove 审核人
* @param saOrder 销售订单
- * @return: Boolean
- * @Author: sui q
- * @Date: 2022/10/22 16:43
*/
R singleRevokeMemberByRegisterOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO);
@@ -75,9 +55,6 @@ public interface IMemberServiceApi {
* @param pkApprove 审核人
* @param memberList 会员列表
* @param saOrderMap 销售订单
- * @return: Boolean
- * @Author: sui q
- * @Date: 2022/10/22 16:43
*/
R mergeRevokeMemberByRegisterOrder(Long pkApprove, List memberList, Map saOrderMap, BusinessCommissionDTO businessCommissionDTO);
@@ -87,9 +64,6 @@ public interface IMemberServiceApi {
* @param pkApprove 审核人
* @param saOrder 订单
* @param cuMember 修改后的会员
- * @return: R
- * @Author: sui q
- * @Date: 2023/3/25 14:13
*/
R normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, List pkOrderItemList, BusinessCommissionDTO businessCommissionDTO);
@@ -97,10 +71,6 @@ public interface IMemberServiceApi {
* 查找安置人伞上会员信息
*
* @param memberId 编号、安置人
- * @Description:
- * @return: List
- * @Author: sui q
- * @Date: 2022/8/29 20:54
*/
R> querySponsorOnUmbrella(Long memberId, String memberCode, String phone);
@@ -108,10 +78,6 @@ public interface IMemberServiceApi {
* 查找安置人伞下
*
* @param memberId 会员编号
- * @Description:
- * @return: List
- * @Author: sui q
- * @Date: 2022/8/29 20:54
*/
R> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList);
@@ -119,10 +85,6 @@ public interface IMemberServiceApi {
* 查找安置人伞下
*
* @param memberId 安置人,编号
- * @Description:
- * @return: List
- * @Author: sui q
- * @Date: 2022/8/29 20:54
*/
R> queryPlaceSponsorUnderUmbrella(Long memberId, String... placeParent);
@@ -131,9 +93,6 @@ public interface IMemberServiceApi {
*
* @param memberId 会员编号
* @param placeDept 1代表左区极左极下,2代表右区极左极下
- * @return: CuMemberExt
- * @Author: sui q
- * @Date: 2022/9/1 20:36
*/
R queryPlaceSponsorLastLeft(Long memberId, Integer placeDept);
@@ -141,10 +100,6 @@ public interface IMemberServiceApi {
* 查找血缘伞上,推荐人
*
* @param memberId 推荐人编号
- * @Description:
- * @return: List
- * @Author: sui q
- * @Date: 2022/8/29 20:54
*/
R> queryBloodKinshipOnUmbrella(Long memberId);
@@ -152,10 +107,6 @@ public interface IMemberServiceApi {
* 查找血缘伞下,推荐人
*
* @param memberId 推荐人编号
- * @Description:
- * @return: List
- * @Author: sui q
- * @Date: 2022/8/29 20:54
*/
R> queryBloodKinshipUnderUmbrella(Long memberId);
@@ -176,10 +127,7 @@ public interface IMemberServiceApi {
R getMember(Long pkMember);
/*
- * @description: 查询会员
- * @author: sui q
- * @date: 2023/4/25 10:32
- * @param: null null
+ * 查询会员
**/
R queryMember(Long pkMember);
@@ -195,17 +143,11 @@ public interface IMemberServiceApi {
* 保存新会员信息,待支付订单
*
* @param cuMember 会员信息
- * @return: R
- * @Author: sui q
- * @Date: 2022/9/9 9:39
*/
R saveMember(CuMember cuMember);
/*
- * @description: 查询网体是否存在推荐人
- * @author: sui q
- * @date: 2023/9/11 9:53
- * @param: null null
+ * 查询网体是否存在推荐人
**/
R queryCuMemberByPkMember(Long pkReference);
@@ -214,9 +156,6 @@ public interface IMemberServiceApi {
*
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
- * @return: Boolean
- * @Author: sui q
- * @Date: 2022/9/26 11:35
*/
R saveMember(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
@@ -225,9 +164,6 @@ public interface IMemberServiceApi {
*
* @param cuMember 会员信息
* @param saOrder 订单信息
- * @return: Boolean
- * @Author: sui q
- * @Date: 2022/9/26 11:35
*/
R saveMember(CuMember cuMember, SaOrder saOrder);
@@ -237,9 +173,6 @@ public interface IMemberServiceApi {
* @param cuMember 会员信息
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
- * @return: Boolean
- * @Author: sui q
- * @Date: 2022/9/26 11:35
*/
R saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
@@ -250,9 +183,6 @@ public interface IMemberServiceApi {
* @param saOrder 订单信息
* @param isPay 是否支付
* @param cuMemberAccountExt 支付账号
- * @return: R
- * @Author: sui q
- * @Date: 2022/9/9 9:39
*/
R saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt);
@@ -261,9 +191,6 @@ public interface IMemberServiceApi {
*
* @param cuMember 会员
* @param isHaiFun 是否嗨粉
- * @return: R
- * @Author: sui q
- * @Date: 2022/9/30 17:30
*/
R createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun);
@@ -304,34 +231,22 @@ public interface IMemberServiceApi {
* 根据会员主键查询会员注册信息
*
* @param pkMember 会员主键
- * @return: CuMemberRegister
- * @Author: sui q
- * @Date: 2023/3/29 18:33
*/
R queryCuMemberRegister(Long pkMember);
/*
- * @description: 会员编号,账户类型,抽奖金额
- * @author: sui q
- * @date: 2023/4/25 16:31
- * @param: null null
+ * 会员编号,账户类型,抽奖金额
**/
R updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney);
/*
- * @description: 会员抽奖,购买抽奖次数支付金额
- * @author: sui q
- * @date: 2023/4/27 15:54
- * @param: null null
+ * 会员抽奖,购买抽奖次数支付金额
**/
R updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney);
/*
- * @description: 会员抽奖,购买抽奖次数支付金额
- * @author: sui q
- * @date: 2023/4/27 15:54
- * @param: null null
+ * 会员抽奖,购买抽奖次数支付金额
**/
R updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt);
@@ -352,10 +267,7 @@ public interface IMemberServiceApi {
R averageTimeCalculation();
/**
- * @description: 查询有没有升级权益
- * @author: sui q
- * @date: 2023/5/22 20:18
- * @param: null null
+ * 查询有没有升级权益
**/
R queryCuMemberUpgradeByCondition(Integer pkCountry, Long pkMember);
@@ -381,11 +293,7 @@ public interface IMemberServiceApi {
R updateMemberLevel(CuMember cuMember, Integer pkOldLevel, EUpgradeType eUpgradeType, String remark);
/**
- * @description: 获取奖衔的翻译KEY值
- * @author: zhang jing
- * @date: 2023/3/2 12:00
- * @param: [pkCountry, pkId]
- * @return: java.lang.Integer
+ * 获取奖衔的翻译KEY值
**/
Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId);
@@ -413,15 +321,10 @@ public interface IMemberServiceApi {
R> queryMemberPlace(Long pkMember);
/**
- * @description: 未激活点位签呈列表
- * @author: zhang jing
- * @date: 2023/10/27 16:25
- * @param: [analysisBusinessAppealParam]
- * @return: com.hzs.common.core.domain.R
+ * 未激活点位签呈列表
**/
R> notActiveByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam);
-
/**
* 查询全部会员
*
@@ -430,4 +333,5 @@ public interface IMemberServiceApi {
* @return
*/
R> getMemberAll(List gradeId, Integer pkCountry, Date startTime, Date endTime);
+
}
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/NotActivePointDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/NotActivePointDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/NotActivePointDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/NotActivePointDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/store/ICuParentStoreServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuParentStoreServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/store/ICuParentStoreServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuParentStoreServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/store/dto/StoreDto.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/store/dto/StoreDto.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/store/dto/StoreDto.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/store/dto/StoreDto.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java
diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/storeconfig/dto/StoreMonthCheckConfigDto.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/dto/StoreMonthCheckConfigDto.java
similarity index 100%
rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/storeconfig/dto/StoreMonthCheckConfigDto.java
rename to bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/dto/StoreMonthCheckConfigDto.java
diff --git a/hzs-api/hzs-api-report/pom.xml b/bd-api/bd-api-report/pom.xml
similarity index 74%
rename from hzs-api/hzs-api-report/pom.xml
rename to bd-api/bd-api-report/pom.xml
index 65196c7..c8dddaa 100644
--- a/hzs-api/hzs-api-report/pom.xml
+++ b/bd-api/bd-api-report/pom.xml
@@ -5,15 +5,15 @@
4.0.0
- com.hzs.africa
- hzs-api
+ com.bd.africa
+ bd-api
1.0.0-SNAPSHOT
- hzs-api-report
+ bd-api-report
- hzs-api-report报表服务
+ bd-api-report报表服务
diff --git a/hzs-api/hzs-api-report/src/main/java/com/hzs/report/dto/package-info.java b/bd-api/bd-api-report/src/main/java/com/hzs/report/dto/package-info.java
similarity index 100%
rename from hzs-api/hzs-api-report/src/main/java/com/hzs/report/dto/package-info.java
rename to bd-api/bd-api-report/src/main/java/com/hzs/report/dto/package-info.java
diff --git a/hzs-api/hzs-api-activity/pom.xml b/bd-api/bd-api-sale/pom.xml
similarity index 65%
rename from hzs-api/hzs-api-activity/pom.xml
rename to bd-api/bd-api-sale/pom.xml
index 7729d3b..672a571 100644
--- a/hzs-api/hzs-api-activity/pom.xml
+++ b/bd-api/bd-api-sale/pom.xml
@@ -5,22 +5,22 @@
4.0.0
- com.hzs.africa
- hzs-api
+ com.bd.africa
+ bd-api
1.0.0-SNAPSHOT
- hzs-api-activity
+ bd-api-sale
- hzs-api-activity活动服务
+ bd-api-sale销售服务
- com.hzs.africa
- hzs-api-system
+ com.bd.africa
+ bd-api-system
diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java
rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java
diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java
similarity index 100%
rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java
rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java
diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
similarity index 71%
rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
index 2b05bc0..80b79d0 100644
--- a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
@@ -16,11 +16,7 @@ import java.util.List;
import java.util.Map;
/**
- * @Description: 订单服务对外提供接口
- * @Author: sui q
- * @Time: 2022/11/2 16:29
- * @Classname: ISaOrderServiceApi
- * @PackageName: com.hzs.sale.order
+ * 订单服务对外提供接口
*/
public interface ISaOrderServiceApi {
@@ -29,17 +25,11 @@ public interface ISaOrderServiceApi {
*
* @param startDate 开始日期
* @param endDate 结束日期
- * @return: R>
- * @Author: sui q
- * @Date: 2022/11/2 16:30
*/
R> querySaOrderByDay(Date startDate, Date endDate);
/*
- * @description: 根据主键查询订单
- * @author: sui q
- * @date: 2024/3/26 13:54
- * @param: null null
+ * 根据主键查询订单
**/
R querySaOrderExtByPkId(Long pkId);
@@ -48,9 +38,6 @@ public interface ISaOrderServiceApi {
*
* @param startDate 开始时间
* @param endDate 结束时间
- * @return: List
- * @Author: sui q
- * @Date: 2022/11/4 9:05
*/
R> querySaOrderByEffectiveDay(Date startDate, Date endDate);
@@ -59,25 +46,16 @@ public interface ISaOrderServiceApi {
*
* @param startDate 开始时间
* @param endDate 结束时间
- * @return: List
- * @Author: sui q
- * @Date: 2022/11/4 9:05
*/
R> queryDeliverySaOrderByDay(Date startDate, Date endDate);
/*
- * @description: 查询订单编号
- * @author: sui q
- * @date: 2023/7/31 16:48
- * @param: null null
+ * 查询订单编号
**/
R querySaOrderByDay(Date startDate, Date endDate, String orderCode);
/*
- * @description: 计算店铺奖金,查询订单
- * @author: sui q
- * @date: 2023/5/8 15:45
- * @param: null null
+ * 计算店铺奖金,查询订单
**/
R> querySaOrderByTimeForStore(Date startDate, Date endDate);
@@ -85,9 +63,6 @@ public interface ISaOrderServiceApi {
* 查询出所有有极差的,海外的计算方式
*
* @param saOrderList 订单列表
- * @return: List
- * @Author: sui q
- * @Date: 2022/12/9 14:09
*/
R