diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java index 83aab87c..2b452257 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java @@ -3,7 +3,7 @@ package com.hzs.activity.add.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.param.AcAddUpgradeRuleConfigParam; -import com.hzs.activity.add.vo.AcAddUpgradeConfig; +import com.hzs.common.domain.activity.add.AcAddUpgradeConfig; import com.hzs.activity.add.vo.AcAddUpgradeListVO; import com.hzs.common.domain.system.config.BdGrade; import org.apache.ibatis.annotations.Param; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java index ecabc47e..6cf0b188 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java @@ -3,7 +3,7 @@ package com.hzs.activity.add.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.vo.AcAddUpgradeListVO; -import com.hzs.activity.add.vo.AcAddUpgradeRecord; +import com.hzs.common.domain.activity.add.AcAddUpgradeRecord; import java.util.List; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java index 38a7de47..f0ee90ee 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java @@ -1,14 +1,10 @@ package com.hzs.activity.add.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.param.AcAddUpgradeParam; -import com.hzs.activity.add.vo.AcAddUpgradeConfig; -import com.hzs.activity.add.vo.AcAddUpgradeListVO; +import com.hzs.common.domain.activity.add.AcAddUpgradeConfig; import com.hzs.common.core.web.domain.AjaxResult; -import java.util.List; - /** *

* 加购升级配置表 服务类 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java index 623f3419..ccff1cba 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java @@ -3,7 +3,7 @@ package com.hzs.activity.add.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.vo.AcAddUpgradeListVO; -import com.hzs.activity.add.vo.AcAddUpgradeRecord; +import com.hzs.common.domain.activity.add.AcAddUpgradeRecord; import java.util.List; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java index 0de2b456..315a8730 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper; import com.hzs.activity.add.param.*; import com.hzs.activity.add.service.IAcAddUpgradeConfigService; -import com.hzs.activity.add.vo.AcAddUpgradeConfig; -import com.hzs.activity.add.vo.AcAddUpgradeListVO; +import com.hzs.common.domain.activity.add.AcAddUpgradeConfig; import com.hzs.activity.base.param.ActivityParam; import com.hzs.activity.base.service.IAcBaseConfigService; import com.hzs.activity.base.service.IAcGoalMemberConfigService; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java index 2faa4d57..03aebe19 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java @@ -5,10 +5,9 @@ import com.hzs.activity.add.mapper.AcAddUpgradeRecordMapper; import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.service.IAcAddUpgradeRecordService; import com.hzs.activity.add.vo.AcAddUpgradeListVO; -import com.hzs.activity.add.vo.AcAddUpgradeRecord; +import com.hzs.common.domain.activity.add.AcAddUpgradeRecord; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java index 89568ce5..8c1613f4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java @@ -1,7 +1,7 @@ package com.hzs.activity.declaration.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig; import com.hzs.common.domain.activity.pick.AcPick; import org.apache.ibatis.annotations.Param; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java index 8ac1fffa..cc802405 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java @@ -2,7 +2,7 @@ package com.hzs.activity.declaration.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.activity.declaration.param.AcDeclarationProductParam; -import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftDetail; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java index 8ada8fc1..4b850038 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java @@ -1,9 +1,8 @@ package com.hzs.activity.declaration.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.declaration.param.AcDeclarationListParam; -import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord; import com.hzs.activity.declaration.vo.AcDeclarationListVO; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; import org.apache.ibatis.annotations.Param; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java index 03b76c4c..f7a9e007 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java @@ -1,9 +1,8 @@ package com.hzs.activity.declaration.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.activity.add.param.AcAddUpgradeParam; import com.hzs.activity.declaration.param.AcDeclarationParam; -import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig; import com.hzs.common.core.web.domain.AjaxResult; /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java index bb6f0e7e..bc891a6e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java @@ -2,7 +2,7 @@ package com.hzs.activity.declaration.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.activity.declaration.param.AcDeclarationProductParam; -import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftDetail; import java.util.List; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java index feb6d4f5..42c7f891 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java @@ -1,9 +1,8 @@ package com.hzs.activity.declaration.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.declaration.param.AcDeclarationListParam; -import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord; import com.hzs.activity.declaration.vo.AcDeclarationListVO; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java index 83bef513..3c55158f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java @@ -2,15 +2,9 @@ package com.hzs.activity.declaration.service.impl; import cn.hutool.core.bean.BeanUtil; import com.alibaba.nacos.client.naming.utils.CollectionUtils; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hzs.activity.add.param.AcAddUpgradeConfigParam; -import com.hzs.activity.add.param.AcAddUpgradeDetailParam; -import com.hzs.activity.add.param.AcAddUpgradeRuleConfigParam; -import com.hzs.activity.add.vo.AcAddUpgradeConfig; import com.hzs.activity.base.param.ActivityParam; import com.hzs.activity.base.service.IAcBaseConfigService; -import com.hzs.activity.base.service.IAcGoalMemberConfigService; import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper; import com.hzs.activity.declaration.param.AcDeclarationConfigParam; @@ -20,25 +14,19 @@ import com.hzs.activity.declaration.param.AcDeclarationProductParam; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; -import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig; -import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftDetail; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.enums.EActType; import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.enums.EControlType; import com.hzs.common.core.enums.ERegistrationAuthority; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.activity.base.AcBaseConfig; -import com.hzs.common.domain.activity.base.AcGoalMemberConfig; -import com.hzs.common.domain.activity.pick.AcPick; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.sale.product.service.IBdProductService; -import com.hzs.sale.wares.service.IBdWaresGradeService; import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.sys.dto.LoginUser; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java index eff83725..ed939b0f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java @@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.declaration.mapper.AcDeclarationGiftDetailMapper; import com.hzs.activity.declaration.param.AcDeclarationProductParam; import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; -import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftDetail; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java index c8a75552..98324c72 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java @@ -1,17 +1,12 @@ package com.hzs.activity.declaration.service.impl; -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hzs.activity.add.param.AcAddUpgradeListParam; -import com.hzs.activity.declaration.mapper.AcDeclarationGiftDetailMapper; import com.hzs.activity.declaration.mapper.AcDeclarationGiftRecordMapper; import com.hzs.activity.declaration.param.AcDeclarationListParam; import com.hzs.activity.declaration.param.AcDeclarationProductParam; import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail; -import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord; import com.hzs.activity.declaration.vo.AcDeclarationListVO; import com.hzs.common.core.enums.ERegistrationAuthority; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java index 1c570859..fdb60354 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java @@ -1,16 +1,16 @@ package com.hzs.activity.tourism.provider; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.activity.base.service.IAcBaseConfigService; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; -import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig; -import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig; +import com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord; import com.hzs.activity.tourism.IAcTourismServiceApi; import com.hzs.activity.tourism.service.IAcTourismDataService; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.domain.R; +import com.hzs.common.core.enums.EOrderType; import com.hzs.common.domain.activity.base.AcBaseConfig; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.sale.order.SaOrder; @@ -112,10 +112,14 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi { // 查询订单 List orderList = iSaOrderService.list(new LambdaQueryWrapper() - .in(SaOrder::getOrderType, 1, 2, 4, 5) + .nested(w -> w.in(SaOrder::getOrderType, EOrderType.REGISTER_ORDER, EOrderType.UPGRADE_ORDER) + .or() + .nested(x -> x.eq(SaOrder::getOrderType, EOrderType.REPURCHASE_ORDER) + .eq(SaOrder::getOrderTypeExtend, 1))) .apply("TRUNC(PAY_TIME) = TRUNC(SYSDATE - {0})", daysAgo) .eq(SaOrder::getOrderStatus, 1) - .eq(SaOrder::getDelFlag, 0)); + .eq(SaOrder::getDelFlag, 0) + ); log.info("{}天无有效订单,处理结束", daysAgo); // 获取所有7天前有效的报单赠送活动 List acBaseConfigList = iAcBaseConfigService.list(new LambdaQueryWrapper() diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java index 96ba4614..16838b93 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java @@ -1,28 +1,20 @@ package com.hzs.sale.order.provider; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.activity.base.service.IAcBaseConfigService; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; -import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig; -import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.msg.SaOrderMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EOrderStatus; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.domain.activity.base.AcBaseConfig; -import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberAccountExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrderItems; import com.hzs.member.base.IMemberServiceApi; -import com.hzs.member.detail.ICuMemberDetailServiceApi; import com.hzs.sale.order.ISaOrderServiceApi; import com.hzs.sale.order.dto.*; import com.hzs.sale.order.param.*; @@ -31,18 +23,12 @@ import com.hzs.sale.order.vo.MemberFirstOrderVo; import com.hzs.sale.order.vo.SingleItemStatVo; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.temporal.ChronoUnit; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml index d86083a9..7e6be604 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml index 0c3f7d29..928d7939 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml index 66b3dcf2..479f6ede 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml index 23b0d831..df6af1d2 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml index 6d46bab8..33644375 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml @@ -3,7 +3,7 @@ - + @@ -117,7 +117,7 @@ AND adgr.CREATION_TIME <= #{creationEndTime} - SELECT * FROM diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeConfig.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeConfig.java similarity index 97% rename from bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeConfig.java rename to bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeConfig.java index f05e3355..11c54201 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeConfig.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeConfig.java @@ -1,4 +1,4 @@ -package com.hzs.activity.add.vo; +package com.hzs.common.domain.activity.add; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeRecord.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeRecord.java similarity index 96% rename from bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeRecord.java rename to bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeRecord.java index bfc0848e..16a618a0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeRecord.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeRecord.java @@ -1,4 +1,4 @@ -package com.hzs.activity.add.vo; +package com.hzs.common.domain.activity.add; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftConfig.java similarity index 95% rename from bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java rename to bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftConfig.java index 4179be57..337d4db3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftConfig.java @@ -1,4 +1,4 @@ -package com.hzs.activity.declaration.vo; +package com.hzs.common.domain.activity.declaration; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftDetail.java similarity index 96% rename from bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftDetail.java rename to bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftDetail.java index 70bb7fa8..b7f4cab7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftDetail.java @@ -1,4 +1,4 @@ -package com.hzs.activity.declaration.vo; +package com.hzs.common.domain.activity.declaration; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftRecord.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftRecord.java similarity index 95% rename from bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftRecord.java rename to bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftRecord.java index 0698041d..7afcd09b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftRecord.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftRecord.java @@ -1,4 +1,4 @@ -package com.hzs.activity.declaration.vo; +package com.hzs.common.domain.activity.declaration; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName;