KKSU
2025-01-10 59b5c5cdcdfcf29537a53b90aa01331cb8894792
src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
@@ -55,6 +55,7 @@
        if(ObjectUtil.isNotEmpty(state)){
            mallActivityLambdaQueryWrapper.eq(MallActivity::getState,state);
        }
        mallActivityLambdaQueryWrapper.orderByAsc(MallActivity::getCreatedTime);
        Page<MallActivity> mallActivityPage = this.baseMapper.selectPage(page, mallActivityLambdaQueryWrapper);
        return mallActivityPage;
    }
@@ -200,14 +201,14 @@
        List<MallActivity> mallActivities = this.baseMapper.selectList(
                new LambdaQueryWrapper<MallActivity>()
                        .select(MallActivity::getId, MallActivity::getName)
                        .select(MallActivity::getId, MallActivity::getName, MallActivity::getState, MallActivity::getType)
        );
        if(CollUtil.isNotEmpty(mallActivities)){
            for (MallActivity mallActivity : mallActivities) {
                AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
                adminMallActivityListVo.setId(mallActivity.getId());
                String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
                String desc1 = ActivityTypeEnum.getEnum(mallActivity.getType()).getDesc();
                String desc = YesOrNoOrIngEnum.YES.getActivityDesc(mallActivity.getState());
                String desc1 = ActivityTypeEnum.ZHE_KOU.getActivityType(mallActivity.getType());
                adminMallActivityListVo.setName(mallActivity.getName()+desc+desc1);
                mallActivityList.add(adminMallActivityListVo);
            }
@@ -249,14 +250,14 @@
        List<AdminMallActivityListVo> mallActivityList = new ArrayList<>();
        List<MallActivity> mallActivities = this.baseMapper.selectList(
                new LambdaQueryWrapper<MallActivity>()
                        .select(MallActivity::getId, MallActivity::getName)
                        .select(MallActivity::getId, MallActivity::getName, MallActivity::getState)
                        .eq(MallActivity::getType, type)
        );
        if(CollUtil.isNotEmpty(mallActivities)){
            for (MallActivity mallActivity : mallActivities) {
                AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
                adminMallActivityListVo.setId(mallActivity.getId());
                String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
                String desc = YesOrNoOrIngEnum.YES.getActivityDesc(mallActivity.getState());
                adminMallActivityListVo.setName(mallActivity.getName()+desc);
                mallActivityList.add(adminMallActivityListVo);
            }