## 调整包结构和maven配置等；去掉短信相关内容；

bd-api/bd-api-activity/pom.xml

@@ -5,22 +5,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.hzs.africa</groupId>
-        <artifactId>hzs-api</artifactId>
+        <groupId>com.bd.africa</groupId>
+        <artifactId>bd-api</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hzs-api-bonus</artifactId>
+    <artifactId>bd-api-activity</artifactId>
 
     <description>
-        hzs-api-bonus奖金服务
+        bd-api-activity活动服务
     </description>
 
     <dependencies>
 
         <dependency>
-            <groupId>com.hzs.africa</groupId>
-            <artifactId>hzs-api-system</artifactId>
+            <groupId>com.bd.africa</groupId>
+            <artifactId>bd-api-system</artifactId>
         </dependency>
 
     </dependencies>

bd-api/bd-api-bonus/pom.xml

@@ -5,22 +5,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.hzs.africa</groupId>
-        <artifactId>hzs-api</artifactId>
+        <groupId>com.bd.africa</groupId>
+        <artifactId>bd-api</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hzs-api-sale</artifactId>
+    <artifactId>bd-api-bonus</artifactId>
 
     <description>
-        hzs-api-sale销售服务
+        bd-api-bonus奖金服务
     </description>
 
     <dependencies>
 
         <dependency>
-            <groupId>com.hzs.africa</groupId>
-            <artifactId>hzs-api-system</artifactId>
+            <groupId>com.bd.africa</groupId>
+            <artifactId>bd-api-system</artifactId>
         </dependency>
 
     </dependencies>

bd-api/bd-api-member/pom.xml

@@ -5,22 +5,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.hzs.africa</groupId>
-        <artifactId>hzs-api</artifactId>
+        <groupId>com.bd.africa</groupId>
+        <artifactId>bd-api</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hzs-api-member</artifactId>
+    <artifactId>bd-api-member</artifactId>
 
     <description>
-        hzs-api-member会员服务
+        bd-api-member会员服务
     </description>
 
     <dependencies>
 
         <dependency>
-            <groupId>com.hzs.africa</groupId>
-            <artifactId>hzs-api-system</artifactId>
+            <groupId>com.bd.africa</groupId>
+            <artifactId>bd-api-system</artifactId>
         </dependency>
 
     </dependencies>

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<CuMember>
-     * @Author: sui q
-     * @Date: 2022/8/29 11:46
      */
     R<List<CuMemberExt>> getMemberInfo(CuMember cuMember);
 
-    /*
-     * @description: 查询三方需要同步的会员
-     * @author: sui q
-     * @date: 2023/6/17 15:52
-     * @param: null null
-     **/
-    R<List<CuMemberExt>> 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<Boolean> 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<Boolean> mergeRevokeMemberByRegisterOrder(Long pkApprove, List<Long> memberList, Map<Long, SaOrderExt> saOrderMap, BusinessCommissionDTO businessCommissionDTO);
 
@@ -87,9 +64,6 @@ public interface IMemberServiceApi {
      * @param pkApprove 审核人
      * @param saOrder   订单
      * @param cuMember  修改后的会员
-     * @return: R<Boolean>
-     * @Author: sui q
-     * @Date: 2023/3/25 14:13
      */
     R<Boolean> normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, List<Long> pkOrderItemList, BusinessCommissionDTO businessCommissionDTO);
 
@@ -97,10 +71,6 @@ public interface IMemberServiceApi {
      * 查找安置人伞上会员信息
      *
      * @param memberId 编号、安置人
-     * @Description:
-     * @return: List<CuMemberExt>
-     * @Author: sui q
-     * @Date: 2022/8/29 20:54
      */
     R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, String memberCode, String phone);
 
@@ -108,10 +78,6 @@ public interface IMemberServiceApi {
      * 查找安置人伞下
      *
      * @param memberId 会员编号
-     * @Description:
-     * @return: List<CuMemberExt>
-     * @Author: sui q
-     * @Date: 2022/8/29 20:54
      */
     R<List<CuMemberExt>> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List<CuMemberExt> cuMemberExtList);
 
@@ -119,10 +85,6 @@ public interface IMemberServiceApi {
      * 查找安置人伞下
      *
      * @param memberId 安置人，编号
-     * @Description:
-     * @return: List<CuMemberExt>
-     * @Author: sui q
-     * @Date: 2022/8/29 20:54
      */
     R<List<CuMemberExt>> 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<CuMemberExt> queryPlaceSponsorLastLeft(Long memberId, Integer placeDept);
 
@@ -141,10 +100,6 @@ public interface IMemberServiceApi {
      * 查找血缘伞上，推荐人
      *
      * @param memberId 推荐人编号
-     * @Description:
-     * @return: List<CuMemberExt>
-     * @Author: sui q
-     * @Date: 2022/8/29 20:54
      */
     R<List<CuMemberExt>> queryBloodKinshipOnUmbrella(Long memberId);
 
@@ -152,10 +107,6 @@ public interface IMemberServiceApi {
      * 查找血缘伞下，推荐人
      *
      * @param memberId 推荐人编号
-     * @Description:
-     * @return: List<CuMemberExt>
-     * @Author: sui q
-     * @Date: 2022/8/29 20:54
      */
     R<List<CuMemberExt>> queryBloodKinshipUnderUmbrella(Long memberId);
 
@@ -176,10 +127,7 @@ public interface IMemberServiceApi {
     R<CuMember> getMember(Long pkMember);
 
     /*
-     * @description: 查询会员
-     * @author: sui q
-     * @date: 2023/4/25 10:32
-     * @param: null null
+     *  查询会员
      **/
     R<CuMember> queryMember(Long pkMember);
 
@@ -195,17 +143,11 @@ public interface IMemberServiceApi {
      * 保存新会员信息,待支付订单
      *
      * @param cuMember 会员信息
-     * @return: R<Integer>
-     * @Author: sui q
-     * @Date: 2022/9/9 9:39
      */
     R<Boolean> saveMember(CuMember cuMember);
 
     /*
-     * @description: 查询网体是否存在推荐人
-     * @author: sui q
-     * @date: 2023/9/11 9:53
-     * @param: null null
+     *  查询网体是否存在推荐人
      **/
     R<Integer> 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<Boolean> 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<Boolean> 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<Boolean> saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
 
@@ -250,9 +183,6 @@ public interface IMemberServiceApi {
      * @param saOrder            订单信息
      * @param isPay              是否支付
      * @param cuMemberAccountExt 支付账号
-     * @return: R<Integer>
-     * @Author: sui q
-     * @Date: 2022/9/9 9:39
      */
     R<Boolean> saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt);
 
@@ -261,9 +191,6 @@ public interface IMemberServiceApi {
      *
      * @param cuMember 会员
      * @param isHaiFun 是否嗨粉
-     * @return: R<Boolean>
-     * @Author: sui q
-     * @Date: 2022/9/30 17:30
      */
     R<CuMember> 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<CuMemberRegister> queryCuMemberRegister(Long pkMember);
 
 
     /*
-     * @description: 会员编号，账户类型，抽奖金额
-     * @author: sui q
-     * @date: 2023/4/25 16:31
-     * @param: null null
+     *  会员编号，账户类型，抽奖金额
      **/
     R<Boolean> updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney);
 
     /*
-     * @description: 会员抽奖，购买抽奖次数支付金额
-     * @author: sui q
-     * @date: 2023/4/27 15:54
-     * @param: null null
+     *  会员抽奖，购买抽奖次数支付金额
      **/
     R<Boolean> updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney);
 
     /*
-     * @description: 会员抽奖，购买抽奖次数支付金额
-     * @author: sui q
-     * @date: 2023/4/27 15:54
-     * @param: null null
+     *  会员抽奖，购买抽奖次数支付金额
      **/
     R<Boolean> updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt);
 
@@ -352,10 +267,7 @@ public interface IMemberServiceApi {
     R<Boolean> averageTimeCalculation();
 
     /**
-     * @description: 查询有没有升级权益
-     * @author: sui q
-     * @date: 2023/5/22 20:18
-     * @param: null null
+     * 查询有没有升级权益
      **/
     R<CuMemberUpgrade> queryCuMemberUpgradeByCondition(Integer pkCountry, Long pkMember);
 
@@ -381,11 +293,7 @@ public interface IMemberServiceApi {
     R<Boolean> 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<List<Integer>> queryMemberPlace(Long pkMember);
 
     /**
-     * @description: 未激活点位签呈列表
-     * @author: zhang jing
-     * @date: 2023/10/27 16:25
-     * @param: [analysisBusinessAppealParam]
-     * @return: com.hzs.common.core.domain.R<com.hzs.member.base.dto.ZeroElementRevokeDTO>
+     * 未激活点位签呈列表
      **/
     R<List<NotActivePointDTO>> notActiveByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam);
 
-
     /**
      * 查询全部会员
      *
@@ -430,4 +333,5 @@ public interface IMemberServiceApi {
      * @return
      */
     R<List<CuMemberExt>> getMemberAll(List<Integer> gradeId, Integer pkCountry, Date startTime, Date endTime);
+
 }

bd-api/bd-api-report/pom.xml

@@ -5,15 +5,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.hzs.africa</groupId>
-        <artifactId>hzs-api</artifactId>
+        <groupId>com.bd.africa</groupId>
+        <artifactId>bd-api</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hzs-api-report</artifactId>
+    <artifactId>bd-api-report</artifactId>
 
     <description>
-        hzs-api-report报表服务
+        bd-api-report报表服务
     </description>
 
     <dependencies>

bd-api/bd-api-sale/pom.xml

@@ -5,22 +5,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.hzs.africa</groupId>
-        <artifactId>hzs-api</artifactId>
+        <groupId>com.bd.africa</groupId>
+        <artifactId>bd-api</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hzs-api-activity</artifactId>
+    <artifactId>bd-api-sale</artifactId>
 
     <description>
-        hzs-api-activity活动服务
+        bd-api-sale销售服务
     </description>
 
     <dependencies>
 
         <dependency>
-            <groupId>com.hzs.africa</groupId>
-            <artifactId>hzs-api-system</artifactId>
+            <groupId>com.bd.africa</groupId>
+            <artifactId>bd-api-system</artifactId>
         </dependency>
 
     </dependencies>

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<List < SaOrderExt>>
-     * @Author: sui q
-     * @Date: 2022/11/2 16:30
      */
     R<List<SaOrderExt>> querySaOrderByDay(Date startDate, Date endDate);
 
     /*
-     * @description: 根据主键查询订单
-     * @author: sui q
-     * @date: 2024/3/26 13:54
-     * @param: null null
+     *  根据主键查询订单
      **/
     R<SaOrder> querySaOrderExtByPkId(Long pkId);
 
@@ -48,9 +38,6 @@ public interface ISaOrderServiceApi {
      *
      * @param startDate 开始时间
      * @param endDate   结束时间
-     * @return: List<SaOrder>
-     * @Author: sui q
-     * @Date: 2022/11/4 9:05
      */
     R<List<SaOrderExt>> querySaOrderByEffectiveDay(Date startDate, Date endDate);
 
@@ -59,25 +46,16 @@ public interface ISaOrderServiceApi {
      *
      * @param startDate 开始时间
      * @param endDate   结束时间
-     * @return: List<SaOrder>
-     * @Author: sui q
-     * @Date: 2022/11/4 9:05
      */
     R<List<SaOrderExt>> queryDeliverySaOrderByDay(Date startDate, Date endDate);
 
     /*
-     * @description: 查询订单编号
-     * @author: sui q
-     * @date: 2023/7/31 16:48
-     * @param: null null
+     *  查询订单编号
      **/
     R<SaOrderExt> querySaOrderByDay(Date startDate, Date endDate, String orderCode);
 
     /*
-     * @description: 计算店铺奖金，查询订单
-     * @author: sui q
-     * @date: 2023/5/8 15:45
-     * @param: null null
+     *  计算店铺奖金，查询订单
      **/
     R<List<SaOrderExt>> querySaOrderByTimeForStore(Date startDate, Date endDate);
 
@@ -85,9 +63,6 @@ public interface ISaOrderServiceApi {
      * 查询出所有有极差的，海外的计算方式
      *
      * @param saOrderList 订单列表
-     * @return: List<OrderRangeVO>
-     * @Author: sui q
-     * @Date: 2022/12/9 14:09
      */
     R<Map<String, List<SaOrderRangeDto>>> queryOrderRangeVO(List<?> saOrderList);
 
@@ -131,19 +106,12 @@ public interface ISaOrderServiceApi {
     void closeOrder();
 
     /**
-     * @description: 根据订单类型查询当天已支付订单信息
-     * @author: zhang jing
-     * @date: 2023/5/17 17:12
-     * @param: [orderType]
-     * @return: com.hzs.common.core.domain.R<java.util.List < java.lang.Long>>
+     * 根据订单类型查询当天已支付订单信息
      **/
     R<List<SaOrder>> querySaOrderByOrderType(String payTime);
 
     /*
-     * @description: 查询订单某段时间累计金额，累计业绩
-     * @author: sui q
-     * @date: 2023/7/3 14:50
-     * @param: null null
+     *  查询订单某段时间累计金额，累计业绩
      **/
     R<SaOrder> queryOrderTotalAchieveByTime(Date startDate, Date endDate);
 
@@ -165,19 +133,12 @@ public interface ISaOrderServiceApi {
     R saveOrderBatch(List<SaOrder> orderList, List<SaOrderItems> orderItemsList);
 
     /* 保存销售订单
-     * @description:
-     * @author: sui q
-     * @date: 2024/4/24 14:13
-     * @param: null null
+     *
      **/
     R saveOrder(SaOrderExt saOrderExt);
 
     /**
-     * @description: 批量插入虚拟订单数据
-     * @author: zhang jing
-     * @date: 2023/10/12 11:57
-     * @param: [orderList]
-     * @return: com.hzs.common.core.domain.R
+     * 批量插入虚拟订单数据
      **/
     R insertUnrealOrderBach(List<SaOrder> orderList);
 
@@ -201,32 +162,24 @@ public interface ISaOrderServiceApi {
 
     /**
      * 查询会员订单总业绩
+     *
      * @param pkMember
      * @return
      */
     R<BigDecimal> getMemberOrderAchieve(Long pkMember);
 
     /*
-     * @description: 根据发货单查询销售订单
-     * @author: sui q
-     * @date: 2023/11/30 10:58
-     * @param: null null
+     *  根据发货单查询销售订单
      **/
     R<List<SaOrderExt>> querySaOrderByDeliverList(List<SaDeliverItemsExt> deliverItemExtList);
 
     /*
-     * @description: 根据订单对订单进行发货，公司发到店铺
-     * @author: sui q
-     * @date: 2024/5/14 9:32
-     * @param: null null
+     *  根据订单对订单进行发货，公司发到店铺
      **/
     R<Boolean> sendDeliverBySaOrder(List<SaOrderExt> saOrderExtList, Long pkMember);
 
     /*
-     * @description: 查询店铺自提、店铺配送未发货订单，用于店铺发货界面
-     * @author: sui q
-     * @date: 2024/5/14 10:52
-     * @param: null null
+     *  查询店铺自提、店铺配送未发货订单，用于店铺发货界面
      **/
     R<List<SaOrderExt>> queryStoreSaOrderByParam(List<Long> orderItemIdList);
 

bd-api/bd-api-scm/pom.xml

@@ -5,26 +5,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.hzs.africa</groupId>
-        <artifactId>hzs-api</artifactId>
+        <groupId>com.bd.africa</groupId>
+        <artifactId>bd-api</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hzs-api-scm</artifactId>
+    <artifactId>bd-api-scm</artifactId>
 
     <description>
-        hzs-api-scm进销存服务
+        bd-api-scm进销存服务
     </description>
 
     <dependencies>
 
         <dependency>
-            <groupId>com.hzs.africa</groupId>
-            <artifactId>hzs-api-system</artifactId>
+            <groupId>com.bd.africa</groupId>
+            <artifactId>bd-api-system</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.hzs.africa</groupId>
-            <artifactId>hzs-common-domain</artifactId>
+            <groupId>com.bd.africa</groupId>
+            <artifactId>bd-common-domain</artifactId>
         </dependency>
 
     </dependencies>

bd-api/bd-api-system/pom.xml

@@ -5,15 +5,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.hzs.africa</groupId>
-        <artifactId>hzs-api</artifactId>
+        <groupId>com.bd.africa</groupId>
+        <artifactId>bd-api</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hzs-api-system</artifactId>
+    <artifactId>bd-api-system</artifactId>
 
     <description>
-        hzs-api-system系统接口模块
+        bd-api-system系统接口模块
     </description>
 
     <dependencies>