angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 实体目录修改,报单赠送同步复购单添加

This commit is contained in:
zhangheng 2025-10-20 15:28:00 +08:00
parent d17986e155
commit 8ba02badc3
27 changed files with 36 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java
View File

@ -3,7 +3,7 @@ package com.hzs.activity.add.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.param.AcAddUpgradeListParam;
import com.hzs.activity.add.param.AcAddUpgradeRuleConfigParam; 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.activity.add.vo.AcAddUpgradeListVO;
import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdGrade;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java
View File

@ -3,7 +3,7 @@ package com.hzs.activity.add.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.param.AcAddUpgradeListParam;
import com.hzs.activity.add.vo.AcAddUpgradeListVO; 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; import java.util.List;

6
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java
View File

@ -1,14 +1,10 @@
package com.hzs.activity.add.service; package com.hzs.activity.add.service;
import com.baomidou.mybatisplus.extension.service.IService; 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.param.AcAddUpgradeParam;
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.core.web.domain.AjaxResult; import com.hzs.common.core.web.domain.AjaxResult;
import java.util.List;
/** /**
* <p> * <p>
* 加购升级配置表 服务类 * 加购升级配置表 服务类

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java
View File

@ -3,7 +3,7 @@ package com.hzs.activity.add.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.param.AcAddUpgradeListParam;
import com.hzs.activity.add.vo.AcAddUpgradeListVO; 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; import java.util.List;

3
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java
View File

@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper; import com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper;
import com.hzs.activity.add.param.*; import com.hzs.activity.add.param.*;
import com.hzs.activity.add.service.IAcAddUpgradeConfigService; import com.hzs.activity.add.service.IAcAddUpgradeConfigService;
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.activity.base.param.ActivityParam; import com.hzs.activity.base.param.ActivityParam;
import com.hzs.activity.base.service.IAcBaseConfigService; import com.hzs.activity.base.service.IAcBaseConfigService;
import com.hzs.activity.base.service.IAcGoalMemberConfigService; import com.hzs.activity.base.service.IAcGoalMemberConfigService;

3
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java
View File

@ -5,10 +5,9 @@ import com.hzs.activity.add.mapper.AcAddUpgradeRecordMapper;
import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.param.AcAddUpgradeListParam;
import com.hzs.activity.add.service.IAcAddUpgradeRecordService; import com.hzs.activity.add.service.IAcAddUpgradeRecordService;
import com.hzs.activity.add.vo.AcAddUpgradeListVO; 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 org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java
View File

@ -1,7 +1,7 @@
package com.hzs.activity.declaration.mapper; package com.hzs.activity.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 com.hzs.common.domain.activity.pick.AcPick;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java
View File

@ -2,7 +2,7 @@ package com.hzs.activity.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.activity.declaration.param.AcDeclarationProductParam; 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 org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

3
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java
View File

@ -1,9 +1,8 @@
package com.hzs.activity.declaration.mapper; package com.hzs.activity.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.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.activity.declaration.vo.AcDeclarationListVO;
import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

3
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java
View File

@ -1,9 +1,8 @@
package com.hzs.activity.declaration.service; package com.hzs.activity.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService; 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.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; import com.hzs.common.core.web.domain.AjaxResult;
/** /**

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java
View File

@ -2,7 +2,7 @@ package com.hzs.activity.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.activity.declaration.param.AcDeclarationProductParam; 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; import java.util.List;

3
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java
View File

@ -1,9 +1,8 @@
package com.hzs.activity.declaration.service; package com.hzs.activity.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService; 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.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.activity.declaration.vo.AcDeclarationListVO;
import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt;

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java
View File

@ -2,15 +2,9 @@ package com.hzs.activity.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.nacos.client.naming.utils.CollectionUtils; 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.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.param.ActivityParam;
import com.hzs.activity.base.service.IAcBaseConfigService; 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.base.service.IActivityService;
import com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper; import com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper;
import com.hzs.activity.declaration.param.AcDeclarationConfigParam; 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.hzs.activity.declaration.service.IAcDeclarationGiftConfigService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService;
import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig;
import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftDetail;
import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.enums.EActType; import com.hzs.common.core.enums.EActType;
import com.hzs.common.core.enums.EApprovalBusiness; 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.enums.ERegistrationAuthority;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.domain.activity.base.AcBaseConfig; 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.common.security.utils.SecurityUtils;
import com.hzs.sale.product.service.IBdProductService; import com.hzs.sale.product.service.IBdProductService;
import com.hzs.sale.wares.service.IBdWaresGradeService;
import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.config.IGradeServiceApi;
import com.hzs.system.sys.dto.LoginUser; import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

3
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java
View File

@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.activity.declaration.mapper.AcDeclarationGiftDetailMapper; import com.hzs.activity.declaration.mapper.AcDeclarationGiftDetailMapper;
import com.hzs.activity.declaration.param.AcDeclarationProductParam; import com.hzs.activity.declaration.param.AcDeclarationProductParam;
import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; 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 org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**

7
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java
View File

@ -1,17 +1,12 @@
package com.hzs.activity.declaration.service.impl; 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.mapper.AcDeclarationGiftRecordMapper;
import com.hzs.activity.declaration.param.AcDeclarationListParam; import com.hzs.activity.declaration.param.AcDeclarationListParam;
import com.hzs.activity.declaration.param.AcDeclarationProductParam; import com.hzs.activity.declaration.param.AcDeclarationProductParam;
import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService; import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService;
import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord;
import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
import com.hzs.activity.declaration.vo.AcDeclarationListVO; import com.hzs.activity.declaration.vo.AcDeclarationListVO;
import com.hzs.common.core.enums.ERegistrationAuthority; import com.hzs.common.core.enums.ERegistrationAuthority;
import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt;

14
bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java
View File

@ -1,16 +1,16 @@
package com.hzs.activity.tourism.provider; 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.hzs.activity.base.service.IAcBaseConfigService; import com.hzs.activity.base.service.IAcBaseConfigService;
import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService;
import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService;
import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig;
import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; import com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord;
import com.hzs.activity.tourism.IAcTourismServiceApi; import com.hzs.activity.tourism.IAcTourismServiceApi;
import com.hzs.activity.tourism.service.IAcTourismDataService; import com.hzs.activity.tourism.service.IAcTourismDataService;
import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.domain.R; 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.activity.base.AcBaseConfig;
import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrder;
@ -112,10 +112,14 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi {
// 查询订单 // 查询订单
List<SaOrder> orderList = iSaOrderService.list(new LambdaQueryWrapper<SaOrder>() List<SaOrder> orderList = iSaOrderService.list(new LambdaQueryWrapper<SaOrder>()
.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) .apply("TRUNC(PAY_TIME) = TRUNC(SYSDATE - {0})", daysAgo)
.eq(SaOrder::getOrderStatus, 1) .eq(SaOrder::getOrderStatus, 1)
.eq(SaOrder::getDelFlag, 0)); .eq(SaOrder::getDelFlag, 0)
);
log.info("{}天无有效订单,处理结束", daysAgo); log.info("{}天无有效订单,处理结束", daysAgo);
// 获取所有7天前有效的报单赠送活动 // 获取所有7天前有效的报单赠送活动
List<AcBaseConfig> acBaseConfigList = iAcBaseConfigService.list(new LambdaQueryWrapper<AcBaseConfig>() List<AcBaseConfig> acBaseConfigList = iAcBaseConfigService.list(new LambdaQueryWrapper<AcBaseConfig>()

14
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java
View File

@ -1,28 +1,20 @@
package com.hzs.sale.order.provider; package com.hzs.sale.order.provider;
import cn.hutool.core.bean.BeanUtil; 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.base.service.IAcBaseConfigService;
import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService;
import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; 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.CacheConstants;
import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.constant.msg.SaOrderMsgConstants; import com.hzs.common.core.constant.msg.SaOrderMsgConstants;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EOrderStatus; import com.hzs.common.core.enums.EOrderStatus;
import com.hzs.common.core.service.RedisService; import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.ComputeUtil; 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.member.ext.CuMemberAccountExt;
import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.ext.SaOrderExt;
import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrder;
import com.hzs.common.domain.sale.order.SaOrderItems; import com.hzs.common.domain.sale.order.SaOrderItems;
import com.hzs.member.base.IMemberServiceApi; import com.hzs.member.base.IMemberServiceApi;
import com.hzs.member.detail.ICuMemberDetailServiceApi;
import com.hzs.sale.order.ISaOrderServiceApi; import com.hzs.sale.order.ISaOrderServiceApi;
import com.hzs.sale.order.dto.*; import com.hzs.sale.order.dto.*;
import com.hzs.sale.order.param.*; 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.sale.order.vo.SingleItemStatVo;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; 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.*;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**

2
bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper"> <mapper namespace="com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.activity.add.vo.AcAddUpgradeConfig"> <resultMap id="BaseResultMap" type="com.hzs.common.domain.activity.add.AcAddUpgradeConfig">
<id column="PK_ID" property="pkId"/> <id column="PK_ID" property="pkId"/>
<result column="DEL_FLAG" property="delFlag"/> <result column="DEL_FLAG" property="delFlag"/>
<result column="CREATION_TIME" property="creationTime"/> <result column="CREATION_TIME" property="creationTime"/>

2
bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.hzs.activity.add.mapper.AcAddUpgradeRecordMapper"> <mapper namespace="com.hzs.activity.add.mapper.AcAddUpgradeRecordMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.activity.add.vo.AcAddUpgradeRecord"> <resultMap id="BaseResultMap" type="com.hzs.common.domain.activity.add.AcAddUpgradeRecord">
<id column="PK_ID" property="pkId" /> <id column="PK_ID" property="pkId" />
<result column="DEL_FLAG" property="delFlag" /> <result column="DEL_FLAG" property="delFlag" />
<result column="CREATION_TIME" property="creationTime" /> <result column="CREATION_TIME" property="creationTime" />

2
bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper"> <mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.activity.declaration.vo.AcDeclarationGiftConfig"> <resultMap id="BaseResultMap" type="com.hzs.common.domain.activity.declaration.AcDeclarationGiftConfig">
<id column="PK_ID" property="pkId"/> <id column="PK_ID" property="pkId"/>
<result column="DEL_FLAG" property="delFlag"/> <result column="DEL_FLAG" property="delFlag"/>
<result column="CREATION_TIME" property="creationTime"/> <result column="CREATION_TIME" property="creationTime"/>

2
bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftDetailMapper"> <mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftDetailMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.activity.declaration.vo.AcDeclarationGiftDetail"> <resultMap id="BaseResultMap" type="com.hzs.common.domain.activity.declaration.AcDeclarationGiftDetail">
<id column="PK_ID" property="pkId" /> <id column="PK_ID" property="pkId" />
<result column="DEL_FLAG" property="delFlag" /> <result column="DEL_FLAG" property="delFlag" />
<result column="CREATION_TIME" property="creationTime" /> <result column="CREATION_TIME" property="creationTime" />

4
bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftRecordMapper"> <mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftRecordMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.activity.declaration.vo.AcDeclarationGiftRecord"> <resultMap id="BaseResultMap" type="com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord">
<id column="PK_ID" property="pkId" /> <id column="PK_ID" property="pkId" />
<result column="DEL_FLAG" property="delFlag" /> <result column="DEL_FLAG" property="delFlag" />
<result column="CREATION_TIME" property="creationTime" /> <result column="CREATION_TIME" property="creationTime" />
@ -117,7 +117,7 @@
AND adgr.CREATION_TIME &lt;= #{creationEndTime} AND adgr.CREATION_TIME &lt;= #{creationEndTime}
</if> </if>
</select> </select>
<select id="selectLastRecord" resultType="com.hzs.activity.declaration.vo.AcDeclarationGiftRecord"> <select id="selectLastRecord" resultType="com.hzs.common.domain.activity.declaration.AcDeclarationGiftRecord">
SELECT SELECT
* *
FROM FROM

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeConfig.java → bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeConfig.java
View File

@ -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.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeRecord.java → bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/AcAddUpgradeRecord.java
View File

@ -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.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java → bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftConfig.java
View File

@ -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.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftDetail.java → bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftDetail.java
View File

@ -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.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftRecord.java → bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/declaration/AcDeclarationGiftRecord.java
View File

@ -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.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;