Browse Source

fix: 解决多模块bean冲突;初始化基础档案模块

master
Yen 3 months ago
parent
commit
b7ff171b0d
  1. 1
      .gitignore
  2. 14
      cms-api/cms-admin-svc/pom.xml
  3. 2
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java
  4. 2
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java
  5. 2
      cms-api/cms-admin-svc/src/main/resources/log4j2.xml
  6. 20
      cms-api/cms-policy-svc/pom.xml
  7. 8
      cms-common/src/main/java/com/qs/serve/common/TestCommon.java
  8. 2
      cms-common/src/main/java/com/qs/serve/common/conf/DevEnvironmentConfig.java
  9. 2
      cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java
  10. 7
      cms-common/src/main/java/com/qs/serve/common/utils/SpringUtils.java
  11. 2
      cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/config/RedisConfig.java
  12. 6
      cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/utils/CodeGenUtil.java
  13. 2
      cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java
  14. 39
      cms-modules/cms-basic/cms-basic-api/pom.xml
  15. 91
      cms-modules/cms-basic/cms-basic-api/src/main/java/com/qs/serve/modules/basic/entity/BmsCostCenter.java
  16. 271
      cms-modules/cms-basic/cms-basic-api/src/main/java/com/qs/serve/modules/basic/entity/BmsSupplier.java
  17. 42
      cms-modules/cms-basic/cms-basic-bus/pom.xml
  18. 14
      cms-modules/cms-basic/cms-basic-bus/src/main/java/com/qs/serve/modules/basic/mapper/BmsCostCenterMapper.java
  19. 15
      cms-modules/cms-basic/cms-basic-bus/src/main/java/com/qs/serve/modules/basic/mapper/BmsSupplierMapper.java
  20. 4
      cms-modules/cms-basic/pom.xml
  21. 7
      cms-modules/cms-policy/cms-policy-bus/pom.xml
  22. 13
      cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java
  23. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
  24. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java
  25. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
  26. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
  27. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java
  28. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsImminentBatchApi.java
  29. 4
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java
  30. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
  31. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java
  32. 2
      cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

1
.gitignore

@ -1,4 +1,5 @@
.idea/
*-logs/
logs/
target/
*.iml

14
cms-api/cms-admin-svc/pom.xml

@ -19,18 +19,30 @@
<dependencies>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-framework</artifactId>
<artifactId>cms-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-actuator</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.qs</groupId>
<artifactId>cms-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-system</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.qs</groupId>
<artifactId>cms-common</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

2
cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java

@ -1,6 +1,6 @@
package com.qs.serve;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

2
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java

@ -1,6 +1,6 @@
package com.qs.serve.task.controller;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
import com.qs.serve.framework.base.model.R;
import com.qs.serve.framework.redis.RedisService;

2
cms-api/cms-admin-svc/src/main/resources/log4j2.xml

@ -7,7 +7,7 @@
<!--变量配置-->
<Properties>
<property name="LOG_PATTERN" value="%d %highlight{%-5level}{ERROR=Bright RED, WARN=Bright Yellow, INFO=Bright Green, DEBUG=Bright Cyan, TRACE=Bright White} %style{[%t]}{bright,magenta} %style{%c{1.}.%M(%L)}{cyan}: %msg%n" />
<property name="FILE_PATH" value="home/logs" />
<property name="FILE_PATH" value="admin-logs" />
</Properties>
<appenders>

20
cms-api/cms-policy-svc/pom.xml

@ -38,4 +38,24 @@
</dependency>
</dependencies>
<build>
<finalName>serve</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.qs.serve.PolicyApplication</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

8
cms-common/src/main/java/com/qs/serve/common/TestCommon.java

@ -1,8 +0,0 @@
package com.qs.serve.common;
/**
* @author YenHex
* @since 2025/4/14
*/
public class TestCommon {
}

2
cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/DevEnvironmentConfig.java → cms-common/src/main/java/com/qs/serve/common/conf/DevEnvironmentConfig.java

@ -1,4 +1,4 @@
package com.qs.serve.framework.base.config;
package com.qs.serve.common.conf;
import com.qs.serve.common.exception.Assert;
import lombok.experimental.UtilityClass;

2
cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java

@ -2,6 +2,7 @@ package com.qs.serve.common.exception;
import com.qs.serve.framework.base.model.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Primary;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.http.converter.HttpMessageNotWritableException;
@ -27,6 +28,7 @@ import java.sql.SQLIntegrityConstraintViolationException;
* @Version 1.0
*/
@Slf4j
@Primary
@Component
@ControllerAdvice
public class UnifiedExceptionHandler {

7
cms-common/src/main/java/com/qs/serve/common/utils/SpringUtils.java

@ -8,6 +8,8 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.Arrays;
@ -17,9 +19,10 @@ import java.util.Arrays;
* @author YenHex
* @since 2022/2/28
*/
@Order(999)
@Primary
@Component
public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
{
public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware {
/** Spring应用上下文环境 */
private static ConfigurableListableBeanFactory beanFactory;

2
cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/RedisConfig.java → cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/config/RedisConfig.java

@ -1,4 +1,4 @@
package com.qs.serve.framework.base.config;
package com.qs.serve.framework.redis.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

6
cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/utils/CodeGenUtil.java

@ -1,6 +1,7 @@
package com.qs.serve.framework.redis.utils;
import cn.hutool.core.util.IdUtil;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.common.utils.SpringUtils;
import com.qs.serve.framework.redis.RedisService;
import lombok.AllArgsConstructor;
@ -20,6 +21,7 @@ public class CodeGenUtil {
@Getter
@AllArgsConstructor
public enum SourceKey{
TZC_REBATE("Rebate"),
CostApply("cost_apply"),
SalePlan("SalePlan"),
Activity("activity"),
@ -99,8 +101,8 @@ public class CodeGenUtil {
appendZeros.append("0");
}
//用于区分测试环境数据
//String subflex = DevEnvironmentConfig.isDev()?"TEST":"";
return digitsNum + appendZeros + appendStr;
String subflex = DevEnvironmentConfig.isDev()?"TEST":"";
return digitsNum + appendZeros + appendStr+subflex;
}
public synchronized static String getDataCode(SourceDataKey dataKey){

2
cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java

@ -1,7 +1,7 @@
package com.qs.serve.actuator;
import com.qs.serve.common.utils.ServletUtils;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
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;

39
cms-modules/cms-basic/cms-basic-api/pom.xml

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>cms-basic</artifactId>
<groupId>com.qs</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-basic-api</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-framework-mybatis-plus</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-framework-feign</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

91
cms-modules/cms-basic/cms-basic-api/src/main/java/com/qs/serve/modules/basic/entity/BmsCostCenter.java

@ -0,0 +1,91 @@
package com.qs.serve.modules.basic.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
/**
* 成本中心 实体类
* @author YenHex
* @since 2022-11-11
*/
@Data
@TableName("bms_cost_center")
public class BmsCostCenter implements Serializable {
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 编码 */
@NotBlank(message = "编码不能为空")
@Length(max = 20,message = "编码长度不能超过20字")
private String code;
/** 名称 */
@NotBlank(message = "名称不能为空")
@Length(max = 20,message = "名称长度不能超过20字")
private String name;
/** 层级 */
@NotNull(message = "层级不能为空")
private Integer level;
/** 是否所有人可见 */
private Integer visibleFlag;
/** 是否销售费用 */
private Integer saleCostFlag;
/** 父级节点 */
@NotNull(message = "父级节点不能为空")
private Long pid;
/** 备注 */
@Length(max = 255,message = "备注长度不能超过255字")
private String remark;
/** 创建时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/** 最后更新时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
/** 所属租户 */
@JsonIgnore
@JsonProperty
private String tenantId;
/** 逻辑删除标记(0:显示;1:隐藏) */
@JsonIgnore
@JsonProperty
private String delFlag;
/** 创建人 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 更新人 */
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
}

271
cms-modules/cms-basic/cms-basic-api/src/main/java/com/qs/serve/modules/basic/entity/BmsSupplier.java

@ -0,0 +1,271 @@
package com.qs.serve.modules.basic.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.qs.serve.common.utils.StringUtils;
import com.qs.serve.mbp.handler.SplitStringTypeHandler;
import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 供应商 实体类
* @author YenHex
* @since 2022-10-11
*/
@Data
@TableName(value = "bms_supplier",autoResultMap = true)
public class BmsSupplier implements Serializable {
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private String id;
/** 一级区域ID */
private String regionFirst;
/** 二级区域ID */
private String regionSecond;
/** 三级区域ID */
private String regionThird;
/** 四级区域ID */
private String regionFourthly;
/** 最子级区域ID */
private String regionLast;
/** 行政一级区域ID */
private String region2First;
/** 行政二级区域ID */
private String region2Second;
/** 行政三级区域ID */
private String region2Third;
/** 行政四级区域ID */
private String region2Fourthly;
/** 行政最子级区域ID */
private String region2Last;
/** 详细地址 */
private String address;
/** 名称 */
@NotBlank(message = "名称不能为空")
@TableField(condition = SqlCondition.LIKE)
private String name;
/** 客户编码 */
@NotBlank(message = "客户编码不能为空")
@TableField(condition = SqlCondition.LIKE)
private String code;
/** 父级id */
private String pid;
private String pathIds;
private String parentCode;
/** 负责人 */
private String userId;
/** 负责人 */
private String userCode;
/** 负责人 */
private String userName;
@TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
private String[] otherUserIds;
private String otherUserNames;
private String otherUserCodes;
/** 闭户 */
private Integer stopFlag;
/**
* CD订单
* 0-> 非必填
* 1-> 下单时必须填写CD订单信息
*/
private Integer cdOrderFlag;
/** 闭户日期 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime stopFlagDate;
/** 所属账套 */
private String belong;
/** 是否供应商 */
private Integer supplierFlag;
/** 供应商是否填写信息 */
@NotNull(message = "供应商是否填写信息不能为空")
private Integer supplierInfoFlag;
/** 供应商税号 */
@Length(max = 255,message = "供应商税号长度不能超过255字")
private String supplierTaxNumber;
/** 供应商联系人 */
@Length(max = 255,message = "供应商联系人长度不能超过255字")
private String supplierUser;
/** 营业执照地址 */
@Length(max = 255,message = "营业执照地址长度不能超过255字")
private String supplierLicenseImg;
/** 附件列表 */
@TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
private String[] supplierAttachIds;
private Integer cooperatePauseFlag;
/** 暂不合作日期 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime cooperatePauseFlagDate;
/** 开始户时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime openTime;
/** 创建时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/** 创建人 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 更新时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
/** 更新人 */
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
/** 租户id */
@JsonIgnore
@JsonProperty
private String tenantId;
/** 删除标识 */
@JsonIgnore
@JsonProperty
private Boolean delFlag;
private String comRegion;
private String comRegionCode;
private String bookCode;
/** 初始化当前欠费 */
@NotNull(message = "初始化当前欠费不能为空")
private BigDecimal initCurAmount;
/** 初始化欠费(历史记录) */
@NotNull(message = "初始化欠费(历史记录)不能为空")
private BigDecimal initHisAmount;
/** 可投放费用标识 */
private Integer costFlag;
/** 在线下单 */
private Integer orderOnlineFlag;
/** 线下下单 */
private Integer orderOfflineFlag;
/** 运输方式是否可见 */
private Integer transportVisible;
public List<String> listBizRegionIds(){
List<String> list = new ArrayList<>();
list.add(this.getRegion2First());
list.add(this.getRegion2Second());
list.add(this.getRegion2Third());
list.add(this.getRegion2Fourthly());
return list.stream().filter(Objects::nonNull).collect(Collectors.toList());
}
public List<String> listSaleRegionIds(){
List<String> list = new ArrayList<>();
list.add(this.getRegionFirst());
list.add(this.getRegionSecond());
list.add(this.getRegionThird());
list.add(this.getRegionFourthly());
return list.stream().filter(Objects::nonNull).collect(Collectors.toList());
}
public String handleSaleRegionId(){
if(isValid(this.getRegionLast())){
return this.getRegionLast();
}else if(isValid(this.getRegionFourthly())){
return this.getRegionFourthly();
}else if(isValid(this.getRegionThird())){
return this.getRegionThird();
}else if(isValid(this.getRegionSecond())){
return this.getRegionSecond();
}else if(isValid(this.getRegionFirst())){
return this.getRegionFirst();
}else {
return null;
}
}
public String handleBizRegionId(){
if(isValid(this.getRegion2Last())){
return this.getRegion2Last();
}else if(isValid(this.getRegion2Fourthly())){
return this.getRegion2Fourthly();
}else if(isValid(this.getRegion2Third())){
return this.getRegion2Third();
}else if(isValid(this.getRegion2Second())){
return this.getRegion2Second();
}else if(isValid(this.getRegion2First())){
return this.getRegion2First();
}else {
return null;
}
}
private boolean isValid(String region){
return StringUtils.hasText(region)&&!"0".equals(region);
}
}

42
cms-modules/cms-basic/cms-basic-bus/pom.xml

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>cms-basic</artifactId>
<groupId>com.qs</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-basic-bus</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-basic-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-framework-mybatis-plus</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-framework-redis</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

14
cms-modules/cms-basic/cms-basic-bus/src/main/java/com/qs/serve/modules/basic/mapper/BmsCostCenterMapper.java

@ -0,0 +1,14 @@
package com.qs.serve.modules.basic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qs.serve.modules.basic.entity.BmsCostCenter;
/**
* 成本中心 Mapper
* @author YenHex
* @date 2022-10-13
*/
public interface BmsCostCenterMapper extends BaseMapper<BmsCostCenter> {
}

15
cms-modules/cms-basic/cms-basic-bus/src/main/java/com/qs/serve/modules/basic/mapper/BmsSupplierMapper.java

@ -0,0 +1,15 @@
package com.qs.serve.modules.basic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qs.serve.modules.basic.entity.BmsSupplier;
/**
* 供应商 Mapper
* @author YenHex
* @date 2022-10-10
*/
public interface BmsSupplierMapper extends BaseMapper<BmsSupplier> {
}

4
cms-modules/cms-basic/pom.xml

@ -10,6 +10,10 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<modules>
<module>cms-basic-api</module>
<module>cms-basic-bus</module>
</modules>
<artifactId>cms-basic</artifactId>
<properties>

7
cms-modules/cms-policy/cms-policy-bus/pom.xml

@ -18,6 +18,13 @@
</properties>
<dependencies>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-basic-bus</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-policy-api</artifactId>

13
cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java

@ -3,6 +3,9 @@ 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.framework.redis.utils.CodeGenUtil;
import com.qs.serve.modules.basic.mapper.BmsCostCenterMapper;
import com.qs.serve.modules.basic.mapper.BmsSupplierMapper;
import com.qs.serve.modules.tzc.entity.TzcRebate;
import com.qs.serve.modules.tzc.entity.bo.*;
import com.qs.serve.modules.tzc.enums.TzcRebateStatus;
@ -26,6 +29,9 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ
private final TzcRebateService tzcRebateService;
private final BmsCostCenterMapper bmsCostCenterMapper;
private final BmsSupplierMapper bmsSupplierMapper;
@Override
public Object modifyRebate(TzcRebateParam param) {
@ -39,7 +45,7 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ
}
rebateCode = rebate.getRebateCode();
}else {
//rebateCode = CodeGenUtil.getDataCode(SourceDataKey.TZC_REBATE);
rebateCode = "FL"+CodeGenUtil.generate(CodeGenUtil.SourceKey.TZC_REBATE);
}
BigDecimal oneHundred = new BigDecimal(100);
@ -109,7 +115,6 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ
}
TzcRebate rebate = new TzcRebate();
rebate.setId(rebateId);
rebate.setRebateCode(rebateCode);
@ -130,8 +135,8 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ
rebate.setSupplierId(param.getSupplierId());
rebate.setSupplierCode();
rebate.setSupplierName();
// rebate.setSupplierCode();
// rebate.setSupplierName();
rebate.setRebateAmount(param.getRebateAmount());
rebate.setOverlayFlag(param.getOverlayFlag());

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java

@ -2,7 +2,7 @@ package com.qs.serve.modules.goods.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.common.exception.Assert;
import com.qs.serve.framework.base.model.PageVo;

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java

@ -1,7 +1,7 @@
package com.qs.serve.modules.goods.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.framework.base.model.PageVo;
import com.qs.serve.framework.base.model.R;

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java

@ -1,6 +1,6 @@
package com.qs.serve.modules.goods.controller;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.framework.base.model.PageVo;
import com.qs.serve.framework.base.model.R;

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@ -3,7 +3,7 @@ package com.qs.serve.modules.goods.controller;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.framework.base.model.PageVo;
import com.qs.serve.framework.base.model.R;

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java

@ -2,7 +2,7 @@ package com.qs.serve.modules.goods.controller.api;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.framework.base.model.R;
import com.qs.serve.framework.base.model.TreeNode;
import com.qs.serve.common.utils.CopierUtil;

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsImminentBatchApi.java

@ -2,7 +2,7 @@ package com.qs.serve.modules.goods.controller.api;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.framework.base.model.PageVo;
import com.qs.serve.framework.base.model.R;

4
cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java

@ -226,7 +226,7 @@ public class OmsSaleOrderApi {
LambdaQueryWrapper<OmsSaleOrder> orderWrapper = new LambdaQueryWrapper<>(param);
orderWrapper.in(OmsSaleOrder::getSupplierId,supplierIds);
orderWrapper.eq(OmsSaleOrder::getOrderType,param.getOrderType()==null?0:param.getOrderType());
orderWrapper.orderByDesc(OmsSaleOrder::getId);
orderWrapper.orderByDesc(OmsSaleOrder::getCreateTime);
orderWrapper.eq(OmsSaleOrder::getCurrentFlag,1);
if(param.getCheckStartTime()!=null){
orderWrapper.ge(OmsSaleOrder::getCheckTime,param.getCheckStartTime().atStartOfDay());
@ -234,7 +234,7 @@ public class OmsSaleOrderApi {
if(param.getCheckEndTime()!=null){
orderWrapper.le(OmsSaleOrder::getCheckTime,param.getCheckEndTime().atTime(23,59,59));
}
orderWrapper.apply(" order_sn not like '2024%' ");
List<OmsSaleOrder> list = omsSaleOrderService.list(orderWrapper);
this.buildOrderVoInfo(list);
return R.byPageHelperList(list);

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java

@ -1,6 +1,6 @@
package com.qs.serve.modules.tbs.common;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
/**
* @author YenHex

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java

@ -1,7 +1,7 @@
package com.qs.serve.modules.third;
import cn.hutool.crypto.SecureUtil;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
import com.qs.serve.common.exception.Assert;
import com.qs.serve.modules.third.consts.ThirtyConst;
import lombok.extern.slf4j.Slf4j;

2
cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@ -1,7 +1,7 @@
package com.qs.serve.modules.tzc.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.conf.DevEnvironmentConfig;
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;

Loading…
Cancel
Save