diff --git a/bd-api/bd-api-activity/pom.xml b/bd-api/bd-api-activity/pom.xml deleted file mode 100644 index e2970b5..0000000 --- a/bd-api/bd-api-activity/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - com.bd.africa - bd-api - 1.0.0-SNAPSHOT - - - bd-api-activity - - - bd-api-activity活动服务 - - - - - - com.bd.africa - bd-api-system - - - - - diff --git a/bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java similarity index 100% rename from bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/base/IActivityApprovalServiceApi.java diff --git a/bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/base/IActivityServiceApi.java similarity index 100% rename from bd-api/bd-api-activity/src/main/java/com/hzs/activity/base/IActivityServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/base/IActivityServiceApi.java diff --git a/bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java similarity index 100% rename from bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcPeopleGiftProductDTO.java diff --git a/bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java similarity index 100% rename from bd-api/bd-api-activity/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java diff --git a/bd-api/bd-api-activity/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java similarity index 100% rename from bd-api/bd-api-activity/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/other/IAcOtherServiceApi.java diff --git a/bd-api/bd-api-activity/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java similarity index 100% rename from bd-api/bd-api-activity/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java diff --git a/bd-api/bd-api-activity/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java similarity index 100% rename from bd-api/bd-api-activity/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java diff --git a/bd-api/pom.xml b/bd-api/pom.xml index b8b2afb..2a51293 100644 --- a/bd-api/pom.xml +++ b/bd-api/pom.xml @@ -28,7 +28,6 @@ - bd-api-activity bd-api-bonus bd-api-member bd-api-report diff --git a/bd-business/bd-business-activity/pom.xml b/bd-business/bd-business-activity/pom.xml deleted file mode 100644 index 87299a2..0000000 --- a/bd-business/bd-business-activity/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - - com.bd.africa - bd-business - 1.0.0-SNAPSHOT - - - bd-business-activity - - - bd-business-activity活动服务 - - - - - - - com.bd.africa - bd-api-activity - - - - - com.bd.africa - bd-api-sale - - - - - com.bd.africa - bd-api-bonus - - - - - com.bd.africa - bd-business-common - - - - org.springframework.amqp - spring-rabbit - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - 2.3.12.RELEASE - - - - repackage - - - - - - - - diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/ActivityApplication.java b/bd-business/bd-business-activity/src/main/java/com/hzs/ActivityApplication.java deleted file mode 100644 index 0e1ce2e..0000000 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/ActivityApplication.java +++ /dev/null @@ -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 活动服务启动成功"); - } - -} diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardController.java b/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardController.java deleted file mode 100644 index 1cb97e8..0000000 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardController.java +++ /dev/null @@ -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 { - -} diff --git a/bd-business/bd-business-activity/src/main/resources/banner.txt b/bd-business/bd-business-activity/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/bd-business/bd-business-activity/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/bd-business/bd-business-activity/src/main/resources/bootstrap.yml b/bd-business/bd-business-activity/src/main/resources/bootstrap.yml deleted file mode 100644 index 92a3457..0000000 --- a/bd-business/bd-business-activity/src/main/resources/bootstrap.yml +++ /dev/null @@ -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 diff --git a/bd-business/bd-business-activity/src/main/resources/logback.xml b/bd-business/bd-business-activity/src/main/resources/logback.xml deleted file mode 100644 index 1b17768..0000000 --- a/bd-business/bd-business-activity/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-bonus/pom.xml b/bd-business/bd-business-bonus/pom.xml index e4715fb..c2ead00 100644 --- a/bd-business/bd-business-bonus/pom.xml +++ b/bd-business/bd-business-bonus/pom.xml @@ -35,12 +35,6 @@ bd-api-third - - - com.bd.africa - bd-api-activity - - com.bd.africa bd-common-aop diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java index 8b57640..b294da3 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java @@ -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; diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleAgentHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleAgentHandle.java index 202ef83..bcd562c 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleAgentHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleAgentHandle.java @@ -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 diff --git a/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml index 788ddb8..a2b26a2 100644 --- a/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml @@ -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 diff --git a/bd-business/bd-business-member/pom.xml b/bd-business/bd-business-member/pom.xml index 1eca08d..2d3bd14 100644 --- a/bd-business/bd-business-member/pom.xml +++ b/bd-business/bd-business-member/pom.xml @@ -49,10 +49,6 @@ com.bd.africa bd-api-third - - com.bd.africa - bd-api-activity - diff --git a/bd-business/bd-business-member/src/main/resources/bootstrap.yml b/bd-business/bd-business-member/src/main/resources/bootstrap.yml index 9f4ebee..41f2698 100644 --- a/bd-business/bd-business-member/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-member/src/main/resources/bootstrap.yml @@ -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 diff --git a/bd-business/bd-business-sale/pom.xml b/bd-business/bd-business-sale/pom.xml index ce0eff3..e29ab53 100644 --- a/bd-business/bd-business-sale/pom.xml +++ b/bd-business/bd-business-sale/pom.xml @@ -42,11 +42,6 @@ spring-rabbit - - com.bd.africa - bd-api-activity - - com.bd.africa bd-api-bonus diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/SaleApplication.java b/bd-business/bd-business-sale/src/main/java/com/hzs/SaleApplication.java index 0252c31..1d0e0ca 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/SaleApplication.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/SaleApplication.java @@ -8,8 +8,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; /** * 销售服务 - * - * @author hzs */ @EnableDiscoveryClient @EnableCustomConfig diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/controller/api/ApiActivityController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/api/ApiActivityController.java similarity index 98% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/controller/api/ApiActivityController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/api/ApiActivityController.java index 3693002..c3a62e9 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/controller/api/ApiActivityController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/api/ApiActivityController.java @@ -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; /** diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java similarity index 99% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java index 8674938..c394cd9 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/controller/manage/ActivityController.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/mapper/AcApprovalLogMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcApprovalLogMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/mapper/AcApprovalLogMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcApprovalLogMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/mapper/AcBaseConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcBaseConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/mapper/AcBaseConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcBaseConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/mapper/AcGoalMemberConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcGoalMemberConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/mapper/AcGoalMemberConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/mapper/AcGoalMemberConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/AcDrawRuleConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/AcDrawRuleConfigParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/AcDrawRuleConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/AcDrawRuleConfigParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/ActivityParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/ActivityParam.java similarity index 95% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/ActivityParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/ActivityParam.java index 94b9418..1c7641e 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/ActivityParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/ActivityParam.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/ConsumeRuleConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/ConsumeRuleConfigParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/ConsumeRuleConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/ConsumeRuleConfigParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/GiftConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/GiftConfigParam.java similarity index 95% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/GiftConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/GiftConfigParam.java index 6f49356..258eb3c 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/GiftConfigParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/GiftConfigParam.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/GiftConfigParamDetail.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/GiftConfigParamDetail.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/GiftConfigParamDetail.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/GiftConfigParamDetail.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/QueryActivityParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/QueryActivityParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/QueryActivityParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/QueryActivityParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/WaresConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/WaresConfigParam.java similarity index 84% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/WaresConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/WaresConfigParam.java index 62e6135..aa58f55 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/WaresConfigParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/WaresConfigParam.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/WaresRuleConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/WaresRuleConfigParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/param/WaresRuleConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/param/WaresRuleConfigParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/provider/ActivityApprovalProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/provider/ActivityApprovalProvider.java similarity index 99% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/provider/ActivityApprovalProvider.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/provider/ActivityApprovalProvider.java index 418a3d9..2a6b3dc 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/provider/ActivityApprovalProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/provider/ActivityApprovalProvider.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/provider/ActivityServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/provider/ActivityServiceProvider.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/provider/ActivityServiceProvider.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/provider/ActivityServiceProvider.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IAcApprovalLogService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcApprovalLogService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IAcApprovalLogService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcApprovalLogService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcBaseConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IAcGoalMemberConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcGoalMemberConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IAcGoalMemberConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IAcGoalMemberConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IActivityService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/IActivityService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/AcApprovalLogServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcApprovalLogServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/AcApprovalLogServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcApprovalLogServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcBaseConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/AcGoalMemberConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcGoalMemberConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/AcGoalMemberConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/AcGoalMemberConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java similarity index 99% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java index 86162ea..22303b2 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/AcGiftConfigVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/AcGiftConfigVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/AcGiftConfigVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/AcGiftConfigVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/BaseConfigVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/BaseConfigVo.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/BaseConfigVo.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/BaseConfigVo.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/CarActivitVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/CarActivitVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/CarActivitVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/CarActivitVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/ConsumeRuleConfigVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/ConsumeRuleConfigVo.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/ConsumeRuleConfigVo.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/ConsumeRuleConfigVo.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/DeptMemberVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/DeptMemberVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/DeptMemberVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/DeptMemberVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/TourismActivitVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/TourismActivitVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/base/vo/TourismActivitVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/TourismActivitVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/mapper/AcConsumeRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/mapper/AcConsumeRuleConfigMapper.java similarity index 87% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/mapper/AcConsumeRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/mapper/AcConsumeRuleConfigMapper.java index 1fca21a..edfc1fe 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/mapper/AcConsumeRuleConfigMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/mapper/AcConsumeRuleConfigMapper.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/mapper/AcConsumeShieldConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/mapper/AcConsumeShieldConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/mapper/AcConsumeShieldConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/mapper/AcConsumeShieldConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/IAcConsumeShieldConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeShieldConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/IAcConsumeShieldConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeShieldConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeShieldConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeShieldConfigServiceImpl.java similarity index 94% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeShieldConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeShieldConfigServiceImpl.java index e494c2b..8d96bea 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeShieldConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeShieldConfigServiceImpl.java @@ -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; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardController.java new file mode 100644 index 0000000..198f410 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardController.java @@ -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 { + +} diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardNumController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardNumController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardNumController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/api/ApiAcDrawRewardNumController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java similarity index 98% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java index f788033..797a9dd 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java similarity index 98% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java index 4c14cf3..4be4f09 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawGiftRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawGiftRuleConfigMapper.java similarity index 94% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawGiftRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawGiftRuleConfigMapper.java index 824a124..16ced6a 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawGiftRuleConfigMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawGiftRuleConfigMapper.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumDetailMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumDetailMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumDetailMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumDetailMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardNumMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardRecordMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardRecordMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRewardRecordMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/mapper/AcDrawRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/mapper/AcDrawRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/param/AcDrawRecordParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/param/AcDrawRecordParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/param/AcDrawRecordParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/param/AcDrawRecordParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/param/AcDrawRewardNumParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/param/AcDrawRewardNumParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/param/AcDrawRewardNumParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/param/AcDrawRewardNumParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/param/DrawGiftConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/param/DrawGiftConfigParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/param/DrawGiftConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/param/DrawGiftConfigParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java similarity index 97% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java index b336591..4880426 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumDetailService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumDetailService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumDetailService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumDetailService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardNumService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardRecordService.java similarity index 95% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardRecordService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardRecordService.java index 3f3122b..352e10d 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRewardRecordService.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/IAcDrawRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawGiftRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawGiftRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawGiftRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawGiftRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumDetailServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumDetailServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumDetailServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumDetailServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java similarity index 99% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java index a139e13..0fdf790 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawGiftRuleConfigVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawGiftRuleConfigVo.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawGiftRuleConfigVo.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawGiftRuleConfigVo.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardDetailRecordVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardDetailRecordVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardDetailRecordVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardDetailRecordVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardNumVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardNumVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardNumVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardNumVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardRecordVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardRecordVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardRecordVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/AcDrawRewardRecordVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/CuMemberPayAccountVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/CuMemberPayAccountVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/CuMemberPayAccountVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/CuMemberPayAccountVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/DrawGiftConfigVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/DrawGiftConfigVo.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/DrawGiftConfigVo.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/DrawGiftConfigVo.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/DrawRewardNumVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/DrawRewardNumVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/draw/vo/DrawRewardNumVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/vo/DrawRewardNumVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/enums/ERegisterGiftType.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/enums/ERegisterGiftType.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/enums/ERegisterGiftType.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/enums/ERegisterGiftType.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/controller/api/ApiAcOtherController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/controller/api/ApiAcOtherController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/controller/api/ApiAcOtherController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/controller/api/ApiAcOtherController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/controller/manage/AcOtherPriceDataController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/controller/manage/AcOtherPriceDataController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/controller/manage/AcOtherPriceDataController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/controller/manage/AcOtherPriceDataController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/controller/manage/OtherPriceConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/controller/manage/OtherPriceConfigController.java similarity index 99% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/controller/manage/OtherPriceConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/controller/manage/OtherPriceConfigController.java index 97de295..ebc5358 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/controller/manage/OtherPriceConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/controller/manage/OtherPriceConfigController.java @@ -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; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceDataMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceDataMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceDataMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceDataMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/mapper/AcOtherPriceMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/param/OtherPriceConfigQueryParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/param/OtherPriceConfigQueryParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/param/OtherPriceConfigQueryParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/param/OtherPriceConfigQueryParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/provider/AcOtherServiceApi.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/provider/AcOtherServiceApi.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/provider/AcOtherServiceApi.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/provider/AcOtherServiceApi.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/IAcOtherPriceConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/IAcOtherPriceConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/IAcOtherPriceConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/IAcOtherPriceConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/IAcOtherPriceDataService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/IAcOtherPriceDataService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/IAcOtherPriceDataService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/IAcOtherPriceDataService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/IAcOtherPriceService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/IAcOtherPriceService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/IAcOtherPriceService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/IAcOtherPriceService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceConfigServiceImpl.java similarity index 98% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceConfigServiceImpl.java index 2176516..5dc5717 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceConfigServiceImpl.java @@ -11,7 +11,6 @@ import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.other.mapper.AcOtherPriceConfigMapper; import com.hzs.activity.other.param.OtherPriceConfigQueryParam; import com.hzs.activity.other.service.IAcOtherPriceConfigService; -import com.hzs.activity.policy.param.PolicyConfigParam; import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.constant.msg.DocumentMsgConstants; import com.hzs.common.core.domain.R; @@ -24,7 +23,6 @@ import com.hzs.common.domain.activity.base.AcApprovalLog; import com.hzs.common.domain.activity.base.AcBaseConfig; import com.hzs.common.domain.activity.other.AcOtherPriceConfig; import com.hzs.common.domain.activity.other.ext.AcOtherPriceConfigExt; -import com.hzs.common.domain.policy.AcPolicyConfig; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; @@ -37,7 +35,6 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.ArrayList; -import java.util.List; /** * 活动： 车奖/旅游奖活动配置表 服务实现类 diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceDataServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceDataServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceDataServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceDataServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/service/impl/AcOtherPriceServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/vo/AcOtherDataVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/vo/AcOtherDataVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/vo/AcOtherDataVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/vo/AcOtherDataVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/vo/AcOtherDetailVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/vo/AcOtherDetailVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/other/vo/AcOtherDetailVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/other/vo/AcOtherDetailVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/controller/manage/AcNewPeopleRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcNewPeopleRuleConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/controller/manage/AcNewPeopleRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcNewPeopleRuleConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java similarity index 81% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java index cc268ad..148ed13 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java @@ -2,23 +2,15 @@ package com.hzs.activity.people.controller.manage; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.hzs.activity.base.param.QueryActivityParam; import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.base.vo.BaseConfigVo; import com.hzs.activity.people.service.IAcPeopleServiceService; import com.hzs.activity.people.vo.AcPeopleServiceVO; import com.hzs.common.core.constant.msg.ActivityMsgConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.enums.EActivityStatus; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.domain.activity.base.AcBaseConfig; -import com.hzs.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java similarity index 98% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java index 6391d90..5d11483 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ExecutionException; /** diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java similarity index 96% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java index 230fc12..416216a 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java @@ -3,7 +3,6 @@ package com.hzs.activity.people.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.activity.people.param.AcBaseConfigParam; -import com.hzs.activity.people.vo.AcBaseConfigVO; import com.hzs.activity.people.vo.AcNewPeopleRuleConfigVO; import com.hzs.common.domain.activity.people.AcNewPeopleRuleConfig; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java similarity index 96% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java index 3de08b9..559396c 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java @@ -2,7 +2,6 @@ package com.hzs.activity.people.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.people.mapper.AcPeopleServiceMapper; @@ -12,12 +11,9 @@ import com.hzs.activity.people.vo.AcPeopleGiftProductVO; import com.hzs.activity.people.vo.AcPeopleServiceVO; import com.hzs.activity.pick.service.IAcPickService; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EActType; -import com.hzs.common.core.enums.EActivityStatus; import com.hzs.common.core.enums.EPlanState; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.activity.people.AcPeopleService; -import com.hzs.common.domain.activity.pick.AcPick; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.member.base.IMemberServiceApi; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java similarity index 94% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java index f6abc1c..27442e9 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java @@ -1,7 +1,5 @@ package com.hzs.activity.people.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.activity.fest.vo.AcFestivalRuleConfigVO; import com.hzs.activity.work.vo.AcSuperWorkRuleConfigVO; @@ -9,9 +7,7 @@ import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.common.domain.activity.base.AcGiftConfig; import com.hzs.common.domain.activity.base.AcGoalMemberConfig; -import com.hzs.common.domain.activity.people.AcNewPeopleRuleConfig; import com.hzs.system.sys.dto.LoginUser; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java similarity index 96% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java index b99eb08..e4db047 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java @@ -1,6 +1,5 @@ package com.hzs.activity.people.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/manage/AcPickLogController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickLogController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/manage/AcPickLogController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickLogController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/manage/AcPickUpConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickUpConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/controller/manage/AcPickUpConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickUpConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickLogMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickLogMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickLogMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickLogMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickMemberLogMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickMemberLogMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickMemberLogMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickMemberLogMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickUpConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickUpConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/mapper/AcPickUpConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickUpConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickLogQueryParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickLogQueryParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickLogQueryParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickLogQueryParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickQueryParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickQueryParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickQueryParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickQueryParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcRepurchasePickParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcRepurchasePickParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/AcRepurchasePickParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcRepurchasePickParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/PickOrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/PickOrderParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/PickOrderParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/PickOrderParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/PickPostageParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/PickPostageParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/param/PickPostageParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/PickPostageParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/provider/AcPickProviderApi.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/provider/AcPickProviderApi.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/provider/AcPickProviderApi.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/provider/AcPickProviderApi.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickLogService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickLogService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickLogService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickLogService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickMemberLogService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickMemberLogService.java similarity index 96% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickMemberLogService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickMemberLogService.java index cdcf004..1773f4e 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickMemberLogService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickMemberLogService.java @@ -5,7 +5,6 @@ import com.hzs.activity.pick.vo.AcPickMemberLogVO; import com.hzs.common.domain.activity.pick.AcPickMemberLog; import com.hzs.common.domain.activity.pick.ext.AcPickExt; import com.hzs.common.domain.sale.ext.SaOrderExt; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickUpConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickUpConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/IAcPickUpConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickUpConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickLogServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickLogServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickLogServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickLogServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickMemberLogServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickMemberLogServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickMemberLogServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickMemberLogServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickUpConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickUpConfigServiceImpl.java similarity index 97% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickUpConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickUpConfigServiceImpl.java index b40457b..7a5dc8f 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/service/impl/AcPickUpConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickUpConfigServiceImpl.java @@ -8,8 +8,6 @@ import com.hzs.common.core.constant.ActivityFieldConstants; import com.hzs.common.domain.activity.base.AcPickUpConfig; import org.springframework.stereotype.Service; -import java.util.List; - /** *

* 活动提货配置表 服务实现类 diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/util/PickUtil.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/util/PickUtil.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/util/PickUtil.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/util/PickUtil.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcPickMemberLogVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcPickMemberLogVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcPickMemberLogVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcPickMemberLogVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcPickQueryDetailVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcPickQueryDetailVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcPickQueryDetailVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcPickQueryDetailVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcPickQueryVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcPickQueryVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcPickQueryVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcPickQueryVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickLogVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickLogVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickLogVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickLogVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcRepurchasePickVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/ApiPickDetailVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/ApiPickDetailVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/ApiPickDetailVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/ApiPickDetailVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/ApiPickListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/ApiPickListVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/ApiPickListVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/ApiPickListVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/ApiPickVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/ApiPickVO.java similarity index 94% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/ApiPickVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/ApiPickVO.java index 3bb7637..3ffa445 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/pick/vo/ApiPickVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/ApiPickVO.java @@ -2,7 +2,6 @@ package com.hzs.activity.pick.vo; import lombok.Data; -import java.math.BigDecimal; import java.util.List; /** diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/controller/manage/PolicyConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/controller/manage/PolicyConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/controller/manage/PolicyConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/controller/manage/PolicyConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/mapper/AcPolicyConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/mapper/AcPolicyConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/mapper/AcPolicyConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/mapper/AcPolicyConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/param/PolicyConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/param/PolicyConfigParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/param/PolicyConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/param/PolicyConfigParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/param/PolicyConfigQueryParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/param/PolicyConfigQueryParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/param/PolicyConfigQueryParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/param/PolicyConfigQueryParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/service/IAcPolicyConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/service/IAcPolicyConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/service/IAcPolicyConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/service/IAcPolicyConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/service/impl/AcPolicyConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/service/impl/AcPolicyConfigServiceImpl.java similarity index 99% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/service/impl/AcPolicyConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/service/impl/AcPolicyConfigServiceImpl.java index 25c10d0..a286424 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/service/impl/AcPolicyConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/service/impl/AcPolicyConfigServiceImpl.java @@ -45,7 +45,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/vo/AcBaseConfigExportVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/vo/AcBaseConfigExportVo.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/vo/AcBaseConfigExportVo.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/vo/AcBaseConfigExportVo.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/vo/AcPolicyConfigVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/vo/AcPolicyConfigVo.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/vo/AcPolicyConfigVo.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/vo/AcPolicyConfigVo.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/vo/PolicyConfigVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/vo/PolicyConfigVo.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/policy/vo/PolicyConfigVo.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/policy/vo/PolicyConfigVo.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/controller/manage/AcRecoilGiveConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/controller/manage/AcRecoilGiveConfigController.java similarity index 99% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/controller/manage/AcRecoilGiveConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/controller/manage/AcRecoilGiveConfigController.java index 259e1f4..8f7484c 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/controller/manage/AcRecoilGiveConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/controller/manage/AcRecoilGiveConfigController.java @@ -28,7 +28,6 @@ import com.hzs.common.domain.activity.base.AcGoalMemberConfig; import com.hzs.common.domain.activity.recoilGive.AcRecoilGiveConfig; import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; -import org.aspectj.weaver.AjAttribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/mapper/AcRecoilGiveConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/mapper/AcRecoilGiveConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/mapper/AcRecoilGiveConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/mapper/AcRecoilGiveConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/service/IAcRecoilGiveConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/service/IAcRecoilGiveConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/service/IAcRecoilGiveConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/service/IAcRecoilGiveConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/service/impl/AcRecoilGiveConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/service/impl/AcRecoilGiveConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/service/impl/AcRecoilGiveConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/service/impl/AcRecoilGiveConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/vo/RecoilGiveConfigVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/vo/RecoilGiveConfigVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recoilGive/vo/RecoilGiveConfigVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recoilGive/vo/RecoilGiveConfigVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/controller/AcRecomUpgradeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecomUpgradeRuleConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/controller/AcRecomUpgradeRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecomUpgradeRuleConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/dto/AcRecommendUpgrade.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/dto/AcRecommendUpgrade.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/dto/AcRecommendUpgrade.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/dto/AcRecommendUpgrade.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRepurCouponsRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRepurCouponsRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRepurCouponsRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRepurCouponsRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharOrderTypeMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharOrderTypeMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharOrderTypeMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharOrderTypeMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRepurSharRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/param/AcRecommendParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcRecommendParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/param/AcRecommendParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcRecommendParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRepurCouponsRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurCouponsRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRepurCouponsRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurCouponsRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharOrderTypeService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharOrderTypeService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharOrderTypeService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharOrderTypeService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurSharRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java similarity index 97% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java index 5106114..9b28459 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java @@ -1,6 +1,5 @@ package com.hzs.activity.recommend.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.recommend.mapper.AcRecomUpgradeRecordMapper; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRuleConfigServiceImpl.java similarity index 97% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRuleConfigServiceImpl.java index e2c674f..c6c413a 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRuleConfigServiceImpl.java @@ -8,7 +8,6 @@ import com.hzs.activity.recommend.service.IAcRecomUpgradeRuleConfigService; import com.hzs.activity.recommend.vo.AcRecommendUpgradeVO; import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.domain.activity.base.AcBaseConfig; import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRuleConfig; import org.springframework.stereotype.Service; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharOrderTypeServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharOrderTypeServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharOrderTypeServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharOrderTypeServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharRuleConfigServiceImpl.java similarity index 96% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharRuleConfigServiceImpl.java index c6b08a8..2bf35e2 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurSharRuleConfigServiceImpl.java @@ -8,7 +8,6 @@ import com.hzs.activity.recommend.mapper.AcRepurSharRuleConfigMapper; import com.hzs.activity.recommend.service.IAcRepurSharRuleConfigService; import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.domain.activity.recommend.AcRepurSharOrderType; import com.hzs.common.domain.activity.recommend.AcRepurSharRuleConfig; import com.hzs.common.domain.activity.recommend.ext.AcRepurSharRuleConfigExt; import org.springframework.stereotype.Service; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRecommendSharVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendSharVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRecommendSharVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendSharVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRecommendUpgradeVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendUpgradeVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRecommendUpgradeVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendUpgradeVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRecommendVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsShowVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsShowVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsShowVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsShowVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcRepurchaseCouponsVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/controller/AcRegisterGiftController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/controller/AcRegisterGiftController.java similarity index 97% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/controller/AcRegisterGiftController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/controller/AcRegisterGiftController.java index 3ab2f64..3633f7d 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/controller/AcRegisterGiftController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/controller/AcRegisterGiftController.java @@ -10,7 +10,6 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.hzs.activity.base.param.ActivityParam; import com.hzs.activity.base.service.IAcBaseConfigService; -import com.hzs.activity.policy.param.PolicyConfigParam; import com.hzs.activity.register.param.RegisterGiftParam; import com.hzs.activity.register.service.IAcRegisterGiftService; import com.hzs.common.core.enums.EActType; @@ -19,7 +18,6 @@ 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.register.AcRegisterGift; -import com.hzs.common.domain.policy.AcPolicyConfig; import com.hzs.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/mapper/AcRegisterGiftMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/mapper/AcRegisterGiftMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/mapper/AcRegisterGiftMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/mapper/AcRegisterGiftMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/param/RegisterGiftParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/param/RegisterGiftParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/param/RegisterGiftParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/param/RegisterGiftParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/service/IAcRegisterGiftService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/service/IAcRegisterGiftService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/service/IAcRegisterGiftService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/service/IAcRegisterGiftService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/service/impl/AcRegisterGiftServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/service/impl/AcRegisterGiftServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/register/service/impl/AcRegisterGiftServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/register/service/impl/AcRegisterGiftServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/controller/api/ApiTreeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/controller/api/ApiTreeRuleConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/controller/api/ApiTreeRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/controller/api/ApiTreeRuleConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/controller/api/SaTreeOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/controller/api/SaTreeOrderController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/controller/api/SaTreeOrderController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/controller/api/SaTreeOrderController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/controller/manage/TreeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/controller/manage/TreeRuleConfigController.java similarity index 98% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/controller/manage/TreeRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/controller/manage/TreeRuleConfigController.java index 67a2b85..24afd25 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/controller/manage/TreeRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/controller/manage/TreeRuleConfigController.java @@ -15,7 +15,6 @@ import com.hzs.activity.base.service.IAcGoalMemberConfigService; import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.base.vo.BaseConfigVo; import com.hzs.activity.tree.param.TreeOrderParam; -import com.hzs.activity.tree.param.TreeRuleConfigParam; import com.hzs.activity.tree.service.IAcTreeRuleConfigService; import com.hzs.activity.tree.service.ISaTreeOrderService; import com.hzs.common.core.constant.msg.ActivityMsgConstants; @@ -31,7 +30,6 @@ import com.hzs.common.domain.activity.base.AcBaseConfig; import com.hzs.common.domain.activity.base.AcGoalMemberConfig; import com.hzs.common.domain.activity.ext.SaTreeOrderExt; import com.hzs.common.domain.activity.tree.AcTreeRuleConfig; -import com.hzs.common.domain.activity.tree.SaTreeOrder; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.system.config.IAwardsServiceApi; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/mapper/AcTreeRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/mapper/AcTreeRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/mapper/AcTreeRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/mapper/AcTreeRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/mapper/SaTreeOrderMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/mapper/SaTreeOrderMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/mapper/SaTreeOrderMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/mapper/SaTreeOrderMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/param/TreeOrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/param/TreeOrderParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/param/TreeOrderParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/param/TreeOrderParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/param/TreeRuleConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/param/TreeRuleConfigParam.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/param/TreeRuleConfigParam.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/param/TreeRuleConfigParam.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/IAcTreeRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/IAcTreeRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/IAcTreeRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/IAcTreeRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/ISaTreeOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/ISaTreeOrderService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/ISaTreeOrderService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/ISaTreeOrderService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/impl/AcTreeRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/impl/AcTreeRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/impl/AcTreeRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/impl/AcTreeRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/impl/SaTreeOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/impl/SaTreeOrderServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/service/impl/SaTreeOrderServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/service/impl/SaTreeOrderServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/vo/SaTreeOrderVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/vo/SaTreeOrderVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/tree/vo/SaTreeOrderVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/tree/vo/SaTreeOrderVO.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/mapper/AcGiftConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/mapper/AcGiftConfigMapper.java similarity index 93% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/mapper/AcGiftConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/mapper/AcGiftConfigMapper.java index c4c9124..79d6254 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/mapper/AcGiftConfigMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/mapper/AcGiftConfigMapper.java @@ -1,7 +1,6 @@ package com.hzs.activity.wares.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.activity.base.param.GiftConfigParam; import com.hzs.common.domain.activity.base.AcGiftConfig; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; import org.apache.ibatis.annotations.Param; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/mapper/AcWaresRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/mapper/AcWaresRuleConfigMapper.java similarity index 92% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/mapper/AcWaresRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/mapper/AcWaresRuleConfigMapper.java index 5f3e419..41c30c1 100644 --- a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/mapper/AcWaresRuleConfigMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/mapper/AcWaresRuleConfigMapper.java @@ -3,7 +3,6 @@ package com.hzs.activity.wares.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.activity.base.param.GiftConfigParam; -import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; import com.hzs.common.domain.activity.wares.AcWaresRuleConfig; import com.hzs.common.domain.activity.wares.ext.AcWaresRuleConfigExt; import org.apache.ibatis.annotations.Param; diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/IAcGiftConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcGiftConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/IAcGiftConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcGiftConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/controller/manage/AcSuperWorkRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/controller/manage/AcSuperWorkRuleConfigController.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/controller/manage/AcSuperWorkRuleConfigController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/controller/manage/AcSuperWorkRuleConfigController.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/mapper/AcSuperWorkRuleConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/mapper/AcSuperWorkRuleConfigMapper.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/mapper/AcSuperWorkRuleConfigMapper.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/mapper/AcSuperWorkRuleConfigMapper.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/service/IAcSuperWorkRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/service/IAcSuperWorkRuleConfigService.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/service/IAcSuperWorkRuleConfigService.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/service/IAcSuperWorkRuleConfigService.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/service/impl/AcSuperWorkRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/service/impl/AcSuperWorkRuleConfigServiceImpl.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/service/impl/AcSuperWorkRuleConfigServiceImpl.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/service/impl/AcSuperWorkRuleConfigServiceImpl.java diff --git a/bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/vo/AcSuperWorkRuleConfigVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/vo/AcSuperWorkRuleConfigVO.java similarity index 100% rename from bd-business/bd-business-activity/src/main/java/com/hzs/activity/work/vo/AcSuperWorkRuleConfigVO.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/activity/work/vo/AcSuperWorkRuleConfigVO.java diff --git a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml index 1785389..45e7251 100644 --- a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml @@ -68,7 +68,7 @@ dubbo: threads: 400 cloud: # 订阅服务 - subscribed-services: bd-system, bd-member, bd-third, bd-activity, bd-bonus,bd-scm + subscribed-services: bd-system, bd-member, bd-third, bd-bonus,bd-scm scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.sale diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/AcSuperWorkRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/AcSuperWorkRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/AcSuperWorkRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/AcSuperWorkRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcApprovalLogMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcApprovalLogMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcApprovalLogMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcApprovalLogMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcBaseConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcBaseConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcBaseConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcBaseConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcGoalMemberConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcGoalMemberConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcGoalMemberConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcGoalMemberConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcPickUpConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcPickUpConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/base/AcPickUpConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/base/AcPickUpConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/consume/AcConsumeRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/consume/AcConsumeRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/consume/AcConsumeRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/consume/AcConsumeRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/consume/AcConsumeShieldConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/consume/AcConsumeShieldConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/consume/AcConsumeShieldConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/consume/AcConsumeShieldConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawGiftRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawGiftRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawGiftRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawGiftRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawRewardNumMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawRewardNumMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawRewardNumMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawRewardNumMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawRewardRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawRewardRecordMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawRewardRecordMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawRewardRecordMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/draw/AcDrawRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/draw/AcDrawRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/other/AcOtherPriceConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/other/AcOtherPriceConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/other/AcOtherPriceConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/other/AcOtherPriceConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/other/AcOtherPriceDataMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/other/AcOtherPriceDataMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/other/AcOtherPriceDataMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/other/AcOtherPriceDataMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/other/AcOtherPriceMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/other/AcOtherPriceMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/other/AcOtherPriceMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/other/AcOtherPriceMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/pick/AcPickLogMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickLogMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/pick/AcPickLogMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickLogMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/pick/AcPickMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/pick/AcPickMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/pick/AcPickMemberLogMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMemberLogMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/pick/AcPickMemberLogMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMemberLogMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/policy/AcPolicyConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/policy/AcPolicyConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/policy/AcPolicyConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/policy/AcPolicyConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/recoilGive/AcRecoilGiveConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recoilGive/AcRecoilGiveConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/recoilGive/AcRecoilGiveConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/recoilGive/AcRecoilGiveConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRepurCouponsRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRepurCouponsRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRepurCouponsRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRepurCouponsRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRepurSharOrderTypeMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRepurSharOrderTypeMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRepurSharOrderTypeMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRepurSharOrderTypeMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRepurSharRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRepurSharRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/recommend/AcRepurSharRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRepurSharRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/register/AcRegisterGiftMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/register/AcRegisterGiftMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/register/AcRegisterGiftMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/register/AcRegisterGiftMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/tree/AcTreeRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/tree/AcTreeRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/tree/AcTreeRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/tree/AcTreeRuleConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/tree/SaTreeOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/tree/SaTreeOrderMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/tree/SaTreeOrderMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/tree/SaTreeOrderMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/wares/AcGiftConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/wares/AcGiftConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/wares/AcGiftConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/wares/AcGiftConfigMapper.xml diff --git a/bd-business/bd-business-activity/src/main/resources/mapper/activity/wares/AcWaresRuleConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/wares/AcWaresRuleConfigMapper.xml similarity index 100% rename from bd-business/bd-business-activity/src/main/resources/mapper/activity/wares/AcWaresRuleConfigMapper.xml rename to bd-business/bd-business-sale/src/main/resources/mapper/activity/wares/AcWaresRuleConfigMapper.xml diff --git a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml b/bd-business/bd-business-scm/src/main/resources/bootstrap.yml index 793d23c..0a770df 100644 --- a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-scm/src/main/resources/bootstrap.yml @@ -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.scm diff --git a/bd-business/bd-business-system/pom.xml b/bd-business/bd-business-system/pom.xml index 65a4cf5..af89e71 100644 --- a/bd-business/bd-business-system/pom.xml +++ b/bd-business/bd-business-system/pom.xml @@ -42,12 +42,6 @@ bd-api-third - - - com.bd.africa - bd-api-activity - - org.springframework.amqp @@ -59,10 +53,6 @@ com.bd.africa bd-business-common - - com.bd.africa - bd-api-activity - com.bd.africa diff --git a/bd-business/bd-business-system/src/main/resources/bootstrap.yml b/bd-business/bd-business-system/src/main/resources/bootstrap.yml index 765baae..3ca3b40 100644 --- a/bd-business/bd-business-system/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-system/src/main/resources/bootstrap.yml @@ -67,7 +67,7 @@ dubbo: port: -1 cloud: # 订阅服务 - subscribed-services: bd-system, bd-third, bd-member, bd-sale, bd-activity, bd-scm + subscribed-services: bd-system, bd-third, bd-member, bd-sale, bd-scm scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.system diff --git a/bd-business/pom.xml b/bd-business/pom.xml index c31238c..fc24b88 100644 --- a/bd-business/pom.xml +++ b/bd-business/pom.xml @@ -76,7 +76,6 @@ - bd-business-activity bd-business-bonus bd-business-member bd-business-report diff --git a/bd-gateway/src/main/resources/bootstrap.yml b/bd-gateway/src/main/resources/bootstrap.yml index ec3687a..fcf9b57 100644 --- a/bd-gateway/src/main/resources/bootstrap.yml +++ b/bd-gateway/src/main/resources/bootstrap.yml @@ -97,14 +97,7 @@ spring: - id: bd-sale uri: lb://bd-sale predicates: - - Path=/sale/** - filters: - - StripPrefix=1 - # 活动模块 - - id: bd-activity - uri: lb://bd-activity - predicates: - - Path=/activity/** + - Path=/sale/**, /activity/** filters: - StripPrefix=1 # 统计模块 diff --git a/bd-third/pom.xml b/bd-third/pom.xml index d6be53c..36a39ca 100644 --- a/bd-third/pom.xml +++ b/bd-third/pom.xml @@ -76,12 +76,6 @@ bd-api-sale - - - com.bd.africa - bd-api-activity - - com.bd.africa diff --git a/bd-third/src/main/resources/bootstrap.yml b/bd-third/src/main/resources/bootstrap.yml index cfe1e1f..95d6295 100644 --- a/bd-third/src/main/resources/bootstrap.yml +++ b/bd-third/src/main/resources/bootstrap.yml @@ -82,7 +82,7 @@ dubbo: port: -1 cloud: ## 订阅服务 - subscribed-services: bd-third, bd-system, bd-member, bd-sale, bd-activity, bd-bonus, bd-scm + subscribed-services: bd-third, bd-system, bd-member, bd-sale, bd-bonus, bd-scm scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.third diff --git a/pom.xml b/pom.xml index f9da26e..240c845 100644 --- a/pom.xml +++ b/pom.xml @@ -191,12 +191,6 @@ ${hzs.version} - - - com.bd.africa - bd-api-activity - ${hzs.version} - com.bd.africa