From faa30a8ed846025b09992b66d4dd1845edd8e16e Mon Sep 17 00:00:00 2001 From: starrySky <1752476835@qq.com> Date: Fri, 19 Jul 2024 15:11:27 +0800 Subject: [PATCH] fix --- .../service/IPlayClerkLevelInfoService.java | 13 +++++-- .../impl/PlayClerkLevelInfoServiceImpl.java | 34 +++++++++++++++++-- .../service/IPlayCustomLevelInfoService.java | 9 +++++ .../impl/PlayCustomLevelInfoServiceImpl.java | 27 +++++++++++++-- .../service/impl/SysTenantServiceImpl.java | 14 +++++++- 5 files changed, 89 insertions(+), 8 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java index abd759a..18e1201 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java @@ -3,6 +3,7 @@ package com.starry.admin.modules.clerk.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity; +import com.starry.admin.modules.platform.entity.SysTenantEntity; import java.util.List; @@ -14,14 +15,23 @@ import java.util.List; */ public interface IPlayClerkLevelInfoService extends IService { + /** + * 初始化店员等级 + * + * @param sysTenantEntity 租户信息 + * @author 杭州世平信息科技有限公司-xuhq + * @since 2024/7/19 15:13 + **/ + void initDefaultLevel(SysTenantEntity sysTenantEntity); /** * 获取新增陪聊时，默认最低等级ID + * * @return PlayClerkLevelInfoEntity */ PlayClerkLevelInfoEntity getDefaultLevel(); + /** - * * 查询店员等级 * * @param id 店员等级主键 @@ -87,7 +97,6 @@ public interface IPlayClerkLevelInfoService extends IService list = this.selectAll(); + if (list == null || list.isEmpty()) { + PlayClerkLevelInfoEntity entity = new PlayClerkLevelInfoEntity(); + entity.setName("普通"); + entity.setFirstRandomRadio(45); + entity.setNotFirstRandomRadio(50); + entity.setFirstRewardRatio(45); + entity.setNotFirstRewardRatio(50); + entity.setFirstRegularRatio(45); + entity.setNotFirstRegularRatio(50); + entity.setLevel(1); + entity.setTenantId(sysTenantEntity.getTenantId()); + this.baseMapper.insert(entity); + } + } + @Override public PlayClerkLevelInfoEntity getDefaultLevel() { List list = this.selectAll(); if (list != null && !list.isEmpty()) { return list.get(0); + } else { + PlayClerkLevelInfoEntity entity = new PlayClerkLevelInfoEntity(); + entity.setName("普通"); + entity.setFirstRandomRadio(45); + entity.setNotFirstRandomRadio(50); + entity.setFirstRewardRatio(45); + entity.setNotFirstRewardRatio(50); + entity.setFirstRegularRatio(45); + entity.setNotFirstRegularRatio(50); + entity.setLevel(1); + this.baseMapper.insert(entity); + return entity; } - throw new CustomException("系统错误,等级数据未初始化"); } /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java index 0fbe5ae..c58e541 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java @@ -2,6 +2,7 @@ package com.starry.admin.modules.custom.service; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity; +import com.starry.admin.modules.platform.entity.SysTenantEntity; import java.util.List; @@ -13,6 +14,14 @@ import java.util.List; */ public interface IPlayCustomLevelInfoService extends IService { + /** + * 初始化顾客等级 + * + * @param sysTenantEntity 租户细信息 + * @author 杭州世平信息科技有限公司-xuhq + * @since 2024/7/19 15:13 + **/ + void initDefaultLevel(SysTenantEntity sysTenantEntity); /** * 获取新增顾客时，默认最低等级ID diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java index 8789928..5a185f6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java @@ -1,14 +1,14 @@ package com.starry.admin.modules.custom.service.impl; -import com.starry.common.utils.IdUtils; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.common.exception.CustomException; import com.starry.admin.modules.custom.mapper.PlayCustomLevelInfoMapper; import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity; import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService; +import com.starry.admin.modules.platform.entity.SysTenantEntity; +import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -27,13 +27,34 @@ public class PlayCustomLevelInfoServiceImpl extends ServiceImpl list = this.selectAll(); + if (list == null || list.isEmpty()) { + PlayCustomLevelInfoEntity entity = new PlayCustomLevelInfoEntity(); + entity.setLevel(1); + entity.setName("V1"); + entity.setConsumptionAmount("1"); + entity.setDiscount(100); + entity.setTenantId(sysTenantEntity.getTenantId()); + this.baseMapper.insert(entity); + } + } + @Override public PlayCustomLevelInfoEntity getDefaultLevel() { List list = this.selectAll(); if (list != null && !list.isEmpty()) { return list.get(0); + } else { + PlayCustomLevelInfoEntity entity = new PlayCustomLevelInfoEntity(); + entity.setLevel(1); + entity.setName("V1"); + entity.setConsumptionAmount("1"); + entity.setDiscount(100); + this.baseMapper.insert(entity); + return entity; } - throw new CustomException("系统错误,等级数据未初始化"); } @Override diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java index 5c4a3d4..ec65377 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java @@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.starry.admin.common.domain.LoginUser; import com.starry.admin.common.exception.CustomException; +import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService; +import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService; import com.starry.admin.modules.platform.entity.SysTenantEntity; import com.starry.admin.modules.platform.entity.SysTenantPackageEntity; import com.starry.admin.modules.platform.mapper.SysTenantMapper; @@ -68,6 +70,12 @@ public class SysTenantServiceImpl extends ServiceImpl listAll() { @@ -85,7 +93,7 @@ public class SysTenantServiceImpl extends ServiceImpl