## 新建活动类型；

bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java

@@ -25,19 +25,12 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @BelongsProject: hzs_cloud
- * @BelongsPackage: com.hzs.activity.controller.manage
- * @Author: yh
- * @CreateTime: 2023-04-20  13:51
- * @Version: 1.0
- */
 @RestController
 @RequestMapping("/manage/activity")
 public class ActivityController extends BaseController {
 
     @Autowired
-    private IAcBaseConfigService baseConfigService;
+    private IAcBaseConfigService iAcBaseConfigService;
     @Autowired
     private IActivityService iActivityService;
 
@@ -95,7 +88,7 @@ public class ActivityController extends BaseController {
         // 创建时间倒叙
         queryWrapper.orderByDesc(AcBaseConfig::getCreationTime);
         List<BaseConfigVo> resultList = new ArrayList<>();
-        List<AcBaseConfig> list = baseConfigService.list(queryWrapper);
+        List<AcBaseConfig> list = iAcBaseConfigService.list(queryWrapper);
         for (AcBaseConfig acBaseConfig : list) {
             BaseConfigVo baseConfigVo = BeanUtil.copyProperties(acBaseConfig, BaseConfigVo.class);
             // 判断活动状态

bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java

@@ -9,9 +9,6 @@ import java.util.List;
 
 /**
  * 活动基本配置表 服务类
- *
- * @author hzs
- * @since 2023-04-20
  */
 public interface IAcBaseConfigService extends IService<AcBaseConfig> {
 
@@ -24,26 +21,17 @@ public interface IAcBaseConfigService extends IService<AcBaseConfig> {
     List<AcBaseConfig> selectBaseConfigByType(AcBaseConfigVO baseConfigVO);
 
     /**
-     * @description: 会员前端查询活动列表
+     * 会员前端查询活动列表
-     * @author: sui q
-     * @date: 2023/4/27 9:20
-     * @param: null null
      **/
     List<AcBaseConfigExt> queryBaseConfigList(Integer pkCountry, Long pkMember);
 
     /*
-     * @description: 查询订单详情
+     *  查询订单详情
-     * @author: sui q
-     * @date: 2023/6/21 10:41
-     * @param: null null
      **/
     AcBaseConfigExt queryBaseConfigDetail(Long pkId, Integer pkCountry);
 
     /**
-     * @description: 根据主键查询活动配置
+     * 根据主键查询活动配置
-     * @author: sui q
-     * @date: 2023/4/27 14:05
-     * @param: null null
      **/
     AcBaseConfig queryBaseConfigById(Long pkBaseId);
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java

@@ -17,9 +17,6 @@ import java.util.List;
 
 /**
  * 活动基本配置表 服务实现类
- *
- * @author hzs
- * @since 2023-04-20
  */
 @Service
 public class AcBaseConfigServiceImpl extends ServiceImpl<AcBaseConfigMapper, AcBaseConfig> implements IAcBaseConfigService {

bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java

@@ -11,12 +11,6 @@ import java.util.List;
 
 /**
  * 直推赠送模块VO
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/4/22 11:01
- * @Classname: AcRecommendUpgradeVO
- * @Package_name: com.hzs.activity.recommend.vo
  */
 @Data
 @AllArgsConstructor

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java

@@ -1,6 +1,5 @@
 package com.hzs.common.core.enums;
 
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -14,32 +13,37 @@ public enum EActType {
     /**
      * 商品赠品
      */
-    PRODUCT_GIFT(11, "商品赠品", 0, EnumsPrefixConstants.ACT_TYPE + "11"),
+    PRODUCT_GIFT(11, "商品赠品", 0),
 
     /**
      * 消费赠送
      */
-    CONSUMPTION_GIFT(12, "消费赠送", 0, EnumsPrefixConstants.ACT_TYPE + "12"),
+    CONSUMPTION_GIFT(12, "消费赠送", 0),
 
     /**
      * 直推赠送
      */
-    DIRECT_PUSH_GIFT(13, "直推赠送", 0, EnumsPrefixConstants.ACT_TYPE + "13"),
+    DIRECT_PUSH_GIFT(13, "直推赠送", 0),
 
     /**
      * 抽奖
      */
-    LOTTERY_DRAW(17, "抽奖", 0, EnumsPrefixConstants.ACT_TYPE + "17"),
+    LOTTERY_DRAW(17, "抽奖", 0),
 
     /**
      * 旅游活动
      */
-    TOURISM(22, "旅游活动", 0, EnumsPrefixConstants.ACT_TYPE + "22"),
+    TOURISM(22, "旅游活动", 0),
 
     /**
      * 会员消费赠送 活动
      */
-    MEMBER_CONSUMPTION(25, "会员消费赠送", 0, EnumsPrefixConstants.ACT_TYPE + "25"),
+    MEMBER_CONSUMPTION(25, "会员消费赠送", 0),
+
+    /**
+     * 直推升级
+     */
+    RECOMMEND_UPGRADE(30, "直推升级", 0),
 
     ;
 
@@ -55,8 +59,5 @@ public enum EActType {
      * 是否启用（0=是,1=否） -- 来源EYesNo
      */
     private final int enable;
-    /**
+
-     * 国际化翻译key值
-     */
-    private final String key;
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java

@@ -1,6 +1,5 @@
 package com.hzs.common.core.enums;
 
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -14,27 +13,27 @@ public enum EPickType {
     /**
      * 关联 BS_PRODUCT 表
      */
-    PICK_PRODUCT(0, "提货产品", EnumsPrefixConstants.ACT_TYPE + "0"),
+    PICK_PRODUCT(0, "提货产品"),
 
     /**
      * 关联 BS_PRODUCT 表（一次全部提走）
      */
-    PRIZE(1, "抽奖", EnumsPrefixConstants.ACT_TYPE + "1"),
+    PRIZE(1, "抽奖"),
 
     /**
      * 关联 AC_GIFT_CONFIG 表
      */
-    CONSUMPTION_GIFT(12, "消费赠送", EnumsPrefixConstants.ACT_TYPE + "12"),
+    CONSUMPTION_GIFT(12, "消费赠送"),
 
     /**
      * 关联 AC_GIFT_CONFIG 表
      */
-    DIRECT_PUSH_GIFT(13, "直推赠送", EnumsPrefixConstants.ACT_TYPE + "13"),
+    DIRECT_PUSH_GIFT(13, "直推赠送"),
 
     /**
      * 关联 AC_GIFT_CONFIG 表
      */
-    LOTTERY_DRAW(17, "抽奖", EnumsPrefixConstants.ACT_TYPE + "17"),
+    LOTTERY_DRAW(17, "抽奖"),
 
     ;
 
@@ -46,10 +45,6 @@ public enum EPickType {
      * 显示标签
      */
     private final String label;
-    /**
-     * 国际化翻译key值
-     */
-    private final String key;
 
     /**
      * 根据枚举值查询枚举

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/base/AcBaseConfig.java

@@ -41,7 +41,7 @@ public class AcBaseConfig extends BaseEntity {
     private String actName;
 
     /**
-     * 活动类型（11=商品赠送 12=消费赠送 13=直推赠送 17=抽奖 24=升级权限赠送）
+     * 活动类型（11=商品赠送 12=消费赠送 13=直推赠送 17=抽奖 30=推荐升级）
      */
     @Transaction(transactionKey = EnumsPrefixConstants.ACT_TYPE)
     @TableField("ACT_TYPE")

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/recommend/AcRecomUpgradeRecord.java

@@ -54,19 +54,19 @@ public class AcRecomUpgradeRecord extends BaseEntity {
     private Integer pkSettleGrade;
 
     /**
-     * 推荐等级
+     * 升级等级
      */
     @TableField("PK_RECOMMEND_GRADE")
     private Integer pkRecommendGrade;
 
     /**
-     * 订单ID
+     * 订单ID -- 已不用
      */
     @TableField("PK_ORDER_ID")
     private Long pkOrderId;
 
     /**
-     * 推荐等级
+     * 升级状态（0：未升级,1：已升级） -- 已不用
      */
     @TableField("UPGRADE_STATUS")
     private Integer upGradeStatus;