Merge remote-tracking branch 'origin/base_test' into base_online

# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
This commit is contained in:
cabbage 2025-04-24 19:27:46 +08:00
commit 0f400f7e4a
4774 changed files with 749 additions and 31849 deletions

View File

@ -1,36 +0,0 @@
# java-base-app
#### Description
直销后台接口
#### Software Architecture
Software architecture description
#### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution
1. Fork the repository
2. Create Feat_xxx branch
3. Commit your code
4. Create Pull Request
#### Gitee Feature
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
4. The most valuable open source project [GVP](https://gitee.com/gvp)
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

View File

@ -2,51 +2,33 @@
### code-util实体代码生成器
### hzs-apiRPC调用接口
hzs-api-activity -- 活动服务接口以及RPC传输数据DTO实体
hzs-api-bonus -- 奖金服务接口以及RPC传输数据DTO实体
hzs-api-member -- 会员服务接口以及RPC传输数据DTO实体
hzs-api-report -- 报表服务接口以及RPC传输数据DTO实体
hzs-api-sale -- 销售、供应链服务接口以及RPC传输数据DTO实体
hzs-api-system -- 系统基础服务接口以及RPC传输数据DTO实体
hzs-api-third -- 三方服务接口以及RPC传输数据DTO实体
### bd-apiRPC调用接口
bd-api-bonus -- 奖金服务接口以及RPC传输数据DTO实体
bd-api-member -- 会员服务接口以及RPC传输数据DTO实体
bd-api-report -- 报表服务接口以及RPC传输数据DTO实体
bd-api-sale -- 销售、供应链服务接口以及RPC传输数据DTO实体
bd-api-system -- 系统基础服务接口以及RPC传输数据DTO实体
bd-api-third -- 三方服务接口以及RPC传输数据DTO实体
### hzs-api-lenjoy乐享RPC调用接口
hzs-api-lenjoy-bonus -- 乐享奖金服务接口以及RPC传输数据DTO实体
hzs-api-lenjoy-member -- 乐享会员服务接口以及RPC传输数据DTO实体
hzs-api-lenjoy-sale -- 乐享销售、供应链服务接口以及RPC传输数据DTO实体
### bd-business业务相关服务
bd-business-bonus -- 奖金服务(奖金计算等) 8098
bd-business-common -- 业务服务公共类(工具类)
bd-business-member -- 会员服务(会员、账户、银行等) 8092
bd-business-report -- 报表服务(统计分析、仪表盘等) 8097
bd-business-sale -- 销售服务(订单、商品、邮费、仓库进销存等) 8093
bd-business-system -- 系统基础服务(基础配置、自定义配置等) 8091
bd-business-scm -- 进销存服务(进销存功能等) 8099
### hzs-business业务相关服务
hzs-business-activity -- 活动服务(所有活动等) 8095
hzs-business-bonus -- 奖金服务(奖金计算等) 8098
hzs-business-common -- 业务服务公共类(工具类)
hzs-business-member -- 会员服务(会员、账户、银行等) 8092
hzs-business-report -- 报表服务(统计分析、仪表盘等) 8097
hzs-business-sale -- 销售服务(订单、商品、邮费、仓库进销存等) 8093
hzs-business-system -- 系统基础服务(基础配置、自定义配置等) 8091
hzs-business-scm -- 进销存服务(进销存功能等) 8099
### bd-common基础公用组件
bd-common-core -- 核心公用组件、缓存操作等
bd-common-domain -- 系统对应数据库实体以及扩展分类
bd-common-security -- security用户鉴权依赖组件
### hzs-business-lenjoy乐享业务相关服务
hzs-business-bonus -- 奖金服务(奖金计算等) 8198
hzs-business-member -- 会员服务(会员、账户、银行等) 8192
hzs-business-sale -- 销售服务(订单、商品、邮费、仓库进销存等) 8193
### hzs-common基础公用组件
hzs-common-core -- 核心公用组件、缓存操作等
hzs-common-domain -- 系统对应数据库实体以及扩展分类
hzs-common-security -- security用户鉴权依赖组件
### hzs-gateway统一网关入口
hzs-gateway -- 统一网关 8080
### bd-gateway统一网关入口
bd-gateway -- 统一网关 8080
### hzs-third三方服务
hzs-third -- 三方服务支付、短信、邮件、物流以及MQ等异步接收消息处理 8082
### hzs-applet小程序服务
hzs-applet -- 目前是生态科技仓小程序,后续有其它小程序可以根据业务进行添加合并 8083
### hzs-shop店务服务
hzs-shop -- 目前是店铺服务内容 8084
### bd-third三方服务
bd-third -- 三方服务支付、短信、邮件、物流以及MQ等异步接收消息处理 8082
@ -65,16 +47,3 @@
### 日志拦截处理
后台管理端controller层涉及到的操作方法需要添加 @Log 注解,用于记录管理后操作日志
## 分支说明:
### 日志拦截处理
dev_inter分支: 为当前研发主分支正常需求迭代以及非紧急BUG修改都提交到该分支正常进行迭代开发。
### 日志拦截处理
pre分支预上线测试分支由 dev_inter 分支中提交内容提取合并而来,该分支进行测试并测试通过后进行上线。
### 日志拦截处理
release分支线上分支pre 分支上线稳定后,将 pre 分支合并到该分支做为线上稳定分支。如果有加急BUG需要上线从此分支拉取临时上线分支进行上线上线成功后合并回本分支。

View File

@ -6,21 +6,21 @@
<parent>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<artifactId>bd-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-sale</artifactId>
<artifactId>bd-api-bonus</artifactId>
<description>
hzs-api-sale销售服务
bd-api-bonus奖金服务
</description>
<dependencies>
<dependency>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
<artifactId>bd-api-system</artifactId>
</dependency>
</dependencies>

View File

@ -6,21 +6,21 @@
<parent>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<artifactId>bd-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-bonus</artifactId>
<artifactId>bd-api-member</artifactId>
<description>
hzs-api-bonus奖金服务
bd-api-member会员服务
</description>
<dependencies>
<dependency>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
<artifactId>bd-api-system</artifactId>
</dependency>
</dependencies>

View File

@ -23,12 +23,6 @@ import java.util.Map;
/**
* 会员服务接口
*
* @Description:
* @Author:
* @Time: 2022/8/29 11:41
* @Classname: IMemberServiceApi
* @PackageName: com.hzs.member
*/
public interface IMemberServiceApi {
@ -69,8 +63,6 @@ public interface IMemberServiceApi {
*
* @param cuMember 会员编号的传输值
* @return: R<CuMember>
* @Author: sui q
* @Date: 2022/8/29 11:46
*/
R<List<CuMemberExt>> getMemberInfo(CuMember cuMember);
@ -80,17 +72,11 @@ public interface IMemberServiceApi {
* @param pkApprove 审核人
* @param saOrder 销售订单
* @return: Boolean
* @Author: sui q
* @Date: 2022/10/22 16:43
*/
R<Boolean> singleRevokeMemberByRegisterOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO);
/**
* @description: 自助撤单-注册单撤单
* @author: zhang jing
* @date: 2023/11/23 16:04
* @param: [pkApprove, saOrder, businessCommissionDTO]
* @return: com.hzs.common.core.domain.R<java.lang.Boolean>
**/
R<Boolean> singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO);
@ -101,8 +87,6 @@ public interface IMemberServiceApi {
* @param memberList 会员列表
* @param saOrderMap 销售订单
* @return: Boolean
* @Author: sui q
* @Date: 2022/10/22 16:43
*/
R<Boolean> mergeRevokeMemberByRegisterOrder(Long pkApprove, List<Long> memberList, Map<Long, SaOrderExt> saOrderMap, BusinessCommissionDTO businessCommissionDTO);
@ -113,8 +97,6 @@ public interface IMemberServiceApi {
* @param saOrder 订单
* @param cuMember 修改后的会员
* @return: R<Boolean>
* @Author: sui q
* @Date: 2023/3/25 14:13
*/
R<Boolean> normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, List<Long> pkOrderItemList, BusinessCommissionDTO businessCommissionDTO);
@ -124,8 +106,6 @@ public interface IMemberServiceApi {
* @param memberId 编号安置人
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, String memberCode, String phone);
@ -135,8 +115,6 @@ public interface IMemberServiceApi {
* @param memberId 编号安置人
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, List<String> memberCodeList);
@ -146,8 +124,6 @@ public interface IMemberServiceApi {
* @param memberId 会员编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
R<List<CuMemberExt>> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List<CuMemberExt> cuMemberExtList);
@ -157,8 +133,6 @@ public interface IMemberServiceApi {
* @param memberId 安置人编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
R<List<CuMemberExt>> queryPlaceSponsorUnderUmbrella(Long memberId, String... placeParent);
@ -168,8 +142,6 @@ public interface IMemberServiceApi {
* @param memberId 会员编号
* @param placeDept 1代表左区极左极下2代表右区极左极下
* @return: CuMemberExt
* @Author: sui q
* @Date: 2022/9/1 20:36
*/
R<CuMemberExt> queryPlaceSponsorLastLeft(Long memberId, Integer placeDept);
@ -210,8 +182,6 @@ public interface IMemberServiceApi {
*
* @param cuMember 会员信息
* @return: R<Integer>
* @Author: sui q
* @Date: 2022/9/9 9:39
*/
R<Boolean> saveMember(CuMember cuMember);
@ -229,8 +199,6 @@ public interface IMemberServiceApi {
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/26 11:35
*/
R<Boolean> saveMember(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
@ -240,8 +208,6 @@ public interface IMemberServiceApi {
* @param cuMember 会员信息
* @param saOrder 订单信息
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/26 11:35
*/
R<Boolean> saveMember(CuMember cuMember, SaOrder saOrder);
@ -252,8 +218,6 @@ public interface IMemberServiceApi {
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/26 11:35
*/
R<Boolean> saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
@ -265,8 +229,6 @@ public interface IMemberServiceApi {
* @param isPay 是否支付
* @param cuMemberAccountExt 支付账号
* @return: R<Integer>
* @Author: sui q
* @Date: 2022/9/9 9:39
*/
R<Boolean> saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt);
@ -276,8 +238,6 @@ public interface IMemberServiceApi {
* @param cuMember 会员
* @param isHaiFun 是否嗨粉
* @return: R<Boolean>
* @Author: sui q
* @Date: 2022/9/30 17:30
*/
R<CuMember> createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun);
@ -327,8 +287,6 @@ public interface IMemberServiceApi {
*
* @param pkMember 主键
* @return: R<CuMemberShare>
* @Author: sui q
* @Date: 2023/3/15 14:20
*/
R<CuMemberShare> queryCuMemberShare(Long pkMember);
@ -337,33 +295,21 @@ public interface IMemberServiceApi {
*
* @param pkMember 会员主键
* @return: CuMemberRegister
* @Author: sui q
* @Date: 2023/3/29 18:33
*/
R<CuMemberRegister> queryCuMemberRegister(Long pkMember);
/*
* @description: 会员编号账户类型抽奖金额
* @author: sui q
* @date: 2023/4/25 16:31
* @param: null null
**/
R<Boolean> updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney);
/*
* @description: 会员抽奖购买抽奖次数支付金额
* @author: sui q
* @date: 2023/4/27 15:54
* @param: null null
**/
R<Boolean> updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney);
/*
* @description: 会员抽奖购买抽奖次数支付金额
* @author: sui q
* @date: 2023/4/27 15:54
* @param: null null
**/
R<Boolean> updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt);
@ -397,10 +343,6 @@ public interface IMemberServiceApi {
/**
* @description: 获取奖衔的翻译KEY值
* @author: zhang jing
* @date: 2023/3/2 12:00
* @param: [pkCountry, pkId]
* @return: java.lang.Integer
**/
Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId);
@ -435,18 +377,11 @@ public interface IMemberServiceApi {
/*
* @description: 查询伞下会员
* @author: sui q
* @date: 2023/10/16 17:29
* @param: null null
**/
R<Boolean> queryCuMemberUnderUmbrella(Long pkMember);
/**
* @description: 零元撤单签呈列表
* @author: zhang jing
* @date: 2023/10/27 16:25
* @param: [analysisBusinessAppealParam]
* @return: com.hzs.common.core.domain.R<com.hzs.member.base.dto.ZeroElementRevokeDTO>
**/
R<List<ZeroElementRevokeDTO>> zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam);
@ -461,9 +396,6 @@ public interface IMemberServiceApi {
/*
* @description: 查询系统中所有甩网数据
* @author: sui q
* @date: 2023/8/30 15:05
* @param: null null
**/
R<List<CuMemberSwingNetExt>> queryCuMemberSwingNetExt();
@ -497,7 +429,6 @@ public interface IMemberServiceApi {
*/
R handleMemberContinue(MemberContinueDTO memberContinueDTO);
/**
* 根据会员编号查询会员信息数量超过1000
*

View File

@ -6,20 +6,20 @@
<parent>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<artifactId>bd-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-report</artifactId>
<artifactId>bd-api-report</artifactId>
<description>
hzs-api-report报表服务
bd-api-report报表服务
</description>
<dependencies>
<dependency>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
<artifactId>bd-api-system</artifactId>
</dependency>
</dependencies>

View File

@ -6,21 +6,21 @@
<parent>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<artifactId>bd-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-member</artifactId>
<artifactId>bd-api-sale</artifactId>
<description>
hzs-api-member会员服务
bd-api-sale销售服务
</description>
<dependencies>
<dependency>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
<artifactId>bd-api-system</artifactId>
</dependency>
</dependencies>

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