From afe8f64d05055ccf1291144bcf03c1bbb810673b Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 11 Sep 2024 18:03:14 +0800 Subject: [PATCH] 9.11 --- .../src/views/EventMarketing/center/index.vue | 246 +++++++++--------- .../activeApplet/entity/ActiveApplet.java | 5 + .../service/impl/ActiveAppletServiceImpl.java | 37 ++- 3 files changed, 158 insertions(+), 130 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue index 90d897c16..1f86c84fe 100644 --- a/fuintAdmin/src/views/EventMarketing/center/index.vue +++ b/fuintAdmin/src/views/EventMarketing/center/index.vue @@ -9,7 +9,7 @@
-
+
会员营销
@@ -216,63 +216,65 @@ 重置
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + - - + + +
重置
- - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + - - - - - + + + + + - - + + +
{ */ @TableField(exist = false) private String createName; + /** + * 创建人名称 + */ + @TableField(exist = false) + private String userGradeName; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java index fcc7ec06f..5149bb45e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java @@ -8,9 +8,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.marketingActivity.activeApplet.mapper.ActiveAppletMapper; import com.fuint.business.marketingActivity.activeApplet.entity.ActiveApplet; import com.fuint.business.marketingActivity.activeApplet.service.ActiveAppletService; +import com.fuint.business.userManager.entity.LJUserGrade; +import com.fuint.business.userManager.service.LJUserGradeService; import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; import com.fuint.utils.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -27,6 +30,8 @@ public class ActiveAppletServiceImpl extends ServiceImpl applet(ActiveApplet activeApplet) { @@ -65,8 +70,22 @@ public class ActiveAppletServiceImpl extends ServiceImpl pageActive(Page page, ActiveApplet activeApplet) { IPage result = activeAppletMapper.pageActive(page,activeApplet); + // 查询用户等级信息 + List ljUserGrades = userGradeService.selectUserGradeAll(TokenUtil.getNowAccountInfo().getStoreId()); result.getRecords().forEach(item -> { item.setTypeText(replaceType(item.getType())); + String userGradeName = ""; + if (ObjectUtil.isNotEmpty(item.getAdaptUserType())){ + String[] gradeIds = item.getAdaptUserType().split(","); + for (String gradeId : gradeIds) { + for (LJUserGrade ljUserGrade : ljUserGrades) { + if (gradeId.equals(ljUserGrade.getId().toString())){ + userGradeName += ljUserGrade.getName() + ","; + } + } + } + } + item.setUserGradeName(userGradeName); }); return result; } @@ -88,16 +107,16 @@ public class ActiveAppletServiceImpl extends ServiceImpl