## 活动合并到销售服务;

This commit is contained in:
cabbage 2025-08-08 17:58:36 +08:00
parent 004d483898
commit 613c4d703e
267 changed files with 27 additions and 437 deletions

View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>bd-api-activity</artifactId>
<description>
bd-api-activity活动服务
</description>
<dependencies>
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-system</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -28,7 +28,6 @@
</dependencies>
<modules>
<module>bd-api-activity</module>
<module>bd-api-bonus</module>
<module>bd-api-member</module>
<module>bd-api-report</module>

View File

@ -1,69 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.bd.africa</groupId>
<artifactId>bd-business</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>bd-business-activity</artifactId>
<description>
bd-business-activity活动服务
</description>
<dependencies>
<!-- 活动服务接口 -->
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-activity</artifactId>
</dependency>
<!-- 销售服务接口 -->
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-sale</artifactId>
</dependency>
<!-- 奖金服务接口 -->
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-bonus</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-business-common</artifactId>
</dependency>
<!-- rabbit mq -->
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.12.RELEASE</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,23 +0,0 @@
package com.hzs;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import com.hzs.common.security.annotation.EnableCustomConfig;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
* 活动服务
*
* @author hzs
*/
@EnableDiscoveryClient
@EnableCustomConfig
@SpringBootApplication
public class ActivityApplication {
public static void main(String[] args) {
SpringApplication.run(ActivityApplication.class, args);
System.out.println("ActivityApplication 活动服务启动成功");
}
}

View File

@ -1,32 +0,0 @@
package com.hzs.activity.draw.controller.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hzs.activity.draw.param.AcDrawRewardNumParam;
import com.hzs.activity.draw.service.IAcDrawRewardNumService;
import com.hzs.activity.draw.service.IAcDrawRewardRecordService;
import com.hzs.common.core.constant.ActivityFieldConstants;
import com.hzs.common.core.constant.msg.ActivityMsgConstants;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.domain.activity.draw.AcDrawRewardNum;
import com.hzs.common.domain.activity.draw.AcDrawRewardRecord;
import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;
import com.hzs.common.security.utils.SecurityUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @description: 中奖控制器
* @author: sui q
* @time: 2023/4/21 19:16
* @classname: ApiAcDrawRewardRecordController
* @package_name: com.hzs.activity.draw.controller.api
* version 1.0.0
*/
@RestController
@RequestMapping("/api/reward")
@Slf4j
public class ApiAcDrawRewardController extends BaseController {
}

View File

@ -1,2 +0,0 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}

View File

@ -1,72 +0,0 @@
# Tomcat
server:
port: 8095
# Spring
spring:
application:
# 应用名称
name: bd-activity
jackson:
# 返回数据序列化时,如果为 null 则不进行返回
default-property-inclusion: NON_NULL
profiles:
# 环境配置
active: dev
cloud:
nacos:
discovery:
# 服务注册地址
server-addr: @config.server-addr@
username: @config.username@
password: @config.password@
namespace: @config.namespace@
config:
# 配置中心地址
server-addr: @config.server-addr@
username: @config.username@
password: @config.password@
namespace: @config.namespace@
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
## 业务模块依赖的公用配置缓存、数据库、事务、mybatis-plus
- business-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
main:
## 当遇到同样名字的时候,是否允许覆盖注册
allow-bean-definition-overriding: true
## true 表示控制台不会打印循环依赖异常
allow-circular-references: true
dubbo:
registry:
# 使用spring-cloud注册配置
address: spring-cloud://localhost
consumer:
# 远程服务调用超时时间(毫秒)
timeout: 10000
# 重试次数默认2
retries: 0
# 启动时不检查dubbo服务是否启动
check: false
# 负载策略(random随机roundrobin轮询leastactive最少活跃调用)
loadbalance: "leastactive"
protocol:
# 设置协议为dubbo
name: dubbo
# dubbo 协议端口 -1 表示自增端口从20880开始
port: -1
cloud:
# 订阅服务
subscribed-services: bd-activity, bd-system, bd-member, bd-sale, bd-bonus
scan:
# dubbo 服务扫描包(开启之后才会对外提供服务)
base-packages: com.hzs.activity
# 日志配置
logging:
level:
com.hzs: debug
org.springframework: warn

View File

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="/home/bd/logs/bd-activity" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file>
<!-- 循环政策:基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作:接收(记录) -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作:拒绝(不记录) -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file>
<!-- 循环政策:基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作:接收(记录) -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作:拒绝(不记录) -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.hzs" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<root level="info">
<appender-ref ref="console" />
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
</configuration>

View File

@ -35,12 +35,6 @@
<artifactId>bd-api-third</artifactId>
</dependency>
<!-- 活动服务 -->
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-activity</artifactId>
</dependency>
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-common-aop</artifactId>

View File

@ -1,6 +1,5 @@
package com.hzs.bonus.bonus.service.impl;
import com.hzs.activity.base.IActivityServiceApi;
import com.hzs.bonus.account.service.ICuMemberAccountService;
import com.hzs.bonus.account.service.ICuMemberTradeDetailService;
import com.hzs.bonus.account.service.ICuMemberTradeService;

View File

@ -1,33 +1,11 @@
package com.hzs.bonus.bonus.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.hzs.activity.base.IActivityServiceApi;
import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.constant.msg.BonusMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.activity.recommend.AcRepurSharOrderType;
import com.hzs.common.domain.activity.recommend.ext.AcRepurSharRuleConfigExt;
import com.hzs.common.domain.bonus.BdBonusDeduct;
import com.hzs.common.domain.member.base.CuMemberAgent;
import com.hzs.common.domain.member.bonus.CuMemberBonus;
import com.hzs.common.domain.member.bonus.CuMemberBonusDetail;
import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.common.domain.sale.order.SaOrder;
import com.hzs.common.domain.system.config.BdBonusCloud;
import com.hzs.bonus.base.service.ICuMemberAgentService;
import com.hzs.system.config.dto.BonusConfigDTO;
import com.hzs.system.sys.dto.BdCurrencyDTO;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description:
* @Author: sui q

View File

@ -67,7 +67,7 @@ dubbo:
port: -1
cloud:
# 订阅服务
subscribed-services: bd-system, bd-third, bd-sale, bd-activity, bd-member
subscribed-services: bd-system, bd-third, bd-sale, bd-member
scan:
# dubbo 服务扫描包(开启之后才会对外提供服务)
base-packages: com.hzs.bonus

View File

@ -49,10 +49,6 @@
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-third</artifactId>
</dependency>
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-activity</artifactId>
</dependency>
<!-- apache common 校验工具包-->
<dependency>

View File

@ -71,7 +71,7 @@ dubbo:
threads: 400
cloud:
# 订阅服务
subscribed-services: bd-system, bd-third, bd-sale, bd-activity
subscribed-services: bd-system, bd-third, bd-sale
scan:
# dubbo 服务扫描包(开启之后才会对外提供服务)
base-packages: com.hzs.member

View File

@ -42,11 +42,6 @@
<artifactId>spring-rabbit</artifactId>
</dependency>
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-activity</artifactId>
</dependency>
<dependency>
<groupId>com.bd.africa</groupId>
<artifactId>bd-api-bonus</artifactId>

View File

@ -8,8 +8,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* 销售服务
*
* @author hzs
*/
@EnableDiscoveryClient
@EnableCustomConfig

View File

@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**

View File

@ -12,7 +12,6 @@ import com.hzs.activity.base.param.QueryActivityParam;
import com.hzs.activity.base.vo.BaseConfigVo;
import com.hzs.activity.base.service.IActivityService;
import com.hzs.activity.base.service.IAcBaseConfigService;
import com.hzs.activity.pick.vo.AcPickQueryVO;
import com.hzs.common.core.enums.EActivityStatus;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;

View File

@ -10,11 +10,8 @@ import com.hzs.activity.draw.vo.AcDrawGiftRuleConfigVo;
import com.hzs.activity.recoilGive.vo.RecoilGiveConfigVO;
import com.hzs.activity.register.param.RegisterGiftParam;
import com.hzs.common.domain.activity.base.AcPickUpConfig;
import com.hzs.common.domain.activity.consume.AcConsumeShieldConfig;
import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
import com.hzs.common.domain.activity.consume.ext.AcConsumeShieldConfigExt;
import com.hzs.common.domain.activity.draw.AcDrawGiftRuleConfig;
import com.hzs.common.domain.activity.draw.AcDrawRuleConfig;
import com.hzs.common.domain.activity.other.AcOtherPriceConfig;
import com.hzs.common.domain.activity.tree.AcTreeRuleConfig;
import lombok.AllArgsConstructor;

View File

@ -1,6 +1,5 @@
package com.hzs.activity.base.param;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

View File

@ -6,8 +6,6 @@ package com.hzs.activity.base.param;/**
* @PackageName: com.hzs.activity.controller.param
*/
import com.hzs.common.domain.activity.base.AcGiftConfig;
import com.hzs.common.domain.activity.wares.AcWaresRuleConfig;
import lombok.Data;
import java.io.Serializable;

View File

@ -9,7 +9,6 @@ import com.hzs.activity.fest.service.IAcFestivalRuleConfigService;
import com.hzs.activity.other.service.IAcOtherPriceConfigService;
import com.hzs.activity.people.param.AcBaseConfigParam;
import com.hzs.activity.people.service.IAcNewPeopleRuleConfigService;
import com.hzs.activity.people.vo.AcBaseConfigVO;
import com.hzs.activity.pick.param.AcPickSaveDetailParam;
import com.hzs.activity.pick.service.IAcPickService;

View File

@ -18,7 +18,6 @@ import com.hzs.activity.pick.service.IAcPickUpConfigService;
import com.hzs.activity.policy.service.IAcPolicyConfigService;
import com.hzs.activity.recommend.service.IAcRepurCouponsRuleConfigService;
import com.hzs.activity.wares.service.IAcGiftConfigService;
import com.hzs.common.core.constant.RabbitMqConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.DateUtils;

View File

@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.activity.base.param.GiftConfigParam;
import com.hzs.common.domain.activity.consume.AcConsumeRuleConfig;
import com.hzs.common.domain.activity.consume.ext.AcConsumeRuleConfigExt;
import com.hzs.common.domain.activity.wares.ext.AcWaresRuleConfigExt;
import org.apache.ibatis.annotations.Param;
import java.util.List;

View File

@ -6,7 +6,6 @@ import com.hzs.activity.consume.mapper.AcConsumeShieldConfigMapper;
import com.hzs.activity.consume.service.IAcConsumeShieldConfigService;
import com.hzs.common.domain.activity.consume.AcConsumeShieldConfig;
import com.hzs.common.domain.activity.consume.ext.AcConsumeShieldConfigExt;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;

View File

@ -0,0 +1,20 @@
package com.hzs.activity.draw.controller.api;
import com.hzs.common.core.web.controller.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
/**
* @description: 中奖控制器
* @author: sui q
* @time: 2023/4/21 19:16
* @classname: ApiAcDrawRewardRecordController
* @package_name: com.hzs.activity.draw.controller.api
* version 1.0.0
*/
@RestController
@RequestMapping("/api/reward")
@Slf4j
public class ApiAcDrawRewardController extends BaseController {
}

View File

@ -25,14 +25,12 @@ import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.activity.base.AcBaseConfig;
import com.hzs.common.domain.activity.base.AcGiftConfig;
import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
import com.hzs.common.domain.activity.base.AcPickUpConfig;
import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt;
import com.hzs.common.domain.activity.draw.AcDrawGiftRuleConfig;
import com.hzs.common.domain.activity.draw.AcDrawRuleConfig;
import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;
import com.hzs.common.domain.activity.ext.SaTreeOrderExt;
import com.hzs.common.security.service.UserTokenService;
import com.hzs.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,7 +38,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

View File

@ -17,7 +17,6 @@ import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.activity.draw.ext.AcDrawRewardNumExt;
import com.hzs.common.domain.activity.draw.ext.AcDrawRewardRecordExt;
import com.hzs.common.domain.member.ext.CuMemberBonusExt;
import com.hzs.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

View File

@ -2,7 +2,6 @@ package com.hzs.activity.draw.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.activity.draw.param.DrawGiftConfigParam;
import com.hzs.activity.draw.vo.DrawGiftConfigVo;
import com.hzs.common.domain.activity.draw.AcDrawGiftRuleConfig;
import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;

View File

@ -3,7 +3,6 @@ package com.hzs.activity.draw.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.activity.base.param.ActivityParam;
import com.hzs.activity.draw.param.DrawGiftConfigParam;
import com.hzs.activity.draw.vo.DrawGiftConfigVo;
import com.hzs.activity.recommend.param.AcRecommendParam;
import com.hzs.common.domain.activity.draw.AcDrawGiftRuleConfig;
import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;

View File

@ -2,7 +2,6 @@ package com.hzs.activity.draw.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.activity.draw.param.AcDrawRecordParam;
import com.hzs.activity.draw.param.AcDrawRewardNumParam;
import com.hzs.common.domain.activity.draw.AcDrawRewardNum;
import com.hzs.common.domain.activity.draw.AcDrawRewardRecord;
import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;

View File

@ -17,7 +17,6 @@ import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.activity.base.AcPickUpConfig;
import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt;
import com.hzs.common.domain.activity.draw.AcDrawGiftRuleConfig;
import com.hzs.common.domain.activity.draw.AcDrawRewardNum;
import com.hzs.common.domain.activity.draw.AcDrawRewardRecord;
import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;

View File

@ -12,7 +12,6 @@ import com.hzs.activity.base.param.ActivityParam;
import com.hzs.activity.base.service.IAcBaseConfigService;
import com.hzs.activity.other.param.OtherPriceConfigQueryParam;
import com.hzs.activity.other.service.IAcOtherPriceConfigService;
import com.hzs.activity.policy.param.PolicyConfigParam;
import com.hzs.activity.policy.param.PolicyConfigQueryParam;
import com.hzs.activity.policy.vo.AcPolicyConfigVo;
import com.hzs.common.core.constant.msg.CommonMsgConstants;

Some files were not shown because too many files have changed in this diff Show More