diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java index 1e96e5a..bbb6537 100644 --- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java +++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java @@ -3,7 +3,6 @@ package com.qs.serve.controller; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.framework.base.config.properties.ProjectProperties; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.framework.security.model.LoginUserType; import com.qs.serve.common.annotation.LimitSubmit; import com.qs.serve.common.annotation.SysLog; @@ -16,6 +15,7 @@ import com.qs.serve.framework.base.util.*; import com.qs.serve.framework.base.util.model.DateFormatString; import com.qs.serve.common.utils.StringUtils; import com.qs.serve.controller.dto.SyLoginParam; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.seeyon.SyKeyLoginUtil; import com.qs.serve.modules.bms.service.BmsSupplierAddressService; import com.qs.serve.modules.goods.entity.GoodsCategory; diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java index 94b3e17..c864216 100644 --- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java +++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java @@ -1,7 +1,6 @@ package com.qs.serve.controller; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.framework.security.model.LoginUser; import com.qs.serve.framework.base.framework.security.model.LoginUserType; import com.qs.serve.common.annotation.SysLog; @@ -13,6 +12,7 @@ import com.qs.serve.common.enums.InterType; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.ServletUtils; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.sys.mapper.SysTenantMapper; import com.qs.serve.modules.sys.service.SysUserService; diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java index ada39c0..d53506c 100644 --- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java +++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java @@ -1,7 +1,7 @@ package com.qs.serve.task; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.model.consts.RedisCacheKeys; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.his.service.HisUserSupplierTempService; import lombok.AllArgsConstructor; diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java index dd5f7cb..5d297f2 100644 --- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java +++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java @@ -1,9 +1,9 @@ package com.qs.serve.task.controller; import com.qs.serve.framework.base.config.DevEnvironmentConfig; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.R; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.his.service.HisUserChannelPointService; import com.qs.serve.task.HisTask; import lombok.AllArgsConstructor; diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java index aab9782..f3354c1 100644 --- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java +++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java @@ -1,8 +1,8 @@ package com.qs.serve.task.controller; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.R; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.his.service.HisUserSupplierTempService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/cms-common/pom.xml b/cms-common/pom.xml index 4e3655f..ed3b53d 100644 --- a/cms-common/pom.xml +++ b/cms-common/pom.xml @@ -100,6 +100,10 @@ org.springframework.boot spring-boot-starter-validation + + cn.hutool + hutool-all + diff --git a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SpringUtils.java b/cms-common/src/main/java/com/qs/serve/common/utils/SpringUtils.java similarity index 97% rename from cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SpringUtils.java rename to cms-common/src/main/java/com/qs/serve/common/utils/SpringUtils.java index 5e9df8e..85052af 100644 --- a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SpringUtils.java +++ b/cms-common/src/main/java/com/qs/serve/common/utils/SpringUtils.java @@ -1,5 +1,6 @@ -package com.qs.serve.framework.base.util; +package com.qs.serve.common.utils; +import cn.hutool.core.collection.CollectionUtil; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/cms-framework/cms-framework-base/pom.xml b/cms-framework/cms-framework-base/pom.xml index de936c4..6b82256 100644 --- a/cms-framework/cms-framework-base/pom.xml +++ b/cms-framework/cms-framework-base/pom.xml @@ -18,6 +18,12 @@ + + com.qs + cms-framework-redis + 1.0-SNAPSHOT + + com.qs cms-common @@ -40,10 +46,6 @@ spring-boot-starter-undertow - - org.springframework.boot - spring-boot-starter-data-redis - org.springframework.boot diff --git a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java index f337b10..3daeeb0 100644 --- a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java +++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java @@ -1,9 +1,9 @@ package com.qs.serve.framework.base.framework.interceptor; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.model.HttpResponsePrintUtil; import com.qs.serve.common.annotation.LimitSubmit; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.RedisService; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java index 911c7c1..c1b3633 100644 --- a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java +++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java @@ -1,6 +1,6 @@ package com.qs.serve.framework.base.framework.manager; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.util.ThreadsUtils; import java.util.TimerTask; diff --git a/cms-framework/cms-framework-feign/src/main/java/com/qs/serve/feign/FeignRequestInterceptor.java b/cms-framework/cms-framework-feign/src/main/java/com/qs/serve/feign/FeignRequestInterceptor.java index 9d79da9..e45d5e9 100644 --- a/cms-framework/cms-framework-feign/src/main/java/com/qs/serve/feign/FeignRequestInterceptor.java +++ b/cms-framework/cms-framework-feign/src/main/java/com/qs/serve/feign/FeignRequestInterceptor.java @@ -5,6 +5,10 @@ import feign.RequestInterceptor; import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + /** * @author YenHex * @since 2025/4/17 @@ -16,6 +20,24 @@ public class FeignRequestInterceptor implements RequestInterceptor { public void apply(RequestTemplate template) { template.header("userId", SecurityUserUtil.getUserId()); template.header("tenant-id", SecurityUserUtil.getTenant()); + + //1：获取普通参数 +// Map> queries = template.queries(); +// Collection authorization = queries.get("userId"); +// if (authorization != null) { +// requestTemplate.header("Authorization", authorization); +// return; +// } + + Collection userIds = template.headers().get("userId"); + if(userIds.size()>0){ + SecurityUserUtil.setUserId(userIds.iterator().next()); + } + Collection tenants = template.headers().get("tenant-id"); + if(tenants.size()>0){ + SecurityUserUtil.setTenant(tenants.iterator().next()); + } + } } diff --git a/cms-framework/cms-framework-redis/pom.xml b/cms-framework/cms-framework-redis/pom.xml new file mode 100644 index 0000000..a886617 --- /dev/null +++ b/cms-framework/cms-framework-redis/pom.xml @@ -0,0 +1,35 @@ + + + + cms-framework + com.qs + 1.0-SNAPSHOT + + 4.0.0 + + cms-framework-redis + + + 8 + 8 + + + + + com.qs + cms-common + 1.0-SNAPSHOT + + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-starter-data-redis + + + + diff --git a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java b/cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/RedisService.java similarity index 99% rename from cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java rename to cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/RedisService.java index b43a4e4..43193d6 100644 --- a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java +++ b/cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/RedisService.java @@ -1,4 +1,4 @@ -package com.qs.serve.framework.base.framework.redis; +package com.qs.serve.framework.redis; import com.qs.serve.common.exception.Assert; import lombok.AllArgsConstructor; diff --git a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java b/cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/TtlRedisCacheManager.java similarity index 95% rename from cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java rename to cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/TtlRedisCacheManager.java index f8c31c0..938c3d3 100644 --- a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java +++ b/cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/TtlRedisCacheManager.java @@ -1,4 +1,4 @@ -package com.qs.serve.framework.base.framework.redis; +package com.qs.serve.framework.redis; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.cache.RedisCache; diff --git a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CodeGenUtil.java b/cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/utils/CodeGenUtil.java similarity index 93% rename from cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CodeGenUtil.java rename to cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/utils/CodeGenUtil.java index f9fb9b2..a72eaaa 100644 --- a/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CodeGenUtil.java +++ b/cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/utils/CodeGenUtil.java @@ -1,7 +1,8 @@ -package com.qs.serve.framework.base.util; +package com.qs.serve.framework.redis.utils; -import com.qs.serve.framework.base.config.DevEnvironmentConfig; -import com.qs.serve.framework.base.framework.redis.RedisService; +import cn.hutool.core.util.IdUtil; +import com.qs.serve.common.utils.SpringUtils; +import com.qs.serve.framework.redis.RedisService; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.beans.BeansException; @@ -98,8 +99,8 @@ public class CodeGenUtil { appendZeros.append("0"); } //用于区分测试环境数据 - String subflex = DevEnvironmentConfig.isDev()?"TEST":""; - return digitsNum + appendZeros + appendStr+subflex; + //String subflex = DevEnvironmentConfig.isDev()?"TEST":""; + return digitsNum + appendZeros + appendStr; } public synchronized static String getDataCode(SourceDataKey dataKey){ diff --git a/cms-framework/pom.xml b/cms-framework/pom.xml index 6320cb6..32d2b51 100644 --- a/cms-framework/pom.xml +++ b/cms-framework/pom.xml @@ -16,6 +16,7 @@ cms-framework-mvc cms-framework-base cms-framework-feign + cms-framework-redis cms-framework diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java index 4274132..b70f5d2 100644 --- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java +++ b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java @@ -2,9 +2,9 @@ package com.qs.serve.actuator; import com.qs.serve.common.utils.ServletUtils; import com.qs.serve.framework.base.config.DevEnvironmentConfig; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.framework.security.model.LoginUser; import com.qs.serve.framework.base.util.DateUtils; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.sys.common.AuthContextUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java index 5a1db62..5524185 100644 --- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java +++ b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java @@ -3,12 +3,12 @@ package com.qs.serve.actuator; import com.qs.serve.framework.base.config.properties.AuthUrlConst; import com.qs.serve.framework.base.config.properties.PermitProperties; import com.qs.serve.framework.base.config.properties.ProjectProperties; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.framework.base.framework.security.model.LoginUser; import com.qs.serve.framework.base.framework.security.util.SecurityPermitUtil; import com.qs.serve.framework.base.model.HttpResponsePrintUtil; import com.qs.serve.framework.base.model.consts.GySysConst; import com.qs.serve.framework.base.model.consts.RedisCacheKeys; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.framework.base.util.JwtUtils; import com.qs.serve.modules.sys.service.SysUserService; diff --git a/cms-modules/cms-basic/pom.xml b/cms-modules/cms-basic/pom.xml new file mode 100644 index 0000000..be251d3 --- /dev/null +++ b/cms-modules/cms-basic/pom.xml @@ -0,0 +1,20 @@ + + + + cms-modules + com.qs + 1.0-SNAPSHOT + + 4.0.0 + + pom + cms-basic + + + 8 + 8 + + + diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java index 62387ad..60b96a5 100644 --- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java +++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java @@ -46,6 +46,8 @@ public class TzcRebate implements Serializable { @Length(max = 64,message = "返利抬头长度不能超过64字") private String rebateName; + private Integer rebateStatus; + /** 返利开始时间 */ @Length(max = 0,message = "返利开始时间长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebateLevelsConfig.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebateLevelsConfig.java index b8f2740..1a1af18 100644 --- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebateLevelsConfig.java +++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebateLevelsConfig.java @@ -39,8 +39,8 @@ public class TzcRebateLevelsConfig implements Serializable { @NotNull(message = "坎级数字不能为空") private Integer levelNum; - /** 条件类型：0-同期进货金额；1-区间目标金额 */ - private Integer levelConfigs; + /** 叠加配置 */ + private String levelConfigs; /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateLevelsConfigParam.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateLevelsConfigParam.java index 067302d..0843721 100644 --- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateLevelsConfigParam.java +++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateLevelsConfigParam.java @@ -25,7 +25,7 @@ public class TzcRebateLevelsConfigParam implements Serializable { private Integer levelNum; /** 坎级设置；格式如：1,3,5 */ - private Integer levelConfigs; + private String levelConfigs; } diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/enums/TzcRebateStatus.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/enums/TzcRebateStatus.java new file mode 100644 index 0000000..2ffa966 --- /dev/null +++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/enums/TzcRebateStatus.java @@ -0,0 +1,41 @@ +package com.qs.serve.modules.tzc.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author YenHex + * @since 2025/4/18 + */ +@Getter +@AllArgsConstructor +public enum TzcRebateStatus { + + /** + * 返利状态：0-草稿，1-审批中，2-通过,待执行，3-完成；4-驳回，5-中止; 6-作废; + */ + DRAFT(0), + APPLY(1), + PASS(2), + FINISH(3), + REJECT(4), + STOP(5), + CANCEL(6) + ; + + public boolean isEqual(Integer status) { + return this.status.equals(status); + } + + public static TzcRebateStatus getByStatus(Integer status) { + for (TzcRebateStatus value : values()) { + if (value.status.equals(status)) { + return value; + } + } + return null; + } + + private Integer status; + +} diff --git a/cms-modules/cms-policy/cms-policy-bus/pom.xml b/cms-modules/cms-policy/cms-policy-bus/pom.xml index 9c86078..325e015 100644 --- a/cms-modules/cms-policy/cms-policy-bus/pom.xml +++ b/cms-modules/cms-policy/cms-policy-bus/pom.xml @@ -28,6 +28,11 @@ cms-framework-mybatis-plus 1.0-SNAPSHOT + + com.qs + cms-framework-redis + 1.0-SNAPSHOT + com.qs cms-common diff --git a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/api/TzcRebateApiImpl.java b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/api/TzcRebateApiImpl.java index 88b70e3..ff73719 100644 --- a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/api/TzcRebateApiImpl.java +++ b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/api/TzcRebateApiImpl.java @@ -1,13 +1,16 @@ package com.qs.serve.modules.tzc.api; +import com.qs.serve.common.utils.ServletUtils; import com.qs.serve.modules.tzc.entity.TzcRebate; import com.qs.serve.modules.tzc.service.TzcRebateService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** * @author YenHex * @since 2025/4/17 */ +@Slf4j @Service public class TzcRebateApiImpl implements TzcRebateApi { @@ -15,6 +18,8 @@ public class TzcRebateApiImpl implements TzcRebateApi { @Override public TzcRebate getRebateById(Long id) { + String userId = ServletUtils.getHeader("user-id"); + log.warn("userId:{}",userId); return tzcRebateService.getById(id); } diff --git a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java index df6904a..4ad4afc 100644 --- a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java +++ b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java @@ -1,12 +1,13 @@ package com.qs.serve.modules.tzc.service.impl; +import cn.hutool.core.collection.CollUtil; import com.qs.serve.common.exception.Assert; import com.qs.serve.framework.base.model.ResultFlag; -import com.qs.serve.modules.tzc.entity.bo.TzcRebateCenterParam; -import com.qs.serve.modules.tzc.entity.bo.TzcRebateParam; -import com.qs.serve.modules.tzc.entity.bo.TzcRebatePeriodParam; -import com.qs.serve.modules.tzc.entity.bo.TzcRebateSubjectParam; +import com.qs.serve.modules.tzc.entity.TzcRebate; +import com.qs.serve.modules.tzc.entity.bo.*; +import com.qs.serve.modules.tzc.enums.TzcRebateStatus; import com.qs.serve.modules.tzc.service.TzcRebateApplicationService; +import com.qs.serve.modules.tzc.service.TzcRebateService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,8 +24,24 @@ import java.util.List; @AllArgsConstructor public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationService { + private final TzcRebateService tzcRebateService; + @Override public Object modifyRebate(TzcRebateParam param) { + + Long rebateId = param.getId(); + String rebateCode = null; + + if(rebateId!=null){ + TzcRebate rebate = tzcRebateService.getById(rebateId); + if(TzcRebateStatus.DRAFT.isEqual(rebate.getRebateStatus())){ + Assert.throwEx("返利状态为初始化，不能修改"); + } + rebateCode = rebate.getRebateCode(); + }else { + //rebateCode = CodeGenUtil.getDataCode(SourceDataKey.TZC_REBATE); + } + BigDecimal oneHundred = new BigDecimal(100); List subjectParamList = param.getSubjectList(); BigDecimal totalRate = BigDecimal.ZERO; @@ -78,9 +95,48 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ } } if(ResultFlag.isTrue(period.getCompensationFlag())){ + if(period.getArgumentParam()==null){ + Assert.throwEx("["+period.getPeriodTitle()+"]返利补偿不能为空"); + } + } + } + // 校验坎级叠加 + if(ResultFlag.isTrue(param.getOverlayFlag())){ + if(CollUtil.isEmpty(param.getConfigList())){ + Assert.throwEx("坎级叠加标识为1时，坎级配置不能为空"); } } + + + + TzcRebate rebate = new TzcRebate(); + rebate.setId(rebateId); + rebate.setRebateCode(rebateCode); + +// rebate.setTemplateId(); +// rebate.setTemplateName(); + + rebate.setRebateName(param.getRebateName()); + rebate.setRebateStatus(TzcRebateStatus.DRAFT.getStatus()); + rebate.setActivityStartTime(param.getActivityStartTime()); + rebate.setActivityEndTime(param.getActivityEndTime()); + rebate.setAutoDispatchFlag(param.getAutoDispatchFlag()); + rebate.setCheckModel(param.getCheckModel()); + rebate.setCheckMaxAmount(param.getCheckMaxAmount()); + rebate.setCheckAutoDateType(param.getCheckAutoDateType()); + rebate.setCheckStartDate(param.getCheckStartDate()); + rebate.setCheckEndDate(param.getCheckEndDate()); + + rebate.setSupplierId(param.getSupplierId()); + + rebate.setSupplierCode(); + rebate.setSupplierName(); + + rebate.setRebateAmount(param.getRebateAmount()); + rebate.setOverlayFlag(param.getOverlayFlag()); + rebate.setRemark(param.getRemark()); + return null; } diff --git a/cms-modules/cms-system/pom.xml b/cms-modules/cms-system/pom.xml index c72b42c..c3da6b1 100644 --- a/cms-modules/cms-system/pom.xml +++ b/cms-modules/cms-system/pom.xml @@ -35,6 +35,13 @@ cms-framework-mybatis-plus 1.0-SNAPSHOT + + + com.qs + cms-framework-redis + 1.0-SNAPSHOT + + com.qs cms-framework-base diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java index d8c4bfd..f7af41e 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java @@ -1,7 +1,7 @@ package com.qs.serve.modules.bir.consts; import cn.hutool.core.collection.CollUtil; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.modules.tbs.entity.TbsCostBirLog; import com.qs.serve.modules.tbs.mapper.TbsCostBirLogMapper; import lombok.extern.slf4j.Slf4j; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java index 390fd19..a66e42f 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java @@ -3,7 +3,7 @@ package com.qs.serve.modules.bms.common; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.modules.sys.common.AuthContextUtils; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.modules.bms.entity.BmsAccountUser; import com.qs.serve.modules.bms.mapper.BmsAccountUserMapper; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index c7ca8a7..9d17b08 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -12,6 +12,7 @@ import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.common.utils.PageUtil; import com.qs.serve.common.utils.StringUtils; import com.qs.serve.common.utils.TreeUtil; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo; import com.qs.serve.modules.bir.service.BirBudgetTargetService; import com.qs.serve.modules.bms.entity.*; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index de70850..7599125 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; import com.qs.serve.common.annotation.SysLog; import com.qs.serve.framework.base.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.PageVo; @@ -17,6 +16,7 @@ import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.common.utils.PageUtil; import com.qs.serve.common.utils.StringUtils; import com.qs.serve.common.utils.TreeUtil; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo; import com.qs.serve.modules.bir.service.BirBudgetTargetService; import com.qs.serve.modules.bms.controller.my.BmsSupplierMyController; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java index 1d76743..d6160fb 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java @@ -1,7 +1,7 @@ package com.qs.serve.modules.erp.service.impl; import com.qs.serve.framework.base.framework.manager.AsyncManager; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.sync.AsyncFactory; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.erp.entity.dto.ErpCustomerAmountResult; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java index fad8c95..e9cb1a1 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java @@ -6,7 +6,7 @@ import com.qs.serve.common.annotation.SysLog; import com.qs.serve.framework.base.model.R; import com.qs.serve.common.enums.BizType; import com.qs.serve.common.enums.SystemModule; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.common.utils.StringUtils; import com.qs.serve.modules.goods.entity.GoodsSku; import com.qs.serve.modules.goods.entity.GoodsSkuSpecValue; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java index 43a02e9..c2b8b79 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.goods.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.exception.Assert; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java index 80f0231..7d21a6e 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; 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.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.PageVo; import com.qs.serve.framework.base.model.R; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java index f19fd92..05e4715 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java @@ -3,7 +3,7 @@ package com.qs.serve.modules.his.service.impl; 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.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsRegionUser; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java index 5b1cdfe..50afd1a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java @@ -1,11 +1,11 @@ package com.qs.serve.modules.oms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.dto.SimpleKeyValue; import com.qs.serve.common.exception.Assert; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.sys.common.AuthContextUtils; -import com.qs.serve.framework.base.util.CodeGenUtil; import com.qs.serve.framework.base.util.CollectionUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.mapper.BmsRegionMapper; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index 967d9d8..4b82698 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -4,11 +4,13 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.common.utils.SpringUtils; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.model.dto.SimpleKeyValue; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.BmsSupplierAddress; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java index 7f4f8a9..9a2af5a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java @@ -1,11 +1,11 @@ package com.qs.serve.modules.oms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.dto.SimpleKeyValue; import com.qs.serve.common.exception.Assert; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.sys.common.AuthContextUtils; -import com.qs.serve.framework.base.util.CodeGenUtil; import com.qs.serve.framework.base.util.CollectionUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.mapper.BmsRegionMapper; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index c9f23dd..8719cdd 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.util.StringUtil; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.common.utils.SpringUtils; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.model.dto.SimpleKeyValue; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.BmsSupplierAddress; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java index 831ad76..298a970 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java @@ -1,8 +1,8 @@ package com.qs.serve.modules.sale.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.sys.common.AuthContextUtils; -import com.qs.serve.framework.base.util.CodeGenUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.goods.entity.GoodsCategory; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java index bbf0c6e..923f608 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java @@ -1,6 +1,6 @@ package com.qs.serve.modules.seeyon.service; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.modules.sys.mapper.SysUserMapper; /** diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index bba9b32..d8fd723 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -1,9 +1,9 @@ package com.qs.serve.modules.seeyon.service; import com.qs.serve.common.exception.Assert; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.model.PageVo; import com.qs.serve.framework.base.model.R; -import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.StringUtils; import com.qs.serve.modules.data.entity.DataAffairCommit; import com.qs.serve.modules.data.mapper.DataAffairCommitMapper; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java index fe72aad..89c952e 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java @@ -1,10 +1,10 @@ package com.qs.serve.modules.sync; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.R; import com.qs.serve.modules.sys.common.AuthContextUtils; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; import com.qs.serve.modules.sys.entity.SysOperationLog; import com.qs.serve.modules.sys.mapper.SysOperationLogMapper; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java index 96f78a5..248ce62 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java @@ -6,7 +6,7 @@ import com.qs.serve.framework.base.model.consts.GySysConst; import com.qs.serve.common.enums.HttpCode; import com.qs.serve.common.exception.Assert; import com.qs.serve.common.utils.ServletUtils; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.common.utils.StringUtils; import com.qs.serve.common.context.SecurityUserUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index a76a386..0d8f0a0 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; import com.qs.serve.common.exception.Assert; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.framework.security.model.LoginUser; import com.qs.serve.common.annotation.SysLog; import com.qs.serve.framework.base.model.consts.GySysConst; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java index 527784d..c0b7ba7 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java @@ -3,7 +3,7 @@ package com.qs.serve.modules.sys.service.impl; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.framework.security.model.LoginUser; import com.qs.serve.framework.base.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.util.*; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java index f57fd58..998d8fd 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.DesensitizedUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.config.properties.SeeYonProperties; import com.qs.serve.common.exception.Assert; import com.qs.serve.framework.base.framework.security.model.LoginUser; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java index b899530..efbe7aa 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java @@ -141,7 +141,7 @@ public class TagDataController { * @return */ @DeleteMapping("deleteById/{id}") - public R deleteById(@PathVariable String id){ + public R deleteById(@PathVariable Long id){ tagDataService.removeById(id); return R.ok(); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java index 209b5e9..6e34c19 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java @@ -10,6 +10,7 @@ import com.qs.serve.common.enums.SystemModule; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.tag.entity.TagCategory; import com.qs.serve.modules.tag.service.TagCategoryService; import lombok.AllArgsConstructor; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java index 7c89ed0..cdf26ce 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.common.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.config.properties.ProjectProperties; import com.qs.serve.framework.base.model.consts.GySysConst; import com.qs.serve.framework.base.model.R; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java index 04029ef..5ce3567 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java @@ -1,7 +1,7 @@ package com.qs.serve.modules.tbs.common.util; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.modules.sys.entity.SysConfig; import com.qs.serve.modules.sys.service.SysConfigService; import com.qs.serve.modules.tbs.entity.TbsActivity; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java index 9bdf723..24ba0bc 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java @@ -1,7 +1,7 @@ package com.qs.serve.modules.tbs.common.util; import com.qs.serve.framework.base.util.CollectionUtil; -import com.qs.serve.framework.base.util.SpringUtils; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.common.utils.StringUtils; import com.qs.serve.modules.goods.entity.GoodsCategory; import com.qs.serve.modules.goods.entity.GoodsSku; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java index 713f4c2..8064786 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java @@ -7,10 +7,10 @@ import com.qs.serve.framework.base.model.PageVo; import com.qs.serve.framework.base.model.R; import com.qs.serve.common.enums.BizType; import com.qs.serve.common.enums.SystemModule; -import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.common.utils.PageUtil; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.entity.TbsCostApply; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java index 562b533..d60b3b3 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java @@ -1,10 +1,10 @@ package com.qs.serve.modules.tbs.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.framework.manager.AsyncManager; import com.qs.serve.framework.base.model.PageVo; import com.qs.serve.framework.base.model.R; -import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.PageUtil; import com.qs.serve.modules.sync.AsyncFactory; import com.qs.serve.modules.sys.service.SysAttachService; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 466092b..483382c 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -13,6 +13,7 @@ import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.common.utils.PageUtil; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsSupplier; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java index 5c9f561..57e6cbb 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java @@ -3,9 +3,9 @@ package com.qs.serve.modules.tbs.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.framework.base.model.PageVo; import com.qs.serve.framework.base.model.R; -import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.PageUtil; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.tbs.common.TbsCommonCheckState; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java index e6547f4..0c48288 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java @@ -10,6 +10,7 @@ import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.util.*; import com.qs.serve.framework.base.util.model.DateFormatString; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bms.entity.BmsSubject; import com.qs.serve.modules.bms.service.BmsSubjectService; import com.qs.serve.modules.goods.entity.GoodsCategory; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java index b544354..1dc7abb 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java @@ -8,6 +8,7 @@ import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.util.*; import com.qs.serve.framework.base.util.model.DateFormatString; import com.qs.serve.common.utils.PageUtil; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo; import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index fc1a7d8..70beef9 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -6,12 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.framework.base.config.properties.ProjectProperties; import com.qs.serve.common.exception.Assert; import com.qs.serve.framework.base.framework.manager.AsyncManager; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.R; import com.qs.serve.common.enums.BudgetLogOptFlag; import com.qs.serve.framework.base.util.*; import com.qs.serve.framework.base.util.model.DateFormatString; import com.qs.serve.common.utils.CopierUtil; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bms.entity.BmsSubject; import com.qs.serve.modules.bms.service.BmsSubjectService; import com.qs.serve.modules.goods.entity.GoodsCategory; @@ -192,7 +193,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl Assert.throwEx("名称已存在"); } budget = CopierUtil.copy(budgetBo,new TbsBudget()); - budget.setBudgetNumber("BM"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Budget)); + budget.setBudgetNumber("BM"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Budget)); } List skuIds = budgetBo.getSkuIds(); List spuIds = budgetBo.getSpuIds(); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index 11c0de3..643b290 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qs.serve.common.exception.Assert; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.framework.manager.AsyncManager; import com.qs.serve.common.enums.BudgetLogOptFlag; import com.qs.serve.framework.base.model.consts.BudgetLogRollbackFlag; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index f451e27..611576d 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -3,11 +3,13 @@ package com.qs.serve.modules.tbs.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.common.utils.SpringUtils; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.R; import com.qs.serve.common.enums.BudgetLogOptFlag; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsSubject; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 90b97c7..8f56bd8 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -6,11 +6,12 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.config.properties.ProjectApisProperties; import com.qs.serve.framework.base.config.properties.ProjectProperties; import com.qs.serve.common.exception.Assert; import com.qs.serve.framework.base.framework.manager.AsyncManager; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.common.enums.BudgetLogOptFlag; import com.qs.serve.framework.base.model.consts.BudgetLogRollbackFlag; import com.qs.serve.framework.base.model.R; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java index 93da4a5..acba483 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.config.properties.ProjectProperties; import com.qs.serve.common.exception.Assert; import com.qs.serve.framework.base.model.R; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index 8112b84..6cf7758 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -11,6 +11,7 @@ import com.qs.serve.framework.base.model.ResultFlag; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.bms.entity.*; import com.qs.serve.modules.bms.service.*; @@ -246,7 +247,7 @@ public class PortalOfCostApplication { Long supplierId = Long.parseLong(supplier.getId()); BigDecimal totalAmount = createBo.getTotalAmount(); String costTheme = createBo.getCostTheme(); - String costApplyCode = "CA"+CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply); + String costApplyCode = "CA"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply); String activityCode = costApplyCode + "_1"; String activityTitle = "由政策"+policyItem.getPolicyItemCode()+"核销一站式API生成的活动"; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index f610012..943dd20 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -6,7 +6,7 @@ import com.qs.serve.framework.base.config.properties.ProjectApisProperties; import com.qs.serve.framework.base.config.properties.ProjectProperties; import com.qs.serve.common.exception.Assert; import com.qs.serve.framework.base.framework.manager.AsyncManager; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.consts.SysConfigKey; import com.qs.serve.common.enums.BudgetLogOptFlag; import com.qs.serve.framework.base.model.R; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java index 1846c78..5eef96c 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java @@ -3,7 +3,7 @@ package com.qs.serve.modules.tzc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.framework.base.model.R; -import com.qs.serve.framework.base.util.*; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.sys.common.AuthContextUtils; @@ -55,7 +55,7 @@ public class TzcPolicyServiceImpl extends ServiceImpl } }else { tzcPolicy = new TzcPolicy(); - tzcPolicy.setPolicyCode("P"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Policy)); + tzcPolicy.setPolicyCode("P"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Policy)); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); tzcPolicy.setUserId(sysUser.getId()); tzcPolicy.setUserCode(sysUser.getCode()); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index 9a9d83b..5d0d2ea 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.vtb.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.exception.Assert; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java index 1aef6ed..166d969 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.exception.Assert; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.util.*; import com.qs.serve.common.utils.CopierUtil; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java index 66fc474..1da7a78 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java @@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.framework.base.config.properties.ProjectProperties; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.R; import com.qs.serve.framework.base.model.oa.OaFormMainProcess; import com.qs.serve.framework.base.model.oa.OaUploadFile; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.tag.util.TagFiledUtil; import com.qs.serve.framework.base.util.*; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index 8dd68ef..a93f0d6 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.qs.serve.common.exception.Assert; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.util.*; import com.qs.serve.modules.seeyon.service.SeeYonOperationService; import com.qs.serve.modules.tbs.common.TbsActivityState; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 3ef0703..82b89c3 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -4,16 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.utils.SpringUtils; import com.qs.serve.framework.base.config.properties.ProjectApisProperties; import com.qs.serve.framework.base.config.properties.ProjectProperties; import com.qs.serve.common.exception.Assert; -import com.qs.serve.framework.base.framework.redis.RedisService; +import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.AmountDTO; import com.qs.serve.common.enums.BudgetLogOptFlag; import com.qs.serve.framework.base.model.R; import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.common.utils.PageUtil; import com.qs.serve.common.utils.StringUtils; +import com.qs.serve.framework.redis.utils.CodeGenUtil; import com.qs.serve.modules.sync.AsyncFactory; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.tag.util.TagFiledUtil; @@ -182,7 +184,7 @@ public class VtbVerificationServiceImpl extends ServiceImplcms-system cms-actuator cms-policy + cms-basic cms-modules