From 9410a83091694755f413d3ce0714de521be8d090 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 29 Oct 2025 14:34:25 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8A=A5=E5=8D=95=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../declaration/param/AcDeclarationParam.java | 4 ++ .../AcDeclarationGiftConfigServiceImpl.java | 49 ++++++++++++++++--- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java index c6fab2af..86cfbb6c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java @@ -44,5 +44,9 @@ public class AcDeclarationParam { * 报单赠送信息 */ private List acDeclarationConfigParams; + /** + * 权限配置列表 + */ + private List authorityList; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java index 3c55158f..0976a436 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java @@ -1,9 +1,12 @@ package com.hzs.activity.declaration.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.activity.base.param.ActivityParam; +import com.hzs.activity.base.service.IAcBaseAuthorityService; import com.hzs.activity.base.service.IAcBaseConfigService; import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper; @@ -14,6 +17,9 @@ import com.hzs.activity.declaration.param.AcDeclarationProductParam; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; +import com.hzs.activity.recommend.param.AcRecommendParam; +import com.hzs.common.core.enums.EDelFlag; +import com.hzs.common.domain.activity.base.AcBaseAuthority; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftDetail; import com.hzs.common.core.constant.CountryConstants; @@ -64,6 +70,8 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl authorityList = recommendParam.getAuthorityList(); + if (CollectionUtil.isNotEmpty(authorityList)) { + for (AcBaseAuthority acBaseAuthority : authorityList) { + acBaseAuthority.setPkBaseId(recommendParam.getPkBaseId()); + } + iAcBaseAuthorityService.saveBatch(authorityList); + } + } private void removeDeclarationConfig(Long pkId) { // 删除活动基本配置 @@ -222,10 +244,15 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl() .eq(AcDeclarationGiftDetail::getPkBaseId, pkId)); + // 删除活动权限配置 + iAcBaseAuthorityService.update(Wrappers.lambdaUpdate() + .eq(AcBaseAuthority::getPkBaseId, pkId) + .eq(AcBaseAuthority::getDelFlag, EDelFlag.UN_DELETE.getValue()) + .set(AcBaseAuthority::getDelFlag, EDelFlag.DELETE.getValue()) + ); } - private void updateDeclarationConfig(ActivityParam activityParam, List acDeclarationConfigParams) { - { + private void updateDeclarationConfig(ActivityParam activityParam, AcDeclarationParam acDeclarationParam) { Long pkId = activityParam.getPkId(); // 查询基础信息 AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class); @@ -235,15 +262,23 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl() .eq(AcDeclarationGiftConfig::getPkBaseId, pkId)); + // 删除活动权限配置 + iAcBaseAuthorityService.update(Wrappers.lambdaUpdate() + .eq(AcBaseAuthority::getPkBaseId, pkId) + .eq(AcBaseAuthority::getDelFlag, EDelFlag.UN_DELETE.getValue()) + .set(AcBaseAuthority::getDelFlag, EDelFlag.DELETE.getValue()) + ); // 删除活动详情配置 iAcDeclarationGiftDetailService.remove(new LambdaQueryWrapper() .eq(AcDeclarationGiftDetail::getPkBaseId, pkId)); // 添加加购活动配置 - saveDeclarationConfig(acDeclarationConfigParams, baseConfig); - } + saveDeclarationConfig(acDeclarationParam, baseConfig); } - private void saveDeclarationConfig(List acDeclarationConfigParams, AcBaseConfig acBaseConfig) { + private void saveDeclarationConfig(AcDeclarationParam acDeclarationParam, AcBaseConfig acBaseConfig) { + List acDeclarationConfigParams = acDeclarationParam.getAcDeclarationConfigParams(); + // 保存活动权限配置 + this.saveAuthority(acDeclarationParam); acDeclarationConfigParams.forEach(item -> { if (item != null) { AcDeclarationGiftConfig build = AcDeclarationGiftConfig.builder()