From 368406e9d74243191216ccf4307552d50c7e4cb7 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 23 Sep 2025 15:11:10 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=96=B0=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manage/ActivityController.java | 11 ++------- .../base/service/IAcBaseConfigService.java | 18 +++------------ .../service/impl/AcBaseConfigServiceImpl.java | 3 --- .../activity/recommend/vo/AcRecommendVO.java | 6 ----- .../com/hzs/common/core/enums/EActType.java | 23 ++++++++++--------- .../com/hzs/common/core/enums/EPickType.java | 15 ++++-------- .../domain/activity/base/AcBaseConfig.java | 2 +- .../recommend/AcRecomUpgradeRecord.java | 6 ++--- 8 files changed, 26 insertions(+), 58 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java index 1c35852e..81c2ef5e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java +++ b/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 resultList = new ArrayList<>(); - List list = baseConfigService.list(queryWrapper); + List list = iAcBaseConfigService.list(queryWrapper); for (AcBaseConfig acBaseConfig : list) { BaseConfigVo baseConfigVo = BeanUtil.copyProperties(acBaseConfig, BaseConfigVo.class); // 判断活动状态 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java index 9867db38..cb872256 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java +++ b/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 { @@ -24,26 +21,17 @@ public interface IAcBaseConfigService extends IService { List selectBaseConfigByType(AcBaseConfigVO baseConfigVO); /** - * @description: 会员前端查询活动列表 - * @author: sui q - * @date: 2023/4/27 9:20 - * @param: null null + * 会员前端查询活动列表 **/ List 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); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java index 00489cca..395403c1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java +++ b/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 implements IAcBaseConfigService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java index e5e2d49b..fc3ab62d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java +++ b/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 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java index e31e06f1..8f3af65b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java +++ b/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; + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java index e45a1026..4c79f653 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java +++ b/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; /** * 根据枚举值查询枚举 diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/base/AcBaseConfig.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/base/AcBaseConfig.java index 63269906..e112fa32 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/base/AcBaseConfig.java +++ b/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") diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/recommend/AcRecomUpgradeRecord.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/recommend/AcRecomUpgradeRecord.java index 25228cc5..a6161ff0 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/recommend/AcRecomUpgradeRecord.java +++ b/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;