diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 838f155a..00000000 --- a/README.en.md +++ /dev/null @@ -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/) diff --git a/README.md b/README.md index 4182384f..4232dda0 100644 --- a/README.md +++ b/README.md @@ -2,51 +2,33 @@ ### code-util（实体代码生成器） -### hzs-api（RPC调用接口） - 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-api（RPC调用接口） + 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需要上线，从此分支拉取临时上线分支进行上线，上线成功后，合并回本分支。 diff --git a/hzs-api/hzs-api-sale/pom.xml b/bd-api/bd-api-bonus/pom.xml similarity index 77% rename from hzs-api/hzs-api-sale/pom.xml rename to bd-api/bd-api-bonus/pom.xml index 706d7bf1..4d91d772 100644 --- a/hzs-api/hzs-api-sale/pom.xml +++ b/bd-api/bd-api-bonus/pom.xml @@ -6,21 +6,21 @@ com.bd - hzs-api + bd-api 1.0.0-SNAPSHOT - hzs-api-sale + bd-api-bonus - hzs-api-sale销售服务 + bd-api-bonus奖金服务 com.bd - hzs-api-system + bd-api-system diff --git a/hzs-api/hzs-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java b/bd-api/bd-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java similarity index 100% rename from hzs-api/hzs-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java rename to bd-api/bd-api-bonus/src/main/java/com/hzs/bonus/settle/IMemberSettleBonusApi.java diff --git a/hzs-api/hzs-api-bonus/pom.xml b/bd-api/bd-api-member/pom.xml similarity index 77% rename from hzs-api/hzs-api-bonus/pom.xml rename to bd-api/bd-api-member/pom.xml index 91f86a44..8bf7f7a2 100644 --- a/hzs-api/hzs-api-bonus/pom.xml +++ b/bd-api/bd-api-member/pom.xml @@ -6,21 +6,21 @@ com.bd - hzs-api + bd-api 1.0.0-SNAPSHOT - hzs-api-bonus + bd-api-member - hzs-api-bonus奖金服务 + bd-api-member会员服务 com.bd - hzs-api-system + bd-api-system diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IBusinessCommission.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountAuditServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberTradeServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberBalanceDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberBusinessBalanceDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberBusinessBalanceDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/MemberBusinessBalanceDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberBusinessBalanceDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuAwardsControlServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/ICuMemberAchieveLogServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberLoginServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberLoginServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberLoginServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberLoginServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java similarity index 87% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java index e9da970d..6f64c842 100644 --- a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java @@ -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 - * @Author: sui q - * @Date: 2022/8/29 11:46 */ R> 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 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 **/ R 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 mergeRevokeMemberByRegisterOrder(Long pkApprove, List memberList, Map saOrderMap, BusinessCommissionDTO businessCommissionDTO); @@ -113,8 +97,6 @@ public interface IMemberServiceApi { * @param saOrder 订单 * @param cuMember 修改后的会员 * @return: R - * @Author: sui q - * @Date: 2023/3/25 14:13 */ R normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, List pkOrderItemList, BusinessCommissionDTO businessCommissionDTO); @@ -124,8 +106,6 @@ public interface IMemberServiceApi { * @param memberId 编号、安置人 * @Description: * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ R> querySponsorOnUmbrella(Long memberId, String memberCode, String phone); @@ -135,8 +115,6 @@ public interface IMemberServiceApi { * @param memberId 编号、安置人 * @Description: * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ R> querySponsorOnUmbrella(Long memberId, List memberCodeList); @@ -146,8 +124,6 @@ public interface IMemberServiceApi { * @param memberId 会员编号 * @Description: * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ R> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList); @@ -157,8 +133,6 @@ public interface IMemberServiceApi { * @param memberId 安置人，编号 * @Description: * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ R> 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 queryPlaceSponsorLastLeft(Long memberId, Integer placeDept); @@ -210,8 +182,6 @@ public interface IMemberServiceApi { * * @param cuMember 会员信息 * @return: R - * @Author: sui q - * @Date: 2022/9/9 9:39 */ R 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 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 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 saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt); @@ -265,8 +229,6 @@ public interface IMemberServiceApi { * @param isPay 是否支付 * @param cuMemberAccountExt 支付账号 * @return: R - * @Author: sui q - * @Date: 2022/9/9 9:39 */ R saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt); @@ -276,8 +238,6 @@ public interface IMemberServiceApi { * @param cuMember 会员 * @param isHaiFun 是否嗨粉 * @return: R - * @Author: sui q - * @Date: 2022/9/30 17:30 */ R createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun); @@ -327,8 +287,6 @@ public interface IMemberServiceApi { * * @param pkMember 主键 * @return: R - * @Author: sui q - * @Date: 2023/3/15 14:20 */ R queryCuMemberShare(Long pkMember); @@ -337,33 +295,21 @@ public interface IMemberServiceApi { * * @param pkMember 会员主键 * @return: CuMemberRegister - * @Author: sui q - * @Date: 2023/3/29 18:33 */ R queryCuMemberRegister(Long pkMember); - /* * @description: 会员编号，账户类型，抽奖金额 - * @author: sui q - * @date: 2023/4/25 16:31 - * @param: null null **/ R updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney); /* * @description: 会员抽奖，购买抽奖次数支付金额 - * @author: sui q - * @date: 2023/4/27 15:54 - * @param: null null **/ R updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney); /* * @description: 会员抽奖，购买抽奖次数支付金额 - * @author: sui q - * @date: 2023/4/27 15:54 - * @param: null null **/ R 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 queryCuMemberUnderUmbrella(Long pkMember); /** * @description: 零元撤单签呈列表 - * @author: zhang jing - * @date: 2023/10/27 16:25 - * @param: [analysisBusinessAppealParam] - * @return: com.hzs.common.core.domain.R **/ R> zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam); @@ -461,9 +396,6 @@ public interface IMemberServiceApi { /* * @description: 查询系统中所有甩网数据 - * @author: sui q - * @date: 2023/8/30 15:05 - * @param: null null **/ R> queryCuMemberSwingNetExt(); @@ -497,7 +429,6 @@ public interface IMemberServiceApi { */ R handleMemberContinue(MemberContinueDTO memberContinueDTO); - /** * 根据会员编号查询会员信息（数量超过1000） * diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IUpPolicyCurrencyServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IUpdateExpireStopServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IUpdateExpireStopServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/IUpdateExpireStopServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/IUpdateExpireStopServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuAwardsControlDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuMakerSpaceDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuMakerSpaceDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuMakerSpaceDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuMakerSpaceDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/CuMemberAchieveLogDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/LoginMember.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/UpPolicyCurrencyDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/UpdateExpireStopDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/UpdateExpireStopDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/UpdateExpireStopDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/UpdateExpireStopDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/ZeroElementRevokeDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ZeroElementRevokeDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/base/dto/ZeroElementRevokeDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ZeroElementRevokeDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/cabin/ICabinMemberServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/cabin/ICabinMemberServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/cabin/ICabinMemberServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/cabin/ICabinMemberServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/cabin/dto/CabinPowerOnDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/cabin/dto/CabinPowerOnDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/cabin/dto/CabinPowerOnDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/cabin/dto/CabinPowerOnDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MakerSpaceCabinAccordDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MakerSpaceCabinAccordDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MakerSpaceCabinAccordDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MakerSpaceCabinAccordDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/statis/ICuBonusStatisServiceApi.java diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/statis/ICuBonusVertexStatisServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/statis/ICuBonusVertexStatisServiceApi.java similarity index 100% rename from hzs-api/hzs-api-member/src/main/java/com/hzs/member/statis/ICuBonusVertexStatisServiceApi.java rename to bd-api/bd-api-member/src/main/java/com/hzs/member/statis/ICuBonusVertexStatisServiceApi.java diff --git a/hzs-api/hzs-api-report/pom.xml b/bd-api/bd-api-report/pom.xml similarity index 77% rename from hzs-api/hzs-api-report/pom.xml rename to bd-api/bd-api-report/pom.xml index 421b280e..e42c4fef 100644 --- a/hzs-api/hzs-api-report/pom.xml +++ b/bd-api/bd-api-report/pom.xml @@ -6,20 +6,20 @@ com.bd - hzs-api + bd-api 1.0.0-SNAPSHOT - hzs-api-report + bd-api-report - hzs-api-report报表服务 + bd-api-report报表服务 com.bd - hzs-api-system + bd-api-system diff --git a/hzs-api/hzs-api-report/src/main/java/com/hzs/report/stat/IStatisticalLogServiceApi.java b/bd-api/bd-api-report/src/main/java/com/hzs/report/stat/IStatisticalLogServiceApi.java similarity index 100% rename from hzs-api/hzs-api-report/src/main/java/com/hzs/report/stat/IStatisticalLogServiceApi.java rename to bd-api/bd-api-report/src/main/java/com/hzs/report/stat/IStatisticalLogServiceApi.java diff --git a/hzs-api/hzs-api-report/src/main/java/com/hzs/report/stat/dto/StatisticalLogDTO.java b/bd-api/bd-api-report/src/main/java/com/hzs/report/stat/dto/StatisticalLogDTO.java similarity index 100% rename from hzs-api/hzs-api-report/src/main/java/com/hzs/report/stat/dto/StatisticalLogDTO.java rename to bd-api/bd-api-report/src/main/java/com/hzs/report/stat/dto/StatisticalLogDTO.java diff --git a/hzs-api/hzs-api-member/pom.xml b/bd-api/bd-api-sale/pom.xml similarity index 77% rename from hzs-api/hzs-api-member/pom.xml rename to bd-api/bd-api-sale/pom.xml index 7e67de29..0fe12b43 100644 --- a/hzs-api/hzs-api-member/pom.xml +++ b/bd-api/bd-api-sale/pom.xml @@ -6,21 +6,21 @@ com.bd - hzs-api + bd-api 1.0.0-SNAPSHOT - hzs-api-member + bd-api-sale - hzs-api-member会员服务 + bd-api-sale销售服务 com.bd - hzs-api-system + bd-api-system diff --git a/hzs-api/hzs-api-sale/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 hzs-api/hzs-api-sale/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/hzs-api/hzs-api-sale/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 hzs-api/hzs-api-sale/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/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/AcBaseConfigParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcBaseConfigParamDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/AcBaseConfigParamDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcBaseConfigParamDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/AcDrawRewardNumDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcDrawRewardNumDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/AcDrawRewardNumDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcDrawRewardNumDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/AcGiftBenefitsRuleConfigDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcGiftBenefitsRuleConfigDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/AcGiftBenefitsRuleConfigDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcGiftBenefitsRuleConfigDTO.java diff --git a/hzs-api/hzs-api-sale/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 hzs-api/hzs-api-sale/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/hzs-api/hzs-api-sale/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 hzs-api/hzs-api-sale/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/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/UpgradeGiveConfigDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/UpgradeGiveConfigDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/dto/UpgradeGiveConfigDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/UpgradeGiveConfigDTO.java diff --git a/hzs-api/hzs-api-sale/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 hzs-api/hzs-api-sale/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/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/tourism/IAcTourismServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/activity/tourism/IAcTourismServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/tourism/IAcTourismServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/activity/tourism/IAcTourismServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderItemsServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderItemsParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderItemsParamDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderItemsParamDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderItemsParamDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderParamDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderParamDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderParamDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderUseBarCodeDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderUseBarCodeDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/OrderUseBarCodeDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderUseBarCodeDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SaCabinCardDetailDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaCabinCardDetailDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SaCabinCardDetailDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaCabinCardDetailDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/postage/IPostageServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/postage/IPostageServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/postage/IPostageServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/postage/IPostageServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/postage/dto/PostageProductDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/postage/dto/PostageProductDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/postage/dto/PostageProductDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/postage/dto/PostageProductDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/product/IProductServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/product/IProductServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/product/IProductServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/product/IProductServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/product/dto/ProductDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/product/dto/ProductDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/product/dto/ProductDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/product/dto/ProductDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/product/dto/ProductParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/product/dto/ProductParamDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/product/dto/ProductParamDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/product/dto/ProductParamDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/CancelOrderDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/CancelOrderDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/CancelOrderDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/CancelOrderDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDetailDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDetailDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDetailDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeAddressDetailDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDetailDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDetailDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDetailDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ChangeProductDetailDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/OrderDeductionDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/OrderDeductionDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/OrderDeductionDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/OrderDeductionDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ReturnDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ReturnDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/ReturnDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/ReturnDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondAccountDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondAccountDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondAccountDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondAccountDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondProductDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondProductDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondProductDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SecondProductDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SelfDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SelfDTO.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/pub/dto/SelfDTO.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/dto/SelfDTO.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/refund/ISaRefundServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/refund/ISaRefundServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/refund/ISaRefundServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/refund/ISaRefundServiceApi.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java similarity index 100% rename from hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java rename to bd-api/bd-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java diff --git a/hzs-api/hzs-api-scm/pom.xml b/bd-api/bd-api-scm/pom.xml similarity index 74% rename from hzs-api/hzs-api-scm/pom.xml rename to bd-api/bd-api-scm/pom.xml index b03d66df..92eb1102 100644 --- a/hzs-api/hzs-api-scm/pom.xml +++ b/bd-api/bd-api-scm/pom.xml @@ -6,25 +6,25 @@ com.bd - hzs-api + bd-api 1.0.0-SNAPSHOT - hzs-api-scm + bd-api-scm - hzs-api-scm进销存服务 + bd-api-scm进销存服务 com.bd - hzs-api-system + bd-api-system com.bd - hzs-common-domain + bd-common-domain diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/IThProductServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IThProductServiceApi.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/IThProductServiceApi.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IThProductServiceApi.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java diff --git a/hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/supplier/IThSupplierApplyServiceApi.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/supplier/IThSupplierApplyServiceApi.java similarity index 100% rename from hzs-api/hzs-api-scm/src/main/java/com/hzs/scm/supplier/IThSupplierApplyServiceApi.java rename to bd-api/bd-api-scm/src/main/java/com/hzs/scm/supplier/IThSupplierApplyServiceApi.java diff --git a/hzs-api/hzs-api-system/pom.xml b/bd-api/bd-api-system/pom.xml similarity index 79% rename from hzs-api/hzs-api-system/pom.xml rename to bd-api/bd-api-system/pom.xml index a5565e19..bb00d767 100644 --- a/hzs-api/hzs-api-system/pom.xml +++ b/bd-api/bd-api-system/pom.xml @@ -6,14 +6,14 @@ com.bd - hzs-api + bd-api 1.0.0-SNAPSHOT - hzs-api-system + bd-api-system - hzs-api-system系统接口模块 + bd-api-system系统接口模块 diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/IApprovalPushInfo.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/IApprovalPushInfo.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/IApprovalPushInfo.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/IApprovalPushInfo.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/IBarCodeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/IBarCodeServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/IBarCodeServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/IBarCodeServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/INoticeAuditServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/INoticeAuditServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/INoticeAuditServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/INoticeAuditServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/INoticeMemberServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/INoticeMemberServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/INoticeMemberServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/INoticeMemberServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ISystemConfigServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ISystemConfigServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ISystemConfigServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/ISystemConfigServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ITransactionServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ITransactionServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/ITransactionServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/ITransactionServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/ApprovalPushInfoDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/ApprovalPushInfoDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/ApprovalPushInfoDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/ApprovalPushInfoDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/AreaDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/AreaDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/AreaDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/AreaDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/BarCodeDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/BarCodeDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/BarCodeDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/BarCodeDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/BarCodeUseDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/BarCodeUseDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/BarCodeUseDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/BarCodeUseDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/BdCubasdocDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/BdCubasdocDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/BdCubasdocDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/BdCubasdocDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/CurrencyDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CurrencyDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/CurrencyDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CurrencyDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/NoticeMemberDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/NoticeMemberDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/NoticeMemberDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/NoticeMemberDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/TransactionDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/TransactionDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/base/dto/TransactionDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/TransactionDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/common/ICommonServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/common/ICommonServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/common/ICommonServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/common/ICommonServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAgreementRenewalWhiteServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAgreementRenewalWhiteServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAgreementRenewalWhiteServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAgreementRenewalWhiteServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAreaCurrencyServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAreaCurrencyServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAreaCurrencyServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAreaCurrencyServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAreaFreePostageServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAreaFreePostageServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAreaFreePostageServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAreaFreePostageServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IBonusItemsServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBonusItemsServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IBonusItemsServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBonusItemsServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ICuMemberAgreementWhiteApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ICuMemberAgreementWhiteApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ICuMemberAgreementWhiteApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/ICuMemberAgreementWhiteApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ILabelServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ILabelServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ILabelServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/ILabelServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IShareServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IShareServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IShareServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IShareServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ITransferServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITransferServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/ITransferServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITransferServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalAutoServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalAutoServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalAutoServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalAutoServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalProcessServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalProcessServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalProcessServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalProcessServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalSpecialServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalSpecialServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalSpecialServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalSpecialServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/AdvertBannerDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/AdvertBannerDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/AdvertBannerDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/AdvertBannerDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/AreaCurrencyDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/AreaCurrencyDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/AreaCurrencyDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/AreaCurrencyDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusDifferenceDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusDifferenceDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusDifferenceDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusDifferenceDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectLoopDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectLoopDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectLoopDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusDirectLoopDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusExpandDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusExpandDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusExpandDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusExpandDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusRepurchasePushDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusRepurchasePushDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/BonusRepurchasePushDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusRepurchasePushDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/GradeDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/GradeDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/GradeDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/GradeDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/HoLeaderDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/HoLeaderDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/HoLeaderDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/HoLeaderDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/LabelConfigDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/LabelConfigDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/LabelConfigDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/LabelConfigDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/RangeDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/RangeDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/RangeDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/RangeDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/ServiceChargeDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/ServiceChargeDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/ServiceChargeDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/ServiceChargeDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/VertexDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/VertexDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/dto/VertexDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/VertexDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IBusinessLogApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ICubasdocApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/ILogServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ILogServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/ILogServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/ILogServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuColumnServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IMenuDetailServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuDetailServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IMenuDetailServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IMenuDetailServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IOperationLogServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IThaliConfigServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IThaliConfigServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IThaliConfigServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IThaliConfigServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IUserServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IUserServiceApi.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/IUserServiceApi.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IUserServiceApi.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalInfoDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalInfoDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalInfoDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalInfoDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalItemInfoDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalItemInfoDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalItemInfoDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalItemInfoDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalMemberNumDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalMemberNumDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalMemberNumDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalMemberNumDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDetailDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDetailDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDetailDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryDetailDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryFileDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryFileDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryFileDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalQueryFileDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSendInfoDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSendInfoDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSendInfoDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSendInfoDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/BdCurrencyDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BdCurrencyDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/BdCurrencyDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BdCurrencyDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/CubasdocDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/LoginUser.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/LoginUser.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/LoginUser.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/LoginUser.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java similarity index 100% rename from hzs-api/hzs-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java rename to bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/UserAuthorityDTO.java diff --git a/hzs-api/hzs-api-activity/pom.xml b/bd-api/bd-api-third/pom.xml similarity index 76% rename from hzs-api/hzs-api-activity/pom.xml rename to bd-api/bd-api-third/pom.xml index 2400e30a..98a68058 100644 --- a/hzs-api/hzs-api-activity/pom.xml +++ b/bd-api/bd-api-third/pom.xml @@ -6,21 +6,21 @@ com.bd - hzs-api + bd-api 1.0.0-SNAPSHOT - hzs-api-activity + bd-api-third - hzs-api-activity活动服务 + bd-api-third三方服务接口模块 com.bd - hzs-api-system + bd-api-system diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/express/IExpressTrackService.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/express/IExpressTrackService.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/express/IExpressTrackService.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/express/IExpressTrackService.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/express/dto/ExpressDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/express/dto/ExpressDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/express/dto/ExpressDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/express/dto/ExpressDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/express/dto/ExpressDetail.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/express/dto/ExpressDetail.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/express/dto/ExpressDetail.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/express/dto/ExpressDetail.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/idcard/IdCardServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/idcard/IdCardServiceApi.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/idcard/IdCardServiceApi.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/idcard/IdCardServiceApi.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/idcard/dto/IdCardOcrDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/idcard/dto/IdCardOcrDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/idcard/dto/IdCardOcrDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/idcard/dto/IdCardOcrDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/IDelayedMessageApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/mq/IDelayedMessageApi.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/IDelayedMessageApi.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/mq/IDelayedMessageApi.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/DelayedMessageDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/DelayedMessageDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/DelayedMessageDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/DelayedMessageDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/LenjoyOrderDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/LenjoyOrderDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/LenjoyOrderDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/LenjoyOrderDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/RefundOrderDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/RefundOrderDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/RefundOrderDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/RefundOrderDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/TransactionMqDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/TransactionMqDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/mq/dto/TransactionMqDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/TransactionMqDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/pay/dto/RefundDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/pay/dto/RefundDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/pay/dto/RefundDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/pay/dto/RefundDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/IMailServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/IMailServiceApi.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/IMailServiceApi.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/sms/IMailServiceApi.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/dto/MailServiceDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/dto/MailServiceDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/dto/MailServiceDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/sms/dto/MailServiceDTO.java diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/dto/SmsServiceDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/dto/SmsServiceDTO.java similarity index 100% rename from hzs-api/hzs-api-third/src/main/java/com/hzs/third/sms/dto/SmsServiceDTO.java rename to bd-api/bd-api-third/src/main/java/com/hzs/third/sms/dto/SmsServiceDTO.java diff --git a/hzs-api/pom.xml b/bd-api/pom.xml similarity index 57% rename from hzs-api/pom.xml rename to bd-api/pom.xml index 5625e1d9..1695348c 100644 --- a/hzs-api/pom.xml +++ b/bd-api/pom.xml @@ -5,16 +5,16 @@ com.bd - hzs + bd 1.0.0-SNAPSHOT - hzs-api + bd-api pom - hzs-api业务服务接口 + bd-api业务服务接口 @@ -22,20 +22,20 @@ com.bd - hzs-common-domain + bd-common-domain - - hzs-api-bonus - hzs-api-member - hzs-api-report - hzs-api-sale - hzs-api-system - hzs-api-third - hzs-api-scm + + bd-api-bonus + bd-api-member + bd-api-report + bd-api-sale + bd-api-system + bd-api-third + bd-api-scm diff --git a/hzs-business/hzs-business-bonus/pom.xml b/bd-business/bd-business-bonus/pom.xml similarity index 80% rename from hzs-business/hzs-business-bonus/pom.xml rename to bd-business/bd-business-bonus/pom.xml index be1e840d..6b8a105f 100644 --- a/hzs-business/hzs-business-bonus/pom.xml +++ b/bd-business/bd-business-bonus/pom.xml @@ -6,49 +6,49 @@ com.bd - hzs-business + bd-business 1.0.0-SNAPSHOT - hzs-business-bonus + bd-business-bonus - hzs-business-bonus奖金服务 + bd-business-bonus奖金服务 com.bd - hzs-business-common + bd-business-common com.bd - hzs-api-sale + bd-api-sale com.bd - hzs-api-third + bd-api-third com.bd - hzs-common-aop + bd-common-aop com.bd - hzs-api-bonus + bd-api-bonus diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/BonusApplication.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/BonusApplication.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/BonusApplication.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/BonusApplication.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberMonthAchieveMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberMonthAchieveMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberMonthAchieveMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberMonthAchieveMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRangeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRangeMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRangeMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRangeMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodDetailMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodDetailMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberSettlePeriodMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberAchieveParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberAchieveParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberAchieveParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberAchieveParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberParentCountParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberParentCountParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberParentCountParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberParentCountParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberPeriodParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberPeriodParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberPeriodParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberPeriodParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MonthAchieveParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MonthAchieveParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MonthAchieveParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MonthAchieveParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRangeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRangeService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRangeService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRangeService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberBonusSettle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberBonusSettle.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberBonusSettle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberBonusSettle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRangeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRangeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRangeServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRangeServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuAwardsControlMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuAwardsControlMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuAwardsControlMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuAwardsControlMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuHonorWallMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuHonorWallMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuHonorWallMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuHonorWallMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuAwardsControlService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuAwardsControlService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuAwardsControlService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuAwardsControlService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuAwardsControlServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuAwardsControlServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuAwardsControlServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuAwardsControlServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/component/BonusSettleTimer.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/component/BonusSettleTimer.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/component/BonusSettleTimer.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/component/BonusSettleTimer.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuBonusExpandController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuBonusExpandController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuBonusExpandController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuBonusExpandController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberShareBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberShareBonusController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberShareBonusController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberShareBonusController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayDetailMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayDetailMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRepeatBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRepeatBonusMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRepeatBonusMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRepeatBonusMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusItemsParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusItemsParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusItemsParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusItemsParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BdWaresBonusParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareBonusParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareBonusParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareBonusParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareBonusParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareDetailParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareDetailParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareDetailParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberShareDetailParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/TripleCycleListParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/TripleCycleListParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/TripleCycleListParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/TripleCycleListParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuBonusExpandService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuBonusExpandService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuBonusExpandService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuBonusExpandService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayDetailService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayDetailService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayDetailService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusRangeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusRangeService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusRangeService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusRangeService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRepeatBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRepeatBonusService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRepeatBonusService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRepeatBonusService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java diff --git a/hzs-business/hzs-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 similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java diff --git a/hzs-business/hzs-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 similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleAgentHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleAgentHandle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java similarity index 99% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index 4648d7c9..e78b02e3 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.bonus.bonus.service.ICuMemberBonusDelayService; import com.hzs.bonus.bonus.vo.BonusRecordDetailVO; -import com.hzs.common.core.config.HzsConfig; +import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.msg.BonusMsgConstants; import com.hzs.common.core.enums.*; @@ -1578,8 +1578,8 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // TODO new 2025年9月1日之前不需要校验，直接按奖衔拿 if (settleDateStr.compareTo("2025-09-01") < 0 - && (EEnv.ONLINE.getValue().equals(HzsConfig.getEnv()) - || EEnv.TEST.getValue().equals(HzsConfig.getEnv())) + && (EEnv.ONLINE.getValue().equals(BdConfig.getEnv()) + || EEnv.TEST.getValue().equals(BdConfig.getEnv())) ) { // 生产环境（2025.09.01之前，领导奖不需要校验业绩，是什么奖衔就按什么奖衔处理） return bdAwards.getAwardsValue(); diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHiFunHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHiFunHandle.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHiFunHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHiFunHandle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRepCouponsHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRepCouponsHandle.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRepCouponsHandle.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRepCouponsHandle.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayDetailServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayDetailServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusExpandServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusExpandServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusExpandServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusExpandServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusRangeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusRangeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusRangeServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusRangeServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRepeatBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRepeatBonusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRepeatBonusServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRepeatBonusServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusDelayVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusDelayVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusDelayVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusDelayVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusRecordDetailVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusRecordDetailVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusRecordDetailVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusRecordDetailVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusMakerSpaceVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusMakerSpaceVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusMakerSpaceVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusMakerSpaceVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusPurchaseVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusPurchaseVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusPurchaseVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusPurchaseVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberRealIncomeVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberRealIncomeVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberRealIncomeVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberRealIncomeVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberSettlePeriodVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberSettlePeriodVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberSettlePeriodVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberSettlePeriodVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/PubMemberBonusVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/PubMemberBonusVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/PubMemberBonusVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/PubMemberBonusVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/component/load/MemberLoadRunner.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/component/load/MemberLoadRunner.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/component/load/MemberLoadRunner.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/component/load/MemberLoadRunner.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/component/load/RedisComponent.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/component/load/RedisComponent.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/component/load/RedisComponent.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/component/load/RedisComponent.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/controller/manage/CuMemberAssessController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/controller/manage/CuMemberAssessController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/controller/manage/CuMemberAssessController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/controller/manage/CuMemberAssessController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessDetailMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessDetailMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessExemptMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessExemptMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessExemptMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessExemptMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAwardsMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAwardsMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAwardsMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAwardsMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberLevelMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberLevelMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberLevelMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberLevelMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessDetailService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessDetailService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessDetailService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessExemptService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessExemptService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessExemptService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessExemptService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAwardsService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAwardsService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAwardsService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAwardsService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberLevelService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberLevelService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberLevelService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberLevelService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessDetailServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessDetailServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessExemptServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessExemptServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessExemptServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessExemptServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAssessVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAssessVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAssessVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAssessVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/mapper/CuMemberRiskControlMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/mapper/CuMemberRiskControlMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/mapper/CuMemberRiskControlMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/mapper/CuMemberRiskControlMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlPetition.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlPetition.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlPetition.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskControlPetition.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskParam.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskParam.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/param/MemberRiskParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/service/ICuMemberRiskControlService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/service/ICuMemberRiskControlService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/service/ICuMemberRiskControlService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/service/ICuMemberRiskControlService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/service/impl/CuMemberRiskControlServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/service/impl/CuMemberRiskControlServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/service/impl/CuMemberRiskControlServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/service/impl/CuMemberRiskControlServiceImpl.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/swing/mapper/CuMemberSwingNetLogMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/swing/mapper/CuMemberSwingNetLogMapper.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/swing/mapper/CuMemberSwingNetLogMapper.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/swing/mapper/CuMemberSwingNetLogMapper.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/swing/service/ICuMemberSwingNetLogService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/swing/service/ICuMemberSwingNetLogService.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/swing/service/ICuMemberSwingNetLogService.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/swing/service/ICuMemberSwingNetLogService.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/swing/service/impl/CuMemberSwingNetLogServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/swing/service/impl/CuMemberSwingNetLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/swing/service/impl/CuMemberSwingNetLogServiceImpl.java rename to bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/swing/service/impl/CuMemberSwingNetLogServiceImpl.java diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/banner.txt b/bd-business/bd-business-bonus/src/main/resources/banner.txt similarity index 100% rename from hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/banner.txt rename to bd-business/bd-business-bonus/src/main/resources/banner.txt diff --git a/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml similarity index 95% rename from hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml rename to bd-business/bd-business-bonus/src/main/resources/bootstrap.yml index 507bdbd8..7acdf43a 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: hzs-bonus + name: bd-bonus jackson: # 返回数据序列化时，如果为 null 则不进行返回 default-property-inclusion: NON_NULL @@ -65,7 +65,7 @@ dubbo: port: -1 cloud: # 订阅服务 - subscribed-services: hzs-system, hzs-third, hzs-sale, hzs-member + subscribed-services: bd-system, bd-third, bd-sale, bd-member scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.bonus diff --git a/hzs-business/hzs-business-sale/src/main/resources/logback.xml b/bd-business/bd-business-bonus/src/main/resources/logback.xml similarity index 97% rename from hzs-business/hzs-business-sale/src/main/resources/logback.xml rename to bd-business/bd-business-bonus/src/main/resources/logback.xml index 3e2dcd00..dc47c5af 100644 --- a/hzs-business/hzs-business-sale/src/main/resources/logback.xml +++ b/bd-business/bd-business-bonus/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberRangeMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberRangeMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberRangeMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuHonorWallMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuHonorWallMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuHonorWallMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuHonorWallMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberRegisterMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberRegisterMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberRegisterMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberRegisterMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberUpgradeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberUpgradeMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberUpgradeMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/base/CuMemberUpgradeMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusCoachMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusCoachMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusCoachMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusCoachMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayDetailMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayDetailMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDetailMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDetailMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusExpandMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusExpandMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusExpandMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusExpandMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushHisMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushHisMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushHisMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushHisMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusRangeMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusRangeMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusRangeMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRepeatBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRepeatBonusMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRepeatBonusMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRepeatBonusMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareBonusMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareBonusMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareBonusMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareDetailMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberShareDetailMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessExemptMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessExemptMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessExemptMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessExemptMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAwardsMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAwardsMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberAwardsMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAwardsMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/risk/CuMemberRiskControlMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/risk/CuMemberRiskControlMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/risk/CuMemberRiskControlMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/risk/CuMemberRiskControlMapper.xml diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/swing/CuMemberSwingNetLogMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/swing/CuMemberSwingNetLogMapper.xml similarity index 100% rename from hzs-business/hzs-business-bonus/src/main/resources/mapper/member/swing/CuMemberSwingNetLogMapper.xml rename to bd-business/bd-business-bonus/src/main/resources/mapper/member/swing/CuMemberSwingNetLogMapper.xml diff --git a/hzs-business/hzs-business-common/pom.xml b/bd-business/bd-business-common/pom.xml similarity index 74% rename from hzs-business/hzs-business-common/pom.xml rename to bd-business/bd-business-common/pom.xml index f8ba28fd..0c69da51 100644 --- a/hzs-business/hzs-business-common/pom.xml +++ b/bd-business/bd-business-common/pom.xml @@ -3,23 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hzs-business + bd-business com.bd 1.0.0-SNAPSHOT 4.0.0 - hzs-business-common + bd-business-common - hzs-business-common业务服务公共类 + bd-business-common业务服务公共类 com.bd - hzs-common-domain + bd-common-domain diff --git a/hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/IBusinessCommonService.java b/bd-business/bd-business-common/src/main/java/com/hzs/common/service/IBusinessCommonService.java similarity index 100% rename from hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/IBusinessCommonService.java rename to bd-business/bd-business-common/src/main/java/com/hzs/common/service/IBusinessCommonService.java diff --git a/hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/ITransactionCommonService.java b/bd-business/bd-business-common/src/main/java/com/hzs/common/service/ITransactionCommonService.java similarity index 100% rename from hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/ITransactionCommonService.java rename to bd-business/bd-business-common/src/main/java/com/hzs/common/service/ITransactionCommonService.java diff --git a/hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/impl/BusinessCommonServiceImpl.java b/bd-business/bd-business-common/src/main/java/com/hzs/common/service/impl/BusinessCommonServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/impl/BusinessCommonServiceImpl.java rename to bd-business/bd-business-common/src/main/java/com/hzs/common/service/impl/BusinessCommonServiceImpl.java diff --git a/hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/impl/TransactionCommonServiceImpl.java b/bd-business/bd-business-common/src/main/java/com/hzs/common/service/impl/TransactionCommonServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-common/src/main/java/com/hzs/common/service/impl/TransactionCommonServiceImpl.java rename to bd-business/bd-business-common/src/main/java/com/hzs/common/service/impl/TransactionCommonServiceImpl.java diff --git a/hzs-business/hzs-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java b/bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java similarity index 100% rename from hzs-business/hzs-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java rename to bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java diff --git a/hzs-business/hzs-business-member/pom.xml b/bd-business/bd-business-member/pom.xml similarity index 79% rename from hzs-business/hzs-business-member/pom.xml rename to bd-business/bd-business-member/pom.xml index d2e88236..ab330a3e 100644 --- a/hzs-business/hzs-business-member/pom.xml +++ b/bd-business/bd-business-member/pom.xml @@ -6,55 +6,55 @@ com.bd - hzs-business + bd-business 1.0.0-SNAPSHOT - hzs-business-member + bd-business-member - hzs-business-member会员服务 + bd-business-member会员服务 com.bd - hzs-business-common + bd-business-common com.bd - hzs-api-member + bd-api-member com.bd - hzs-api-system + bd-api-system com.bd - hzs-api-sale + bd-api-sale com.bd - hzs-common-aop + bd-common-aop com.bd - hzs-api-third + bd-api-third diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/MemberApplication.java b/bd-business/bd-business-member/src/main/java/com/hzs/MemberApplication.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/MemberApplication.java rename to bd-business/bd-business-member/src/main/java/com/hzs/MemberApplication.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/filter/MemberConsumerFilter.java b/bd-business/bd-business-member/src/main/java/com/hzs/filter/MemberConsumerFilter.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/filter/MemberConsumerFilter.java rename to bd-business/bd-business-member/src/main/java/com/hzs/filter/MemberConsumerFilter.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/filter/MemberProviderFilter.java b/bd-business/bd-business-member/src/main/java/com/hzs/filter/MemberProviderFilter.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/filter/MemberProviderFilter.java rename to bd-business/bd-business-member/src/main/java/com/hzs/filter/MemberProviderFilter.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBusinessLicenseController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBusinessLicenseController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBusinessLicenseController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBusinessLicenseController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRechargeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRechargeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRechargeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRechargeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRelatedAccountsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRelatedAccountsController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRelatedAccountsController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRelatedAccountsController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountDetailController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountDetailController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountDetailController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountDetailController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountSummaryController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountSummaryController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountSummaryController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountSummaryController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberBusinessLicenseController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberBusinessLicenseController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberBusinessLicenseController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberBusinessLicenseController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberFrozenAmountController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberFrozenAmountController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberFrozenAmountController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberFrozenAmountController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTradeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTradeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTradeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTradeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTransferController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTransferController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTransferController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberTransferController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberAccountParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberAccountParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberAccountParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberAccountParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeDetailParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeDetailParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeDetailParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeDetailParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBatchRechargeParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenDetailParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenDetailParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenDetailParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenDetailParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberFrozenParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeAccountParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeAccountParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeAccountParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeAccountParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeDetailParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeDetailParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeDetailParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeDetailParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberRechargeParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberTransferParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberTransferParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberTransferParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberTransferParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberWithdrawParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberWithdrawParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/CuMemberWithdrawParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberWithdrawParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountLogMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountLogMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountLogMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAuthenticationMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAuthenticationMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAuthenticationMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAuthenticationMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBusinessLicenseMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBusinessLicenseMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBusinessLicenseMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBusinessLicenseMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRelatedAccountsMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRelatedAccountsMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRelatedAccountsMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRelatedAccountsMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeBonusMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeBonusMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeBonusMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeBonusMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/param/AccountSummaryStatisticsParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/param/AccountSummaryStatisticsParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/param/AccountSummaryStatisticsParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/param/AccountSummaryStatisticsParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IBusinessCommissionServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IBusinessCommissionServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IBusinessCommissionServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IBusinessCommissionServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/ICuMemberTradeServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuMemberTradeServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/ICuMemberTradeServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuMemberTradeServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IMemberAccountAuditServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberAccountAuditServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IMemberAccountAuditServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberAccountAuditServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IMemberTradeServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberTradeServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/IMemberTradeServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberTradeServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/MemberBankServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberBankServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/provider/MemberBankServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberBankServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountLogService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountLogService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountLogService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBusinessLicenseService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBusinessLicenseService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBusinessLicenseService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBusinessLicenseService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRelatedAccountsService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRelatedAccountsService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRelatedAccountsService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRelatedAccountsService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeBonusService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeBonusService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeBonusService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeBonusService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountLogServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountLogServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBusinessLicenseServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBusinessLicenseServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBusinessLicenseServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBusinessLicenseServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRelatedAccountsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRelatedAccountsServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRelatedAccountsServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRelatedAccountsServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeBonusServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeBonusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeBonusServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeBonusServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/AccountSummaryStatisticsVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/AccountSummaryStatisticsVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/AccountSummaryStatisticsVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/AccountSummaryStatisticsVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/ApprovalDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/ApprovalDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/ApprovalDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/ApprovalDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/BatchRechargeTemplateVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/BatchRechargeTemplateVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/BatchRechargeTemplateVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/BatchRechargeTemplateVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/BdAccountVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/BdAccountVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/BdAccountVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/BdAccountVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookExtVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookExtVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookExtVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookExtVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExportVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExportVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExportVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExportVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExtVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExtVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExtVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExtVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountShowVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountShowVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountShowVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountShowVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAuthenticationVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAuthenticationVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAuthenticationVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAuthenticationVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBalanceVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBalanceVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBalanceVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBalanceVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBusinessLicenseVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBusinessLicenseVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBusinessLicenseVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBusinessLicenseVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberFrozenAmountVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberFrozenAmountVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberFrozenAmountVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberFrozenAmountVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionListVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionListVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionListVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionListVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberPetitionVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTransferVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTransferVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTransferVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTransferVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletBalanceVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletBalanceVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletBalanceVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletBalanceVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWalletDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawalAddVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawalAddVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawalAddVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawalAddVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/RechargeTemplateVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/RechargeTemplateVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/RechargeTemplateVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/RechargeTemplateVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/TemplateVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/TemplateVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/vo/TemplateVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/TemplateVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuMemberAchieveDisController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuMemberAchieveDisController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuMemberAchieveDisController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuMemberAchieveDisController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/manage/CuActiveMemberCensusController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/manage/CuActiveMemberCensusController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/manage/CuActiveMemberCensusController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/manage/CuActiveMemberCensusController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AchievementVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AchievementVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AchievementVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AchievementVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AzAchievementPie.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AzAchievementPie.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AzAchievementPie.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/AzAchievementPie.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/CuActiveMemberCensusVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/CuActiveMemberCensusVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/CuActiveMemberCensusVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/CuActiveMemberCensusVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/MemberMonthAchieveVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/MemberMonthAchieveVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/MemberMonthAchieveVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/MemberMonthAchieveVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/PlaceNewAddAchieveVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/PlaceNewAddAchieveVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/PlaceNewAddAchieveVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/PlaceNewAddAchieveVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/RealPerformanceVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/RealPerformanceVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/controller/vo/RealPerformanceVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/RealPerformanceVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuActiveMemberCensusMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuActiveMemberCensusMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuActiveMemberCensusMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuActiveMemberCensusMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthAchieveMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthAchieveMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthAchieveMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthAchieveMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberSettlePeriodMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberParentCountParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberParentCountParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberParentCountParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberParentCountParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberPeriodParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberPeriodParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MemberPeriodParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberPeriodParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MonthAchieveParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MonthAchieveParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/param/MonthAchieveParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MonthAchieveParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuActiveMemberCensusService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuActiveMemberCensusService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuActiveMemberCensusService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuActiveMemberCensusService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuActiveMemberCensusServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuActiveMemberCensusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuActiveMemberCensusServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuActiveMemberCensusServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberBonusSettle.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberBonusSettle.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberBonusSettle.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberBonusSettle.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAchieveDisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAchieveDisVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAchieveDisVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAchieveDisVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsDisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsDisVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsDisVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsDisVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsUnderVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsUnderVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsUnderVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsUnderVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberDisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberDisVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberDisVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberDisVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthAchieveContrastVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthAchieveContrastVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthAchieveContrastVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthAchieveContrastVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberNewAddAchieveVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberNewAddAchieveVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberNewAddAchieveVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberNewAddAchieveVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/MemberSettlePeriodVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/MemberSettlePeriodVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/MemberSettlePeriodVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/MemberSettlePeriodVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/controller/api/ApiMemberGiftController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/controller/api/ApiMemberGiftController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/controller/api/ApiMemberGiftController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/controller/api/ApiMemberGiftController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftRecordController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftRecordController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftRecordController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/controller/manage/CuMemberGiftRecordController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftRecordMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftRecordMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftRecordMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberGiftRecordMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberReceivingMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberReceivingMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberReceivingMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/mapper/CuMemberReceivingMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/param/ApiMemberGiftParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/param/ApiMemberGiftParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/param/ApiMemberGiftParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/param/ApiMemberGiftParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/provider/CuMemberGiftServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/provider/CuMemberGiftServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/provider/CuMemberGiftServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/provider/CuMemberGiftServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftRecordService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftRecordService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftRecordService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftRecordService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/ICuMemberGiftService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/ICuMemberReceivingService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/ICuMemberReceivingService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/ICuMemberReceivingService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/ICuMemberReceivingService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftRecordServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftRecordServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftRecordServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftRecordServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberGiftServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberReceivingServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberReceivingServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberReceivingServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/service/impl/CuMemberReceivingServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/vo/ApiMemberGiftVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/vo/ApiMemberGiftVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/vo/ApiMemberGiftVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/vo/ApiMemberGiftVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/vo/CuMemberGiftVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/vo/CuMemberGiftVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/address/vo/CuMemberGiftVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/address/vo/CuMemberGiftVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java similarity index 99% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java index 6f73cf4d..9bb83096 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java @@ -3,7 +3,7 @@ package com.hzs.member.attest.controller.api; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.config.HzsConfig; +import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.msg.DocumentMsgConstants; import com.hzs.common.core.domain.FileResult; import com.hzs.common.core.enums.*; @@ -146,7 +146,7 @@ public class ApiMakerSpaceController extends BaseController { } else { // 2024.06.06 创客空间新需求，发起认证都是【体验中心发起人】 // 2024.06.07 新需求，只有购买19.8万或者打上标的会员才能看到创客发起人认证专区 - if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { + if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { // 测试环境 makerSpaceDetailVO.setStoreLevelVal(EStoreLevel.EXPERIENCE_CENTER_INITIATOR.getLabel()); } else { @@ -324,7 +324,7 @@ public class ApiMakerSpaceController extends BaseController { cuMakerSpace.setStoreCode(CommonUtil.createSerialNumber()); } if (EStoreType.MAKER_SPACE.getValue() == param.getStoreType()) { - if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { + if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { // 测试环境 cuMakerSpace.setStoreLevel(EStoreLevel.EXPERIENCE_CENTER_INITIATOR.getValue()); } else { diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuEnergySiloMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/AttestationQueryParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/AttestationQueryParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/AttestationQueryParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/AttestationQueryParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/EnergySiloParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/EnergySiloParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/EnergySiloParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/EnergySiloParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceRejectParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceRejectParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceRejectParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceRejectParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSaveParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSaveParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSaveParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSaveParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSubmitParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSubmitParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSubmitParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/MakerSpaceSubmitParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuEnergySiloService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuEnergySiloServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuDealerQueryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuDealerQueryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuDealerQueryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuDealerQueryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuMakerSpaceQueryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuMakerSpaceQueryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuMakerSpaceQueryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuMakerSpaceQueryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuSuperStudioQueryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuSuperStudioQueryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/CuSuperStudioQueryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuSuperStudioQueryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceRecommendVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceRecommendVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceRecommendVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceRecommendVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceSubmitCabinAccordVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceSubmitCabinAccordVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceSubmitCabinAccordVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceSubmitCabinAccordVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java similarity index 98% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java index 5baeb77d..c324f174 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java @@ -1,6 +1,6 @@ package com.hzs.member.base.controller.api; -import com.hzs.common.core.config.HzsConfig; +import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.enums.EAwards; import com.hzs.common.core.enums.EEnv; import com.hzs.common.core.enums.EYesNo; @@ -179,7 +179,7 @@ public class ApiHomePageController { List yearMonthList = new ArrayList<>(); if ("2024".equals(dateYear) || "2025".equals(dateYear)) { - if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { + if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { // 测试环境，按 2024-06 开始时间 yearMonthList.add("202406"); yearMonthList.add("202407"); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHonorWallController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHonorWallController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHonorWallController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHonorWallController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java similarity index 98% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index 7ba15ec4..4ec50071 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.hzs.common.core.annotation.RepeatSubmit; import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.config.HzsConfig; +import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.SysConstants; @@ -415,7 +415,7 @@ public class ApiMemberController extends BaseController { @RepeatSubmit @PostMapping("/reg-share-member") public AjaxResult confirmRegisterOrder(@RequestBody MemberParam memberParam) { - if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { + if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { if (new Date().getTime() >= SysConstants.CLOSE_ZERO_DATE_TEST) { return AjaxResult.error("二维码已停用，请联系相应亲友协助办理注册"); } @@ -477,10 +477,10 @@ public class ApiMemberController extends BaseController { .phone(newCuMember.getPhone()) .loginPassword(newCuMember.getLoginPassword()) .payPassword(newCuMember.getPayPassword()) - .urlAddress(HzsConfig.getPc()) - .gzh(HzsConfig.getGzh()) - .ios(HzsConfig.getIos()) - .android(HzsConfig.getAndroid()) + .urlAddress(BdConfig.getPc()) + .gzh(BdConfig.getGzh()) + .ios(BdConfig.getIos()) + .android(BdConfig.getAndroid()) .build(); return AjaxResult.success(memberShare); } else { @@ -581,10 +581,10 @@ public class ApiMemberController extends BaseController { .phone(cuMemberExt.getPhone()) .loginPassword(cuMemberExt.getLoginPassword()) .payPassword(cuMemberExt.getPayPassword()) - .urlAddress(HzsConfig.getPc()) - .gzh(HzsConfig.getGzh()) - .ios(HzsConfig.getIos()) - .android(HzsConfig.getAndroid()) + .urlAddress(BdConfig.getPc()) + .gzh(BdConfig.getGzh()) + .ios(BdConfig.getIos()) + .android(BdConfig.getAndroid()) .build()); } @@ -608,10 +608,10 @@ public class ApiMemberController extends BaseController { .phone(cuMemberExt.getPhone()) .loginPassword(cuMemberExt.getLoginPassword()) .payPassword(cuMemberExt.getPayPassword()) - .urlAddress(HzsConfig.getPc()) - .gzh(HzsConfig.getGzh()) - .ios(HzsConfig.getIos()) - .android(HzsConfig.getAndroid()) + .urlAddress(BdConfig.getPc()) + .gzh(BdConfig.getGzh()) + .ios(BdConfig.getIos()) + .android(BdConfig.getAndroid()) .build()); } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuAwardsControlController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuAwardsControlController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuAwardsControlController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuAwardsControlController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuHonorWallController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuHonorWallController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuHonorWallController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuHonorWallController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberRegisterController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberRegisterController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberRegisterController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberRegisterController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/MemberServiceCodeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/MemberServiceCodeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/MemberServiceCodeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/MemberServiceCodeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/MemeberStatisticsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/MemeberStatisticsController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/MemeberStatisticsController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/MemeberStatisticsController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpPolicyCurrencyController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpPolicyCurrencyController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpPolicyCurrencyController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpPolicyCurrencyController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateCodeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateCodeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateCodeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateCodeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateExpireStopController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateExpireStopController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateExpireStopController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateExpireStopController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateParentController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateParentController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateParentController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateParentController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdatePlaceParentController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdatePlaceParentController.java similarity index 83% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdatePlaceParentController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdatePlaceParentController.java index c655eb78..59d17df7 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdatePlaceParentController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdatePlaceParentController.java @@ -4,12 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.HttpStatus; -import com.hzs.common.core.constant.MemberConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; @@ -58,36 +56,32 @@ import java.util.stream.Collectors; /** * @Description: 修改安置关系控制器 - * @Author: yuhui - * @Time: 2023/1/4 15:40 - * @Classname: UpdatePlaceParentController - * @PackageName: com.hzs.member.base.controller.manager */ @RequestMapping("/manage/update-place-parent") @RestController public class UpdatePlaceParentController extends BaseController { @Autowired - private ICuMemberTradeService cuMemberTradeService; + private ICuMemberTradeService iCuMemberTradeService; @Autowired - private ICuMemberServiceLogService memberServiceLogService; + private ICuMemberServiceLogService iCuMemberServiceLogService; @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; @Autowired private ITransactionCommonService iTransactionCommonService; @DubboReference - IServiceChargeServiceApi serviceChargeServiceApi; + IServiceChargeServiceApi iServiceChargeServiceApi; @DubboReference - IAccountServiceApi accountServiceApi; + IAccountServiceApi iAccountServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi iAwardsServiceApi; @DubboReference - IVertexServiceApi vertexServiceApi; + IVertexServiceApi iVertexServiceApi; @DubboReference - ISaOrderServiceApi orderServiceApi; + ISaOrderServiceApi iSaOrderServiceApi; @DubboReference - IBusinessCommission businessCommission; + IBusinessCommission iBusinessCommission; /** * 安置关系记录列表 @@ -96,7 +90,7 @@ public class UpdatePlaceParentController extends BaseController { */ @AccessPermissions("ModifyPlacement") @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_RESETTLE, method = EOperationMethod.SELECT) - @GetMapping("list") + @GetMapping("/list") public TableDataInfo list(String memberCode, String memberName, Integer approveStatus) { CuMemberServiceLogExt memberServiceLogExt = new CuMemberServiceLogExt(); memberServiceLogExt.setEditType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); @@ -106,20 +100,20 @@ public class UpdatePlaceParentController extends BaseController { memberServiceLogExt.setApproveStatus(approveStatus); startPage(); - List list = memberServiceLogService.selectByList(memberServiceLogExt); + List list = iCuMemberServiceLogService.selectByList(memberServiceLogExt); List resultList = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values()); // 奖衔 - R> awardsData = awardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); + R> awardsData = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); Map awardsMap = awardsData.getData().stream().collect(Collectors.toMap(BdAwards::getPkId, Function.identity())); // 体系 - R> vertexDto = vertexServiceApi.findAll(); + R> vertexDto = iVertexServiceApi.findAll(); Map vertexMap = vertexDto.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity())); - List pkIdMemberList = cuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet())); + List pkIdMemberList = iCuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet())); Map pkMemberMap = pkIdMemberList.stream().collect(Collectors.toMap(CuMember::getPkId, val -> val)); for (CuMemberServiceLog cuMemberServiceLog : list) { @@ -149,7 +143,7 @@ public class UpdatePlaceParentController extends BaseController { if (StringUtils.isNotBlank(cuMemberServiceLog.getOldValue()) && JSONUtil.isJson(cuMemberServiceLog.getOldValue())) { JSONObject jsonObject = JSONObject.parseObject(cuMemberServiceLog.getOldValue()); String placeMemberCode = jsonObject.getString("placeMemberCode"); - CuMemberExt memberByCode = cuMemberService.getMemberByCode(placeMemberCode); + CuMemberExt memberByCode = iCuMemberService.getMemberByCode(placeMemberCode); if (memberByCode != null) { updatePlaceParentVo.setParMemberCode(memberByCode.getMemberCode()); if (member.getPlaceDept() != null) { @@ -163,7 +157,7 @@ public class UpdatePlaceParentController extends BaseController { String placeMemberCode = jsonObject.getString("placeMemberCode"); Integer placeDept = jsonObject.getInteger("placeDept"); updatePlaceParentVo.setEditNewPlaceMemberCode(placeMemberCode); - CuMember newMember = cuMemberService.getMember(placeMemberCode); + CuMember newMember = iCuMemberService.getMember(placeMemberCode); if (newMember != null) { updatePlaceParentVo.setEditNewPlaceMemberName(newMember.getMemberName()); if (placeDept != null) { @@ -191,7 +185,7 @@ public class UpdatePlaceParentController extends BaseController { * @param * @return */ - @PostMapping("export") + @PostMapping("/export") public void export(String memberCode, String memberName, Integer approveStatus, HttpServletResponse response) { CuMemberServiceLogExt memberServiceLogExt = new CuMemberServiceLogExt(); @@ -201,20 +195,20 @@ public class UpdatePlaceParentController extends BaseController { memberServiceLogExt.setMemberName(memberName); memberServiceLogExt.setApproveStatus(approveStatus); - List list = memberServiceLogService.selectByList(memberServiceLogExt); + List list = iCuMemberServiceLogService.selectByList(memberServiceLogExt); List resultList = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values()); // 奖衔 - R> awardsData = awardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); + R> awardsData = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); Map awardsMap = awardsData.getData().stream().collect(Collectors.toMap(BdAwards::getPkId, Function.identity())); // 体系 - R> vertexDto = vertexServiceApi.findAll(); + R> vertexDto = iVertexServiceApi.findAll(); Map vertexMap = vertexDto.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity())); - List pkIdMemberList = cuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet())); + List pkIdMemberList = iCuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet())); Map pkMemberMap = pkIdMemberList.stream().collect(Collectors.toMap(CuMember::getPkId, val -> val)); for (CuMemberServiceLog cuMemberServiceLog : list) { @@ -240,7 +234,7 @@ public class UpdatePlaceParentController extends BaseController { if (StringUtils.isNotBlank(cuMemberServiceLog.getOldValue()) && JSONUtil.isJson(cuMemberServiceLog.getOldValue())) { JSONObject jsonObject = JSONObject.parseObject(cuMemberServiceLog.getOldValue()); String placeMemberCode = jsonObject.getString("placeMemberCode"); - CuMemberExt memberByCode = cuMemberService.getMemberByCode(placeMemberCode); + CuMemberExt memberByCode = iCuMemberService.getMemberByCode(placeMemberCode); if (memberByCode != null) { updatePlaceParentVo.setParMemberCode(memberByCode.getMemberCode()); if (member.getPlaceDept() != null) { @@ -254,7 +248,7 @@ public class UpdatePlaceParentController extends BaseController { String placeMemberCode = jsonObject.getString("placeMemberCode"); Integer placeDept = jsonObject.getInteger("placeDept"); updatePlaceParentVo.setEditNewPlaceMemberCode(placeMemberCode); - CuMember newMember = cuMemberService.getMember(placeMemberCode); + CuMember newMember = iCuMemberService.getMember(placeMemberCode); if (newMember != null) { updatePlaceParentVo.setEditNewPlaceMemberName(newMember.getMemberName()); if (placeDept != null) { @@ -287,11 +281,11 @@ public class UpdatePlaceParentController extends BaseController { // 校验编号是否存在 for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) { - CuMember member = cuMemberService.getMemberByCode(updateParentParam.getMemberCode()); + CuMember member = iCuMemberService.getMemberByCode(updateParentParam.getMemberCode()); if (member == null) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } - CuMember parentMember = cuMemberService.getMemberByCode(updateParentParam.getEditNewPlaceMemberCode()); + CuMember parentMember = iCuMemberService.getMemberByCode(updateParentParam.getEditNewPlaceMemberCode()); if (parentMember == null) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } @@ -303,7 +297,7 @@ public class UpdatePlaceParentController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL)); } //校验新安置部门和安置编号下是否已存在节点 - Long placeDeptCount = cuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); + Long placeDeptCount = iCuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); if (placeDeptCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY)); } @@ -312,12 +306,12 @@ public class UpdatePlaceParentController extends BaseController { query.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue()); query.eq("EDIT_TYPE", EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); query.eq("PK_MEMBER", member.getPkId()); - int ct = memberServiceLogService.count(query); + int ct = iCuMemberServiceLogService.count(query); if (ct > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PARENT_UPDATE)); } //当前最大次数 - Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(member.getPkId(), + Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); updateParentParam.setChangeNumber(approveNumber + 1); //查询扣费金额，账户信息 @@ -325,7 +319,7 @@ public class UpdatePlaceParentController extends BaseController { serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setQuantity(approveNumber + 1); serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); updateParentParam.setCost(serviceChargeDTOR.getData().getCost()); updateParentParam.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); if (placeParentParam.getProcessType() == EProcessType.AVOIDSIGNING.getValue() || placeParentParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { @@ -343,14 +337,14 @@ public class UpdatePlaceParentController extends BaseController { businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); placeParentParam.setMemberAmountDTOList(memberAmountDTOList); //接口查询金额是否足够 - R> memberBalanceList = businessCommission.selectBalanceNotEnoughMember(businessCommissionDTO); + R> memberBalanceList = iBusinessCommission.selectBalanceNotEnoughMember(businessCommissionDTO); if (CollectionUtil.isNotEmpty(memberBalanceList.getData())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList.getData()); } } } - cuMemberService.updatePlaceParent(placeParentParam); + iCuMemberService.updatePlaceParent(placeParentParam); return AjaxResult.success(); } @@ -359,14 +353,14 @@ public class UpdatePlaceParentController extends BaseController { * * @return */ - @PostMapping("get-member-charging-detail") + @PostMapping("/get-member-charging-detail") public AjaxResult getMemberChargingDetail(@RequestBody MemberChargingDetailParam memberChargingDetailParam) { Integer pkCountry = SecurityUtils.getPkCountry(); List resultList = new ArrayList<>(); for (MemberChargingDetailVo memberChargingDetailVo : memberChargingDetailParam.getMemberChargingDetailList()) { - CuMember member = cuMemberService.getMember(memberChargingDetailVo.getPkMember()); + CuMember member = iCuMemberService.getMember(memberChargingDetailVo.getPkMember()); // 安置 - CuMember placeParentMember = cuMemberService.getMember(member.getPkPlaceParent()); + CuMember placeParentMember = iCuMemberService.getMember(member.getPkPlaceParent()); UpdatePlaceParentVo updatePlaceParentVo = new UpdatePlaceParentVo(); updatePlaceParentVo.setMemberCode(member.getMemberCode()); updatePlaceParentVo.setMemberName(member.getMemberName()); @@ -375,19 +369,19 @@ public class UpdatePlaceParentController extends BaseController { updatePlaceParentVo.setPlaceDept(placeParentMember.getPlaceDept()); updatePlaceParentVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(placeParentMember.getPlaceDept())); // 变更后 - CuMember newPlaceParentMember = cuMemberService.getMember(memberChargingDetailVo.getEditNewPlaceMemberCode()); + CuMember newPlaceParentMember = iCuMemberService.getMember(memberChargingDetailVo.getEditNewPlaceMemberCode()); updatePlaceParentVo.setEditNewPlaceMemberCode(newPlaceParentMember.getMemberCode()); updatePlaceParentVo.setEditNewPlaceMemberName(newPlaceParentMember.getMemberName()); updatePlaceParentVo.setEditNewPlaceDept(newPlaceParentMember.getPlaceDept()); updatePlaceParentVo.setEditNewPlaceDeptStr(EPlaceDept.getEPlaceDept(newPlaceParentMember.getPlaceDept())); // TODO 扣款 - Integer quantity = memberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); + Integer quantity = iCuMemberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setQuantity(quantity + 1); - R serviceCharge = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); - R account = accountServiceApi.getAccount(serviceCharge.getData().getPkAccount()); + R serviceCharge = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R account = iAccountServiceApi.getAccount(serviceCharge.getData().getPkAccount()); updatePlaceParentVo.setPkAccount(serviceCharge.getData().getPkAccount()); updatePlaceParentVo.setAccountName(account.getData().getAccountName()); @@ -408,24 +402,24 @@ public class UpdatePlaceParentController extends BaseController { List resultList = new ArrayList<>(); for (MemberPlaceParentServiceLogVo memberServiceLogVo : list) { if (StringUtils.isNotBlank(memberServiceLogVo.getMemberCode())) { - CuMember member = cuMemberService.getMember(memberServiceLogVo.getMemberCode()); + CuMember member = iCuMemberService.getMember(memberServiceLogVo.getMemberCode()); memberServiceLogVo.setMemberName(member.getMemberName()); // 变更前安置编号 - CuMember changeMember = cuMemberService.getMember(member.getPkPlaceParent()); + CuMember changeMember = iCuMemberService.getMember(member.getPkPlaceParent()); memberServiceLogVo.setPlaceMemberName(changeMember.getMemberName()); memberServiceLogVo.setPlaceMemberCode(changeMember.getMemberCode()); memberServiceLogVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(member.getPlaceDept())); - Integer quantity = memberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); + Integer quantity = iCuMemberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setQuantity(quantity + 1); - R serviceCharge = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); - R account = accountServiceApi.getAccount(serviceCharge.getData().getPkAccount()); + R serviceCharge = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R account = iAccountServiceApi.getAccount(serviceCharge.getData().getPkAccount()); memberServiceLogVo.setPkAccount(serviceCharge.getData().getPkAccount()); memberServiceLogVo.setPkAccountKeyVal(account.getData().getAccountName()); memberServiceLogVo.setCost(serviceCharge.getData().getCost()); - CuMember newMember = cuMemberService.getMember(memberServiceLogVo.getEditNewPlaceMemberCode()); + CuMember newMember = iCuMemberService.getMember(memberServiceLogVo.getEditNewPlaceMemberCode()); memberServiceLogVo.setEditNewPlaceMemberName(newMember.getMemberName()); resultList.add(memberServiceLogVo); } @@ -439,15 +433,15 @@ public class UpdatePlaceParentController extends BaseController { * @param placeParentParam * @return */ - @PostMapping("check-place-member") + @PostMapping("/check-place-member") public AjaxResult checkPlaceMember(@RequestBody PlaceParentParam placeParentParam) { for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) { - CuMember member = cuMemberService.getMemberByCode(updateParentParam.getMemberCode()); + CuMember member = iCuMemberService.getMemberByCode(updateParentParam.getMemberCode()); if (member == null) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } //查询修改后编号是否在安置人伞下 - Long count = cuMemberService.checkPlaceMemberList(member.getPkParent(), updateParentParam.getEditNewPlaceMemberCode()); + Long count = iCuMemberService.checkPlaceMemberList(member.getPkParent(), updateParentParam.getEditNewPlaceMemberCode()); // 查询推荐人安置伞下 if (count == 0) { // TODO 让前端弹窗展示返回信息 @@ -460,7 +454,7 @@ public class UpdatePlaceParentController extends BaseController { /** * 首单校验变为弹窗展示 */ - @PostMapping("check-member-first-order") + @PostMapping("/check-member-first-order") public AjaxResult checkMemberFirstOrder(@RequestBody PlaceParentParam placeParentParam) { // 校验编号是否存在 List editNewMemberCodeList = new ArrayList<>(); @@ -472,7 +466,7 @@ public class UpdatePlaceParentController extends BaseController { } if (editNewMemberCodeList.size() > 0) { // 如果是安置到右区 校验是否首单 - List memberFirstOrderDTOList = orderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList); + List memberFirstOrderDTOList = iSaOrderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList); for (MemberFirstOrderDTO memberFirstOrderDTO : memberFirstOrderDTOList) { if (memberFirstOrderDTO.getOrderCount() == 0) { // 没有首单 校验 @@ -489,17 +483,17 @@ public class UpdatePlaceParentController extends BaseController { * @param placeParentParam * @return */ - @PostMapping("check-member-place-parent") + @PostMapping("/check-member-place-parent") public AjaxResult checkMemberPlaceParent(@RequestBody PlaceParentParam placeParentParam) { // 校验编号是否存在 // List editNewMemberCodeList = new ArrayList<>(); for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) { - CuMember member = cuMemberService.getMemberByCode(updateParentParam.getMemberCode()); + CuMember member = iCuMemberService.getMemberByCode(updateParentParam.getMemberCode()); if (member == null) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } - CuMember parentMember = cuMemberService.getMember(updateParentParam.getEditNewPlaceMemberCode()); + CuMember parentMember = iCuMemberService.getMember(updateParentParam.getEditNewPlaceMemberCode()); if (parentMember == null) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } @@ -515,13 +509,13 @@ public class UpdatePlaceParentController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL)); } //校验新安置部门和安置编号下是否已存在节点 - Long placeDeptCount = cuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); + Long placeDeptCount = iCuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); if (placeDeptCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY)); } // 不能是自己的安置伞下 - Long checkCount = cuMemberService.checkPlaceMemberList(member.getPkId(), updateParentParam.getEditNewPlaceMemberCode()); + Long checkCount = iCuMemberService.checkPlaceMemberList(member.getPkId(), updateParentParam.getEditNewPlaceMemberCode()); if (checkCount >= 1) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CAN_ONLY_BE_PLACE_PARENT)); } @@ -534,7 +528,7 @@ public class UpdatePlaceParentController extends BaseController { query.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue()); query.eq("EDIT_TYPE", EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); query.eq("PK_MEMBER", member.getPkId()); - int ct = memberServiceLogService.count(query); + int ct = iCuMemberServiceLogService.count(query); if (ct > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PARENT_UPDATE)); } @@ -543,7 +537,7 @@ public class UpdatePlaceParentController extends BaseController { //安置右区 是否存在首个注册单校验 // if (editNewMemberCodeList.size() > 0){ // // 如果是安置到右区 校验是否首单 -// List memberFirstOrderDTOList = orderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList); +// List memberFirstOrderDTOList = iSaOrderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList); // for (MemberFirstOrderDTO memberFirstOrderDTO : memberFirstOrderDTOList) { // if (memberFirstOrderDTO.getOrderCount() == 0){ // // 没有首单 校验 @@ -568,24 +562,24 @@ public class UpdatePlaceParentController extends BaseController { String businessNo = CommonUtil.createSerialNumber(EOrderPrefix.UPDATE_PLACE_PARENT.getValue()); String memberCode = memberService.getMemberCode(); - CuMember member = cuMemberService.getMember(memberCode); + CuMember member = iCuMemberService.getMember(memberCode); CuMemberServiceLog cuMemberServiceLog = new CuMemberServiceLog(); cuMemberServiceLog.setPkMember(member.getPkId()); cuMemberServiceLog.setEditType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); JSONObject oldJson = new JSONObject(); oldJson.put("changeMemberCode", memberService.getEditOldPlaceMemberCode()); - if (MemberConstants.LEFT_DEPT.equals(memberService.getEditOldPlaceDeptStr())) { + if (EPlaceDept.LEFT_DEPT.getLabel().equals(memberService.getEditOldPlaceDeptStr())) { oldJson.put("placeDept", EPlaceDept.LEFT_DEPT.getValue()); - } else if (MemberConstants.RIGHT_DEPT.equals(memberService.getEditOldPlaceDeptStr())) { + } else if (EPlaceDept.RIGHT_DEPT.getLabel().equals(memberService.getEditOldPlaceDeptStr())) { oldJson.put("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); } cuMemberServiceLog.setOldValue(oldJson.toJSONString()); JSONObject newJson = new JSONObject(); newJson.put("newChangeMemberCode", memberService.getEditNewPlaceMemberCode()); - if (MemberConstants.LEFT_DEPT.equals(memberService.getEditNewPlaceDeptStr())) { + if (EPlaceDept.LEFT_DEPT.getLabel().equals(memberService.getEditNewPlaceDeptStr())) { newJson.put("newPlaceDept", EPlaceDept.LEFT_DEPT.getValue()); - } else if (MemberConstants.RIGHT_DEPT.equals(memberService.getEditNewPlaceDeptStr())) { + } else if (EPlaceDept.RIGHT_DEPT.getLabel().equals(memberService.getEditNewPlaceDeptStr())) { newJson.put("newPlaceDept", EPlaceDept.RIGHT_DEPT.getValue()); } // newJson.put("newPlaceDept",memberService.getNewPlaceDept()); @@ -598,7 +592,7 @@ public class UpdatePlaceParentController extends BaseController { resultList.add(cuMemberServiceLog); } - memberServiceLogService.saveBatch(resultList); + iCuMemberServiceLogService.saveBatch(resultList); return AjaxResult.success(); } @@ -608,7 +602,7 @@ public class UpdatePlaceParentController extends BaseController { * * @param response */ - @PostMapping("get-service-export") + @PostMapping("/get-service-export") public void getOrderListExport(HttpServletResponse response) { ExcelUtil util = new ExcelUtil<>(UpdatePlaceImport.class); util.exportExcel(response, new ArrayList<>(), "修改安置导出"); @@ -616,10 +610,6 @@ public class UpdatePlaceParentController extends BaseController { /** * @description: 发起签呈 免付，需要签呈需要付费 - * @author: yh - * @date: 2023/3/4 11:06 - * @param: [updateCodeVO] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_RESETTLE, method = EOperationMethod.SUBMIT) @PostMapping("/petition") @@ -647,11 +637,11 @@ public class UpdatePlaceParentController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL)); } // 修改会员 - CuMember member = cuMemberService.getMemberByCode(uc.getMemberCode()); + CuMember member = iCuMemberService.getMemberByCode(uc.getMemberCode()); if (member == null) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } - CuMember parentMember = cuMemberService.getMemberByCode(uc.getEditNewPlaceMemberCode()); + CuMember parentMember = iCuMemberService.getMemberByCode(uc.getEditNewPlaceMemberCode()); if (parentMember == null) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } @@ -662,14 +652,14 @@ public class UpdatePlaceParentController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL)); } //校验新安置部门和安置编号下是否已存在节点 - Long placeDeptCount = cuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); + Long placeDeptCount = iCuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); if (placeDeptCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY)); } // 添加 修改安置编号不能是安置伞下校验 -// List cuMemberExts = cuMemberService.queryPlaceSponsorUnderUmbrella(member.getPkId()); +// List cuMemberExts = iCuMemberService.queryPlaceSponsorUnderUmbrella(member.getPkId()); // Map memberMap = cuMemberExts.stream().collect(Collectors.toMap(CuMemberExt::getMemberCode, Function.identity())); // CuMemberExt cuMemberExt = memberMap.get(uc.getEditNewPlaceMemberCode()); // if (cuMemberExt != null){ @@ -681,7 +671,7 @@ public class UpdatePlaceParentController extends BaseController { } // 会员安置编号信息 - CuMember placeParentMember = cuMemberService.getMemberById(member.getPkPlaceParent()); + CuMember placeParentMember = iCuMemberService.getMemberById(member.getPkPlaceParent()); uc.setPkMember(member.getPkId()); JSONObject oldJson = new JSONObject(); oldJson.put("placeDept", member.getPlaceDept()); @@ -689,9 +679,9 @@ public class UpdatePlaceParentController extends BaseController { oldJson.put("placeMemberCode", placeParentMember.getMemberCode()); } uc.setOldValue(oldJson.toJSONString()); - if (MemberConstants.LEFT_DEPT.equals(uc.getEditNewPlaceDeptStr())) { + if (EPlaceDept.LEFT_DEPT.getLabel().equals(uc.getEditNewPlaceDeptStr())) { uc.setEditNewPlaceDept(EPlaceDept.LEFT_DEPT.getValue()); - } else if (MemberConstants.RIGHT_DEPT.equals(uc.getEditNewPlaceDeptStr())) { + } else if (EPlaceDept.RIGHT_DEPT.getLabel().equals(uc.getEditNewPlaceDeptStr())) { uc.setEditNewPlaceDept(EPlaceDept.RIGHT_DEPT.getValue()); } JSONObject newJson = new JSONObject(); @@ -704,12 +694,12 @@ public class UpdatePlaceParentController extends BaseController { } uc.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue()); - Integer count = cuMemberService.checkmsLogCount(uc.getPkMember(), EApproveStatus.ALREADY_SUBMIT.getValue()); + Integer count = iCuMemberService.checkmsLogCount(uc.getPkMember(), EApproveStatus.ALREADY_SUBMIT.getValue()); if (count > 0) { return AjaxResult.error(uc.getMemberCode(), TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)); } //当前最大次数 - Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(uc.getPkMember(), + Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(uc.getPkMember(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), null); uc.setChangeNumber(approveNumber + 1); if (updatePlaceParentPetitionParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { @@ -718,7 +708,7 @@ public class UpdatePlaceParentController extends BaseController { serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setQuantity(approveNumber + 1); serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); //接口查询金额是否足够 businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setPkCountry(pkCountry); @@ -736,13 +726,13 @@ public class UpdatePlaceParentController extends BaseController { if (CollectionUtil.isNotEmpty(memberAmountDTOList)) { //接口查询金额是否足够 if (updatePlaceParentPetitionParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { - List memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); + List memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); if (CollectionUtil.isNotEmpty(memberBalanceList)) { return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList); } } } - cuMemberService.petitionUpdatePlaceParent(updatePlaceParentPetitionParam); + iCuMemberService.petitionUpdatePlaceParent(updatePlaceParentPetitionParam); return AjaxResult.success(); } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateSettleCountryController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateSettleCountryController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateSettleCountryController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdateSettleCountryController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/dto/MemberBusinessTemplate.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberBusinessTemplate.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/dto/MemberBusinessTemplate.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberBusinessTemplate.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/dto/MemberCountDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberCountDTO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/dto/MemberCountDTO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberCountDTO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/BdWaresMappingMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/BdWaresMappingMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/BdWaresMappingMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/BdWaresMappingMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuAwardsControlMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuAwardsControlMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuAwardsControlMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuAwardsControlMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuHonorWallMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuHonorWallMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuHonorWallMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuHonorWallMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAgentMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAgentMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAgentMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAgentMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberExpireHistoryMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberExpireHistoryMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberExpireHistoryMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberExpireHistoryMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHistroyAwardsMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHistroyAwardsMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHistroyAwardsMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHistroyAwardsMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHonorWallMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHonorWallMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHonorWallMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberHonorWallMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java similarity index 87% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 0e334fbb..12828085 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -3,7 +3,6 @@ package com.hzs.member.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.member.achieve.vo.DeptMemberNumberVo; import com.hzs.member.base.dto.MemberCountDTO; import com.hzs.member.base.dto.MemberYearAwardsDTO; import com.hzs.member.base.param.*; @@ -58,9 +57,6 @@ public interface CuMemberMapper extends BaseMapper { * 前台查询会员的方法，通过传输不同的参数，查询不同的会员 * * @param cuMember 会员编号 - * @return: CuMemberExt - * @Author: sui q - * @Date: 2022/8/29 11:50 */ List queryMemberInfoByCondition(CuMember cuMember); @@ -77,9 +73,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 会员编号 * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectPlaceSponsorOnUmbrella(@Param("memberId") Long memberId, @Param("memberCode") String memberCode, @@ -90,9 +83,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 编号、安置人 * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List querySponsorOnUmbrella(@Param("memberId") Long memberId, @Param("memberCodeList") List memberCodeList); @@ -101,9 +91,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 会员编号 * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectPlaceSponsorUnderUmbrella(@Param("memberId") Long memberId); @@ -112,9 +99,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 会员编号 * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectPlaceSponsorUnderUmbrellaByCode(@Param("memberId") Long memberId, @Param("placeParentCode") String placeParentCode); @@ -123,9 +107,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 会员编号 * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectPlaceSponsorUnderUmbrellaByCondition(@Param("memberId") Long memberId, @Param("cuMemberExtList") List cuMemberExtList); @@ -134,9 +115,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 会员编号 * @param placeDept 安置部门 - * @return: CuMemberExt - * @Author: sui q - * @Date: 2022/9/1 20:36 */ CuMemberExt selectPlaceSponsorLastLeft(@Param("memberId") Long memberId, @Param("placeDept") Integer placeDept); @@ -145,9 +123,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 推荐人编号 * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectBloodKinshipOnUmbrella(Long memberId); @@ -156,9 +131,6 @@ public interface CuMemberMapper extends BaseMapper { * * @param memberId 推荐人编号 * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectBloodKinshipUnderUmbrella(Long memberId); @@ -175,9 +147,6 @@ public interface CuMemberMapper extends BaseMapper { * 查询会员信息，根据条件 * * @param memberParam 参数 - * @return: List - * @Author: sui q - * @Date: 2022/10/13 16:34 */ List queryCuMemberByCondition(CuMemberVO memberParam); @@ -195,10 +164,6 @@ public interface CuMemberMapper extends BaseMapper { /** * @description: 会员真实信息 - * @author: zhang jing - * @date: 2022/11/16 15:13 - * @param: [memberParam] - * @return: java.util.List **/ List realCuMemberByCondition(CuMemberVO memberParam); @@ -235,41 +200,23 @@ public interface CuMemberMapper extends BaseMapper { /** * @description: 特殊业务-修改会员编号列表 - * @author: zhang jing - * @date: 2022/12/29 11:48 - * @param: [updateCodeVO] - * @return: java.util.List **/ List puCodeList(UpdateCodeVO updateCodeVO); /** * @description: 查询会员有效期休止期 - * @author: zhang jing - * @date: 2024/6/4 14:25 - * @param: [updateExpireStopVO] - * @return: java.util.List **/ List getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO); List zeroList(ZeroElementRevokeVO zeroElementRevokeVO); - /** * @description: 查询全部修改过会员编号的记录 - * @author: zhang jing - * @date: 2023/9/27 10:51 - * @param: [updateCodeVO] - * @return: java.util.List **/ List puCodeAllList(UpdateCodeVO updateCodeVO); - /** * @description: 查询会员变更前信息 - * @author: zhang jing - * @date: 2023/7/17 12:18 - * @param: [updateCodeVO] - * @return: com.hzs.member.base.vo.UpdateCodeVO **/ UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO); @@ -315,9 +262,6 @@ public interface CuMemberMapper extends BaseMapper { * 保存会员信息 * * @param cuMember 会员信息 - * @return: void - * @Author: sui q - * @Date: 2023/2/2 15:19 */ Integer insertCuMember(CuMember cuMember); @@ -339,75 +283,43 @@ public interface CuMemberMapper extends BaseMapper { /** * @description:特殊业务-修改结算国 - * @author: zhang jing - * @date: 2023/2/21 9:25 - * @param: [upseCountryVO] - * @return: java.util.List **/ List upseCountryList(UpdateSettleCountryVO upseCountryVO); /** * @description: 特殊配置 修改结算国列表 - * @author: zhang jing - * @date: 2023/4/28 17:23 - * @param: [upseCountryVO] - * @return: java.util.List **/ List upsettleCountryList(UpdateSettleCountryVO upseCountryVO); /** * @description: 查询修改政策币列表 - * @author: zhang jing - * @date: 2023/5/9 14:25 - * @param: [upVO] - * @return: java.util.List **/ List upPolicyCurrencyList(UpPolicyCurrencyVO upVO); /** * @description: 校验会员是否有充值审核 - * @author: zhang jing - * @date: 2023/2/23 10:52 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkCecharge(@Param("pkMember") Long pkMember); /** * @description: 校验会员是否有提现审核 - * @author: zhang jing - * @date: 2023/2/23 10:52 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkWithdraw(@Param("pkMember") Long pkMember); /** * @description: 校验会员所有账户是否有余额 - * @author: zhang jing - * @date: 2023/2/23 10:53 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkAccount(@Param("pkMember") Long pkMember); /** * @description: 查询会员是否存在未完成基础业务办理 - * @author: zhang jing - * @date: 2023/2/23 16:00 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkmsLogCount(@Param("pkMember") Long pkMember, @Param("editType") Integer editType); /** * @description: 查询会员是否存在未完成注水业绩业务 - * @author: zhang jing - * @date: 2023/2/23 16:34 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkMemberAchieveCount(@Param("pkMember") Long pkMember); @@ -422,9 +334,6 @@ public interface CuMemberMapper extends BaseMapper { /* * description: 查询历史网体的最末安置人，左右区一起查出来 - * @author: sui q - * @date: 2023/4/6 17:35 - * @param: **/ List queryCuMemberLastPlaceParent(@Param("pkMember") Long pkMember); @@ -435,7 +344,6 @@ public interface CuMemberMapper extends BaseMapper { */ List selectByMemberRealInfo(MemberRealInfoParam memberRealInfoParam); - /** * 查询所有有推荐订单的用户 * @@ -470,19 +378,11 @@ public interface CuMemberMapper extends BaseMapper { /** * @description: 查询最新会员 - * @author: zhang jing - * @date: 2023/5/24 16:37 - * @param: [] - * @return: com.hzs.common.domain.member.base.CuMember **/ CuMember queryRecentlyMember(@Param("pkCountry") Integer pkCountry); /** * @description: 查询最新国际编号 - * @author: zhang jing - * @date: 2023/5/30 19:30 - * @param: [] - * @return: com.hzs.common.domain.member.base.CuMember **/ CuMember queryInternationalMember(); @@ -626,9 +526,6 @@ public interface CuMemberMapper extends BaseMapper { /* * @description: 查询会员左右区人数 - * @author: sui q - * @date: 2023/8/15 14:34 - * @param: null null **/ List queryMemberLeftRightCount(@Param("pkMember") Long pkMember); @@ -665,15 +562,6 @@ public interface CuMemberMapper extends BaseMapper { */ List queryDateBySummary(CensusSummaryParam censusSummaryParam); - /** - * 查询会员左右区人数 - * - * @param pkMember - * @return - */ - List selectByDeptNumberPlace(@Param("pkMember") Long pkMember); - - /** * 查询安置位置错误 * @@ -683,18 +571,11 @@ public interface CuMemberMapper extends BaseMapper { /* * @description: 查询伞下会员 - * @author: sui q - * @date: 2023/10/16 17:29 - * @param: null null **/ List queryCuMemberUnderUmbrella(@Param("pkMember") Long pkMember); /** * @description: 校验会员是否存在三方订单 - * @author: zhang jing - * @date: 2023/10/27 16:45 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkThreeOrder(@Param("pkMember") Long pkMember); @@ -724,7 +605,6 @@ public interface CuMemberMapper extends BaseMapper { */ Long checkMemberParent(@Param("pkMember") Long pkMember, @Param("memberCode") String memberCode); - /** * 更新会员的修改次数 * @@ -742,7 +622,6 @@ public interface CuMemberMapper extends BaseMapper { */ List checkMemberPlaceParent(@Param("pkMember") Long pkMember, @Param("editNewPlaceMemberCode") String editNewPlaceMemberCode); - /** * @param pkMember 推荐人 * @param editNewPlaceMemberCode 安置后会员编号 @@ -772,7 +651,6 @@ public interface CuMemberMapper extends BaseMapper { */ Integer updateMemberExpireDate(); - /** * 用户消费统计 * @@ -782,10 +660,6 @@ public interface CuMemberMapper extends BaseMapper { /** * @description: 查询表是否存在 - * @author: zhang jing - * @date: 2024/4/7 16:10 - * @param: [tableName] - * @return: java.lang.Integer **/ Integer selectExistTable(String tableName); @@ -884,7 +758,6 @@ public interface CuMemberMapper extends BaseMapper { @Param("stopMonth") Integer stopMonth, @Param("pkCountry") Integer pkCountry); - /** * 更新有效状态 * diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberSpecialMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberSpecialMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberSpecialMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberSpecialMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberUpgradeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberUpgradeMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberUpgradeMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberUpgradeMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuSettleCountryDetailedMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuSettleCountryDetailedMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuSettleCountryDetailedMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuSettleCountryDetailedMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/FansRegisterParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/FansRegisterParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/FansRegisterParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/FansRegisterParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/HonorWallParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/HonorWallParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/HonorWallParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/HonorWallParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberAddressParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberAddressParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberAddressParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberAddressParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberAwardsQueryParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberAwardsQueryParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberAwardsQueryParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberAwardsQueryParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberChargingDetailParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberChargingDetailParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberChargingDetailParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberChargingDetailParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberConsumptionStatParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberConsumptionStatParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberConsumptionStatParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberConsumptionStatParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberDataParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberDataParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberDataParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberDataParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberSelectParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberSelectParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberSelectParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberSelectParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberServiceCodeParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberServiceCodeParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberServiceCodeParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberServiceCodeParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberServiceLogParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberServiceLogParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberServiceLogParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberServiceLogParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/OrderBackDetailParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/OrderBackDetailParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/OrderBackDetailParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/OrderBackDetailParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/OrderBackParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/OrderBackParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/OrderBackParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/OrderBackParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/OrderStatusParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/OrderStatusParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/OrderStatusParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/OrderStatusParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ParentParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ParentParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ParentParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ParentParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/PlaceParentParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/PlaceParentParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/PlaceParentParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/PlaceParentParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdMemberParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdMemberParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdMemberParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdMemberParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdNoticeParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdNoticeParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdNoticeParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdNoticeParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderItemsParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderItemsParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderItemsParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderItemsParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusItemsParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusItemsParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusItemsParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusItemsParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdOrderStatusParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/ThirdParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ThirdParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdateParentParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdateParentParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdateParentParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdateParentParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdateParentPetitionParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdateParentPetitionParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdateParentPetitionParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdateParentPetitionParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentPetitionParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentPetitionParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentPetitionParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/UpdatePlaceParentPetitionParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/WaresAuthorityParentParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/WaresAuthorityParentParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/param/WaresAuthorityParentParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/WaresAuthorityParentParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/CuAwardsControlServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/CuAwardsControlServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/CuAwardsControlServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/CuAwardsControlServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/ICuMemberAchieveLogServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/ICuMemberAchieveLogServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/ICuMemberAchieveLogServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/ICuMemberAchieveLogServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberLoginServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberLoginServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberLoginServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberLoginServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java similarity index 71% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java index 0e46eada..a4f939bb 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java @@ -38,29 +38,27 @@ import java.util.Map; /** * 会员涉及dubbo服务 - * - * @author jiangchao */ @Slf4j @DubboService public class MemberServiceProvider implements IMemberServiceApi { @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; @Autowired - private ICuMemberShareService cuMemberShareService; + private ICuMemberShareService iCuMemberShareService; @Autowired - private ICuMemberBusinessService cuMemberBusinessService; + private ICuMemberBusinessService iCuMemberBusinessService; @Autowired - private ICuMemberRegisterService cuMemberRegisterService; + private ICuMemberRegisterService iCuMemberRegisterService; @Autowired private ICuMemberEmptyCodeService iCuMemberEmptyCodeService; @Autowired - private ICuMemberSwingNetService cuMemberSwingNetService; + private ICuMemberSwingNetService iCuMemberSwingNetService; @Override public R getMemberInfo(String memberCode) { - CuMemberExt cuMember = cuMemberService.getMemberByCode(memberCode); + CuMemberExt cuMember = iCuMemberService.getMemberByCode(memberCode); if (null == cuMember) { return R.fail("用户名或密码错误"); } @@ -75,7 +73,7 @@ public class MemberServiceProvider implements IMemberServiceApi { public R getShareMemberInfo(String memberCode) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberShare::getMemberCode, memberCode); - CuMemberShare cuMemberShare = cuMemberShareService.getOne(queryWrapper); + CuMemberShare cuMemberShare = iCuMemberShareService.getOne(queryWrapper); if (null == cuMemberShare) { return R.fail("用户名或密码错误"); } @@ -87,12 +85,12 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R getMemberById(Long memberId) { - return R.ok(cuMemberService.getMemberById(memberId)); + return R.ok(iCuMemberService.getMemberById(memberId)); } @Override public R getMemberByCode(String memberCode) { - return R.ok(cuMemberService.getMemberByCode(memberCode)); + return R.ok(iCuMemberService.getMemberByCode(memberCode)); } /** @@ -100,12 +98,10 @@ public class MemberServiceProvider implements IMemberServiceApi { * * @param cuMember 会员各种值 * @return: R - * @Author: sui q - * @Date: 2022/8/29 11:46 */ @Override public R> getMemberInfo(CuMember cuMember) { - return R.ok(cuMemberService.getMemberInfoByCondition(cuMember)); + return R.ok(iCuMemberService.getMemberInfoByCondition(cuMember)); } /** @@ -124,7 +120,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R singleRevokeMemberByRegisterOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) { try { - if (cuMemberBusinessService.singleRevokeMemberByRegisterOrder(pkApprove, saOrder, businessCommissionDTO)) { + if (iCuMemberBusinessService.singleRevokeMemberByRegisterOrder(pkApprove, saOrder, businessCommissionDTO)) { return R.ok(); } return R.fail("会员信息处理失败"); @@ -136,15 +132,11 @@ public class MemberServiceProvider implements IMemberServiceApi { /** * @description: 自助撤单-注册单撤单 - * @author: zhang jing - * @date: 2023/11/23 16:17 - * @param: [pkApprove, saOrder, businessCommissionDTO] - * @return: com.hzs.common.core.domain.R **/ @Override public R singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) { try { - return R.ok(cuMemberBusinessService.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrder, businessCommissionDTO)); + return R.ok(iCuMemberBusinessService.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrder, businessCommissionDTO)); } catch (Exception e) { log.error("singleRevokeMemberBySelfRevokeOrder error msg: {}", e.getMessage(), e); return R.ok(false); @@ -155,7 +147,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R mergeRevokeMemberByRegisterOrder(Long pkApprove, List memberList, Map saOrderMap, BusinessCommissionDTO businessCommissionDTO) { try { - if (cuMemberBusinessService.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, saOrderMap, businessCommissionDTO)) { + if (iCuMemberBusinessService.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, saOrderMap, businessCommissionDTO)) { return R.ok(); } return R.fail("会员信息处理失败"); @@ -168,7 +160,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, List pkOrderItemList, BusinessCommissionDTO businessCommissionDTO) { try { - return R.ok(cuMemberBusinessService.normalRevokeOrder(pkApprove, saOrder, cuMember, pkOrderItemList, businessCommissionDTO)); + return R.ok(iCuMemberBusinessService.normalRevokeOrder(pkApprove, saOrder, cuMember, pkOrderItemList, businessCommissionDTO)); } catch (Exception e) { log.error("normalRevokeOrder error msg: {}", e.getMessage(), e); return R.ok(false); @@ -177,17 +169,17 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R> querySponsorOnUmbrella(Long memberId, String memberCode, String phone) { - return R.ok(cuMemberService.queryPlaceSponsorOnUmbrella(memberId, memberCode, phone)); + return R.ok(iCuMemberService.queryPlaceSponsorOnUmbrella(memberId, memberCode, phone)); } @Override public R> querySponsorOnUmbrella(Long memberId, List memberCodeList) { - return R.ok(cuMemberService.querySponsorOnUmbrella(memberId, memberCodeList)); + return R.ok(iCuMemberService.querySponsorOnUmbrella(memberId, memberCodeList)); } @Override public R> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList) { - return R.ok(cuMemberService.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList)); + return R.ok(iCuMemberService.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList)); } /** @@ -195,12 +187,10 @@ public class MemberServiceProvider implements IMemberServiceApi { * * @param memberId 安置人，编号 * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ @Override public R> queryPlaceSponsorUnderUmbrella(Long memberId, String... placeParent) { - return R.ok(cuMemberService.queryPlaceSponsorUnderUmbrella(memberId, placeParent)); + return R.ok(iCuMemberService.queryPlaceSponsorUnderUmbrella(memberId, placeParent)); } /** @@ -209,32 +199,30 @@ public class MemberServiceProvider implements IMemberServiceApi { * @param memberId 会员编号 * @param placeDept 1代表左区极左极下，2代表右区极左极下 * @return: CuMemberExt - * @Author: sui q - * @Date: 2022/9/1 20:36 */ @Override public R queryPlaceSponsorLastLeft(Long memberId, Integer placeDept) { - return R.ok(cuMemberService.queryPlaceSponsorLastLeft(memberId, placeDept)); + return R.ok(iCuMemberService.queryPlaceSponsorLastLeft(memberId, placeDept)); } @Override public R getMember(String memberCode) { - return R.ok(cuMemberService.getMember(memberCode)); + return R.ok(iCuMemberService.getMember(memberCode)); } @Override public R getMember(Long pkMember) { - return R.ok(cuMemberService.getMember(pkMember)); + return R.ok(iCuMemberService.getMember(pkMember)); } @Override public R queryMember(String memberCode) { - return R.ok(cuMemberService.queryMember(memberCode)); + return R.ok(iCuMemberService.queryMember(memberCode)); } @Override public R queryMember(Long pkMember) { - return R.ok(cuMemberService.queryMember(pkMember)); + return R.ok(iCuMemberService.queryMember(pkMember)); } /** @@ -242,13 +230,11 @@ public class MemberServiceProvider implements IMemberServiceApi { * * @param cuMember 会员 * @return: R - * @Author: sui q - * @Date: 2022/9/26 11:49 */ @Override public R saveMember(CuMember cuMember) { try { - return R.ok(cuMemberService.saveMember(cuMember)); + return R.ok(iCuMemberService.saveMember(cuMember)); } catch (Exception e) { log.error("调用会员处理一失败", e); return R.fail(e.getMessage()); @@ -257,13 +243,13 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R queryCuMemberByPkMember(Long pkReference) { - return R.ok(cuMemberService.queryCuMemberByPkMember(pkReference)); + return R.ok(iCuMemberService.queryCuMemberByPkMember(pkReference)); } @Override public R saveMember(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt) { try { - return R.ok(cuMemberBusinessService.saveMember(null, saOrder, cuMemberAccountExt)); + return R.ok(iCuMemberBusinessService.saveMember(null, saOrder, cuMemberAccountExt)); } catch (Exception e) { log.error("调用会员处理二失败", e); return R.ok(false); @@ -273,7 +259,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R saveMember(CuMember cuMember, SaOrder saOrder) { try { - return R.ok(cuMemberBusinessService.saveMember(cuMember, saOrder)); + return R.ok(iCuMemberBusinessService.saveMember(cuMember, saOrder)); } catch (Exception e) { log.error("saveMember 1 error!", e); return R.fail(e.getMessage()); @@ -287,13 +273,11 @@ public class MemberServiceProvider implements IMemberServiceApi { * @param saOrder 订单信息 * @param cuMemberAccountExt 会员账户信息 * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 11:35 */ @Override public R saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt) { try { - return R.ok(cuMemberBusinessService.saveMember(cuMember, saOrder, cuMemberAccountExt)); + return R.ok(iCuMemberBusinessService.saveMember(cuMember, saOrder, cuMemberAccountExt)); } catch (Exception e) { log.error("saveMember 3 error!!!", e); return R.fail(e.getMessage()); @@ -311,7 +295,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt) { try { - return R.ok(cuMemberBusinessService.saveMember(cuMember, saOrder, isPay, cuMemberAccountExt)); + return R.ok(iCuMemberBusinessService.saveMember(cuMember, saOrder, isPay, cuMemberAccountExt)); } catch (Exception e) { log.error("saveMember 4 error", e); return R.fail(e.getMessage()); @@ -320,12 +304,12 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun) { - return R.ok(cuMemberService.createMemberIdAndCode(cuMember, isHaiFun)); + return R.ok(iCuMemberService.createMemberIdAndCode(cuMember, isHaiFun)); } @Override public R createRegisterMemberCode(CuMember cuMember) { - return R.ok(cuMemberService.createRegisterMemberCode(cuMember)); + return R.ok(iCuMemberService.createRegisterMemberCode(cuMember)); } /** @@ -336,38 +320,38 @@ public class MemberServiceProvider implements IMemberServiceApi { */ @Override public R createEmptyOrderMember(CuMemberExt member) { - return R.ok(cuMemberService.createEmptyOrderMember(member)); + return R.ok(iCuMemberService.createEmptyOrderMember(member)); } @Override public R checkLowerMember(Long pkMember) { - return R.ok(cuMemberService.checkLowerMember(pkMember)); + return R.ok(iCuMemberService.checkLowerMember(pkMember)); } @Override public R cancelMember(Long pkMember) { - return R.ok(cuMemberService.cancelMember(pkMember)); + return R.ok(iCuMemberService.cancelMember(pkMember)); } @Override public R> findMemberByMemberId(List pkMemberList, Integer pkCountry) { - return R.ok(cuMemberService.findMemberByMemberId(pkMemberList, pkCountry)); + return R.ok(iCuMemberService.findMemberByMemberId(pkMemberList, pkCountry)); } @Override public R queryCuMemberShare(Long pkMember) { - return R.ok(cuMemberShareService.queryCuMemberShare(pkMember)); + return R.ok(iCuMemberShareService.queryCuMemberShare(pkMember)); } @Override public R queryCuMemberRegister(Long pkMember) { - return R.ok(cuMemberRegisterService.queryCuMemberRegister(pkMember)); + return R.ok(iCuMemberRegisterService.queryCuMemberRegister(pkMember)); } @Override public R updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney) { try { - return R.ok(cuMemberBusinessService.updateCuMemberAccountByDraw(pkMember, pkCountry, accountValue, rewardMoney)); + return R.ok(iCuMemberBusinessService.updateCuMemberAccountByDraw(pkMember, pkCountry, accountValue, rewardMoney)); } catch (Exception e) { return R.fail(); } @@ -376,7 +360,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney) { try { - return R.ok(cuMemberBusinessService.updateCuMemberAccountByDraw(cuMemberAccountExt, payMoney)); + return R.ok(iCuMemberBusinessService.updateCuMemberAccountByDraw(cuMemberAccountExt, payMoney)); } catch (Exception e) { log.error("updateCuMemberAccountByDraw Exception: ", e); return R.fail(); @@ -386,7 +370,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt) { try { - return R.ok(cuMemberBusinessService.updateCuMemberAccountByDraw(payNum, acDrawRewardNumExt)); + return R.ok(iCuMemberBusinessService.updateCuMemberAccountByDraw(payNum, acDrawRewardNumExt)); } catch (Exception e) { return R.fail(); } @@ -394,27 +378,27 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel) { - return R.ok(cuMemberBusinessService.updateMemberLevel(cuMember, saOrder, pkOldLevel)); + return R.ok(iCuMemberBusinessService.updateMemberLevel(cuMember, saOrder, pkOldLevel)); } @Override public R checkParent(String topCode, Long userId) { - return R.ok(cuMemberService.checkParent(topCode, userId) > 0); + return R.ok(iCuMemberService.checkParent(topCode, userId) > 0); } @Override public R checkMemberByParentList(List topCodeList, Long userId) { - return R.ok(cuMemberService.checkMemberByParentList(topCodeList, userId)); + return R.ok(iCuMemberService.checkMemberByParentList(topCodeList, userId)); } @Override public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) { - return cuMemberService.getAwardsTranslateValue(pkCountry, pkId); + return iCuMemberService.getAwardsTranslateValue(pkCountry, pkId); } @Override public R> findAll() { - return R.ok(cuMemberService.findAll()); + return R.ok(iCuMemberService.findAll()); } /** @@ -425,12 +409,12 @@ public class MemberServiceProvider implements IMemberServiceApi { */ @Override public R> checkIsShowWares(List showWaresDTOS) { - return R.ok(cuMemberService.checkIsShowWares(showWaresDTOS)); + return R.ok(iCuMemberService.checkIsShowWares(showWaresDTOS)); } @Override public R> queryPlaceErrorCode() { - return R.ok(cuMemberService.selectPlaceErrorCode()); + return R.ok(iCuMemberService.selectPlaceErrorCode()); } @Override @@ -440,29 +424,25 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R queryCuMemberUnderUmbrella(Long pkMember) { - return R.ok(cuMemberService.queryCuMemberUnderUmbrella(pkMember)); + return R.ok(iCuMemberService.queryCuMemberUnderUmbrella(pkMember)); } /** * @description: 零元撤单签呈列表 - * @author: zhang jing - * @date: 2023/10/27 16:25 - * @param: [analysisBusinessAppealParam] - * @return: com.hzs.common.core.domain.R **/ @Override public R> zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam) { - return R.ok(cuMemberService.zeroByBusinessList(analysisBusinessAppealParam)); + return R.ok(iCuMemberService.zeroByBusinessList(analysisBusinessAppealParam)); } @Override public R checkPlaceParent(String topCode, Long pkMember) { - return R.ok(cuMemberService.checkPlaceParent(topCode, pkMember) > 0); + return R.ok(iCuMemberService.checkPlaceParent(topCode, pkMember) > 0); } @Override public R> queryCuMemberSwingNetExt() { - return R.ok(cuMemberSwingNetService.queryCuMemberSwingNetExt(new CuMemberSwingNetParam())); + return R.ok(iCuMemberSwingNetService.queryCuMemberSwingNetExt(new CuMemberSwingNetParam())); } @Transactional(rollbackFor = Exception.class) @@ -470,15 +450,15 @@ public class MemberServiceProvider implements IMemberServiceApi { public R handleExpireDate(Long userId, Integer pkCountry) { try { // 根据奖衔更新休止期时间 - cuMemberService.flushStopDateBatch(pkCountry); + iCuMemberService.flushStopDateBatch(pkCountry); log.info("根据奖衔更新休止期处理完成"); // 更新有效状态为：【休止期】 - int expireCount = cuMemberService.flushExpireStatusBatch(pkCountry); + int expireCount = iCuMemberService.flushExpireStatusBatch(pkCountry); log.info("处理会员续约，休止期数量：{}", expireCount); // 更新有效状态为：【已终止】；变更会员类型为【已注销】（CATEGORY = 2） - int stopCount = cuMemberService.flushStopStatusBatch(pkCountry); + int stopCount = iCuMemberService.flushStopStatusBatch(pkCountry); log.info("处理会员续约，已终止数量：{}", stopCount); } catch (Exception e) { @@ -492,7 +472,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R updateMemberExpireDate() { try { - cuMemberService.updateMemberExpireDate(); + iCuMemberService.updateMemberExpireDate(); } catch (Exception e) { log.error("updateMemberExpireDate error:", e); return R.fail(); @@ -503,7 +483,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R updateMemberInfo(CuMember cuMember) { try { - cuMemberService.updateById(cuMember); + iCuMemberService.updateById(cuMember); } catch (Exception e) { log.error("updateMemberInfo error:", e); return R.fail(); @@ -514,7 +494,7 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R handleMemberContinue(MemberContinueDTO memberContinueDTO) { try { - String str = cuMemberBusinessService.handleMemberContinue(memberContinueDTO); + String str = iCuMemberBusinessService.handleMemberContinue(memberContinueDTO); if (null == str) { return R.ok(); } @@ -527,22 +507,22 @@ public class MemberServiceProvider implements IMemberServiceApi { @Override public R> findMemberByMemberCodeList(List memberCodeList, Integer pkCountry) { - return R.ok(cuMemberService.findMemberByMemberCodeList(memberCodeList, pkCountry)); + return R.ok(iCuMemberService.findMemberByMemberCodeList(memberCodeList, pkCountry)); } @Override public R getMenuMember(Long pkMember) { - return R.ok(cuMemberService.getMenuMember(pkMember)); + return R.ok(iCuMemberService.getMenuMember(pkMember)); } @Override public R getParentMember(String memberCode) { - return R.ok(cuMemberService.getParentMember(memberCode)); + return R.ok(iCuMemberService.getParentMember(memberCode)); } @Override public R countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry) { - return R.ok(cuMemberService.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry)); + return R.ok(iCuMemberService.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry)); } } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/UpPolicyCurrencyServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/UpPolicyCurrencyServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/UpPolicyCurrencyServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/UpPolicyCurrencyServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/UpdateExpireStopServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/UpdateExpireStopServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/UpdateExpireStopServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/UpdateExpireStopServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/IBdWaresMappingService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/IBdWaresMappingService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/IBdWaresMappingService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/IBdWaresMappingService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuHonorWallService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuHonorWallService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuHonorWallService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuHonorWallService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAgentService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAgentService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAgentService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAgentService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberExpireHistoryService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberExpireHistoryService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberExpireHistoryService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberExpireHistoryService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHistroyAwardsService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHistroyAwardsService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHistroyAwardsService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHistroyAwardsService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHonorWallService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHonorWallService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHonorWallService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberHonorWallService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java similarity index 80% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index b19b2b97..fb630bfb 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; -import com.hzs.member.achieve.vo.DeptMemberNumberVo; import com.hzs.member.base.param.UpdatePlaceParentPetitionParam; import com.hzs.member.base.dto.MemberYearAwardsDTO; import com.hzs.member.base.dto.ShowWaresDTO; @@ -29,9 +28,6 @@ import java.util.Map; /** * 会员 服务类 - * - * @author hzs - * @since 2022-08-04 */ public interface ICuMemberService extends IService { @@ -39,17 +35,11 @@ public interface ICuMemberService extends IService { * 保存会员信息 * * @param cuMember 会员信息 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 11:46 */ Boolean saveMember(CuMember cuMember); /* * @description: 查询网体是否存在推荐人 - * @author: sui q - * @date: 2023/9/11 9:53 - * @param: null null **/ Integer queryCuMemberByPkMember(Long pkReference); @@ -73,9 +63,6 @@ public interface ICuMemberService extends IService { * 前台查询会员的方法，通过传输不同的参数，查询不同的会员 * * @param cuMember 会员编号的值 - * @return: CuMemberExt - * @Author: sui q - * @Date: 2022/8/29 11:46 */ List getMemberInfoByCondition(CuMember cuMember); @@ -105,17 +92,11 @@ public interface ICuMemberService extends IService { /* * @description: 查询会员 - * @author: sui q - * @date: 2023/4/25 10:32 - * @param: null null **/ CuMember queryMember(String memberCode); /* * @description: 查询会员 - * @author: sui q - * @date: 2023/4/25 10:32 - * @param: null null **/ CuMember queryMember(Long pkMember); @@ -140,10 +121,6 @@ public interface ICuMemberService extends IService { * 查找安置人伞上 * * @param memberId 安置人，编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List queryPlaceSponsorOnUmbrella(Long memberId); @@ -151,10 +128,6 @@ public interface ICuMemberService extends IService { * 查找安置人伞上 * * @param memberId 安置人，编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List queryPlaceSponsorOnUmbrella(Long memberId, String memberCode, String phone); @@ -162,10 +135,6 @@ public interface ICuMemberService extends IService { * 查找安置人伞上会员信息 * * @param memberId 编号、安置人 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List querySponsorOnUmbrella(Long memberId, List memberCodeList); @@ -173,10 +142,6 @@ public interface ICuMemberService extends IService { * 查找安置人伞下 * * @param memberId 会员编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList); @@ -184,10 +149,6 @@ public interface ICuMemberService extends IService { * 查找安置人伞下 * * @param memberId 安置人，编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List queryPlaceSponsorUnderUmbrella(Long memberId, String... placeParent); @@ -197,9 +158,6 @@ public interface ICuMemberService extends IService { * * @param memberId 会员编号 * @param placeDept 1代表左区极左极下，2代表右区极左极下 - * @return: CuMemberExt - * @Author: sui q - * @Date: 2022/9/1 20:36 */ CuMemberExt queryPlaceSponsorLastLeft(Long memberId, Integer placeDept); @@ -207,10 +165,6 @@ public interface ICuMemberService extends IService { * 查找血缘伞上，推荐人 * * @param memberId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List queryBloodKinshipOnUmbrella(Long memberId); @@ -218,10 +172,6 @@ public interface ICuMemberService extends IService { * 查找血缘伞下，推荐人 * * @param memberId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List queryBloodKinshipUnderUmbrella(Long memberId); @@ -230,9 +180,6 @@ public interface ICuMemberService extends IService { * * @param cuMember 会员 * @param isHaiFun 是否嗨粉 - * @return: String - * @Author: sui q - * @Date: 2022/9/8 13:51 */ CuMember createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun); @@ -248,17 +195,11 @@ public interface ICuMemberService extends IService { * 查询会员信息，根据条件 * * @param memberParam 参数 - * @return: List - * @Author: sui q - * @Date: 2022/10/13 16:34 */ List queryCuMemberByCondition(CuMemberVO memberParam); /* * @description: 查询会员信息，根据条件 - * @author: sui q - * @date: 2023/6/20 11:42 - * @param: null null **/ List queryCuMemberByMemberList(List cuMemberVOList, CuMemberVO memberParam); @@ -266,10 +207,6 @@ public interface ICuMemberService extends IService { /** * @description: 查询真实信息 - * @author: zhang jing - * @date: 2022/11/15 18:01 - * @param: [memberParam] - * @return: java.util.List **/ List realCuMemberByCondition(CuMemberVO memberParam); @@ -331,51 +268,29 @@ public interface ICuMemberService extends IService { /** * @description: 特殊业务-修改会员编号列表 - * @author: zhang jing - * @date: 2022/12/29 11:47 - * @param: [updateCodeVO] - * @return: java.util.List **/ List puCodeList(UpdateCodeVO updateCodeVO); /** * @description: 查询会员有效期休止期 - * @author: zhang jing - * @date: 2024/6/4 14:23 - * @param: [updateExpireStopVO] - * @return: java.util.List **/ List getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO); /** * @description: 零元撤单列表 - * @author: zhang jing - * @date: 2023/10/26 15:27 - * @param: [zeroElementRevokeVO] - * @return: java.util.List **/ List zeroList(ZeroElementRevokeVO zeroElementRevokeVO); /** * @description: 零元撤单签呈列表 - * @author: zhang jing - * @date: 2023/11/3 16:50 - * @param: [analysisBusinessAppealParam] - * @return: java.util.List **/ List zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam); - /** * @description: 查询会员变更前信息 - * @author: zhang jing - * @date: 2023/7/17 12:18 - * @param: [updateCodeVO] - * @return: com.hzs.member.base.vo.UpdateCodeVO **/ UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO); - /** * 修改安置信息 * @@ -392,102 +307,56 @@ public interface ICuMemberService extends IService { /** * @description: 批量修改会员编号 - * @author: zhang jing - * @date: 2022/12/30 14:21 - * @param: [updateCodeVOList] - * @return: boolean **/ UpdateCodeVO updateCode(UpdateCodeVO updateCodeVO); /** * @description: 修改会员续约发起签呈 - * @author: zhang jing - * @date: 2024/6/5 15:27 - * @param: [upESVO] - * @return: com.hzs.member.base.vo.UpdateExpireStopVO **/ UpdateExpireStopVO upExpireStop(UpdateExpireStopVO upESVO); /** * @description: 修改会员续约-审核通过驳回 - * @author: zhang jing - * @date: 2024/6/6 10:38 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ boolean upExpireStopProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** * @description: 零元撤单业务 - * @author: zhang jing - * @date: 2023/10/26 17:36 - * @param: [zeroElementRevokeVO] - * @return: com.hzs.member.base.vo.ZeroElementRevokeVO **/ ZeroElementRevokeVO zeroRevokeBusiness(ZeroElementRevokeVO zeroElementRevokeVO); /** * @description: 发起签呈-零元撤单 - * @author: zhang jing - * @date: 2023/10/27 14:08 - * @param: [zeroElementRevokeVO] - * @return: com.hzs.member.base.vo.ZeroElementRevokeVO **/ ZeroElementRevokeVO zeroPetition(ZeroElementRevokeVO zeroElementRevokeVO); - /** * @description: 发起签呈-修改会员编号 - * @author: zhang jing - * @date: 2023/3/4 11:12 - * @param: [updateCodeVO] - * @return: com.hzs.member.base.vo.UpdateCodeVO **/ UpdateCodeVO petition(UpdateCodeVO updateCodeVO); - /** * @description: 审核通过根据业务单号，业务类型批量修改业务数据 - * @author: zhang jing - * @date: 2023/1/6 16:36 - * @param: [UpdateCodeVO] - * @return: boolean **/ boolean updateCodeByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** * @description: 政策币签呈审核 - * @author: zhang jing - * @date: 2023/5/10 18:13 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ boolean upPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** * @description:删除政策币业务审核 - * @author: zhang jing - * @date: 2024/4/24 15:19 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ boolean delPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** * @description: 审核驳回 根据业务单号，业务类型批量修改业务数据 - * @author: zhang jing - * @date: 2023/1/7 9:17 - * @param: [updateCodeVO] - * @return: boolean **/ boolean updateCodeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** * @description: 真实奖衔控制-通过或驳回 - * @author: zhang jing - * @date: 2023/4/10 14:08 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ boolean awardsControlPetition(ApprovalBusinessResultDTO approvalBusinessResultDTO); @@ -519,10 +388,6 @@ public interface ICuMemberService extends IService { /** * @description: 招商列表 - * @author: - * @date: 2023/2/22 11:01 - * @param: [marketNewsParam] - * @return: java.util.List **/ List selectBiddingList(MarketNewsParam marketNewsParam); @@ -536,78 +401,44 @@ public interface ICuMemberService extends IService { /** * @description: - * @author: zhang jing - * @date: 2023/4/28 17:24 - * @param: [upseCountryVO] - * @return: java.util.List **/ List upsettleCountryList(UpdateSettleCountryVO upseCountryVO); /** * @description:查询修改政策币列表 - * @author: zhang jing - * @date: 2023/5/9 14:23 - * @param: [upVO] - * @return: java.util.List **/ List upPolicyCurrencyList(UpPolicyCurrencyVO upVO); /** * @description: 特殊业务-修改结算国 - * @author: zhang jing - * @date: 2023/2/21 16:13 - * @param: [upseCountryVO] - * @return: com.hzs.member.base.vo.UpdateSettleCountryVO **/ UpdateSettleCountryVO updateSettleCountry(UpdateSettleCountryVO upseCountryVO); /** * @description: 特殊业务-修改政策币 - * @author: zhang jing - * @date: 2023/5/9 16:08 - * @param: [policyCurrencyVO] - * @return: com.hzs.member.base.vo.UpPolicyCurrencyVO **/ UpPolicyCurrencyVO upPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO); /** * @description: 特殊业务-删除政策币业务 - * @author: zhang jing - * @date: 2024/4/24 11:52 - * @param: [policyCurrencyVO] - * @return: com.hzs.member.base.vo.UpPolicyCurrencyVO **/ UpPolicyCurrencyVO delPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO); - /** * @description: 发起签呈-修改结算国 - * @author: zhang jing - * @date: 2023/2/21 16:13 - * @param: [upseCountryVO] - * @return: com.hzs.member.base.vo.UpdateSettleCountryVO **/ UpdateSettleCountryVO petition(UpdateSettleCountryVO upseCountryVO); /** * @description: 发起签呈-修改政策币发起签呈 - * @author: zhang jing - * @date: 2023/2/21 16:13 - * @param: [upseCountryVO] - * @return: com.hzs.member.base.vo.UpdateSettleCountryVO **/ UpPolicyCurrencyVO petition(UpPolicyCurrencyVO policyCurrencyVO); /** * @description: 零元撤单审核-审核通过、驳回 - * @author: zhang jing - * @date: 2023/10/27 15:11 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ boolean zeroByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO); - /** * 后台设置推荐上下级 * @@ -621,64 +452,36 @@ public interface ICuMemberService extends IService { /** * @description: 特殊业务-修改结算国-审核通过 - * @author: zhang jing - * @date: 2023/2/22 9:41 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ boolean updateSettleCountryAdopt(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** * @description: 特殊业务-修改结算国-审核驳回 - * @author: zhang jing - * @date: 2023/2/22 9:44 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ boolean updateSettleCountryReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** * @description: 校验会员是否有充值审核 - * @author: zhang jing - * @date: 2023/2/23 10:52 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkCecharge(Long pkMember); /** * @description: 校验会员是否有提现审核 - * @author: zhang jing - * @date: 2023/2/23 10:52 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkWithdraw(Long pkMember); /** * @description: 校验会员所有账户是否有余额 - * @author: zhang jing - * @date: 2023/2/23 10:53 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkAccount(Long pkMember); /** * @description: 查询会员是否存在未完成基础业务办理 - * @author: zhang jing - * @date: 2023/2/23 16:00 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkmsLogCount(Long pkMember, Integer editType); /** * @description: 查询会员是否存在未完成注水业绩业务 - * @author: zhang jing - * @date: 2023/2/23 16:35 - * @param: [pkMember] - * @return: java.lang.Integer **/ Integer checkMemberAchieveCount(Long pkMember); @@ -710,19 +513,11 @@ public interface ICuMemberService extends IService { /** * @description: 获取等级的翻译KEY值 - * @author: zhang jing - * @date: 2023/3/2 12:00 - * @param: [pkId] - * @return: java.lang.Integer **/ Integer getGradeTranslateValue(Integer pkId); /** * @description: 获取奖衔的翻译KEY值 - * @author: zhang jing - * @date: 2023/3/2 12:00 - * @param: [pkCountry, pkId] - * @return: java.lang.Integer **/ Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId); @@ -747,9 +542,6 @@ public interface ICuMemberService extends IService { * 点击确认生成分享订单 * * @param memberParam 参数 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/15 10:30 */ CuMember confirmShareMemberByMemberParam(MemberParam memberParam); @@ -759,9 +551,6 @@ public interface ICuMemberService extends IService { * @param pkMember 会员主键 * @param pkApprove 审核人 * @param currentDateTime 时间 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 11:46 */ void deleteCuMemberByPkMember(Long pkMember, Long pkApprove, Date currentDateTime); @@ -811,10 +600,6 @@ public interface ICuMemberService extends IService { /** * @description: 获取最新国家编号和国际编号 - * @author: zhang jing - * @date: 2023/5/24 16:49 - * @param: [] - * @return: com.hzs.common.domain.member.base.CuMember **/ void generateNumber(CuMember cuMember, Integer pkCountry); @@ -876,7 +661,6 @@ public interface ICuMemberService extends IService { */ List selectMemberByMemberCode(String memberCode, String memberName, Integer pkCountry); - /** * 查询左右区人数统计 安置 * @@ -975,9 +759,6 @@ public interface ICuMemberService extends IService { /* * @description: 查询会员左右区人数 - * @author: sui q - * @date: 2023/8/15 14:34 - * @param: null null **/ List queryMemberLeftRightCount(Long pkMember); @@ -1012,14 +793,6 @@ public interface ICuMemberService extends IService { */ CuMemberExt queryRegisterOrder(String orderCode, Long pkMember); - /** - * 查询会员左右区人数 - * - * @param pkMember - * @return - */ - List selectByDeptNumberPlace(Long pkMember); - /** * 更新会员的认证状态 * @@ -1039,9 +812,6 @@ public interface ICuMemberService extends IService { /* * @description: 查询伞下会员 - * @author: sui q - * @date: 2023/10/16 17:29 - * @param: null null **/ Boolean queryCuMemberUnderUmbrella(Long pkMember); @@ -1130,10 +900,6 @@ public interface ICuMemberService extends IService { /** * @description: 查询表是否存在 - * @author: zhang jing - * @date: 2024/4/7 16:11 - * @param: [tableName] - * @return: java.lang.Integer **/ Integer selectExistTable(String tableName); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberSpecialService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberSpecialService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberSpecialService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberSpecialService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuSettleCountryDetailedService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuSettleCountryDetailedService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuSettleCountryDetailedService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuSettleCountryDetailedService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/IMemberInfoService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/IMemberInfoService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/IMemberInfoService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/IMemberInfoService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/BdWaresMappingServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/BdWaresMappingServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/BdWaresMappingServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/BdWaresMappingServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuHonorWallServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuHonorWallServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuHonorWallServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuHonorWallServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAgentServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAgentServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAgentServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAgentServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberExpireHistoryServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberExpireHistoryServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberExpireHistoryServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberExpireHistoryServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHistroyAwardsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHistroyAwardsServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHistroyAwardsServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHistroyAwardsServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHonorWallServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHonorWallServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHonorWallServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberHonorWallServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java similarity index 95% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 8fc325ae..5c19126d 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -39,7 +39,6 @@ import com.hzs.member.account.dto.BusinessCommissionDTO; import com.hzs.member.account.dto.MemberAmountDTO; import com.hzs.member.account.service.ICuMemberAccountService; import com.hzs.member.account.service.ICuMemberTradeService; -import com.hzs.member.achieve.vo.DeptMemberNumberVo; import com.hzs.member.base.param.UpdatePlaceParentPetitionParam; import com.hzs.member.base.dto.*; import com.hzs.member.base.mapper.CuMemberMapper; @@ -87,9 +86,6 @@ import java.util.stream.Collectors; /** * 会员 服务实现类 - * - * @author hzs - * @since 2022-08-04 */ @Service @Slf4j @@ -111,25 +107,25 @@ public class CuMemberServiceImpl extends ServiceImpl i ISystemConfigServiceApi systemConfigServiceApi; @Autowired - private ICuMemberRegisterService memberRegisterService; + private ICuMemberRegisterService iCuMemberRegisterService; @Autowired - private ICuMemberAccountService memberAccountService; + private ICuMemberAccountService iCuMemberAccountService; @Autowired - private ICuMemberServiceLogService memberServiceLogService; + private ICuMemberServiceLogService iCuMemberServiceLogService; @Autowired - private ICuMemberTradeService cuMemberTradeService; + private ICuMemberTradeService iCuMemberTradeService; @Autowired private UserTokenService userTokenService; @Autowired private ICuMemberEmptyCodeService iCuMemberEmptyCodeService; @Autowired - private ICuAwardsControlService controlService; + private ICuAwardsControlService iCuAwardsControlService; @Autowired private ICuSettleCountryDetailedService iCuSettleCountryDetailedService; @Autowired - private ICuMemberTeamService memberTeamService; + private ICuMemberTeamService iCuMemberTeamService; @Autowired - private ICuMemberBusinessService cuMemberBusinessService; + private ICuMemberBusinessService iCuMemberBusinessService; @Autowired private RedisService redisService; @@ -158,7 +154,6 @@ public class CuMemberServiceImpl extends ServiceImpl i public Integer queryCuMemberByPkMember(Long pkReference) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMember::getPkParent, pkReference); - log.info("推荐人主键:{}", pkReference); queryWrapper.eq(CuMember::getCategory, ECategory.NORMAL.getValue()); queryWrapper.eq(CuMember::getPayStatus, EPayStatus.PAID.getValue()); List customerList = new ArrayList<>(); @@ -275,8 +270,6 @@ public class CuMemberServiceImpl extends ServiceImpl i * @param memberId 会员编号 * @param placeDept 1代表左区极左极下，2代表右区极左极下 * @return: CuMemberExt - * @Author: sui q - * @Date: 2022/9/1 20:36 */ @Override public CuMemberExt queryPlaceSponsorLastLeft(Long memberId, Integer placeDept) { @@ -332,10 +325,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 会员信息 - * @author: zhang jing - * @date: 2022/11/16 13:48 - * @param: [memberParam] - * @return: java.util.List **/ @Override public List queryCuMemberByCondition(CuMemberVO memberParam) { @@ -354,10 +343,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 真实信息 - * @author: zhang jing - * @date: 2022/11/15 19:24 - * @param: [memberParam] - * @return: java.util.List **/ @Override public List realCuMemberByCondition(CuMemberVO memberParam) { @@ -387,7 +372,7 @@ public class CuMemberServiceImpl extends ServiceImpl i CuMemberAccount cuMemberAccount = new CuMemberAccount(); cuMemberAccount.setLockAccount4(member.getLockAccount4()); cuMemberAccount.setPkMember(cuMember.getPkId()); - Boolean b = memberAccountService.updateMemberAccount(cuMemberAccount, member.getPkCreator()); + Boolean b = iCuMemberAccountService.updateMemberAccount(cuMemberAccount, member.getPkCreator()); if (!b) { return null; } @@ -411,15 +396,11 @@ public class CuMemberServiceImpl extends ServiceImpl i cuMemberRegister.setCreationTime(DateUtils.currentDateTime()); cuMemberRegister.setPkCountry(cuMember.getPkCountry()); cuMemberRegister.setPkMember(cuMember.getPkId()); - memberRegisterService.save(cuMemberRegister); + iCuMemberRegisterService.save(cuMemberRegister); } /** * @description: 特殊业务-修改会员编号列表 - * @author: zhang jing - * @date: 2022/12/29 11:47 - * @param: [updateCodeVO] - * @return: java.util.List **/ @Override public List puCodeList(UpdateCodeVO updateCodeVO) { @@ -428,10 +409,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 查询会员续约 - * @author: zhang jing - * @date: 2024/6/4 14:25 - * @param: [updateExpireStopVO] - * @return: java.util.List **/ @Override public List getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO) { @@ -440,10 +417,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 零元撤单列表 - * @author: zhang jing - * @date: 2023/10/26 15:26 - * @param: [zeroElementRevokeVO] - * @return: java.util.List **/ @Override public List zeroList(ZeroElementRevokeVO zeroElementRevokeVO) { @@ -457,7 +430,7 @@ public class CuMemberServiceImpl extends ServiceImpl i LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, analysisBusinessAppealParam.getBusinessNo()); queryWrapper.eq(CuMemberServiceLog::getApproveStatus, EApproveStatus.ALREADY_SUBMIT.getValue()); - List memberServiceLogList = memberServiceLogService.list(queryWrapper); + List memberServiceLogList = iCuMemberServiceLogService.list(queryWrapper); for (CuMemberServiceLog cs : memberServiceLogList) { ZeroElementRevokeDTO zero = JSONObject.parseObject(cs.getNewValue(), ZeroElementRevokeDTO.class); long timestamp = Long.parseLong(zero.getCreationTime()); @@ -470,10 +443,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 查询会员变更前信息 - * @author: zhang jing - * @date: 2023/7/17 12:18 - * @param: [updateCodeVO] - * @return: com.hzs.member.base.vo.UpdateCodeVO **/ @Override public UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO) { @@ -483,10 +452,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 批量修改会员编号 - * @author: zhang jing - * @date: 2022/12/30 14:20 - * @param: [updateCodeVOList] - * @return: boolean **/ @Override @Transactional(rollbackFor = Exception.class) @@ -516,7 +481,7 @@ public class CuMemberServiceImpl extends ServiceImpl i || updateCode.getProcessType() == EProcessType.DOUBLEAVOID.getValue()) { //添加修改记录表数据 memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //修改会员编号 CuMember member = new CuMember(); member.setPkId(uc.getPkId()); @@ -542,7 +507,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkCountry(updateCode.getPkCountry()); businessCommissionDTO.setMemberAmountDTOList(updateCode.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY)); } @@ -556,10 +521,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 修改会员续约发起签呈 - * @author: zhang jing - * @date: 2024/6/5 14:23 - * @param: [upESVO] - * @return: com.hzs.member.base.vo.UpdateExpireStopVO **/ @Override @Transactional(rollbackFor = Exception.class) @@ -625,7 +586,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue()); } //添加修改记录表数据 - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); } //生成签呈 if (upESVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { @@ -653,10 +614,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 修改会员续约-审核通过驳回 - * @author: zhang jing - * @date: 2024/6/6 10:37 - * @param: [approvalBusinessResultDTO] - * @return: boolean **/ @Transactional(rollbackFor = Exception.class) @Override @@ -669,7 +626,7 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberServiceLog::getApproveStatus, EApproveStatus.FINISH.getValue()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - List list = memberServiceLogService.list(queryWrapper); + List list = iCuMemberServiceLogService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { for (CuMemberServiceLog cs : list) { UpdateExpireStopVO ues = JSONObject.parseObject(cs.getNewValue(), UpdateExpireStopVO.class); @@ -692,16 +649,12 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); updateWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - memberServiceLogService.update(updateWrapper); + iCuMemberServiceLogService.update(updateWrapper); return true; } /** * @description: 零元撤单 - * @author: zhang jing - * @date: 2023/10/26 17:46 - * @param: [zero] - * @return: com.hzs.member.base.vo.ZeroElementRevokeVO **/ @Override @Transactional(rollbackFor = Exception.class) @@ -730,7 +683,7 @@ public class CuMemberServiceImpl extends ServiceImpl i || zero.getProcessType() == EProcessType.DOUBLEAVOID.getValue()) { //添加修改记录表数据 memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //校验会员是否存在推荐或安置 CuMember member = new CuMember(); member.setPkId(zo.getPkId()); @@ -769,7 +722,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setMemberAmountDTOList(zero.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); businessCommissionDTO.setPkAccount(zero.getZeroVOList().get(0).getPkAccount()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.ZERO_ELEMENT_REVOKE_MONEY)); } @@ -782,10 +735,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 发起签呈-零元撤单 - * @author: zhang jing - * @date: 2023/3/4 11:12 - * @param: [updateCodeVO] - * @return: com.hzs.member.base.vo.UpdateCodeVO **/ @Override @Transactional(rollbackFor = Exception.class) @@ -812,7 +761,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setApproveNumber(zero.getChangeNumber()); memberLog.setSingleAmount(zero.getCost()); memberLog.setProcessType(zero.getProcessType()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //组装日志数据 BusinessLogDTO businessLog = BusinessLogDTO.builder() .businessType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()) @@ -847,7 +796,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(zeroElementRevokeVO.getZeroVOList().get(0).getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(zeroElementRevokeVO.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.ZERO_ELEMENT_REVOKE_MONEY)); } @@ -860,10 +809,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 发起签呈-修改会员编号 - * @author: zhang jing - * @date: 2023/3/4 11:12 - * @param: [updateCodeVO] - * @return: com.hzs.member.base.vo.UpdateCodeVO **/ @Override @Transactional(rollbackFor = Exception.class) @@ -890,7 +835,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setApproveNumber(uc.getChangeNumber()); memberLog.setSingleAmount(uc.getCost()); memberLog.setProcessType(updateCodeVO.getProcessType()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //组装日志数据 BusinessLogDTO businessLog = BusinessLogDTO.builder() .businessType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()) @@ -925,7 +870,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(updateCodeVO.getUpdateParentParamList().get(0).getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(updateCodeVO.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY)); } @@ -939,10 +884,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 发起签呈-修改结算国 - * @author: zhang jing - * @date: 2023/3/22 18:02 - * @param: [upseCountryVO] - * @return: com.hzs.member.base.vo.UpdateSettleCountryVO **/ @Override @Transactional(rollbackFor = Exception.class) @@ -971,7 +912,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setApproveNumber(uc.getChangeNumber()); memberLog.setSingleAmount(uc.getCost()); memberLog.setProcessType(upseCountryVO.getProcessType()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //组装日志数据 BusinessLogDTO businessLog = BusinessLogDTO.builder() @@ -1007,7 +948,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(upseCountryVO.getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(upseCountryVO.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.UPDATE_SETTLE_COUNTRY.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_SETTLE_MONEY)); } @@ -1020,10 +961,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-修改政策币发起签呈 - * @author: zhang jing - * @date: 2023/5/9 17:00 - * @param: [policyCurrencyVO] - * @return: com.hzs.member.base.vo.UpPolicyCurrencyVO **/ @Override @Transactional(rollbackFor = Exception.class) @@ -1049,7 +986,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setSingleAmount(plc.getCost()); memberLog.setProcessType(plc.getProcessType()); memberLog.setBusinessScope(policyCurrencyVO.getBusinessScope()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //组装日志数据 BusinessLogDTO businessLog = BusinessLogDTO.builder() .businessType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()) @@ -1087,7 +1024,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(policyCurrencyVO.getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(policyCurrencyVO.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.POLICY_CURRENCY_MONEY)); } @@ -1102,10 +1039,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-零元撤单-审核通过/驳回 - * @author: zhang jing - * @date: 2023/1/6 16:37 - * @param: [updateCodeVO] - * @return: boolean **/ @Transactional(rollbackFor = Exception.class) @Override @@ -1120,7 +1053,7 @@ public class CuMemberServiceImpl extends ServiceImpl i LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); queryWrapper.eq(CuMemberServiceLog::getApproveStatus, EApproveStatus.ALREADY_SUBMIT.getValue()); - List memberServiceLogList = memberServiceLogService.list(queryWrapper); + List memberServiceLogList = iCuMemberServiceLogService.list(queryWrapper); for (CuMemberServiceLog cs : memberServiceLogList) { ZeroElementRevokeVO zero = JSONObject.parseObject(cs.getNewValue(), ZeroElementRevokeVO.class); //校验会员是否存在推荐或安置 @@ -1150,7 +1083,7 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberServiceLog::getApproveStatus, EApproveStatus.REJECTED.getValue()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - List list = memberServiceLogService.list(queryWrapper); + List list = iCuMemberServiceLogService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { //查询扣费金额，账户信息 List memberAmountDTOList = new ArrayList<>(); @@ -1178,7 +1111,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); - Boolean result = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); + Boolean result = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); if (!result) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_REFUND)); } @@ -1189,7 +1122,7 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); updateWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - memberServiceLogService.update(updateWrapper); + iCuMemberServiceLogService.update(updateWrapper); return true; } @@ -1210,7 +1143,7 @@ public class CuMemberServiceImpl extends ServiceImpl i LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); queryWrapper.eq(CuMemberServiceLog::getApproveStatus, EApproveStatus.ALREADY_SUBMIT.getValue()); - List list = memberServiceLogService.list(queryWrapper); + List list = iCuMemberServiceLogService.list(queryWrapper); Date date = new Date(); Long userID = approvalBusinessResultDTO.getLoginUser().getUserId(); if (CollectionUtil.isNotEmpty(list)) { @@ -1219,7 +1152,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setPkModified(userID); memberLog.setModifiedTime(date); memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.updateById(memberLog); + iCuMemberServiceLogService.updateById(memberLog); //修改会员编号 CuMember member = new CuMember(); member.setPkId(memberLog.getPkMember()); @@ -1254,7 +1187,7 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberServiceLog::getApproveStatus, EApproveStatus.REJECTED.getValue()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - List list = memberServiceLogService.list(queryWrapper); + List list = iCuMemberServiceLogService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { //查询扣费金额，账户信息 List memberAmountDTOList = new ArrayList<>(); @@ -1282,7 +1215,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); - Boolean result = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); + Boolean result = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); if (!result) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_REFUND)); } @@ -1293,7 +1226,7 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); updateWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - memberServiceLogService.update(updateWrapper); + iCuMemberServiceLogService.update(updateWrapper); return true; } @@ -1314,7 +1247,7 @@ public class CuMemberServiceImpl extends ServiceImpl i LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - List list = memberServiceLogService.list(queryWrapper); + List list = iCuMemberServiceLogService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { //处理审核驳回 if (approvalBusinessResultDTO.getEApproveStatus().getValue() == EApproveStatus.REJECTED.getValue()) { @@ -1345,7 +1278,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue()); - Boolean result = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); + Boolean result = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); if (!result) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_REFUND)); } @@ -1360,14 +1293,14 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper1.set(CuMemberServiceLog::getModifiedTime, date); updateWrapper1.set(CuMemberServiceLog::getDelFlag, EDelFlag.DELETE.getValue()); updateWrapper1.eq(CuMemberServiceLog::getPkId, up.getPkId()); - memberServiceLogService.update(updateWrapper1); + iCuMemberServiceLogService.update(updateWrapper1); } updateWrapper.set(CuMemberServiceLog::getApproveStatus, EApproveStatus.FINISH.getValue()); } updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); updateWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - memberServiceLogService.update(updateWrapper); + iCuMemberServiceLogService.update(updateWrapper); } else { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_ERROR)); } @@ -1412,7 +1345,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setModifiedTime(date); memberLog.setApproveNumber(uc.getChangeNumber() - 1); memberLog.setApproveStatus(EApproveStatus.REJECTED.getValue()); - memberServiceLogService.updateById(memberLog); + iCuMemberServiceLogService.updateById(memberLog); if (StringUtils.isNotNull(uc.getCost())) { MemberAmountDTO memberAmountDTO = new MemberAmountDTO(); memberAmountDTO.setPkMember(uc.getPkId()); @@ -1428,7 +1361,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); - Boolean result = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); + Boolean result = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); if (!result) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_REFUND)); } @@ -1451,7 +1384,7 @@ public class CuMemberServiceImpl extends ServiceImpl i LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); queryWrapper.eq(CuMemberServiceLog::getApproveStatus, EApproveStatus.ALREADY_SUBMIT.getValue()); - List memberServiceLogList = memberServiceLogService.list(queryWrapper); + List memberServiceLogList = iCuMemberServiceLogService.list(queryWrapper); Date date = new Date(); Long userID = approvalBusinessResultDTO.getLoginUser().getUserId(); List memberAmountDTOList = new ArrayList<>(); @@ -1461,7 +1394,7 @@ public class CuMemberServiceImpl extends ServiceImpl i cs.setPkModified(userID); cs.setModifiedTime(date); cs.setApproveStatus(approvalBusinessResultDTO.getEApproveStatus().getValue()); - memberServiceLogService.updateById(cs); + iCuMemberServiceLogService.updateById(cs); //新增真实奖衔控制 CuAwardsControlVO controlVO = JSONObject.parseObject(cs.getNewValue(), CuAwardsControlVO.class); CuAwardsControl control = BeanUtil.copyProperties(controlVO, CuAwardsControl.class); @@ -1479,10 +1412,10 @@ public class CuMemberServiceImpl extends ServiceImpl i } if (approvalBusinessResultDTO.getEApproveStatus().getValue() == EApproveStatus.FINISH.getValue()) { if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()) { - controlService.save(control); + iCuAwardsControlService.save(control); } if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue()) { - controlService.updateById(control); + iCuAwardsControlService.updateById(control); } if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue()) { //删除真实奖衔控制 @@ -1491,7 +1424,7 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuAwardsControl::getCreationTime, date); updateWrapper.set(CuAwardsControl::getPkCreator, userID); updateWrapper.eq(CuAwardsControl::getPkId, control.getPkId()); - controlService.update(updateWrapper); + iCuAwardsControlService.update(updateWrapper); } } } @@ -1504,7 +1437,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(memberAmountDTOList.get(0).getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(approvalBusinessResultDTO.getEApprovalBusiness().getValue()); - Boolean result = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); + Boolean result = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); if (!result) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.AWARDS_CONTROL_IS_REFUND)); } @@ -1564,7 +1497,7 @@ public class CuMemberServiceImpl extends ServiceImpl i // 免签/全免 // TODO 免签提交修改安置 memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); editPlaceParent(placeParentParam.getUpdatePlaceParentList(), false); } else if (placeParentParam.getProcessType() == EProcessType.AVOIDPAY.getValue() || placeParentParam.getProcessType() == EProcessType.DOUBLEPAY.getValue() @@ -1575,7 +1508,7 @@ public class CuMemberServiceImpl extends ServiceImpl i Set memberSet = new HashSet<>(); memberSet.add(loginUser.getUserId()); memberLog.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); ApprovalSubmitDTO approvalSubmitDTO = ApprovalSubmitDTO.builder().eApprovalBusiness(EApprovalBusiness.CU_MEMBER_PLACE_PARENT) .businessCode(code) .signType(ESignType.getEnumByValue(placeParentParam.getSignType())) @@ -1601,7 +1534,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(placeParentParam.getUpdatePlaceParentList().get(0).getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(placeParentParam.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_PLACE_MONEY)); } @@ -1689,7 +1622,7 @@ public class CuMemberServiceImpl extends ServiceImpl i || parentParam.getProcessType() == EProcessType.DOUBLEAVOID.getValue()) { //添加修改记录表数据 memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //修改会员编号 CuMember newParentMember = getMemberByCode(uc.getEditNewPlaceMemberCode()); @@ -1707,7 +1640,7 @@ public class CuMemberServiceImpl extends ServiceImpl i } else { //添加修改记录表数据 memberLog.setApproveStatus(EApproveStatus.APPROVE.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); // 修改会员直推次数 CuMember newParentMember = getMemberById(uc.getPkMember()); int directPushNumber; @@ -1726,7 +1659,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(uc.getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(parentParam.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.CU_MEMBER_PARENT.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY)); } @@ -1799,14 +1732,14 @@ public class CuMemberServiceImpl extends ServiceImpl i cuMemberServiceLog.setPkCreator(SecurityUtils.getUserId()); cuMemberServiceLog.setApproveStatus(approveStatus.getValue()); cuMemberServiceLog.setBusinessNo(businessNo); - Integer maxApproveNumber = memberServiceLogService.selectByMaxApproveNumber(cuMember.getPkId(), + Integer maxApproveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(cuMember.getPkId(), EApprovalBusiness.CU_MEMBER_PARENT.getValue(), EApproveStatus.FINISH.getValue()); cuMemberServiceLog.setApproveNumber(maxApproveNumber + 1); MemberServiceLogList.add(cuMemberServiceLog); cuMember.setPkParent(pkParent); } } - memberServiceLogService.saveBatch(MemberServiceLogList); + iCuMemberServiceLogService.saveBatch(MemberServiceLogList); return businessNo; } @@ -2405,7 +2338,7 @@ public class CuMemberServiceImpl extends ServiceImpl i } if (pkCountry != null) { if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - return num.multiply(inExchangeRate).setScale(0, BigDecimal.ROUND_DOWN); + return num.multiply(inExchangeRate).setScale(2, BigDecimal.ROUND_DOWN); } } @@ -2475,7 +2408,7 @@ public class CuMemberServiceImpl extends ServiceImpl i upseCountryVO.getProcessType() == EProcessType.DOUBLEAVOID.getValue()) { //添加修改记录表数据 memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //修改会员结算国 //查询用户原先的结算等级注册等级真实奖衔 CuMember member = baseMapper.selectById(uc.getPkId()); @@ -2524,7 +2457,7 @@ public class CuMemberServiceImpl extends ServiceImpl i LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(CuMemberAccount::getPkCountry, uc.getNewPkSettleCountry()); updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId()); - memberAccountService.update(updateWrapper); + iCuMemberAccountService.update(updateWrapper); // //修改国家编号 // CuMember cm = baseMapper.queryRecentlyMember(uc.getNewPkSettleCountry()); // if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) { @@ -2561,7 +2494,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(upseCountryVO.getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(upseCountryVO.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.UPDATE_SETTLE_COUNTRY.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_SETTLE_PETITION)); } @@ -2611,7 +2544,7 @@ public class CuMemberServiceImpl extends ServiceImpl i policyCurrencyVO.getProcessType() == EProcessType.DOUBLEAVOID.getValue()) { //添加修改记录表数据 memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //组装日志数据 BusinessLogDTO businessLog = BusinessLogDTO.builder() @@ -2634,7 +2567,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(policyCurrencyVO.getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(policyCurrencyVO.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.POLICY_CURRENCY_MONEY)); } @@ -2686,7 +2619,7 @@ public class CuMemberServiceImpl extends ServiceImpl i } else { memberLog.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue()); } - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); //免签呈 if (policyCurrencyVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() || @@ -2696,7 +2629,7 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberServiceLog::getPkModified, policyCurrencyVO.getPkCreator()); updateWrapper.set(CuMemberServiceLog::getModifiedTime, policyCurrencyVO.getCreationTime()); updateWrapper.eq(CuMemberServiceLog::getPkId, plc.getPkId()); - memberServiceLogService.update(updateWrapper); + iCuMemberServiceLogService.update(updateWrapper); //组装日志数据 BusinessLogDTO businessLog = BusinessLogDTO.builder() @@ -2720,7 +2653,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(policyCurrencyVO.getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(policyCurrencyVO.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.POLICY_CURRENCY_MONEY)); } @@ -2779,7 +2712,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setModifiedTime(date); memberLog.setApproveNumber(uc.getChangeNumber()); memberLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.updateById(memberLog); + iCuMemberServiceLogService.updateById(memberLog); CuSettleCountryDetailed countryDetailed = new CuSettleCountryDetailed(); countryDetailed.setPkServiceLog(memberLog.getPkId()); countryDetailed.setPkMember(uc.getPkId()); @@ -2835,7 +2768,7 @@ public class CuMemberServiceImpl extends ServiceImpl i LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(CuMemberAccount::getPkCountry, Integer.parseInt(uc.getNewSettleCountry())); updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId()); - memberAccountService.update(updateWrapper); + iCuMemberAccountService.update(updateWrapper); // //修改国家编号 // CuMember cm = baseMapper.queryRecentlyMember(Integer.parseInt(uc.getNewSettleCountry())); // if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) { @@ -2886,7 +2819,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setModifiedTime(date); memberLog.setApproveNumber(uc.getChangeNumber() - 1); memberLog.setApproveStatus(EApproveStatus.REJECTED.getValue()); - memberServiceLogService.updateById(memberLog); + iCuMemberServiceLogService.updateById(memberLog); if (StringUtils.isNotNull(uc.getCost()) && uc.getCost().compareTo(BigDecimal.ONE) > 0) { MemberAmountDTO memberAmountDTO = new MemberAmountDTO(); memberAmountDTO.setPkMember(uc.getPkId()); @@ -2901,7 +2834,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(EApprovalBusiness.UPDATE_SETTLE_COUNTRY.getValue()); - Boolean result = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); + Boolean result = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED); if (!result) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_REFUND)); } @@ -3135,13 +3068,13 @@ public class CuMemberServiceImpl extends ServiceImpl i // censusSummaryVo.setFansAmountLocality(checkIsDecimalNull(amount)); // censusSummaryVo.setHiFunPvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate)); // } else { - censusSummaryVo.setFansAmount(BigDecimal.ZERO); - censusSummaryVo.setHiFunPv(BigDecimal.ZERO); - censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO); - censusSummaryVo.setHiFunPvDollar(BigDecimal.ZERO); - // 本地币 - censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO); - censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO); + censusSummaryVo.setFansAmount(BigDecimal.ZERO); + censusSummaryVo.setHiFunPv(BigDecimal.ZERO); + censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO); + censusSummaryVo.setHiFunPvDollar(BigDecimal.ZERO); + // 本地币 + censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO); + censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO); // } // 复购金额 @@ -3340,7 +3273,7 @@ public class CuMemberServiceImpl extends ServiceImpl i cuMember.setConsumeMoney(BigDecimal.ZERO); cuMember.setConsumeAchieve(BigDecimal.ZERO); cuMember.setRegisterAuthority(gradeDTO.getRegisterAuthority()); - cuMemberBusinessService.saveShareMember(cuMember); + iCuMemberBusinessService.saveShareMember(cuMember); return cuMember; } @@ -3392,7 +3325,7 @@ public class CuMemberServiceImpl extends ServiceImpl i cuMember.setPkCreator(parentMember.getPkId()); if (parentMember.getPkTeamCode() == null) { // 验证父级是不是团队 - CuMemberTeamExt memberTeamExt = memberTeamService.getCuMemberTeamById(parentMember.getPkId()); + CuMemberTeamExt memberTeamExt = iCuMemberTeamService.getCuMemberTeamById(parentMember.getPkId()); if (memberTeamExt != null) { cuMember.setPkTeamCode(memberTeamExt.getPkId()); } @@ -3404,7 +3337,7 @@ public class CuMemberServiceImpl extends ServiceImpl i } private CuMember repeatTryTree(CuMember cuMember) { - CuMember placeCuMember = cuMemberBusinessService.queryCuMemberPlaceDept(cuMember, false, false); + CuMember placeCuMember = iCuMemberBusinessService.queryCuMemberPlaceDept(cuMember, false, false); if (!redisService.lockKeyOnce(CacheConstants.POSITION + placeCuMember.getPkPlaceParent() + placeCuMember.getPlaceDept(), Constants.FIVE_TIMEOUT_SECOND)) { try { Thread.sleep(300); @@ -3788,7 +3721,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setApproveNumber(uc.getChangeNumber()); memberLog.setSingleAmount(uc.getCost()); memberLog.setProcessType(uc.getProcessType()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); // 拼装发送mq StringBuilder str = new StringBuilder(); @@ -3829,7 +3762,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(updateParentPetitionParam.getUpdateParentParamList().get(0).getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(updateParentPetitionParam.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.CU_MEMBER_PARENT.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY)); } @@ -3868,7 +3801,7 @@ public class CuMemberServiceImpl extends ServiceImpl i memberLog.setApproveNumber(uc.getChangeNumber()); memberLog.setSingleAmount(uc.getCost()); memberLog.setProcessType(updatePlaceParentPetitionParam.getProcessType()); - memberServiceLogService.save(memberLog); + iCuMemberServiceLogService.save(memberLog); // 拼装发送mq StringBuilder str = new StringBuilder(); @@ -3924,7 +3857,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(updatePlaceParentPetitionParam.getUpdateParentParamList().get(0).getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(updatePlaceParentPetitionParam.getMemberAmountDTOList()); businessCommissionDTO.setTradeType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); - Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY)); } @@ -3943,7 +3876,7 @@ public class CuMemberServiceImpl extends ServiceImpl i String businessCode = approvalBusinessResultDTO.getBusinessCode(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, businessCode); - CuMemberServiceLog memberServiceLog = memberServiceLogService.getOne(queryWrapper); + CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); if (memberServiceLog != null) { CuMember newParentMember = getMemberByCode(memberServiceLog.getNewValue()); int directPushNumber; @@ -3956,7 +3889,7 @@ public class CuMemberServiceImpl extends ServiceImpl i baseMapper.updateParentById(memberServiceLog.getPkMember(), newParentMember.getPkId(), directPushNumber); memberServiceLog.setApproveStatus(EApproveStatus.FINISH.getValue()); // memberServiceLog.setApproveNumber(memberServiceLog.getApproveNumber() + 1); - memberServiceLogService.updateById(memberServiceLog); + iCuMemberServiceLogService.updateById(memberServiceLog); } } @@ -3971,7 +3904,7 @@ public class CuMemberServiceImpl extends ServiceImpl i String businessCode = approvalBusinessResultDTO.getBusinessCode(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, businessCode); - CuMemberServiceLog memberServiceLog = memberServiceLogService.getOne(queryWrapper); + CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); if (memberServiceLog != null) { List memberAmountDTOList = new ArrayList<>(); //查询扣费金额，账户信息 @@ -3985,7 +3918,7 @@ public class CuMemberServiceImpl extends ServiceImpl i } ServiceChargeDTO serviceCharge = serviceChargeDTOR.getData(); memberServiceLog.setApproveStatus(EApproveStatus.REJECTED.getValue()); - memberServiceLogService.updateById(memberServiceLog); + iCuMemberServiceLogService.updateById(memberServiceLog); if (StringUtils.isNotNull(serviceCharge.getCost()) && serviceCharge.getCost().compareTo(BigDecimal.ONE) > 0) { MemberAmountDTO memberAmountDTO = new MemberAmountDTO(); @@ -4002,7 +3935,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkCreator(memberServiceLog.getPkCreator()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(EApprovalBusiness.CU_MEMBER_PARENT.getValue()); - Boolean b = cuMemberTradeService.businessCommissionReject(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionReject(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_REFUND)); } @@ -4021,7 +3954,7 @@ public class CuMemberServiceImpl extends ServiceImpl i String businessCode = approvalBusinessResultDTO.getBusinessCode(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, businessCode); - List memberServiceLogList = memberServiceLogService.list(queryWrapper); + List memberServiceLogList = iCuMemberServiceLogService.list(queryWrapper); for (CuMemberServiceLog memberServiceLog : memberServiceLogList) { boolean typeJSON = JSONUtil.isTypeJSON(memberServiceLog.getNewValue()); if (typeJSON) { @@ -4031,7 +3964,7 @@ public class CuMemberServiceImpl extends ServiceImpl i // 修改安置 baseMapper.updatePlaceParentAndPlaceDeptById(memberServiceLog.getPkMember(), newParentMember.getPkId(), placeDept); memberServiceLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberServiceLogService.updateById(memberServiceLog); + iCuMemberServiceLogService.updateById(memberServiceLog); } } @@ -4047,10 +3980,10 @@ public class CuMemberServiceImpl extends ServiceImpl i String businessCode = approvalBusinessResultDTO.getBusinessCode(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberServiceLog::getBusinessNo, businessCode); - CuMemberServiceLog memberServiceLog = memberServiceLogService.getOne(queryWrapper); + CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); if (memberServiceLog != null) { memberServiceLog.setApproveStatus(EApproveStatus.REJECTED.getValue()); - memberServiceLogService.updateById(memberServiceLog); + iCuMemberServiceLogService.updateById(memberServiceLog); List memberAmountDTOList = new ArrayList<>(); //查询扣费金额，账户信息 @@ -4077,7 +4010,7 @@ public class CuMemberServiceImpl extends ServiceImpl i businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setTradeType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); - Boolean b = cuMemberTradeService.businessCommissionReject(businessCommissionDTO); + Boolean b = iCuMemberTradeService.businessCommissionReject(businessCommissionDTO); if (!b) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_REFUND)); } @@ -4100,17 +4033,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.queryRegisterOrder(orderCode, pkMember); } - /** - * 查询会员左右区人数 - * - * @param pkMember - * @return - */ - @Override - public List selectByDeptNumberPlace(Long pkMember) { - return baseMapper.selectByDeptNumberPlace(pkMember); - } - @Override public Boolean updateMemberStatusByPkIds(List pkMembers, Long updatePkMember, Integer type) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); @@ -4140,10 +4062,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 校验会员是否存在三方订单 - * @author: zhang jing - * @date: 2023/10/27 16:48 - * @param: [pkMember] - * @return: java.lang.Integer **/ @Override public Integer checkThreeOrder(Long pkMember) { @@ -4349,20 +4267,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry); } - private Boolean lockKey(String key) { - return redisService.lockKeyOnce(key); - } - - private CuMember obtainLastResettleByRecommend(CuMember cuMember, Boolean isFirstAchieve, Boolean isFirst) { - // 验证是否首单 - if (isFirst == null) { - isFirst = validateFirstOrder(cuMember.getPkParent(), cuMember.getPkSettleCountry()); - } - cuMember = cuMemberBusinessService.queryCuMemberPlaceDept(cuMember, isFirst, isFirstAchieve); - // 验证是否推荐过人，没有推荐只能放入极左极下 - return cuMember; - } - private boolean validateFirstOrder(Long pkParent, Integer pkCountry) { String validateFirstOrder = querySystemConfigByKey(pkCountry, ESystemConfig.FIRST_ORDER.getKey()); if (EYesNo.YES.getIntValue() == Integer.parseInt(validateFirstOrder)) { diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberSpecialServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberSpecialServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberSpecialServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberSpecialServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuSettleCountryDetailedServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuSettleCountryDetailedServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuSettleCountryDetailedServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuSettleCountryDetailedServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/AwardsVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AwardsVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/AwardsVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AwardsVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlImportVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlImportVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlImportVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlImportVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuAwardsControlVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberImportVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberImportVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberImportVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberImportVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberTeamVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberTeamVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberTeamVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberTeamVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ImportPolicyCurrencyVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ImportPolicyCurrencyVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ImportPolicyCurrencyVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ImportPolicyCurrencyVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ImportSettleCountryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ImportSettleCountryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ImportSettleCountryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ImportSettleCountryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAddressVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAddressVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAddressVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAddressVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAwards.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAwards.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAwards.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAwards.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsInfoVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsInfoVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsInfoVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsQueryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsQueryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsQueryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberAwardsQueryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberCardVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberCardVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberCardVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberCardVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingDetailVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingDetailVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingDetailVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingDetailVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberConsumptionStatVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberConsumptionStatVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberConsumptionStatVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberConsumptionStatVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberDataVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDataVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberDataVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDataVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberMeritsSummaryVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberMeritsSummaryVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberMeritsSummaryVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberMeritsSummaryVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberParentExportVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberParentExportVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberParentExportVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberParentExportVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberParentVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberParentVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberParentVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberParentVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberPlaceParentServiceLogVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPlaceParentServiceLogVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberPlaceParentServiceLogVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPlaceParentServiceLogVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberSelectVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberSelectVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberSelectVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberSelectVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceCodeVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceCodeVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceCodeVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceCodeVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceLogVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceLogVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceLogVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberServiceLogVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberShare.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberShare.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberShare.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberShare.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ParentMemberVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ParentMemberVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ParentMemberVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ParentMemberVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/SpecialMemberExport.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/SpecialMemberExport.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/SpecialMemberExport.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/SpecialMemberExport.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/TopMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TopMemberVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/TopMemberVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TopMemberVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpPolicyCurrencyVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpPolicyCurrencyVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpPolicyCurrencyVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpPolicyCurrencyVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeImportVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeImportVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeImportVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeImportVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopImportVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopImportVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopImportVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopImportVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateExpireStopVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentExport.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentExport.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentExport.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentExport.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateParentVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceImport.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceImport.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceImport.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceImport.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceParentVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceParentVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceParentVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceParentVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdatePlaceVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateSettleCountryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateSettleCountryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/UpdateSettleCountryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateSettleCountryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ZeroElementRevokeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ZeroElementRevokeVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/vo/ZeroElementRevokeVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ZeroElementRevokeVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushHisMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushHisMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushHisMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushHisMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushHisService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushHisService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushHisService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushHisService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/component/load/MemberLoadRunner.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/component/load/MemberLoadRunner.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/component/load/MemberLoadRunner.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/component/load/MemberLoadRunner.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/component/load/RedisComponent.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/component/load/RedisComponent.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/component/load/RedisComponent.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/component/load/RedisComponent.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/api/ApiCuMemberAssessController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/api/ApiCuMemberAssessController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/api/ApiCuMemberAssessController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/api/ApiCuMemberAssessController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessExemptMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessExemptMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessExemptMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessExemptMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAssessMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAuthorityMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAuthorityMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAuthorityMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAuthorityMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAwardsMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAwardsMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAwardsMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberAwardsMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberChangeLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberChangeLogMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberChangeLogMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberChangeLogMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLoginMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLoginMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLoginMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLoginMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuUpgradeGiveLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuUpgradeGiveLogMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuUpgradeGiveLogMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuUpgradeGiveLogMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessExemptService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessExemptService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessExemptService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessExemptService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAssessService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAuthorityService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAuthorityService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAuthorityService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAuthorityService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAwardsService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAwardsService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAwardsService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberAwardsService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberChangeLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberChangeLogService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberChangeLogService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberChangeLogService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLoginService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLoginService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLoginService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLoginService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessExemptServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessExemptServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessExemptServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessExemptServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAuthorityServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAuthorityServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAuthorityServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAuthorityServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAwardsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAwardsServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAwardsServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAwardsServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberChangeLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberChangeLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberChangeLogServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberChangeLogServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLoginServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLoginServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLoginServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLoginServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAwardsRecordVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAwardsRecordVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAwardsRecordVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAwardsRecordVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberServiceLogVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberServiceLogVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberServiceLogVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberServiceLogVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDTO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDTO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDTO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDetailDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDetailDTO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDetailDTO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDetailDTO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyProductDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyProductDTO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyProductDTO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyProductDTO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyLogMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyLogMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyLogMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyAddParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyAddParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyAddParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyAddParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyQueryParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyQueryParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyQueryParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyQueryParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyRegisterQueryParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyRegisterQueryParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyRegisterQueryParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptyRegisterQueryParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptySignParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptySignParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptySignParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/param/MemberEmptySignParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyLogService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyLogService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyLogService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyLogServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyLogServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyCodeTemplate.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyCodeTemplate.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyCodeTemplate.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyCodeTemplate.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyDetailTemplate.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyDetailTemplate.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyDetailTemplate.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/CuMemberEmptyDetailTemplate.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryProductVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryProductVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryProductVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryProductVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberAwardsVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberAwardsVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberAwardsVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberAwardsVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberLevelVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberLevelVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberLevelVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/footmark/vo/CuMemberLevelVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/controller/api/ApiCuPersonalGoalsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/controller/api/ApiCuPersonalGoalsController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/controller/api/ApiCuPersonalGoalsController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/controller/api/ApiCuPersonalGoalsController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/controller/manage/CuPersonalGoalsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/controller/manage/CuPersonalGoalsController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/controller/manage/CuPersonalGoalsController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/controller/manage/CuPersonalGoalsController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/param/CuPersonalGoalsParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/param/CuPersonalGoalsParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/param/CuPersonalGoalsParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/param/CuPersonalGoalsParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsClassifyServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsClassifyServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsClassifyServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsClassifyServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsClassifyVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsClassifyVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsClassifyVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsClassifyVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsListVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsListVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsListVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsListVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMeetingVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMeetingVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMeetingVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMeetingVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMonthDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMonthDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMonthDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsMonthDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsRowDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsRowDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsRowDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsRowDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/mapper/CuHandleBusinessMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/mapper/CuHandleBusinessMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/mapper/CuHandleBusinessMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/mapper/CuHandleBusinessMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/ICuHandleBusinessService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/ICuHandleBusinessService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/ICuHandleBusinessService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/ICuHandleBusinessService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessCostVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessCostVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessCostVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessCostVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessErrorVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessErrorVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessErrorVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessErrorVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessFreeExamVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessFreeExamVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessFreeExamVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessFreeExamVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessMemberVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessMemberVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessMemberVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTableVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTableVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTableVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTableVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTypeValueVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTypeValueVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTypeValueVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessTypeValueVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessWalletVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessWalletVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessWalletVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/BusinessWalletVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/CuMemberOldValueVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/CuMemberOldValueVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/CuMemberOldValueVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/CuMemberOldValueVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessShowVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessShowVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessShowVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessShowVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/HandleBusinessVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/OnlinePetitionVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/OnlinePetitionVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/vo/OnlinePetitionVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/OnlinePetitionVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/param/AutoLoginParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/param/AutoLoginParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/param/AutoLoginParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/login/param/AutoLoginParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/service/IMemberLoginService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/IMemberLoginService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/service/IMemberLoginService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/IMemberLoginService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/param/MarketNewsParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/param/MarketNewsParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/param/MarketNewsParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/param/MarketNewsParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/param/SeaFlourParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/param/SeaFlourParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/param/SeaFlourParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/param/SeaFlourParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/param/TripleCycleListParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/param/TripleCycleListParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/param/TripleCycleListParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/param/TripleCycleListParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/vo/SeaFlourVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/vo/SeaFlourVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/vo/SeaFlourVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/vo/SeaFlourVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/vo/UserInvestmentVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/vo/UserInvestmentVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/vo/UserInvestmentVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/vo/UserInvestmentVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/param/CuMemberAuthorityParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/param/CuMemberAuthorityParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/param/CuMemberAuthorityParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/param/CuMemberAuthorityParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/param/CuMemberGiftParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/param/CuMemberGiftParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/param/CuMemberGiftParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/param/CuMemberGiftParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/param/MemberParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/param/MemberParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/param/MemberParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/param/MemberParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/pub/tool/MemberToolsHandler.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/pub/tool/MemberToolsHandler.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/pub/tool/MemberToolsHandler.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/pub/tool/MemberToolsHandler.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfModifyAddressController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfModifyAddressController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfModifyAddressController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfModifyAddressController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/manage/SelfModifyAddressController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/SelfModifyAddressController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/controller/manage/SelfModifyAddressController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/SelfModifyAddressController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/DomicileChangeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/DomicileChangeVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/DomicileChangeVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/DomicileChangeVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/MyOrderItemsVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/MyOrderItemsVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/MyOrderItemsVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/MyOrderItemsVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/OrderItemsParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/OrderItemsParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/OrderItemsParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/OrderItemsParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/OrderParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/OrderParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/OrderParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/OrderParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/SelfModifyAddressVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfModifyAddressVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/SelfModifyAddressVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfModifyAddressVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/WaresItemsParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/WaresItemsParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/self/vo/WaresItemsParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/WaresItemsParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/controller/manage/SettleCenterController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/controller/manage/SettleCenterController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/controller/manage/SettleCenterController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/controller/manage/SettleCenterController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/param/PlacementDataParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/param/PlacementDataParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/param/PlacementDataParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/param/PlacementDataParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PalaceAchieveDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PalaceAchieveDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PalaceAchieveDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PalaceAchieveDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataBaseVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataBaseVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataBaseVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataBaseVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementDataVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementExportDataVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementExportDataVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementExportDataVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementExportDataVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementImageDataVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementImageDataVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementImageDataVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/PlacementImageDataVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendImageDataVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendImageDataVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendImageDataVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendImageDataVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendTeamImagVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendTeamImagVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendTeamImagVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendTeamImagVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java similarity index 98% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java index 0b07d480..667adb1d 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java @@ -1,6 +1,6 @@ package com.hzs.member.share.controller.api; -import com.hzs.common.core.config.HzsConfig; +import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EEnv; @@ -156,7 +156,7 @@ public class ApiShareController { * @return */ private boolean checkShare() { - if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { + if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { return new Date().getTime() >= SysConstants.CLOSE_ZERO_DATE_TEST; } else { return new Date().getTime() >= SysConstants.CLOSE_ZERO_DATE_ONLINE; diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/controller/manage/CuMemberSiloWhiteController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/controller/manage/CuMemberSiloWhiteController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/controller/manage/CuMemberSiloWhiteController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/controller/manage/CuMemberSiloWhiteController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloNumMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloNumMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloNumMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloNumMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloTradeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloTradeMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloTradeMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloTradeMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloWhiteMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloWhiteMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloWhiteMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/mapper/CuMemberSiloWhiteMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteQueryParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteQueryParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteQueryParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteQueryParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteSaveParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteSaveParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteSaveParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/param/MemberSiloWhiteSaveParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/provider/ISiloMemberServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/provider/ISiloMemberServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/provider/ISiloMemberServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/provider/ISiloMemberServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloNumService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloNumService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloNumService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloNumService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloTradeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloTradeService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloTradeService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloTradeService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloWhiteService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloWhiteService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloWhiteService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/ICuMemberSiloWhiteService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloNumServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloNumServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloNumServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloNumServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloTradeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloTradeServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloTradeServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloTradeServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloWhiteServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloWhiteServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloWhiteServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/service/impl/CuMemberSiloWhiteServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/vo/MemberSiloWhiteQueryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/silo/vo/MemberSiloWhiteQueryVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/silo/vo/MemberSiloWhiteQueryVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/silo/vo/MemberSiloWhiteQueryVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/sms/service/IApiSmsService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiSmsService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/sms/service/IApiSmsService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiSmsService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiSmsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiSmsServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiSmsServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiSmsServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusLenjoyStatisController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusLenjoyStatisController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusLenjoyStatisController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusLenjoyStatisController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusLenjoyStatisMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusLenjoyStatisMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusLenjoyStatisMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusLenjoyStatisMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusVertexStatisMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusVertexStatisMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusVertexStatisMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusVertexStatisMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusLenjoyStatisService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusLenjoyStatisService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusLenjoyStatisService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusLenjoyStatisService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusStatisService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusStatisService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusStatisService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusStatisService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusVertexStatisService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusVertexStatisService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusVertexStatisService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/ICuBonusVertexStatisService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusLenjoyStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusLenjoyStatisServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusLenjoyStatisServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusLenjoyStatisServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusLenjoyStatisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusLenjoyStatisVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusLenjoyStatisVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusLenjoyStatisVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusSinglePersonStatisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusSinglePersonStatisVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusSinglePersonStatisVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusSinglePersonStatisVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisChartVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisChartVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisChartVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisChartVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisColumnarVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisColumnarVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisColumnarVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisColumnarVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisRoundVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisRoundVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisRoundVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisRoundVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisTotalVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisTotalVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisTotalVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisTotalVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/controller/api/ApiCuStoreController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/api/ApiCuStoreController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/controller/api/ApiCuStoreController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/api/ApiCuStoreController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/controller/manager/CuStoreController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/CuStoreController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/controller/manager/CuStoreController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/CuStoreController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/controller/manager/MakerSpaceController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/MakerSpaceController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/controller/manager/MakerSpaceController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/MakerSpaceController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/mapper/CuStoreMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/mapper/CuStoreMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/mapper/CuStoreMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/mapper/CuStoreMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/param/MakerSpaceParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/param/MakerSpaceParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/param/MakerSpaceParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/param/MakerSpaceParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/service/ICuStoreService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/ICuStoreService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/service/ICuStoreService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/ICuStoreService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/service/impl/CuStoreServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/impl/CuStoreServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/service/impl/CuStoreServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/impl/CuStoreServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/vo/CuMakerSpaceVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuMakerSpaceVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/vo/CuMakerSpaceVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuMakerSpaceVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/vo/CuStoreVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuStoreVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/store/vo/CuStoreVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuStoreVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java similarity index 80% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java index 9db690c1..9b138ff5 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java @@ -50,10 +50,6 @@ import java.util.*; /** * @Description: 架构管理 - * @Author: yuhui - * @Time: 2023/2/2 11:32 - * @Classname: MemberStructureController - * @PackageName: com.hzs.member.memberStructure */ @RestController @RequestMapping("/manage/member-structure") @@ -62,18 +58,18 @@ public class MemberStructureController extends BaseController { @Autowired private UserTokenService userTokenService; @Autowired - private ICuMemberSettlePeriodService memberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @Autowired - private ICuMemberTreeService memberTreeService; + private ICuMemberTreeService iCuMemberTreeService; @Autowired - private ICuMemberService memberService; + private ICuMemberService iCuMemberService; @DubboReference - ICountryServiceApi countryServiceApi; + ICountryServiceApi iCountryServiceApi; @DubboReference IUserServiceApi iUserServiceApi; @DubboReference - IGradeServiceApi gradeServiceApi; + IGradeServiceApi iGradeServiceApi; /** * 默认层数 @@ -98,22 +94,22 @@ public class MemberStructureController extends BaseController { Long pkMember = null; if (StringUtils.isNotBlank(memberCode)) { - CuMember member = memberService.getMemberByCode(memberCode); + CuMember member = iCuMemberService.getMemberByCode(memberCode); if (member == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); } pkMember = member.getPkId(); } else { if (userVertexList != null && userVertexList.size() > 0) { - CuMember member = memberService.getMemberById(userVertexList.get(0)); + CuMember member = iCuMemberService.getMemberById(userVertexList.get(0)); pkMember = member.getPkId(); memberCode = member.getMemberCode(); } else { - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); for (Map.Entry be : allCountryMap.getData().entrySet()) { if (be.getKey().equals(SecurityUtils.getPkCountry())) { memberCode = be.getValue().getCode() + "30720201"; - CuMember member = memberService.getMemberByCode(memberCode); + CuMember member = iCuMemberService.getMemberByCode(memberCode); pkMember = member.getPkId(); } } @@ -122,7 +118,7 @@ public class MemberStructureController extends BaseController { if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 - List memberExtList = memberService.checkMemberVertex(vertexIdList, memberCode); + List memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); if (memberExtList.size() == 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); } @@ -131,11 +127,11 @@ public class MemberStructureController extends BaseController { Integer period = null; Date settleDate = null; if (memberSettlePeriodId != null) { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } else { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); @@ -148,37 +144,37 @@ public class MemberStructureController extends BaseController { String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; // 查询所有用户表数据 id // 查询秒结 表 如果 秒结表 没有则去 历史表 - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { List cuMemberSettleExts = null; // 查询今日会员表是否有值 - Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); + Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); if (treeMemberCount > 0) { //表格存在 - cuMemberSettleExts = memberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); + cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); } else { DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - cuMemberSettleExts = memberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); + cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); } // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); // 添加自身 cuMemberSettleExts.add(memberSettleExt); - List> build = memberService.systemAzSetListTree(cuMemberSettleExts, memberSettleExt); + List> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExts, memberSettleExt); // 安置架构 无点位 追加空点位 // if (type != EStructureType.JG4.getIntValue()){ - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); List> trees = setTreeList(build, level, allCountryData); return AjaxResult.success(trees); @@ -187,24 +183,24 @@ public class MemberStructureController extends BaseController { // } } else { // 查询表格是否存在 - tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber == null) { settleTableName = null; } // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); //查询下级 - List list = memberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(), level); + List list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(), level); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); - List> build = memberService.systemAzSetListTree(list, memberSettleExt); + List> build = iCuMemberService.systemAzSetListTree(list, memberSettleExt); // 安置架构 无点位 追加空点位 // if (type != EStructureType.JG4.getIntValue()){ - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); return AjaxResult.success(setTreeList(build, level, allCountryData)); // }else { @@ -214,23 +210,23 @@ public class MemberStructureController extends BaseController { } else { // 查询 历史 String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { // 表示表格存在 // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); //查询下级 - // List list = memberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level); - List list = memberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); + // List list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level); + List list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); - List> build = memberService.systemAzSetListTree(list, memberSettleExt); + List> build = iCuMemberService.systemAzSetListTree(list, memberSettleExt); // 安置架构 无点位 追加空点位 - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); return AjaxResult.success(setTreeList(build, level, allCountryData)); } @@ -251,7 +247,6 @@ public class MemberStructureController extends BaseController { String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2(); for (Tree stringTree : build) { Integer level = (Integer) stringTree.get("level"); - Integer placeDept = (Integer) stringTree.get("placeDept"); if (level < (numberOfPlies - 1)) { if (stringTree.getChildren() != null) { if (stringTree.getChildren().size() == 0) { @@ -345,7 +340,6 @@ public class MemberStructureController extends BaseController { } else { // 等于空 List> children = new ArrayList<>(); - children = new ArrayList<>(); Tree emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode1.putExtra("level", level + 1); @@ -361,7 +355,6 @@ public class MemberStructureController extends BaseController { // emptyNode1.setChildren(setChildren(level+1,emptyNode1.getId())); children.add(emptyNode1); - Tree emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); emptyNode2.putExtra("level", level + 1); @@ -391,7 +384,7 @@ public class MemberStructureController extends BaseController { * 推荐架构网体 */ @AccessPermissions("Recommend") - @GetMapping("tj-framework") + @GetMapping("/tj-framework") public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) { Date date = new Date(); String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); @@ -401,7 +394,7 @@ public class MemberStructureController extends BaseController { List userVertexList = userAuthorityDTO.getUserVertexList(); Long pkMember = null; if (StringUtils.isNotBlank(memberCode)) { - CuMember member = memberService.getMember(memberCode); + CuMember member = iCuMemberService.getMember(memberCode); if (member == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); } @@ -409,29 +402,28 @@ public class MemberStructureController extends BaseController { } else { if (userVertexList != null && userVertexList.size() > 0) { - CuMember member = memberService.getMember(userVertexList.get(0)); + CuMember member = iCuMemberService.getMember(userVertexList.get(0)); pkMember = member.getPkId(); } else { - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); for (Map.Entry be : allCountryMap.getData().entrySet()) { if (be.getKey().equals(SecurityUtils.getPkCountry())) { memberCode = be.getValue().getCode() + "30720201"; - CuMember member = memberService.getMember(memberCode); + CuMember member = iCuMemberService.getMember(memberCode); pkMember = member.getPkId(); } } } - } Integer period = null; Date settleDate = null; if (memberSettlePeriodId != null) { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } else { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); @@ -444,7 +436,7 @@ public class MemberStructureController extends BaseController { // 会员结算秒结表 String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { //表格存在 if (level == null) { @@ -452,23 +444,23 @@ public class MemberStructureController extends BaseController { } List cuMemberSettleExts = null; // 查询今日会员表是否有值 - Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); + Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); if (treeMemberCount > 0) { //表格存在 - cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); } else { DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); } // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } @@ -476,7 +468,7 @@ public class MemberStructureController extends BaseController { // 添加自身 cuMemberSettleExts.add(memberSettleExt); - List> build = memberService.systemTjSetListTree(cuMemberSettleExts, memberSettleExt, settleTableName, true); + List> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExts, memberSettleExt, settleTableName, true); // 安置架构 无点位 追加空点位 return AjaxResult.success(build); } else { @@ -489,16 +481,16 @@ public class MemberStructureController extends BaseController { settleTableName = null; } // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); //查询下级 - List list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); - List> build = memberService.systemTjSetListTree(list, memberSettleExt, settleTableName, true); + List> build = iCuMemberService.systemTjSetListTree(list, memberSettleExt, settleTableName, true); // 安置架构 无点位 追加空点位 return AjaxResult.success(build); } @@ -509,31 +501,31 @@ public class MemberStructureController extends BaseController { } DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); } // 查询 历史 String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber == null) { // 表示表格存在 settleTableName = null; } // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); if (StringUtils.isNotBlank(memberSettleExt.getParentMemberCode()) && MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); //查询下级 - // List list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level); - List list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + // List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level); + List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); - List> build = memberService.systemTjSetListTree(list, memberSettleExt, settleTableName, false); + List> build = iCuMemberService.systemTjSetListTree(list, memberSettleExt, settleTableName, false); // 安置架构 无点位 追加空点位 return AjaxResult.success(build); } @@ -545,7 +537,7 @@ public class MemberStructureController extends BaseController { * * @return */ - @GetMapping("az-framework-five") + @GetMapping("/az-framework-five") public AjaxResult azFrameWorkFive(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { if (level == null) { level = 10; @@ -556,22 +548,22 @@ public class MemberStructureController extends BaseController { List userVertexList = userAuthorityDTO.getUserVertexList(); Long pkMember = null; if (StringUtils.isNotBlank(memberCode)) { - CuMember member = memberService.getMemberByCode(memberCode); + CuMember member = iCuMemberService.getMemberByCode(memberCode); if (member == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); } pkMember = member.getPkId(); } else { if (userVertexList != null && userVertexList.size() > 0) { - CuMember member = memberService.getMemberById(userVertexList.get(0)); + CuMember member = iCuMemberService.getMemberById(userVertexList.get(0)); pkMember = member.getPkId(); memberCode = member.getMemberCode(); } else { - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); for (Map.Entry be : allCountryMap.getData().entrySet()) { if (be.getKey().equals(SecurityUtils.getPkCountry())) { memberCode = be.getValue().getCode() + "30720201"; - CuMember member = memberService.getMemberByCode(memberCode); + CuMember member = iCuMemberService.getMemberByCode(memberCode); pkMember = member.getPkId(); } } @@ -580,7 +572,7 @@ public class MemberStructureController extends BaseController { if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 - List memberExtList = memberService.checkMemberVertex(vertexIdList, memberCode); + List memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); if (memberExtList.size() == 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); } @@ -588,18 +580,18 @@ public class MemberStructureController extends BaseController { // 查询当天 (秒结) // 会员结算秒结表 - List cuMemberSettleExts = memberTreeService.selectByTreeMemberListFive(pkMember, level, vertexIdList); + List cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberListFive(pkMember, level, vertexIdList); // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(null, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(null, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); // 添加自身 cuMemberSettleExts.add(memberSettleExt); - List> build = memberService.systemAzSetListTreeFive(cuMemberSettleExts, memberSettleExt); + List> build = iCuMemberService.systemAzSetListTreeFive(cuMemberSettleExts, memberSettleExt); // 安置架构 无点位 追加空点位 - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); List> trees = setTreeList(build, level, allCountryData); return AjaxResult.success(trees); @@ -617,7 +609,7 @@ public class MemberStructureController extends BaseController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.orderByDesc(CuMemberSettlePeriod::getSettleDate); queryWrapper.between(CuMemberSettlePeriod::getSettleDate, dateTime, new Date()); - List list = memberSettlePeriodService.list(queryWrapper); + List list = iCuMemberSettlePeriodService.list(queryWrapper); List resultList = new ArrayList<>(); for (CuMemberSettlePeriod cuMemberSettlePeriod : list) { CuMemberSettlePeriodVo cuMemberSettlePeriodVo = BeanUtil.copyProperties(cuMemberSettlePeriod, CuMemberSettlePeriodVo.class); @@ -640,7 +632,7 @@ public class MemberStructureController extends BaseController { @GetMapping("get-avatar-info") public AjaxResult getAvatarUrl() { LoginUser user = userTokenService.getLoginUser(); - //R> list = gradeServiceApi.queryGradeConfigByCondition(user.getDataCountry()); + //R> list = iGradeServiceApi.queryGradeConfigByCondition(user.getDataCountry()); JSONArray array = new JSONArray(); // 虚拟 JSONObject other = new JSONObject(); @@ -659,7 +651,7 @@ public class MemberStructureController extends BaseController { djhOther.put("value", MemberFrameworkConstants.toBeActivated); array.add(djhOther); } - R> list = gradeServiceApi.selectGradeAll(SecurityUtils.getPkCountry()); + R> list = iGradeServiceApi.selectGradeAll(SecurityUtils.getPkCountry()); for (GradeDTO date : list.getData()) { JSONObject js = new JSONObject(); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberSettlePeriodVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberSettlePeriodVo.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberSettlePeriodVo.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberSettlePeriodVo.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/controller/manage/CuMemberSwingNetController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/controller/manage/CuMemberSwingNetController.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/controller/manage/CuMemberSwingNetController.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/controller/manage/CuMemberSwingNetController.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/vo/CuMemberRetVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/vo/CuMemberRetVO.java similarity index 100% rename from hzs-business/hzs-business-member/src/main/java/com/hzs/member/swing/vo/CuMemberRetVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/swing/vo/CuMemberRetVO.java diff --git a/hzs-business/hzs-business-member/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/bd-business/bd-business-member/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter rename to bd-business/bd-business-member/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/banner.txt b/bd-business/bd-business-member/src/main/resources/banner.txt similarity index 100% rename from hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/banner.txt rename to bd-business/bd-business-member/src/main/resources/banner.txt diff --git a/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml b/bd-business/bd-business-member/src/main/resources/bootstrap.yml similarity index 96% rename from hzs-business/hzs-business-member/src/main/resources/bootstrap.yml rename to bd-business/bd-business-member/src/main/resources/bootstrap.yml index c5841936..7b3b38ad 100644 --- a/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-member/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: hzs-member + name: bd-member jackson: # 返回数据序列化时，如果为 null 则不进行返回 default-property-inclusion: NON_NULL @@ -69,7 +69,7 @@ dubbo: threads: 400 cloud: # 订阅服务 - subscribed-services: hzs-system, hzs-third, hzs-sale + subscribed-services: bd-system, bd-third, bd-sale scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.member diff --git a/hzs-business/hzs-business-bonus/src/main/resources/logback.xml b/bd-business/bd-business-member/src/main/resources/logback.xml similarity index 97% rename from hzs-business/hzs-business-bonus/src/main/resources/logback.xml rename to bd-business/bd-business-member/src/main/resources/logback.xml index 9676ec90..ba7d36c1 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/logback.xml +++ b/bd-business/bd-business-member/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAccountDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAccountDetailMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountDetailMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAccountLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountLogMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAccountLogMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountLogMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAuthenticationMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAuthenticationMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberAuthenticationMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAuthenticationMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberBusinessLicenseMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBusinessLicenseMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberBusinessLicenseMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBusinessLicenseMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeBonusMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeDetailMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTransferMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTransferMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberTransferMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTransferMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberWithdrawMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberWithdrawMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/account/CuMemberWithdrawMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberWithdrawMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuActiveMemberCensusMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuActiveMemberCensusMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuActiveMemberCensusMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuActiveMemberCensusMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodDetailMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/address/CuMemberGiftMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/address/CuMemberGiftMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/address/CuMemberGiftMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/address/CuMemberGiftMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/address/CuMemberGiftRecordMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/address/CuMemberGiftRecordMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/address/CuMemberGiftRecordMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/address/CuMemberGiftRecordMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/address/CuMemberReceivingMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/address/CuMemberReceivingMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/address/CuMemberReceivingMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/address/CuMemberReceivingMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuEnergySiloDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuEnergySiloDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuEnergySiloDetailMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuEnergySiloDetailMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuEnergySiloMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuEnergySiloMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuEnergySiloMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuEnergySiloMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceDetailMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceDetailMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceDetailMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceFileMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceFileMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceFileMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceFileMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/base/CuAwardsControlMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAgentMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberExpireHistoryMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberExpireHistoryMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberExpireHistoryMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberExpireHistoryMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberHistroyAwardsMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberHistroyAwardsMapper.xml similarity index 100% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberHistroyAwardsMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberHistroyAwardsMapper.xml diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml similarity index 99% rename from hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml rename to bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 38e6988a..a34351c1 100644 --- a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -2828,27 +2828,6 @@ group by sa.ORDER_TYPE - - - - select pk_id, pk_member, account_name, decode(account_name, 'ACCOUNT4', - WITHDRAW_ACCOUNT4-lock_withdraw_account4, 0) withdrawBalance, - case - when account_name = 'ACCOUNT1' then - balance - lock_account1 - lock_transfer_account1 - when account_name = 'ACCOUNT2' then - balance - lock_account2 - lock_transfer_account2 - when account_name = 'ACCOUNT3' then - balance - lock_account3 - lock_transfer_account3 - when account_name = 'ACCOUNT4' then - balance - lock_account4 - lock_transfer_account4 - - lock_withdraw_account4 - when account_name = 'ACCOUNT5' then - balance - lock_account5 - lock_transfer_account5 - when account_name = 'ACCOUNT6' then - balance - lock_account6 - lock_transfer_account6 - when account_name = 'ACCOUNT7' then - balance - lock_account7 - lock_transfer_account7 - when account_name = 'ACCOUNT8' then - balance - lock_account8 - lock_transfer_account8 - when account_name = 'ACCOUNT13' then - balance - lock_account13 - when account_name = 'ACCOUNT14' then - balance - else - 0 - end availableBalance, - replace(account_name, 'ACCOUNT', '') accountType,balance - from CU_MEMBER_ACCOUNT unpivot(balance for account_name in(account1, account2, account3, account4,account5, - account6, account7, account8,account9, account10,account13,account14)) - where del_flag=0 - - and pk_member = ( - select pk_id from cu_member m where m.member_code=#{memberCode} and m.del_flag=0) - - - and pk_member = #{pkMember} - - and replace(account_name, 'ACCOUNT', '') in - - #{item} - - - - - - UPDATE CU_MEMBER_ACCOUNT - SET - - account1 = account1 + #{account1}, - - - account2 = account2 + #{account2}, - - - account3 = account3 + #{account3}, - - - account4 = account4 + #{account4}, - - - account5 = account5 + #{account5}, - - - account6 = account6 + #{account6}, - - - account7 = account7 + #{account7}, - - - account8 = account8 + #{account8}, - - - account9 = account9 + #{account9}, - - - account10 = account10 + #{account10}, - - - account11 = account11 + #{account11}, - - - account12 = account12 + #{account12}, - - - account13 = account13 + #{account13}, - - - account14 = account14 + #{account14}, - - - account15 = account15 + #{account15}, - - - account16 = account16 + #{account16}, - - - account17 = account17 + #{account17}, - - - account18 = account18 + #{account18}, - - - account19 = account19 + #{account19}, - - - account20 = account20 + #{account20}, - - - lock_account1 = #{lockAccount1}, - - - lock_account2 = #{lockAccount2}, - - - lock_account4 = #{lockAccount4}, - - - withdraw_account4 = withdraw_account4 + #{withdrawAccount4}, - - - consume_account4 = consume_account4 + #{consumeAccount4}, - - - lock_account13 = #{lockAccount13}, - - pk_modified = #{pkModified}, - modified_time = sysdate - WHERE pk_member = #{pkMember} and pk_country = #{pkCountry} and del_flag=0 - - and account2 + #{account2} >= 0 - - - - - - - - - - - - - - - - - - - INSERT ALL - - into CU_MEMBER_ACCOUNT ( - PK_ID, PK_MEMBER, PK_CREATOR, CREATION_TIME, PK_COUNTRY - ) - values ( - #{item.pkId}, #{item.pkMember}, #{item.pkCreator}, #{item.creationTime}, #{item.pkCountry} - ) - - SELECT 1 FROM dual - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberAuthenticationMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberAuthenticationMapper.xml deleted file mode 100644 index 5b022f21..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberAuthenticationMapper.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MEMBER, ID_CARD, REAL_NAME, SEX, ID_TYPE, SUB_BANK_NAME, ACCOUNT_NAME, CARD_NUMBER, PHONE, PK_BANK, BANK_NAME, PK_PROVINCE, PK_CITY, PK_COUNTY, ADDRESS, ID_FRONT, ID_BACK - - - - - - - - update cu_member_authentication a - set a.del_flag = 1 ,a.modified_time=sysdate ,a.pk_modified= #{updatePkMember} - where a.del_flag = 0 - and a.pk_member in - - #{item} - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberBankMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberBankMapper.xml deleted file mode 100644 index ce248eea..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberBankMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberRechargeMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberRechargeMapper.xml deleted file mode 100644 index 3a8a2e11..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberRechargeMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeBonusMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeBonusMapper.xml deleted file mode 100644 index 932181c1..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeBonusMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - insert ALL - - into cu_member_trade_bonus(PK_MEMBER,CONSUME_TYPE,PK_ORDER,PK_TRADE_DETAIL,CONSUME_MONEY,CASH_MONEY,PK_COUNTRY,PK_CREATOR) values - (#{item.pkMember},#{item.consumeType},#{item.pkOrder,jdbcType=INTEGER},#{item.pkTradeDetail,jdbcType=INTEGER},#{item.consumeMoney,jdbcType=NUMERIC}, - #{item.cashMoney,jdbcType=NUMERIC},#{item.pkCountry},#{item.pkCreator}) - - SELECT 1 FROM dual - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeDetailMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeDetailMapper.xml deleted file mode 100644 index 468df160..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeDetailMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - insert ALL - - into CU_MEMBER_TRADE_DETAIL(period,pk_member_trade,consume_money,pk_country,creation_time,pk_creator) values - ( - #{item.period},#{item.pkMemberTrade},#{item.consumeMoney,jdbcType=NUMERIC},#{item.pkCountry}, - #{item.creationTime, jdbcType=TIMESTAMP},#{item.pkCreator} - ) - - SELECT 1 FROM dual - - - - merge into cu_member_trade_detail a - using ( - select cd.pk_id, cd.consume_money - from cu_member_trade ct - inner join cu_member_trade_detail cd - on cd.pk_member_trade = ct.pk_id - where cd.del_flag = 0 - and ct.del_flag = 0 - and cd.trade_statue = 1 - and cd.period between #{startPeriod} and #{endPeriod} - and ct.pk_country = #{pkCountry} - ) b - on (a.pk_id = b.pk_id) - when matched then - update set a.consume_money = 0 - - - - merge into cu_member_trade_detail a - using ( - - select #{item.pkId} pk_id,#{item.grantMoney,jdbcType=NUMERIC} grant_money,#{item.consumeMoney,jdbcType=NUMERIC} consume_money from dual - - ) b - on (a.pk_id = b.pk_id) - when matched then - update set a.grant_money = b.grant_money, - a.consume_money = b.consume_money - - - - merge into cu_member_trade_detail a - using ( - - select #{item.pkId} pk_id,#{item.grantMoney,jdbcType=NUMERIC} grant_money,#{item.consumeMoney,jdbcType=NUMERIC} consume_money from dual - - ) b - on (a.pk_id = b.pk_id) - when matched then - update set a.grant_money = a.grant_money + b.grant_money, - a.consume_money = a.consume_money + b.consume_money - - - - merge into cu_member_trade_detail d - using (select t.pk_id, t.trade_amount, t.pk_country, t.pk_creator - from cu_member_trade t - left join bd_account a - on t.pk_account = a.pk_id - and a.del_flag = 0 - where t.del_flag = 0 - and a.field_value = 4 - and t.trade_amount > 0 - and t.source_code = #{sourceCode}) tt - on (1 = 0) - when not matched then - insert - (d.period, - d.pk_member_trade, - d.consume_money, - d.pk_country, - d.pk_creator) - values (#{period}, tt.pk_id, tt.trade_amount, tt.pk_country, tt.pk_creator) - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeMapper.xml deleted file mode 100644 index b5da097a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTradeMapper.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select t.*, - m.member_code as memberCode, - m.member_name as memberName, - v.VERTEX_NAME as vertexName, - c.TEAM_NAME as teamName - from cu_member_trade t - left join cu_member m - on t.pk_member = m.pk_id - left join cu_member_team c - ON c.pk_id = m.pk_team_code - and c.del_flag = 0 - left join bd_vertex v - on v.pk_id = m.PK_VERTEX - and v.del_flag = 0 - - - - - t.del_flag='0' - and t.pk_id in - - #{item} - - - - - - - t.del_flag = 0 - - and m.member_name like #{memberName} || '%' - - - and m.member_code like #{memberCode} || '%' - - - and t.TRADE_AMOUNT = #{tradeAmount} - - - and m.REMARKS like #{remarks} || '%' - - - and t.PK_ACCOUNT = #{pkAccount} - - - and t.TRADE_TYPE = #{tradeType} - - - and t.SOURCE_CODE = #{sourceCode} - - - and t.pk_country = #{pkCountry} - - - and t.TRADE_CLASSIFY = #{tradeClassify} - - - and t.CREATION_TIME >= to_date(#{startDate}, 'yyyy-mm-dd') - - - and t.CREATION_TIME <= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') - - - and m.PK_VERTEX=#{vertexId} - - - - and m.pk_team_code=#{teamId} - - - - - - - - - - - - - - insert into CU_MEMBER_TRADE (PK_ID, PK_MEMBER, TRADE_CODE, PK_ACCOUNT, TRADE_TYPE, - TRADE_CLASSIFY, PK_RATE, TRADE_AMOUNT, TRADE_BALANCE,TRADE_BEFORE_BALANCE, - SOURCE_CODE, TRADE_STATUE, REMARKS, PK_COUNTRY, CREATION_TIME, PK_CREATOR) - SELECT cu_member_trade_seq.nextval,t.* FROM - ( - - SELECT #{item.pkMember},#{item.tradeCode},#{item.pkAccount},#{item.tradeType} - ,#{item.tradeClassify},#{item.pkRate},#{item.tradeAmount},#{item.tradeBalance},#{item.tradeBeforeBalance} - ,#{item.sourceCode, jdbcType=VARCHAR},#{item.tradeStatue}, - - - #{item.remarks}, - - - null, - - - #{item.pkCountry},sysdate,#{item.pkCreator} - FROM dual - - ) t - - - - - - - - - - - - update cu_member_trade t set t.source_code = #{sourceCode}, - t.pk_modified = #{pkModified}, - t.modified_time = sysdate - where t.trade_code in - - #{item} - - - - merge into cu_member_trade a - using ( - select m.pk_id, m.pk_member, m.trade_code, m.pk_account, m.trade_type,m.trade_classify, m.pk_rate, m.trade_amount, - (case when ba.field_value=4 then ca.account4 + m.trade_amount when ba.field_value=5 then ca.account5 + m.trade_amount - when ba.field_value=8 then ca.account8 + m.trade_amount when ba.field_value=9 then ca.account9 + m.trade_amount - else ca.account10 + m.trade_amount end) trade_balance, - (case when ba.field_value=4 then ca.account4 when ba.field_value=5 then ca.account5 when ba.field_value=8 then ca.account8 - when ba.field_value=9 then ca.account9 else ca.account10 end) trade_before_balance, - m.source_code, m.trade_statue, m.remarks, m.pk_country, m.creation_time, m.pk_creator from( - - select #{item.pkId} pk_id,#{item.tradeCode} trade_code, #{item.tradeClassify} trade_classify, - #{item.pkMember} pk_member,#{item.pkAccount} pk_account,#{item.pkRate} pk_rate,#{item.tradeAmount} trade_amount, - #{item.sourceCode} source_code,#{item.tradeStatue} trade_statue,#{item.remarks} remarks, - #{item.tradeType} trade_type,#{item.pkCountry} pk_country,#{item.pkCreator} pk_creator, - #{item.creationTime} creation_time from dual - ) m - inner join cu_member_account ca - on m.pk_member = ca.pk_member - inner join bd_account ba - on ba.pk_id = m.pk_account - ) b - on (a.pk_id = b.pk_id) - when not matched then - insert (pk_id, pk_member, trade_code, pk_account, trade_type, - trade_classify, pk_rate, trade_amount, trade_balance,trade_before_balance, - source_code, trade_statue, remarks, pk_country, creation_time, pk_creator) - values(b.pk_id,b.pk_member,b.trade_code,b.pk_account,b.trade_type, - b.trade_classify,b.pk_rate,b.trade_amount,b.trade_balance,b.trade_before_balance, - b.source_code,b.trade_statue,b.remarks,b.pk_country,b.creation_time,b.pk_creator) - - - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTransferMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTransferMapper.xml deleted file mode 100644 index 96d5a0b9..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberTransferMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberWithdrawMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberWithdrawMapper.xml deleted file mode 100644 index 6cc55486..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/mapper/xml/CuMemberWithdrawMapper.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG - , - PK_COUNTRY, - PK_CREATOR, - CREATION_TIME, - PK_MODIFIED, - MODIFIED_TIME, - PK_ID, PK_MEMBER, WITHDRAW_CODE, PK_ACCOUNT, PK_BANK, PK_RATE, CASH_AMOUNT, SERVICE_CHARGE, INCOME_TAX, - ISSUED_AMOUNT,APPROVE_STATE, PAYMENT_TIME, PAYER, REMARKS, APPROVER, APPROVE_TIME, PK_ROLE, ROLE_NAME,STATUS,PAYER_REMARKS,APPROVE_REMARKS - - - - SELECT r.*, - m.member_code memberCode, - m.member_name memberName, - bb.bank_name bankName, - b.sub_bank_name subBankName, - b.card_number cardNumber, - b.account_name accountName, - b.id_card idCard, - b.phone, - b.pk_id pkBdBank, - u.user_name paymentName, - su.user_name approveName, - ver.VERTEX_NAME vertexName - FROM cu_member_withdraw r - LEFT JOIN cu_member_bank b - ON r.pk_Bank = b.pk_id - AND b.default_card = 1 - AND b.del_flag = 0 - LEFT JOIN bd_bank bb - ON b.pk_bank = bb.pk_id - AND bb.del_flag = 0 - LEFT JOIN cu_member m - ON r.pk_member = m.pk_id - AND m.del_flag = 0 - LEFT JOIN bd_vertex ver - ON ver.pk_id = m.PK_VERTEX - AND ver.del_flag = 0 - LEFT JOIN sys_user u - ON r.payer = u.user_id - LEFT JOIN sys_user su - ON r.approver = su.user_id - - - - - - r.del_flag='0' - and r.status != 3 - - and m.member_name like '%' || #{memberName} || '%' - - - and m.member_code like '%'|| #{memberCode} || '%' - - - and m.member_code in - - #{item} - - - - and r.APPROVE_STATE = #{approveState} - - - and r.PK_ACCOUNT = #{pkAccount} - - - and r.pk_country = #{pkCountry} - - - and bb.bank_name like #{bankName} || '%' - - - and r.CASH_AMOUNT = #{cashAmount} - - - and b.sub_bank_name like #{subBankName} || '%' - - - and b.card_number like #{cardNumber} || '%' - - - and b.account_name like #{accountName} || '%' - - - and b.phone like #{phone} || '%' - - - and r.remarks like #{remarks} || '%' - - - and r.ISSUED_AMOUNT = #{issuedAmount} - - - and su.user_name like #{approveName} || '%' - - - and r.APPROVE_REMARKS like #{approveRemarks} || '%' - - - and u.user_name like #{paymentName} || '%' - - - and r.PAYER_REMARKS like #{payerRemarks} || '%' - - - and r.WITHDRAW_CODE = #{withdrawCode} - - - - and r.status = #{status} - - - and m.PK_VERTEX=#{vertexId} - - - and r.CREATION_TIME >= to_date(#{startDate}, 'yyyy-mm-dd') - - - and r.CREATION_TIME <= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') - - - and r.APPROVE_TIME >= to_date(#{startPaymentTime},'yyyy-mm-dd') - - - and r.APPROVE_TIME < to_date(#{endPaymentTime} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') - - - - - - - - r.del_flag='0' - and r.pk_id in - - #{item} - - - - - - - - - - - - - update cu_member_withdraw - - approve_state = #{approveState}, - approver = #{approver}, - approve_time = #{approveTime}, - pk_modified = #{pkModified}, - pk_role = #{pkRole}, - role_name = #{roleName}, - modified_time = sysdate - - where BATCH = #{withdrawCode} - - - - - - - - - - - - - - - - - update cu_member_withdraw - - PAYMENT_TIME = #{paymentTime}, - PAYER = #{payer}, - STATUS = #{status}, - PAYER_REMARKS = #{payerRemarks}, - - approve_state = #{approveState}, - - batch = #{batch}, - - - pk_modified = #{pkModified}, - - modified_time = sysdate - - where pk_id in - - #{item} - - - - - - - - - - - update cu_member_withdraw w - set w.status = 3, - pk_modified = #{pkModified}, - modified_time = sysdate - where w.pk_id = #{pkId} - and w.approve_state = 1 - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/AccountSummaryStatisticsParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/AccountSummaryStatisticsParam.java deleted file mode 100644 index 1d410e1f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/AccountSummaryStatisticsParam.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.lenjoy.member.account.param; - -import lombok.Data; - -/** - * @Description: 会员余额汇总统计入参 - * @Author: jiang chao - * @Time: 2023/12/11 15:08 - * @Classname: AccountSummaryStatisticsParam - * @PackageName: com.hzs.member.account.param - */ -@Data -public class AccountSummaryStatisticsParam { - - /** - * 查询类型（1=顶点、2=体系、3=会员） - */ - private Integer type; - - /** - * 顶点会员 - */ - private Long pkMember; - - /** - * 所属体系 - */ - private Long pkVertex; - - /** - * 会员编号 - */ - private String memberCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberAccountParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberAccountParam.java deleted file mode 100644 index 67d36707..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberAccountParam.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.hzs.lenjoy.member.account.param; - - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 充值币种参数 - * - * @Description: - * @Author: ljc - * @Time: 2022/11/3 18:07 - * @Classname: CuMemberRechargeAccountParam - * @Package_name: com.hzs.member.account.param - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberAccountParam implements Serializable { - - private static final long serialVersionUID = 2735117381144061149L; - - - /** - * 用户编号 - */ - private Long pkMember; - /** - * 账户英文名称 - */ - private String accountName; - /** - * 账户余额 - */ - private BigDecimal balance; - - /** - * 可用余额 - */ - private BigDecimal availableBalance; - - /** - * 可提余额 - */ - private BigDecimal withdrawBalance; - /** - * 账户类型ID - */ - private Integer pkAccount; - - /** - * 账户类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer accountType; - - /** - * 账户类型 翻译 - */ - private String accountTypeVal; - - - /** - * 金额 - */ - private BigDecimal amount; - - - //页面显示提供的参数 - /** - * 是否显示禁止消费 - */ - private Integer isShowLockConsume; - - /** - * 是否显示禁止转账 - */ - private Integer isShowLockTransfer; - - /** - * 是否显示禁止提现 - */ - private Integer isShowLockWithdraw; - - - /** - * 禁止消费金额 - */ - private BigDecimal lockAccount; - - /** - * 禁止转账金额 - */ - private BigDecimal transferAccount; - - /** - * 禁止提现金额 - */ - private BigDecimal withdrawAccount; - - /** - * 修改人 - */ - private Long pkModified; - - /** - * 账户分类 - */ - private int accountClassify; - - - /** - * 国家ID - */ - private Integer pkCountry; - - /** - * 转账类型 - */ - private int transferType; - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberBankParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberBankParam.java deleted file mode 100644 index 60728758..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberBankParam.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hzs.lenjoy.member.account.param; - - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - *

- * 会员信息-银行卡信息 - *

- * - * @author hzs - * @since 2022-08-31 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberBankParam implements Serializable { - - private static final long serialVersionUID = -7463678186844161121L; - - /** - * 银行主键 - */ - private Integer pkBank; - /** - * 开户姓名 - */ - private String accountName; - - /** - * 支行名称 - */ - private String subBankName; - - /** - * 银行卡号 - */ - private String cardNumber; - - /** - * 身份证号 - */ - private String idCard; - - /** - * 手机号 - */ - private String phone; - - /** - * 国家ID - */ - private Integer pkCountry; - /** - * 会员ID - */ - private Long pkMember; - /** - * 验证码 - */ - private String verificationCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberRechargeAccountParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberRechargeAccountParam.java deleted file mode 100644 index cc20ef6c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberRechargeAccountParam.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.hzs.lenjoy.member.account.param; - - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - -/** - * 充值币种参数 - * - * @Description: - * @Author: ljc - * @Time: 2022/11/3 18:07 - * @Classname: CuMemberRechargeAccountParam - * @Package_name: com.hzs.member.account.param - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberRechargeAccountParam implements Serializable { - - private static final long serialVersionUID = 2735117381144061149L; - /** - * 账户英文名称 - */ - private String accountName; - /** - * 账户余额 - */ - private BigDecimal balance; - - /** - * 充值金额 - */ - private BigDecimal rechargeAmount; - /** - * 可用余额 - */ - private BigDecimal availableBalance; - - /** - * 可提余额 - */ - private BigDecimal withdrawBalance; - /** - * 账户类型ID - */ - private Integer pkAccount; - - /** - * 账户类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer accountType; - - /** - * 账户类型 翻译 - */ - private String accountTypeVal; - - - - private Map rechargeDetailMap; - - /** - * 充值备注 - */ - private String remarks; - - //页面显示提供的参数 - /** - * 是否显示禁止消费 - */ - private Integer isShowLockConsume; - - /** - * 是否显示禁止转账 - */ - private Integer isShowLockTransfer; - - /** - * 是否显示禁止提现 - */ - private Integer isShowLockWithdraw; - - - /** - * 禁止消费金额 - */ - private BigDecimal lockAccount; - - /** - * 禁止转账金额 - */ - private BigDecimal transferAccount; - - /** - * 禁止提现金额 - */ - private BigDecimal withdrawAccount; - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberTransferParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberTransferParam.java deleted file mode 100644 index f0b5d863..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberTransferParam.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.lenjoy.member.account.param; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 转账参数 - * @Author: ljc - * @Time: 2022/9/27 15:32 - * @Classname: CuMemberWithdrawParam - * @Package_name: com.hzs.member.account.param - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberTransferParam implements Serializable { - - private static final long serialVersionUID = 4222990759951385870L; - - /** - * 转出编号 - */ - private String memberCode; - - /** - * 账户类型(来源于参照：币种配置) - */ - private Integer pkAccount; - - /** - * 转入编号 - */ - private String toMemberCode; - - /** - * 转入账户类型(来源于参照：币种配置) - */ - private Integer pkToAccount; - - /** - * 转账金额 - */ - private BigDecimal transferMoney; - - /** - * 备注 - */ - private String remarks; - /** - * 支付密码 - */ - private String payPwd; - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberWithdrawParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberWithdrawParam.java deleted file mode 100644 index 12726de7..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/param/CuMemberWithdrawParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.lenjoy.member.account.param; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 提现参数类 - * @Author: ljc - * @Time: 2022/9/27 15:32 - * @Classname: CuMemberWithdrawParam - * @Package_name: com.hzs.member.account.param - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberWithdrawParam implements Serializable { - - private static final long serialVersionUID = -6164198212158171789L; - - /** - * 支付密码 - */ - private String payPwd; - - /** - * 银行信息 - */ - private Long pkBank; - - - /** - * 提现金额 - */ - private BigDecimal cashAmount; - /** - * 提现账户ID - */ - private Integer pkAccount; - - - /** - * 备注 - */ - private String remarks; -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/provider/MemberAccountProvider.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/provider/MemberAccountProvider.java deleted file mode 100644 index f1b74ab2..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/provider/MemberAccountProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.lenjoy.member.account.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.lenjoy.member.account.IMemberAccountApi; -import com.hzs.lenjoy.member.account.service.ICuMemberAccountService; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 会员账户dubbo服务 - * @Author: jiang chao - * @Time: 2024/10/23 10:14 - * @Classname: MemberAccountProvider - * @PackageName: com.hzs.lenjoy.member.account.provider - */ -@DubboService -public class MemberAccountProvider implements IMemberAccountApi { - - @Autowired - private ICuMemberAccountService iCuMemberAccountService; - - @Override - public R getPayAccount(Long pkMember, Integer pkCountry) { - return R.ok(iCuMemberAccountService.getPayAccount(pkMember, pkCountry)); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberAccountService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberAccountService.java deleted file mode 100644 index dafe4c74..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberAccountService.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.lenjoy.member.account.param.CuMemberAccountParam; -import com.hzs.lenjoy.member.account.vo.CuMemberAccountVO; - -import java.math.BigDecimal; -import java.util.List; - -/** - * @Description: 会员账户服务 - * @Author: jiang chao - * @Time: 2024/10/16 14:46 - * @Classname: ICuMemberAccountService - * @PackageName: com.hzs.lenjoy.member.base.service - */ -public interface ICuMemberAccountService extends IService { - - /** - * 根据用户ID查询余额信息 - * - * @param pkMember 用户ID - * @return CuMemberAccount - */ - CuMemberAccount queryCuMemberAccountByPkMember(Long pkMember); - - /** - * 根据用户ID查询账户余额信息 - * - * @param pkAccount 币种值 - * @param pkMember 会员ID - * @return CuMemberRechargeAccountParam - */ - CuMemberAccountParam findMemberBalanceById(Integer pkAccount, Long pkMember); - - /** - * 更新用户余额 - * - * @param cuMemberAccountParam 入参 - * @return int - */ - Integer updateMemberAccountByMemberCode(CuMemberAccountParam cuMemberAccountParam); - - /** - * 根据会员编码获取余额 - * - * @param pkMember 会员编号 - * @param accountType 账户类型 - * @return BigDecimal - */ - BigDecimal selectBalanceByMemberCode(Long pkMember, Integer accountType); - - /** - * 更新账户余额 - * - * @param cuMemberAccount 会员账户表 - * @param pkModified 修改人 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/21 21:42 - */ - Boolean updateMemberAccount(CuMemberAccount cuMemberAccount, Long pkModified); - - - /** - * 查询钱包余额（会员端） - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @return List - */ - CuMemberAccountVO queryWalletBalanceByPkMember(Long pkMember, Integer pkCountry); - - - /** - * 获取会员支付账户 - * - * @param pkMember 会员ID - * @param pkCountry 所属国家 - * @return - */ - CuMemberAccountExt getPayAccount(Long pkMember, Integer pkCountry); - - /** - * 查询指定数量会员账户SEQ - * - * @param param 数量 - * @return - */ - List querySeqList(Integer param); - - /** - * 批量保存会员账户信息 - * - * @param memberAccountList 会员账户列表 - * @return - */ - int insertBatchCuMemberAccount(List memberAccountList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberAuthenticationService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberAuthenticationService.java deleted file mode 100644 index 81aa1917..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberAuthenticationService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberAuthentication; -import com.hzs.lenjoy.member.account.vo.CuMemberAuthenticationVO; - - -import java.util.List; - -/** - *

- * 实名认证 服务类 - *

- * - * @author hzs - * @since 2023-04-17 - */ -public interface ICuMemberAuthenticationService extends IService { - - /** - * 保存实名认证 - * - * @param authenticationVO 认证信息 - * @return Boolean - */ - Boolean saveAuthentication(CuMemberAuthenticationVO authenticationVO); - - /** - * 会员续约 - * - * @param pkMember 会员ID - * @return Boolean - */ - Boolean memberRenewalContract(Long pkMember); - - /** - * 查询实名认证详情 - * - * @param authenticationVO 认证信息 - * @return CuMemberAuthenticationVO - */ - CuMemberAuthenticationVO selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO authenticationVO); - - - /** - * 根据会员ID逻辑删除认证信息 - * - * @param pkMember 会员ID - * @param pkModified 修改人ID - * @return Boolean - */ - Boolean updateMemberAuthByPkMember(Long pkMember, Long pkModified); - - - /** - * 批量删除实名认证 - * - * @param pkMembers 会员办理业务 - * @param updatePkMember 更新人 - * @return Boolean - */ - Boolean deleteByPkMembers(List pkMembers, Long updatePkMember); - - /** - * 是否显示实名认证 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule) - * @return - */ - int isAuth(Long pkMember, Integer pkCountry, Integer businessModule); -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberBankService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberBankService.java deleted file mode 100644 index 31ce2b58..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberBankService.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberBank; -import com.hzs.lenjoy.member.account.param.CuMemberBankParam; -import com.hzs.lenjoy.member.account.vo.CuMemberBankVO; - - -import java.util.List; - -/** - *

- * 会员信息-银行卡信息 服务类 - *

- * - * @author hzs - * @since 2022-08-31 - */ -public interface ICuMemberBankService extends IService { - /** - * 根据主键查询银行卡信息 - * - * @param pkId 主键 - * @return CuMemberBank - */ - CuMemberBankVO selectCuMemberBankById(Long pkId); - - /** - * 是否绑定银行卡 - * - * @param pkMember 会员ID - * @return CuMemberBank - */ - CuMemberBankVO isBindBank(Long pkMember, Integer pkCountry); - - /** - * 解绑银行卡 - * - * @param pkId 银行卡ID - * @param pkMember 会员ID - * @return Boolean - */ - Boolean unbindBank(Long pkId, Long pkMember); - - /** - * 保存用户银行卡信息 - * - * @param cuMemberBankParam 银行卡信息 - * @return Integer - */ - Integer saveMemberBank(CuMemberBankParam cuMemberBankParam); - - - /** - * 查询绑定的银行卡 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @return List - */ - List selectBankCardByPkMember(Long pkMember, Integer pkCountry); - - /** - * 修改默认卡 - * - * @param pkId ID - * @return Integer - */ - Boolean updateDefault(Long pkId, Long pkMember, Integer pkCountry); - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberBaseService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberBaseService.java deleted file mode 100644 index 809c7cf5..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberBaseService.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - -import com.hzs.common.core.enums.EVerificationModule; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.account.CuMemberAccountRechargeExt; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.system.config.BdAccount; -import com.hzs.common.domain.system.config.BdTradeConfig; -import com.hzs.common.domain.system.config.BdTradeWhiteConfig; -import com.hzs.member.base.dto.MemberContinueDTO; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.sys.dto.BusinessLogDTO; - -import java.util.List; -import java.util.Map; - -/** - * 会员服务的公用调用三方服务 - * - * @Description: - * @Author: ljc - * @Time: 2022/10/11 15:21 - * @Classname: ICuMemberBaseService - * @Package_name: com.hzs.member.account.service - */ -public interface ICuMemberBaseService { - - /** - * 根据国家ID获取汇率 - * - * @param pkCountry 国家ID - * @return CurrencyDTO 汇率信息 - */ - CurrencyDTO getCurrency(Integer pkCountry); - - /** - * 根据汇率ID查询汇率 - * - * @param currencyId ID - * @return CurrencyDTO - */ - CurrencyDTO getCurrencyById(Integer currencyId); - - - /** - * 根据ID查询 账户信息 - * - * @param pkId 账户类型ID - * @return BdAccount - */ - BdAccount getAccount(Integer pkId); - - - - - /** - * 根据国家ID查询账户类型 - * - * @param pkCountry 国家ID - * @return List - */ - List getAccountByCountryId(Integer pkCountry); - - - /** - * 查询翻译的KEY值 - * - * @param pkAccount 账户ID - * @return Integer - */ - Integer translateAccountValue(Integer pkAccount); - - - /** - * 根据币种ID查询币种对应的值 - * - * @param pkAccount 账户ID - * @return Integer - */ - Integer getAccountValueById(Integer pkAccount); - - - - - /** - * 金额为正时，只插入MemberTradeDetail - * - * @param sourceCode 来源单号 - */ - void saveMemberTradeDetail(String sourceCode); - - - /** - * 金额为负时，插入MemberTradeDetail MemberTradeBonus - * - * @param memberAccountList 账户信息 - * @param sourceCode 来源单号 - * @param idsMap 业务ID - * @param module 模块类型 来源于枚举 - */ - void handleMemberTradeDetailAndBonus(List memberAccountList, String sourceCode, Map idsMap, Integer module); - - /** - * 包括重复的会员ID map - * 金额为负时，插入MemberTradeDetail MemberTradeBonus - * - * @param memberAccountList 账户信息 - * @param module 模块类型 来源于枚举 - */ - void handleRepeatMemberTradeDetailAndBonus(List memberAccountList, Integer module); - - - /** - * 从数据库直译币种（导出用） - * - * @param pkAccount 币种翻译值 - * @return String - */ - String getAccountTranslateFromDataBase(Integer pkAccount); - - - - /** - * 查询是否配置白名单 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule) - * @return BdTradeWhiteConfig - */ - BdTradeWhiteConfig selectConfigWhite(Long pkMember, Integer pkCountry, Integer businessModule); - - /** - * 查询交易配置信息 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule) - * @param eVerificationModule 1：实名 2：营业执照 （来源枚举 EVerificationModule） - * @return BdTradeConfig - */ - BdTradeConfig selectConfigTrade(Long pkMember, Integer pkCountry, Integer businessModule, EVerificationModule eVerificationModule); - - /** - * 根据配置是否上传营业执照 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule) - * @return Boolean - */ - Boolean isExistBusinessLicence(Long pkMember, Integer pkCountry, Integer businessModule); - - /** - * 根据配置是否实名认证 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule) - * @return Boolean - */ - Boolean isExistRealName(Long pkMember, Integer pkCountry, Integer businessModule); - - - /** - * 如果有服务编号优先使用，没有则使用会员编号 - * - * @param cuMember 会员信息 - * @return String - */ - String getMemberName(CuMember cuMember); - - /** - * 根据体系判断会员名称还是会员昵称 - * - * @param cuMember 会员信息 - * @return String - */ - String getMemberNameByVertex(CuMember cuMember); - - - /** - * 根据 模块类型、 国家ID查询账户类型 - * - * @param accountType 账户类型 - * @param pkCountry 国家ID - * @return List - */ - List getAccountByCountry(Integer accountType, Integer pkCountry); - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberRechargeService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberRechargeService.java deleted file mode 100644 index ed9dc90f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberRechargeService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberRecharge; - - -/** - *

- * 会员充值表 服务类 - *

- * - * @author hzs - * @since 2022-09-08 - */ -public interface ICuMemberRechargeService extends IService { - - /** - * 会员端在线预充值 - * - * @param rechargeAmount 充值金额 - * @param pkCountry 国家ID - * @param pkMember 会员ID - * @param rechargeCode 充值单号 - * @return Boolean - */ - Boolean preCharge(String rechargeAmount, Integer pkCountry, Long pkMember, String rechargeCode, Long pkCreator); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeBonusService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeBonusService.java deleted file mode 100644 index 59338f2d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeBonusService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberTradeBonus; - -import java.util.List; - -/** - *

- * 会员已发放奖金交易明细表 服务类 - *

- * - * @author hzs - * @since 2023-03-24 - */ -public interface ICuMemberTradeBonusService extends IService { - - /** - * 批量插入会员奖金交易明细 - * @param cuMemberTradeBonusList 会员奖金交易明细 - * @return: void - * @Author: sui q - * @Date: 2023/3/24 18:00 - */ - void batchInsertCuMemberTradeBonus(List cuMemberTradeBonusList); - - /** - * 查询会员交易的奖金明细， - * @param consumeTypeList 消费类型 - * @param pkOrder 订单主键 - * @return: List - * @Author: sui q - * @Date: 2023/3/28 18:38 - */ - List queryCuMemberTradeBonus(List consumeTypeList, Long pkOrder); -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeDetailService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeDetailService.java deleted file mode 100644 index 5b71f767..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeDetailService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberTradeDetail; - -import java.util.List; - -/** - * 服务类 - * - * @author hzs - * @since 2023-03-21 - */ -public interface ICuMemberTradeDetailService extends IService { - - - /** - * 根据交易流水信息 批量插入会员奖金发放 - * - * @param sourceCode 单号 - * @param period 期间 - * @return Integer - */ - Integer batchInsertMemberTradeDetailFromTrade(String sourceCode, Integer period); - - /** - * 根据用户ID查询用户扣款金额 - * - * @param pkMember 用户ID - * @return List - */ - List selectMemberTradeDetailByPkMember(Long pkMember); - - /** - * 根据会员编号查询会员奖金的发放明细 - * - * @param pkMember 会员编号 - * @return: List - * @Author: sui q - * @Date: 2023/3/24 16:05 - */ - List queryCuMemberTradeDetail(Long pkMember); - - /** - * 批量更新会员奖金发放明细 - * - * @param cuMemberTradeDetailList 会员奖金发放明细 - * @return: void - * @Author: sui q - * @Date: 2023/3/24 17:41 - */ - void updateCuMemberTradeDetail(List cuMemberTradeDetailList); - - /** - * 批量更新会员奖金发放明细 - * - * @param cuMemberTradeDetailList 会员奖金发放明细 - * @return: void - * @Author: sui q - * @Date: 2023/3/24 17:41 - */ - void updateAddCuMemberTradeDetail(List cuMemberTradeDetailList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeService.java deleted file mode 100644 index 933e84ba..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTradeService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberTrade; -import com.hzs.lenjoy.member.account.vo.CuMemberTradeVO; - -import java.util.List; - -/** - * 会员交易明细 服务类 - * - * @author hzs - * @since 2022-09-06 - */ -public interface ICuMemberTradeService extends IService { - - /** - * 根据来源单号查询会员奖金币种的流水信息 - * - * @param sourceCode 来源单号 - * @return List - */ - List selectMemberTradeBySourceCode(String sourceCode); - - /** - * 查询用户交易类型 - * - * @param pkMember 用户ID - * @param pkCountry 国家ID - * @return Integer - */ - List selectTradeType(Long pkMember, Integer pkCountry); - - /** - * 查询钱包明细（前端） - * - * @param cuMemberTradeVO 交易明细 - * @return List - */ - List selectWattleDetail(CuMemberTradeVO cuMemberTradeVO); - - /** - * 查询订单的消费记录，含退款的 - * - * @param pkMember 会员主键 - * @param sourceCode 订单编号 - * @return: List - * @Author: sui q - * @Date: 2022/10/22 21:26 - */ - List queryCuMemberTrade(Long pkMember, String sourceCode); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTransferService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTransferService.java deleted file mode 100644 index cb0e3a3b..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberTransferService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.account.CuMemberTransfer; -import com.hzs.common.domain.system.config.BdTransfer; - - - - -/** - *

- * 会员转账表 服务类 - *

- * - * @author hzs - * @since 2022-09-06 - */ -public interface ICuMemberTransferService extends IService { - /** - * 是否在血缘线上 - * - * @param pkMember 转出方用户ID - * @param toPkMember 转入方用户ID - * @return Boolean - */ - Boolean isBloodLine(Long pkMember, Long toPkMember); - - /** - * 获取转账配置 - * - * @param pkCountry 国家ID - * @return BdTransfer - */ - BdTransfer getBdTransfer(Integer pkCountry); - - - /** - * 保存转账 - * - * @param cuMemberTransfer 转账信息 - * @param cuMemberAccount 转出的账户信息 - * @param toMemberAccount 转入的账户信息 - * @return Integer - */ - Integer saveMemberTransferInfo(CuMemberTransfer cuMemberTransfer, CuMemberAccount cuMemberAccount,CuMemberAccount toMemberAccount); - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberWithdrawService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberWithdrawService.java deleted file mode 100644 index df51c7ac..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/ICuMemberWithdrawService.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hzs.lenjoy.member.account.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.account.CuMemberWithdraw; -import com.hzs.common.domain.system.config.BdWithdrawal; - - -import java.math.BigDecimal; -import java.util.List; - -/** - *

- * 会员提现表 服务类 - *

- * - * @author hzs - * @since 2022-09-06 - */ -public interface ICuMemberWithdrawService extends IService { - /** - * 根据用户ID查询用户的提现次数 - * - * @param pkMember 用户ID - * @return Long - */ - List getWithdrawTimes(Long pkMember); - - - /** - * 保存提现 - * - * @param cuMemberWithdraw 提现信息 - * @return Integer - */ - Integer saveMemberWithdrawInfo(CuMemberWithdraw cuMemberWithdraw); - - - /** - * 计算本次提现应该交的个税 - * - * @param pkMember 用户ID - * @param cashAmount 提现金额 - * @param pkCountry 国家ID - * @param minAmount 最低提现金额 - * @return BigDecimal - */ - BigDecimal computeIncomeTaxValue(Long pkMember, BigDecimal cashAmount, Integer pkCountry, BigDecimal minAmount); - - /** - * 获取手续费金额 - * - * @param pkCountry 国家ID - * @param cashAmount 提现金额 - * @return BigDecimal - */ - BigDecimal computeServiceCharge(Integer pkCountry, BigDecimal cashAmount); - - /** - * 获取取整后的金额 - * - * @param bdWithdrawal 提现配置信息 - * @param cashAmount 提现金额 - * @return BigDecimal - */ - BigDecimal computeRounding(BdWithdrawal bdWithdrawal, BigDecimal cashAmount); - - - /** - * 获取账户余额 - * - * @param accountsType 账户值 - * @param cuMemberAccount 账户信息 - * @return BigDecimal - */ - BigDecimal getAccountBalance(Integer accountsType, CuMemberAccount cuMemberAccount); - - - /** - * 会员端查询提现列表 - * - * @param pkMember 会员编号 - * @param pkCountry 国家ID - * @return List - */ - Object[] selectMemberWithdrawListByPkMember(Long pkMember, Integer pkCountry); - - /** - * 根据ID 修改提现状态 - * - * @param pkId 主键ID - * @param pkModified 修改人 - * @return Integer - */ - Integer updateWithdrawStatusByPkId(Long pkId, Long pkModified); - - - /** - * 查询会员是否存在提现记录 - * - * @param pkCountry 国家ID - * @param pkMember 会员 ID - * @return List - */ - List selectWithdrawMember(Integer pkCountry, Long pkMember); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberAccountServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberAccountServiceImpl.java deleted file mode 100644 index c3ed6f14..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberAccountServiceImpl.java +++ /dev/null @@ -1,247 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.enums.ETradeClassify; -import com.hzs.common.core.enums.ETransferType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.common.domain.system.config.BdAccount; -import com.hzs.lenjoy.member.account.mapper.CuMemberAccountMapper; -import com.hzs.lenjoy.member.account.param.CuMemberAccountParam; -import com.hzs.lenjoy.member.account.param.CuMemberRechargeAccountParam; -import com.hzs.lenjoy.member.account.service.ICuMemberAccountService; -import com.hzs.lenjoy.member.account.service.ICuMemberBaseService; -import com.hzs.lenjoy.member.account.vo.CuMemberAccountVO; -import com.hzs.lenjoy.member.account.vo.CuMemberWalletBalanceVO; -import com.hzs.system.base.ITransactionServiceApi; -import com.hzs.system.config.IAccountServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Description: 会员账户服务 - * @Author: jiang chao - * @Time: 2024/10/16 14:47 - * @Classname: CuMemberAccountServiceImpl - * @PackageName: com.hzs.lenjoy.member.base.service.impl - */ -@Service -public class CuMemberAccountServiceImpl extends ServiceImpl implements ICuMemberAccountService { - - - @Autowired - private ICuMemberBaseService cuMemberBaseService; - - - @DubboReference - private ITransactionServiceApi transactionServiceApi; - - @DubboReference - IAccountServiceApi accountServiceApi; - - @Override - public CuMemberAccount queryCuMemberAccountByPkMember(Long pkMember) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MemberFieldConstants.PK_MEMBER, pkMember); - return baseMapper.selectOne(queryWrapper); - } - - @Override - public CuMemberAccountParam findMemberBalanceById(Integer pkAccount, Long pkMember) { - List cuMemberRechargeAccountParams = baseMapper.queryMemberAccountByMemberCode(null, Collections.singletonList(pkAccount), pkMember); - return CollUtil.isNotEmpty(cuMemberRechargeAccountParams) ? cuMemberRechargeAccountParams.get(0) : null; - } - - - @Override - public Integer updateMemberAccountByMemberCode(CuMemberAccountParam cuMemberAccountParam) { - BigDecimal amount = cuMemberAccountParam.getAmount(); - CuMemberAccount cuMemberAccount = new CuMemberAccount(); - cuMemberAccount.setPkMember(cuMemberAccountParam.getPkMember()); - switch (cuMemberAccountParam.getAccountType()) { - case 1: - cuMemberAccount.setAccount1(amount); - break; - case 2: - cuMemberAccount.setAccount2(amount); - break; - case 3: - cuMemberAccount.setAccount3(amount); - break; - case 4: - this.getBonusAccount(cuMemberAccount, cuMemberAccountParam.getAccountClassify(), amount, cuMemberAccountParam.getTransferType()); - break; - case 5: - cuMemberAccount.setAccount5(amount); - break; - case 6: - cuMemberAccount.setAccount6(amount); - break; - case 7: - cuMemberAccount.setAccount7(amount); - break; - case 8: - cuMemberAccount.setAccount8(amount); - break; - case 9: - cuMemberAccount.setAccount9(amount); - break; - case 10: - cuMemberAccount.setAccount10(amount); - break; - case 11: - cuMemberAccount.setAccount11(amount); - break; - case 12: - cuMemberAccount.setAccount12(amount); - break; - case 13: - cuMemberAccount.setAccount13(amount); - break; - case 14: - cuMemberAccount.setAccount14(amount); - break; - default: - break; - } - cuMemberAccount.setPkModified(cuMemberAccountParam.getPkModified()); - cuMemberAccount.setPkCountry(cuMemberAccountParam.getPkCountry()); - return baseMapper.updateMemberAccount(cuMemberAccount); - } - - /** - * 获得更新账户余额 奖金账户、可提现账户、可消费账户 - * 奖金账户 = 可提现账户+可消费账户 - * 奖金账户操作时 ：入的金额 进可消费账户 出的金额 进可提现账户 - * - * @param cuMemberAccount 会员账户余额 - * @param accountClassify 账户分类 - * @param amount 金额 - */ - private void getBonusAccount(CuMemberAccount cuMemberAccount, int accountClassify, BigDecimal amount, int transferType) { - if (accountClassify == ETradeClassify.WITHDRAWAL.getValue()) { - cuMemberAccount.setAccount4(amount); - cuMemberAccount.setWithdrawAccount4(amount); - } else if (accountClassify == ETradeClassify.TRANSFER.getValue()) { - cuMemberAccount.setAccount4(amount); - //转账转入方（奖金币充正时，只充可消费） - if (transferType == ETransferType.TRANSFER_IN.getValue()) { - cuMemberAccount.setConsumeAccount4(amount); - } - //转账转出方 - if (transferType == ETransferType.TRANSFER_OUT.getValue()) { - CuMemberAccount account = queryCuMemberAccountByPkMember(cuMemberAccount.getPkMember()); - //可提现金额 - BigDecimal withdrawAccount = account.getWithdrawAccount4(); - //奖金币扣款时，先扣可提现、再扣可消费 - if (withdrawAccount.add(amount).compareTo(BigDecimal.ZERO) < 0) { - cuMemberAccount.setWithdrawAccount4(withdrawAccount.negate()); - cuMemberAccount.setConsumeAccount4(amount.add(withdrawAccount)); - } else { - cuMemberAccount.setWithdrawAccount4(amount); - } - } - } else if (accountClassify == ETradeClassify.RECHARGE.getValue()) { - cuMemberAccount.setAccount4(amount); - cuMemberAccount.setConsumeAccount4(amount); - } else { - cuMemberAccount.setAccount4(amount); - } - - } - - - @Override - public BigDecimal selectBalanceByMemberCode(Long pkMember, Integer accountType) { - return baseMapper.selectBalanceByMemberCode(pkMember, accountType); - } - - - @Override - public Boolean updateMemberAccount(CuMemberAccount cuMemberAccount, Long pkModified) { - cuMemberAccount.setPkModified(pkModified); - return baseMapper.updateMemberAccount(cuMemberAccount) > 0; - } - - - @Override - public CuMemberAccountVO queryWalletBalanceByPkMember(Long pkMember, Integer pkCountry) { - CuMemberWalletBalanceVO memberWalletBalanceVO; - List memberWalletBalanceVOList = new ArrayList<>(); - List cuMemberRechargeAccountParams = baseMapper.queryWalletBalanceByPkMember(pkMember); - //根据币种值查询币种 - List accounts = accountServiceApi.memberAccountByType(pkCountry).getData(); - Map accountMap = accounts.stream().collect(Collectors.toMap(BdAccount::getFieldValue, Function.identity())); - BigDecimal total = BigDecimal.ZERO; - if (CollUtil.isNotEmpty(cuMemberRechargeAccountParams)) { - for (CuMemberRechargeAccountParam memberRechargeAccountParam : cuMemberRechargeAccountParams) { - Integer accountType = memberRechargeAccountParam.getAccountType(); - memberWalletBalanceVO = BeanUtil.copyProperties(memberRechargeAccountParam, CuMemberWalletBalanceVO.class); - BdAccount bdAccount = accountMap.get(accountType); - if (isShow(bdAccount, memberWalletBalanceVO)) { - memberWalletBalanceVO.setUnavailableBalance(memberRechargeAccountParam.getBalance().subtract(memberRechargeAccountParam.getAvailableBalance())); - total = total.add(memberRechargeAccountParam.getBalance()); - memberWalletBalanceVO.setPkAccountId(bdAccount.getPkId()); - memberWalletBalanceVO.setPkAccount(cuMemberBaseService.translateAccountValue(bdAccount.getPkId())); - memberWalletBalanceVO.setIsRecharge(bdAccount.getIsRecharge()); - memberWalletBalanceVO.setIsTransfer(bdAccount.getIsTransfer()); - memberWalletBalanceVO.setIsWithdrawal(bdAccount.getIsWithdrawal()); - memberWalletBalanceVO.setBackgroundImg(bdAccount.getBackgroundImg()); - memberWalletBalanceVOList.add(memberWalletBalanceVO); - } - } - } - CuMemberAccountVO cuMemberAccountVO = new CuMemberAccountVO(); - cuMemberAccountVO.setWalletTotalAmount(total); - cuMemberAccountVO.setMemberWalletBalanceVOList(memberWalletBalanceVOList); - return cuMemberAccountVO; - } - - - /** - * 根据配置 是否显示币种 - * - * @param bdAccount 币种 - * @param memberWalletBalanceVO 钱包余额 - * @return Boolean - */ - private Boolean isShow(BdAccount bdAccount, CuMemberWalletBalanceVO memberWalletBalanceVO) { - if (bdAccount == null) { - return false; - } - //是否固定 - Integer isRegular = bdAccount.getIsRegular(); - BigDecimal balance = memberWalletBalanceVO.getBalance(); - //设置固定为禁止，余额不为零时，显示 - return isRegular.equals(EYesNo.YES.getIntValue()) || (isRegular.equals(EYesNo.NO.getIntValue()) && balance.compareTo(BigDecimal.ZERO) > 0); - } - - @Override - public CuMemberAccountExt getPayAccount(Long pkMember, Integer pkCountry) { - return baseMapper.getPayAccount(pkMember, pkCountry); - } - - @Override - public List querySeqList(Integer param) { - return baseMapper.querySeqList(param); - } - - @Override - public int insertBatchCuMemberAccount(List memberAccountList) { - return baseMapper.insertBatchCuMemberAccount(memberAccountList); - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberAuthenticationServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberAuthenticationServiceImpl.java deleted file mode 100644 index e42b2cef..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberAuthenticationServiceImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EServiceStatus; -import com.hzs.common.core.enums.EVerificationModule; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.account.CuMemberAuthentication; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.system.config.BdTradeConfig; -import com.hzs.common.domain.system.config.BdTradeWhiteConfig; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.account.mapper.CuMemberAuthenticationMapper; -import com.hzs.lenjoy.member.account.service.ICuMemberAuthenticationService; -import com.hzs.lenjoy.member.account.service.ICuMemberBaseService; -import com.hzs.lenjoy.member.account.vo.CuMemberAuthenticationVO; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDate; -import java.time.ZoneId; -import java.util.Date; -import java.util.List; - -/** - *

- * 实名认证 服务实现类 - *

- * - * @author hzs - * @since 2023-04-17 - */ -@Service -public class CuMemberAuthenticationServiceImpl extends ServiceImpl implements ICuMemberAuthenticationService { - - @Autowired - ICuMemberService iCuMemberService; - - @Autowired - private ICuMemberAuthenticationService authenticationService; - - @Autowired - private ICuMemberBaseService iCuMemberBaseService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveAuthentication(CuMemberAuthenticationVO authenticationVO) { - CuMemberAuthentication authentication = BeanUtil.copyProperties(authenticationVO, CuMemberAuthentication.class); - authentication.setPkCreator(authenticationVO.getPkMember()); - save(authentication); - return updateCuMemberRealName(authenticationVO); - } - - /** - * |更新用户表中的实名状态 - * - * @param authenticationVO 入参 - * @return Boolean - */ - public Boolean updateCuMemberRealName(CuMemberAuthenticationVO authenticationVO) { - Long pkMember = authenticationVO.getPkMember(); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("IS_REAL_NAME", EYesNo.YES.getIntValue()); - updateWrapper.set("ID_CARD", authenticationVO.getIdCard()); - updateWrapper.set("SERVICE_AGREEMENT", EServiceStatus.SIGNED.getValue()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkMember); - return iCuMemberService.update(updateWrapper); - } - - @Override - public Boolean memberRenewalContract(Long pkMember) { - CuMemberExt member = iCuMemberService.getMemberById(SecurityUtils.getUserId()); - //到期日期 - LocalDate expireDate = member.getExpireDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("SERVICE_AGREEMENT", EServiceStatus.SIGNED.getValue()); - updateWrapper.set("EXPIRE_DATE", DateUtils.toDate(expireDate.plusYears(1).atStartOfDay())); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkMember); - return iCuMemberService.update(updateWrapper); - } - - @Override - public CuMemberAuthenticationVO selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO authenticationVO) { - CuMemberAuthentication authentication = baseMapper.selectAuthenticationByPkMember(authenticationVO); - if (null != authentication) { - return BeanUtil.copyProperties(authentication, CuMemberAuthenticationVO.class); - } - return null; - - } - - @Override - public Boolean updateMemberAuthByPkMember(Long pkMember, Long pkModified) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_MEMBER", pkMember); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", pkModified); - updateWrapper.set("MODIFIED_TIME", new Date()); - return this.update(updateWrapper); - } - - - @Override - public Boolean deleteByPkMembers(List pkMembers, Long updatePkMember) { - return baseMapper.deleteByPkMembers(pkMembers, updatePkMember); - } - - @Override - public int isAuth(Long pkMember, Integer pkCountry, Integer businessModule) { - int flag = EYesNo.YES.getIntValue(); - //查询配置实名认证白名证 - BdTradeWhiteConfig bdTradeWhiteConfig = iCuMemberBaseService.selectConfigWhite(pkMember, pkCountry, businessModule); - if (null == bdTradeWhiteConfig) { - //查询配置是否实名认证 - BdTradeConfig bdTradeConfig = iCuMemberBaseService.selectConfigTrade(pkMember, pkCountry, businessModule, EVerificationModule.REAL_NAME); - //配置后才进行验证 - if (null != bdTradeConfig) { - //查询是否已实名认证 - CuMemberAuthenticationVO authenticationVO = authenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); - flag = null == authenticationVO ? EYesNo.NO.getIntValue() : EYesNo.YES.getIntValue(); - } - } - return flag; - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberBankServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberBankServiceImpl.java deleted file mode 100644 index 55f3b36e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberBankServiceImpl.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - -import cn.hutool.core.bean.BeanUtil; -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.common.core.enums.EBankCardStatus; -import com.hzs.common.core.enums.EDefault; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.domain.member.account.CuMemberBank; -import com.hzs.lenjoy.member.account.mapper.CuMemberBankMapper; -import com.hzs.lenjoy.member.account.param.CuMemberBankParam; -import com.hzs.lenjoy.member.account.service.ICuMemberBankService; -import com.hzs.lenjoy.member.account.vo.CuMemberBankVO; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - *

- * 会员信息-银行卡信息 服务实现类 - *

- * - * @author hzs - * @since 2022-08-31 - */ -@Service -public class CuMemberBankServiceImpl extends ServiceImpl implements ICuMemberBankService { - - - @Override - public CuMemberBankVO selectCuMemberBankById(Long pkId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_ID", pkId); - queryWrapper.eq("DEFAULT_CARD", EDefault.YES.getValue()); - CuMemberBank cuMemberBank = this.getOne(queryWrapper); - return cuMemberBank == null ? null : BeanUtil.copyProperties(cuMemberBank, CuMemberBankVO.class); - } - - - @Override - public CuMemberBankVO isBindBank(Long pkMember, Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_COUNTRY", pkCountry); - queryWrapper.eq("PK_MEMBER", pkMember); - queryWrapper.eq("DEFAULT_CARD", EDefault.YES.getValue()); - return BeanUtil.copyProperties(this.getOne(queryWrapper), CuMemberBankVO.class); - } - - - @Override - public Boolean unbindBank(Long pkId, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()) - .set("MODIFIED_TIME", new Date()) - .set("PK_MODIFIED", pkMember) - .eq("PK_ID", pkId); - return update(updateWrapper); - } - - @Override - public Integer saveMemberBank(CuMemberBankParam cuMemberBankParam) { - CuMemberBank cuMemberBank = new CuMemberBank(); - BeanUtil.copyProperties(cuMemberBankParam, cuMemberBank); - //是否绑定银行卡 - Long pkMember = cuMemberBankParam.getPkMember(); - Integer pkCountry = cuMemberBankParam.getPkCountry(); - CuMemberBankVO bindCard = isBindBank(pkMember, pkCountry); - int isDefault = null != bindCard.getDefaultCard() ? EBankCardStatus.NO.getValue() : EBankCardStatus.YES.getValue(); - cuMemberBank.setDefaultCard(isDefault); - cuMemberBank.setPkCreator(cuMemberBankParam.getPkMember()); - return baseMapper.insert(cuMemberBank); - } - - @Override - public List selectBankCardByPkMember(Long pkMember, Integer pkCountry) { - return BeanUtil.copyToList(baseMapper.selectBankCardByPkMember(pkMember, pkCountry), CuMemberBankVO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean updateDefault(Long pkId, Long pkMember, Integer pkCountry) { - updateMemberBankCardToDefault(pkMember, pkCountry); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("DEFAULT_CARD", EBankCardStatus.YES.getValue()).eq("PK_ID", pkId); - return update(updateWrapper); - } - - /** - * 绑定的银行卡更新为非默认 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @return Boolean - */ - public Boolean updateMemberBankCardToDefault(Long pkMember, Integer pkCountry) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("DEFAULT_CARD", EBankCardStatus.NO.getValue()) - .eq("DEFAULT_CARD", EBankCardStatus.YES.getValue()) - .eq("PK_MEMBER", pkMember) - .eq("PK_COUNTRY", pkCountry); - return update(updateWrapper); - } - - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberBaseServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberBaseServiceImpl.java deleted file mode 100644 index df3f6f75..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberBaseServiceImpl.java +++ /dev/null @@ -1,391 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.account.*; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.system.config.BdAccount; -import com.hzs.common.domain.system.config.BdTradeConfig; -import com.hzs.common.domain.system.config.BdTradeWhiteConfig; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.lenjoy.member.account.service.*; - -import com.hzs.lenjoy.member.account.vo.CuMemberAuthenticationVO; -import com.hzs.lenjoy.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.config.IAccountServiceApi; -import com.hzs.system.config.ICuMemberAgreementWhiteApi; -import com.hzs.system.config.ITradeConfigServiceApi; -import com.hzs.system.config.dto.TradeConfigDTO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @Description: - * @Author: ljc - * @Time: 2022/10/11 15:22 - * @Classname: ICuMemberBaseServiceImpl - * @Package_name: com.hzs.member.account.service.impl - */ -@Service -public class CuMemberBaseServiceImpl implements ICuMemberBaseService { - - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @DubboReference - private IAccountServiceApi accountServiceApi; - - @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; - - @Autowired - private ICuMemberTradeDetailService cuMemberTradeDetailService; - - @Autowired - private ICuMemberTradeBonusService cuMemberTradeBonusService; - - @Autowired - private ICuMemberTradeService cuMemberTradeService; - - @Autowired - private ITransactionCommonService iTransactionCommonService; - - - @Autowired - private ICuMemberAuthenticationService authenticationService; - - - @Autowired - private ICuMemberService iCuMemberService; - - @DubboReference - private ITradeConfigServiceApi tradeConfigServiceApi; - - - @DubboReference - private ICuMemberAgreementWhiteApi cuMemberAgreementWhiteApi; - - - @Autowired - private RabbitTemplate rabbitTemplate; - - - @Override - public CurrencyDTO getCurrency(Integer pkCountry) { - R currency = currencyServiceApi.getCurrency(pkCountry); - return currency.getData(); - } - - @Override - public CurrencyDTO getCurrencyById(Integer pkId) { - return currencyServiceApi.getByHistoryPkId(pkId).getData(); - } - - - @Override - public BdAccount getAccount(Integer pkId) { - return accountServiceApi.getAccount(pkId).getData(); - } - - - - @Override - public Integer translateAccountValue(Integer pkAccount) { - BdAccount awardsKey = getAccount(pkAccount); - return awardsKey == null ? pkAccount : awardsKey.getPkTransactionKey(); - } - - - @Override - public Integer getAccountValueById(Integer pkAccount) { - BdAccount bdAccount = getAccount(pkAccount); - return bdAccount.getFieldValue(); - } - - @Override - public List getAccountByCountryId(Integer pkCountry) { - return accountServiceApi.queryAccountByType(null, pkCountry).getData(); - } - - - @Override - public void saveMemberTradeDetail(String sourceCode) { - String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()); - //获取期数 - CuMemberSettlePeriod cuMemberSettlePeriodByDate = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date); - cuMemberTradeDetailService.batchInsertMemberTradeDetailFromTrade(sourceCode, cuMemberSettlePeriodByDate.getPkId()); - } - - - @Override - public void handleMemberTradeDetailAndBonus(List memberAccountList, String sourceCode, Map idsMap, Integer module) { - //查询充值奖金币的交易流水 - List cuMemberTradesList = cuMemberTradeService.selectMemberTradeBySourceCode(sourceCode); - Map map = cuMemberTradesList.stream().collect(Collectors.toMap(CuMemberTrade::getPkMember, o -> o)); - for (CuMemberAccount cuMemberAccount : memberAccountList) { - Long pkMember = cuMemberAccount.getPkMember(); - CuMemberTrade cuMemberTrade = map.get(pkMember); - Long businessId = idsMap.get(pkMember); - deductionMemberAmount(cuMemberAccount, cuMemberTrade, pkMember, businessId, module); - } - } - - - @Override - public void handleRepeatMemberTradeDetailAndBonus(List memberAccountList, Integer module) { - for (CuMemberAccountRechargeExt cuMemberAccount : memberAccountList) { - Long pkMember = cuMemberAccount.getPkMember(); - deductionRepeatMemberAmount(cuMemberAccount, pkMember, module); - } - } - - /** - * 扣费 - * - * @param cuMemberAccount 账户余额 - * @param cuMemberTrade 交易流水 - * @param pkMember 用户ID - * @param pkId 业务ID - * @param module 模块类型 来源枚举 - */ - private void deductionMemberAmount(CuMemberAccount cuMemberAccount, CuMemberTrade cuMemberTrade, Long pkMember, Long pkId, Integer module) { - //交易金额 - BigDecimal tradeAmount = cuMemberTrade.getTradeAmount(); - //可提现金额 - BigDecimal withdrawAccount = cuMemberAccount.getWithdrawAccount4(); - //修改人 - Long pkModified = cuMemberAccount.getPkModified(); - if (null == pkModified) { - pkModified = pkMember; - } - //扣除消费金额 - if (withdrawAccount.add(tradeAmount).compareTo(BigDecimal.ZERO) < 0) { - //扣除可提现金额 - if (withdrawAccount.compareTo(BigDecimal.ZERO) != 0) { - CuMemberTradeBonus bonus = CuMemberTradeBonus.builder().pkMember(pkMember) - .consumeType(module).pkOrder(pkId) - .cashMoney(withdrawAccount.negate()).build(); - bonus.setPkCountry(cuMemberAccount.getPkCountry()); - bonus.setPkCreator(pkModified); - //插入奖金发放流水 - cuMemberTradeBonusService.save(bonus); - } - //扣除金额 - BigDecimal amount = tradeAmount.add(withdrawAccount); - List cuMemberTradeDetails = cuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember); - //扣除可消费金额 - deductionConsumeAmount(amount, cuMemberTradeDetails, pkMember, pkId, pkModified, module); - } else { - //扣除可提现金额 - CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, null, tradeAmount, cuMemberAccount.getPkCountry(), pkModified, module); - //插入奖金发放流水 - cuMemberTradeBonusService.save(bonus); - } - - } - - - /** - * 扣费（包括重复会员金额） - * - * @param cuMemberAccount 账户余额 - * @param pkMember 用户ID - * @param module 模块类型 来源枚举 - */ - private void deductionRepeatMemberAmount(CuMemberAccountRechargeExt cuMemberAccount, Long pkMember, Integer module) { - //交易金额 - BigDecimal tradeAmount = cuMemberAccount.getRechargeAmount(); - Long pkId = cuMemberAccount.getRechargePkId(); - //可提现金额 - BigDecimal withdrawAccount = cuMemberAccount.getWithdrawAccount4(); - //修改人 - Long pkModified = cuMemberAccount.getPkModified(); - if (null == pkModified) { - pkModified = pkMember; - } - //扣除消费金额 - if (withdrawAccount.add(tradeAmount).compareTo(BigDecimal.ZERO) < 0) { - //扣除可提现金额 - if (withdrawAccount.compareTo(BigDecimal.ZERO) != 0) { - CuMemberTradeBonus bonus = CuMemberTradeBonus.builder().pkMember(pkMember) - .consumeType(module).pkOrder(pkId) - .cashMoney(withdrawAccount.negate()).build(); - bonus.setPkCountry(cuMemberAccount.getPkCountry()); - bonus.setPkCreator(pkModified); - //插入奖金发放流水 - cuMemberTradeBonusService.save(bonus); - } - //扣除金额 - BigDecimal amount = tradeAmount.add(withdrawAccount); - List cuMemberTradeDetails = cuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember); - //扣除可消费金额 - deductionConsumeAmount(amount, cuMemberTradeDetails, pkMember, pkId, pkModified, module); - } else { - //扣除可提现金额 - CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, null, tradeAmount, cuMemberAccount.getPkCountry(), pkModified, module); - //插入奖金发放流水 - cuMemberTradeBonusService.save(bonus); - } - - } - - /** - * 先入先出扣款 - * - * @param amount 金锭 - * @param cuMemberTradeDetails 奖金明细余额表 - */ - private void deductionConsumeAmount(BigDecimal amount, List cuMemberTradeDetails, Long pkMember, Long pkId, Long pkModified, Integer module) { - BigDecimal balance = amount; - for (CuMemberTradeDetail cuMemberTradeDetail : cuMemberTradeDetails) { - Long detailPkId = cuMemberTradeDetail.getPkId(); - BigDecimal consumeMoney = cuMemberTradeDetail.getConsumeMoney(); - balance = consumeMoney.add(balance); - if (balance.compareTo(BigDecimal.ZERO) <= 0) { - //更新余额为零 - CuMemberTradeDetail detail = CuMemberTradeDetail.builder().pkId(detailPkId) - .consumeMoney(BigDecimal.ZERO).build(); - cuMemberTradeDetailService.updateById(detail); - CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, detailPkId, consumeMoney, cuMemberTradeDetail.getPkCountry(), pkModified, module); - //插入奖金发放流水 - cuMemberTradeBonusService.save(bonus); - } else { - //更新余额值 - CuMemberTradeDetail detail = CuMemberTradeDetail.builder().pkId(detailPkId) - .consumeMoney(balance).build(); - cuMemberTradeDetailService.updateById(detail); - CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, detailPkId, consumeMoney.subtract(balance), cuMemberTradeDetail.getPkCountry(), pkModified, module); - //插入奖金发放流水 - cuMemberTradeBonusService.save(bonus); - break; - } - - } - } - - /** - * 获取奖金流水 - * - * @param pkMember 会员ID - * @param pkId 业务ID - * @param detailPkId 奖金发放余额ID - * @param consumeMoney 消费余额 - * @param pkCountry 国家ID - * @param pkModified 修改人ID - * @return CuMemberTradeBonus - */ - private CuMemberTradeBonus gerCuMemberTradeBonus(Long pkMember, Long pkId, Long detailPkId, BigDecimal consumeMoney, Integer pkCountry, Long pkModified, Integer module) { - CuMemberTradeBonus bonus = CuMemberTradeBonus.builder().pkMember(pkMember) - .consumeType(module).pkOrder(pkId) - .pkTradeDetail(detailPkId).consumeMoney(consumeMoney.negate()).build(); - bonus.setPkCountry(pkCountry); - if (null == pkModified) { - pkModified = pkMember; - } - bonus.setPkCreator(pkModified); - return bonus; - } - - @Override - public String getAccountTranslateFromDataBase(Integer pkAccount) { - Map accountMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_ACC); - return accountMap.get(pkAccount); - } - - @Override - public BdTradeWhiteConfig selectConfigWhite(Long pkMember, Integer pkCountry, Integer businessModule) { - TradeConfigDTO whiteDTO = TradeConfigDTO.builder().pkMember(pkMember).pkCountry(pkCountry).build(); - if (businessModule.equals(EBusinessModule.WITHDRAWAL.getValue())) { - whiteDTO.setWithdrawalState(EYesNo.YES.getIntValue()); - } else { - whiteDTO.setTransferState(EYesNo.YES.getIntValue()); - } - //查询配置实名认证白名证 - return tradeConfigServiceApi.selectTradeWhiteConfigByCondition(whiteDTO).getData(); - } - - @Override - public BdTradeConfig selectConfigTrade(Long pkMember, Integer pkCountry, Integer businessModule, EVerificationModule eVerificationModule) { - CuMember member = iCuMemberService.getMemberById(pkMember); - TradeConfigDTO tradeConfigDTO = TradeConfigDTO.builder() - .pkAwards(member.getPkAwards()).pkGrade(member.getPkSettleGrade()).pkCountry(pkCountry) - .businessModule(businessModule) - .build(); - if (eVerificationModule.getValue() == EVerificationModule.REAL_NAME.getValue()) { - tradeConfigDTO.setRealNameState(EYesNo.YES.getIntValue()); - } else { - tradeConfigDTO.setLicenseState(EYesNo.YES.getIntValue()); - } - //查询配置是否实名认证 - return tradeConfigServiceApi.selectTradeConfigByCondition(tradeConfigDTO).getData(); - } - - @Override - public Boolean isExistBusinessLicence(Long pkMember, Integer pkCountry, Integer businessModule) { - Boolean result = true; - //查询配置白名单 - BdTradeWhiteConfig bdTradeWhiteConfig = selectConfigWhite(pkMember, pkCountry, businessModule); - if (null == bdTradeWhiteConfig) { - //查询配置是否营业执照 - BdTradeConfig bdTradeConfig = selectConfigTrade(pkMember, pkCountry, businessModule, EVerificationModule.BUSINESS_LICENSE); - //配置后才进行验证 - if (null != bdTradeConfig) { - //查询是否完成经销商认证 - CuMember cuMember = iCuMemberService.getMemberById(pkMember); - result = null != cuMember && cuMember.getIsDealer().equals(EYesNo.YES.getIntValue()) ? true : false; - } - } - return result; - } - - @Override - public Boolean isExistRealName(Long pkMember, Integer pkCountry, Integer businessModule) { - Boolean result = true; - //查询配置实名认证白名证 - BdTradeWhiteConfig bdTradeWhiteConfig = selectConfigWhite(pkMember, pkCountry, businessModule); - if (null == bdTradeWhiteConfig) { - //查询配置是否实名 - BdTradeConfig bdTradeConfig = selectConfigTrade(pkMember, pkCountry, businessModule, EVerificationModule.REAL_NAME); - //配置后才进行验证 - if (null != bdTradeConfig) { - //查询是否已实名认证 - CuMemberAuthenticationVO authenticationVO = authenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); - result = null == authenticationVO ? false : true; - } - } - return result; - } - - @Override - public String getMemberName(CuMember cuMember) { - return CommonUtil.getMemberCode(cuMember.getMemberCode(), cuMember.getServiceCode()); - } - - - @Override - public String getMemberNameByVertex(CuMember cuMember) { - return CommonUtil.getMemberName(cuMember.getPkVertex(), cuMember.getMemberName(), cuMember.getNickName()); - } - - - @Override - public List getAccountByCountry(Integer accountType, Integer pkcountry) { - return accountServiceApi.queryAccountByType(accountType, pkcountry).getData(); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberRechargeServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberRechargeServiceImpl.java deleted file mode 100644 index 235fcf8b..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberRechargeServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EAccount; -import com.hzs.common.core.enums.EApproveRechargeStatus; -import com.hzs.common.core.enums.EOrderPayType; -import com.hzs.common.core.enums.ERechargeMethod; -import com.hzs.common.domain.member.account.CuMemberRecharge; -import com.hzs.common.domain.system.config.BdAccount; -import com.hzs.lenjoy.member.account.mapper.CuMemberRechargeMapper; -import com.hzs.lenjoy.member.account.service.ICuMemberBaseService; -import com.hzs.lenjoy.member.account.service.ICuMemberRechargeService; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.config.IAccountServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *

- * 会员充值表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-08 - */ -@Service -public class CuMemberRechargeServiceImpl extends ServiceImpl implements ICuMemberRechargeService { - - @Autowired - ICuMemberBaseService cuMemberBaseService; - - - @DubboReference - IAccountServiceApi accountServiceApi; - - - - @Override - public Boolean preCharge(String rechargeAmount, Integer pkCountry, Long pkMember, String rechargeCode, Long pkCreator) { - BdAccount bdAccount = accountServiceApi.getBdAccountByFieldValue(pkCountry, EAccount.CONSUME.getValue()).getData(); - CurrencyDTO currency = cuMemberBaseService.getCurrency(pkCountry); - - CuMemberRecharge memberRecharge = CuMemberRecharge.builder().pkMember(pkMember) - .rechargeAmount(new BigDecimal(rechargeAmount)) - .pkAccount(bdAccount.getPkId()).pkRate(currency.getPkId()) - .rechargeSource(EOrderPayType.ONLINE.getValue()) - .rechargeCode(rechargeCode).batch(rechargeCode).build(); - memberRecharge.setApproveState(EApproveRechargeStatus.WAIT.getValue()); - memberRecharge.setApproveTime(new Date()); - memberRecharge.setApprover(pkCreator); - memberRecharge.setRemarks("会员端线上充值"); - memberRecharge.setPkCreator(pkCreator); - memberRecharge.setRechargeMethod(ERechargeMethod.ADD.getValue()); - return this.save(memberRecharge); - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeBonusServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeBonusServiceImpl.java deleted file mode 100644 index 1c7abea6..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeBonusServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.domain.member.account.CuMemberTradeBonus; - -import com.hzs.lenjoy.member.account.mapper.CuMemberTradeBonusMapper; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeBonusService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 会员已发放奖金交易明细表 服务实现类 - *

- * - * @author hzs - * @since 2023-03-24 - */ -@Service -public class CuMemberTradeBonusServiceImpl extends ServiceImpl implements ICuMemberTradeBonusService { - - @Override - public void batchInsertCuMemberTradeBonus(List cuMemberTradeBonusList) { - baseMapper.batchInsertCuMemberTradeBonus(cuMemberTradeBonusList); - } - - @Override - public List queryCuMemberTradeBonus(List consumeTypeList, Long pkOrder) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("pk_member,pk_order,pk_trade_detail,sum(consume_money) consume_money,sum(cash_money) cash_money"); - queryWrapper.eq(SaOrderFieldConstants.PK_ORDER, pkOrder); - queryWrapper.in(SaOrderFieldConstants.CONSUME_TYPE, consumeTypeList); - queryWrapper.groupBy("pk_member,pk_order,pk_trade_detail"); - queryWrapper.orderByDesc("consume_money", "cash_money"); - return baseMapper.selectList(queryWrapper); - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeDetailServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeDetailServiceImpl.java deleted file mode 100644 index b0379033..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeDetailServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.member.account.CuMemberTradeDetail; - -import com.hzs.lenjoy.member.account.mapper.CuMemberTradeDetailMapper; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeDetailService; -import com.hzs.lenjoy.member.achieve.service.impl.CuMemberBonusSettle; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 服务实现类 - * - * @author hzs - * @since 2023-03-21 - */ -@Service -public class CuMemberTradeDetailServiceImpl extends ServiceImpl implements ICuMemberTradeDetailService { - - @Autowired - private CuMemberBonusSettle cuMemberBonusSettle; - - @Override - public Integer batchInsertMemberTradeDetailFromTrade(String sourceCode, Integer period) { - return baseMapper.batchInsertMemberTradeDetailFromTrade(sourceCode, period); - } - - @Override - public List selectMemberTradeDetailByPkMember(Long pkMember) { - return baseMapper.selectMemberTradeDetailByPkMember(pkMember); - } - - @Override - public List queryCuMemberTradeDetail(Long pkMember) { - return baseMapper.queryCuMemberTradeDetail(pkMember); - } - - @Override - public void updateCuMemberTradeDetail(List cuMemberTradeDetailList) { - if (cuMemberTradeDetailList.size() > 0) { - List> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList); - cutList.forEach(memberTradeDetailList -> - baseMapper.updateCuMemberTradeDetail(memberTradeDetailList)); - } - } - - @Override - public void updateAddCuMemberTradeDetail(List cuMemberTradeDetailList) { - if (cuMemberTradeDetailList.size() > 0) { - List> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList); - cutList.forEach(memberTradeDetailList -> - baseMapper.updateAddCuMemberTradeDetail(memberTradeDetailList)); - } - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeServiceImpl.java deleted file mode 100644 index 29b83430..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTradeServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.github.pagehelper.Page; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.enums.ETradeType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.member.account.CuMemberTrade; - -import com.hzs.common.domain.member.account.CuMemberTradeExt; -import com.hzs.common.domain.system.config.BdAccount; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.lenjoy.member.account.mapper.CuMemberTradeMapper; - -import com.hzs.lenjoy.member.account.service.ICuMemberBaseService; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeService; - -import com.hzs.lenjoy.member.account.vo.CuMemberTradeVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * 会员交易明细 服务实现类 - * - * @author hzs - * @since 2022-09-06 - */ -@Service -public class CuMemberTradeServiceImpl extends ServiceImpl implements ICuMemberTradeService { - - @Autowired - private ITransactionCommonService iTransactionCommonService; - @Autowired - private ICuMemberBaseService cuMemberBaseService; - - @Override - public List selectMemberTradeBySourceCode(String sourceCode) { - return baseMapper.selectMemberTradeBySourceCode(sourceCode); - } - - @Override - public List selectTradeType(Long pkMember, Integer pkCountry) { - return baseMapper.selectTradeType(pkMember, pkCountry); - } - - @Override - public List selectWattleDetail(CuMemberTradeVO cuMemberTradeVO) { - CuMemberTradeVO memberTradeVO; - Page cuMemberTradeVOList = new Page<>(); - Integer pkCountry = cuMemberTradeVO.getPkCountry(); - Page cuMemberTrades = (Page) baseMapper.selectWattleDetail(cuMemberTradeVO); - if (CollUtil.isNotEmpty(cuMemberTrades)) { - Map transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values()); - Map accountTranValue = this.getTranslateAccountValue(pkCountry); - for (CuMemberTradeExt memberTrade : cuMemberTrades) { - memberTradeVO = BeanUtil.copyProperties(memberTrade, CuMemberTradeVO.class); - Integer pkAccount = memberTradeVO.getPkAccount(); - memberTradeVO.setPkAccount(accountTranValue.get(pkAccount)); - //转化备注 - String remarks = memberTradeVO.getRemarks(); - if (StringUtils.isNotEmpty(remarks) && remarks.startsWith(EnumsPrefixConstants.TRADE_TYPE)) { - memberTradeVO.setRemarks(transactionMap.get(remarks)); - memberTradeVO.setMontage(EYesNo.YES.getIntValue()); - } else { - memberTradeVO.setMontage(EYesNo.NO.getIntValue()); - } - //充值的前台备注 - String memberRemarks = memberTrade.getMemberRemarks(); - if (memberTrade.getTradeType().equals(ETradeType.OFF_LINE_RECHARGE.getValue())) { - memberTradeVO.setRemarks(memberRemarks); - } - cuMemberTradeVOList.add(memberTradeVO); - } - } - cuMemberTradeVOList.setTotal(cuMemberTrades.getTotal()); - return cuMemberTradeVOList; - } - - /** - * 获取币种翻译值 - * - * @param pkCountry 国家 - * @return Map - */ - private Map getTranslateAccountValue(Integer pkCountry) { - List accountList = cuMemberBaseService.getAccountByCountry(null, pkCountry); - return accountList.stream().collect(Collectors.toMap(BdAccount::getPkId, BdAccount::getPkTransactionKey)); - } - - @Override - public List queryCuMemberTrade(Long pkMember, String sourceCode) { - return baseMapper.queryCuMemberTrade(pkMember, sourceCode); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTransferServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTransferServiceImpl.java deleted file mode 100644 index ce40370e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberTransferServiceImpl.java +++ /dev/null @@ -1,283 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.msg.FinanceMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.account.CuMemberTrade; -import com.hzs.common.domain.member.account.CuMemberTransfer; - -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.system.config.BdTransfer; -import com.hzs.common.util.TransactionUtils; - -import com.hzs.lenjoy.member.account.mapper.CuMemberTransferMapper; -import com.hzs.lenjoy.member.account.param.CuMemberAccountParam; -import com.hzs.lenjoy.member.account.service.ICuMemberAccountService; -import com.hzs.lenjoy.member.account.service.ICuMemberBaseService; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeService; -import com.hzs.lenjoy.member.account.service.ICuMemberTransferService; -import com.hzs.lenjoy.member.base.service.ICuMemberService; - -import com.hzs.system.config.ITransferServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; - -/** - *

- * 会员转账表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-06 - */ -@Service -public class CuMemberTransferServiceImpl extends ServiceImpl implements ICuMemberTransferService { - - @Autowired - private ICuMemberService cuMemberService; - - @Autowired - private ICuMemberAccountService cuMemberAccountService; - - @Autowired - private ICuMemberTradeService cuMemberTradeService; - - @DubboReference - private ITransferServiceApi transferServiceApi; - - - @Autowired - private ICuMemberBaseService cuMemberBaseService; - - - @Override - public Boolean isBloodLine(Long pkMember, Long toPkMember) { - if (Boolean.TRUE.equals(isBloodKinshipOnUmbrella(pkMember, toPkMember))) { - return true; - } - return isBloodKinshipUnderUmbrella(pkMember, toPkMember); - } - - @Override - public BdTransfer getBdTransfer(Integer pkCountry) { - return transferServiceApi.queryTransfer(pkCountry).getData(); - } - - - private Boolean isBloodKinshipOnUmbrella(Long pkMember, Long toPkMember) { - //查找血缘伞上，推荐人 - List cuMemberUp = cuMemberService.queryBloodKinshipOnUmbrella(pkMember); - Optional upOptional = cuMemberUp.stream().filter(up -> toPkMember.equals(up.getPkId())).findFirst(); - return upOptional.isPresent(); - } - - - private Boolean isBloodKinshipUnderUmbrella(Long pkMember, Long toPkMember) { - //查找血缘伞下，推荐人 - List cuMemberDown = cuMemberService.queryBloodKinshipUnderUmbrella(pkMember); - Optional downOptional = cuMemberDown.stream().filter(down -> toPkMember.equals(down.getPkId())).findFirst(); - return downOptional.isPresent(); - } - - - @Transactional(rollbackFor = Exception.class) - @Override - public Integer saveMemberTransferInfo(CuMemberTransfer cuMemberTransfer, CuMemberAccount cuMemberAccount, CuMemberAccount toMemberAccount) { - Integer row = baseMapper.insert(cuMemberTransfer); - this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_OUT.getValue()); - this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_IN.getValue()); - ChargingBonusDetail(cuMemberTransfer, cuMemberAccount, toMemberAccount); - return row; - } - - /** - * 奖金交易流水扣费 - * - * @param cuMemberTransfer - */ - private void ChargingBonusDetail(CuMemberTransfer cuMemberTransfer, CuMemberAccount cuMemberAccount, CuMemberAccount toMemberAccount) { - Map idsMap; - List memberAccountList; - Integer pkAccount = cuMemberTransfer.getPkAccount(); - Integer pkToAccount = cuMemberTransfer.getPkToAccount(); - String transferCode = cuMemberTransfer.getTransferCode(); - //转出方 - if (cuMemberBaseService.getAccountValueById(pkAccount).equals(EAccount.BONUS.getValue())) { - memberAccountList = new ArrayList<>(); - memberAccountList.add(cuMemberAccount); - idsMap = new HashMap<>(); - idsMap.put(cuMemberTransfer.getPkMember(), cuMemberTransfer.getPkId()); - saveTransferMemberTradeDetailAndBonus(memberAccountList, ETransferType.TRANSFER_OUT.getValue(), transferCode, idsMap); - } - //转入方 - if (cuMemberBaseService.getAccountValueById(pkToAccount).equals(EAccount.BONUS.getValue())) { - memberAccountList = new ArrayList<>(); - memberAccountList.add(toMemberAccount); - idsMap = new HashMap<>(); - idsMap.put(cuMemberTransfer.getPkMember(), cuMemberTransfer.getPkId()); - saveTransferMemberTradeDetailAndBonus(memberAccountList, ETransferType.TRANSFER_IN.getValue(), transferCode, idsMap); - } - } - - /** - * 插入奖金流水明细 - * - * @param memberAccountList 账户信息 - * @param type 类型 - * @param businessCode 业务编码 - */ - private void saveTransferMemberTradeDetailAndBonus(List memberAccountList, Integer type, String businessCode, Map idsMap) { - //转出方 - if (type.equals(ETransferType.TRANSFER_OUT.getValue())) { - cuMemberBaseService.handleMemberTradeDetailAndBonus(memberAccountList, businessCode, idsMap, EConsumeType.TRANSFER.getValue()); - } else { - cuMemberBaseService.saveMemberTradeDetail(businessCode); - } - } - - - /** - * 更新交易流水和余额 - * - * @param cuMemberTransfer 提现信息 - * @param type 转入类型 - */ - private Integer updateTradeAndBalancd(CuMemberTransfer cuMemberTransfer, int type) { - CuMemberTrade cuMemberTrade = type == (ETransferType.TRANSFER_OUT.getValue()) ? this.getCuMemberTradeToTransferOut(cuMemberTransfer) : this.getCuMemberTradeToTransferIn(cuMemberTransfer); - cuMemberTradeService.save(cuMemberTrade); - //更新余额表 - Long pkMember = cuMemberTransfer.getPkMember(); - Long toPkMember = cuMemberTransfer.getToPkMember(); - //用户 - Long memberId = type == (ETransferType.TRANSFER_OUT.getValue()) ? pkMember : toPkMember; - int accountType = cuMemberTransfer.getPkAccount(); - int toAccountType = cuMemberTransfer.getPkToAccount(); - //账户类型 - int pkAccount = type == (ETransferType.TRANSFER_OUT.getValue()) ? accountType : toAccountType; - - //转账金额 - BigDecimal transferMoney = type == (ETransferType.TRANSFER_OUT.getValue()) ? cuMemberTransfer.getTransferMoney() : cuMemberTransfer.getIssuedAmount(); - BigDecimal amount = type == (ETransferType.TRANSFER_OUT.getValue()) ? transferMoney.negate() : transferMoney; - Integer pkAccountValue = cuMemberBaseService.getAccountValueById(pkAccount); - - CuMemberAccountParam param = CuMemberAccountParam.builder().pkMember(memberId) - .accountType(pkAccountValue).amount(amount).pkModified(cuMemberTransfer.getPkCreator()) - .accountClassify(ETradeClassify.TRANSFER.getValue()).pkCountry(cuMemberTransfer.getPkCountry()) - .transferType(type).build(); - - return cuMemberAccountService.updateMemberAccountByMemberCode(param); - } - - /** - * 构造转出方交易明细 - * - * @param cuMemberTransfer 转账信息 - * @return CuMemberTrade - */ - private CuMemberTrade getCuMemberTradeToTransferOut(CuMemberTransfer cuMemberTransfer) { - Long pkMember = cuMemberTransfer.getPkMember(); - Long toPkMember = cuMemberTransfer.getToPkMember(); - CuMember member = cuMemberService.getMemberById(pkMember); - CuMember toMember = cuMemberService.getMemberById(toPkMember); - //提现金额 - BigDecimal tradeAmount = cuMemberTransfer.getTransferMoney(); - BigDecimal amount = tradeAmount.negate(); - int accountType = cuMemberTransfer.getPkAccount(); - String tradeCode = CommonUtil.createSerialNumber(EOrderPrefix.TRANSFER_CODE.getValue()); - //查询余额 - BigDecimal balance = cuMemberAccountService.selectBalanceByMemberCode(pkMember, cuMemberBaseService.getAccountValueById(accountType)); - CuMemberTrade memberTrade = CuMemberTrade.builder().pkMember(pkMember) - .tradeCode(tradeCode) - .pkAccount(cuMemberTransfer.getPkAccount()) - .tradeType(ETradeType.TRANSFER.getValue()) - .tradeClassify(ETradeClassify.TRANSFER.getValue()) - .pkRate(cuMemberTransfer.getPkRate()) - .tradeAmount(amount) - .tradeBeforeBalance(balance) - .tradeBalance(balance.add(amount)) - .sourceCode(cuMemberTransfer.getTransferCode()) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .remarks(getTransferRemarks(toMember, member, tradeAmount, ETransferType.TRANSFER_OUT)) - .build(); - memberTrade.setPkCountry(cuMemberTransfer.getPkCountry()); - memberTrade.setPkCreator(cuMemberTransfer.getPkCreator()); - return memberTrade; - } - - - /** - * 构造转入方交易明细 - * - * @param cuMemberTransfer 转账信息 - * @return CuMemberTrade - */ - private CuMemberTrade getCuMemberTradeToTransferIn(CuMemberTransfer cuMemberTransfer) { - Long pkMember = cuMemberTransfer.getPkMember(); - Long toPkMember = cuMemberTransfer.getToPkMember(); - CuMember member = cuMemberService.getMemberById(pkMember); - CuMember toMember = cuMemberService.getMemberById(toPkMember); - //提现金额 - BigDecimal tradeAmount = cuMemberTransfer.getIssuedAmount(); - int accountType = cuMemberTransfer.getPkToAccount(); - String tradeCode = CommonUtil.createSerialNumber(EOrderPrefix.TRANSFER_CODE.getValue()); - //查询余额 - BigDecimal balance = cuMemberAccountService.selectBalanceByMemberCode(toPkMember, cuMemberBaseService.getAccountValueById(accountType)); - CuMemberTrade memberTrade = CuMemberTrade.builder().pkMember(toPkMember) - .tradeCode(tradeCode) - .pkAccount(cuMemberTransfer.getPkToAccount()) - .tradeType(ETradeType.TRANSFER.getValue()) - .tradeClassify(ETradeClassify.TRANSFER.getValue()) - .pkRate(cuMemberTransfer.getPkRate()) - .tradeAmount(tradeAmount) - .tradeBeforeBalance(balance) - .tradeBalance(balance.add(tradeAmount)) - .sourceCode(cuMemberTransfer.getTransferCode()) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .remarks(getTransferRemarks(member, toMember, tradeAmount, ETransferType.TRANSFER_IN)) - .build(); - memberTrade.setPkCountry(cuMemberTransfer.getPkCountry()); - memberTrade.setPkCreator(cuMemberTransfer.getPkCreator()); - return memberTrade; - } - - /** - * 转入方账户转账备注 - * - * @param member 显示会员昵称会员 - * @param toMember 显示会员姓名会员 - * @param tradeAmount 转账金额 - * @param eTransferType 转账类型 - * @return String - */ - private String getTransferRemarks(CuMember member, CuMember toMember, BigDecimal tradeAmount, ETransferType eTransferType) { - StringBuilder remarks = new StringBuilder(); - remarks.append(cuMemberBaseService.getMemberName(toMember)) - .append("(") - .append(toMember.getMemberName()) - .append(") "); - if (eTransferType == ETransferType.TRANSFER_IN) { - remarks.append(TransactionUtils.getContent(FinanceMsgConstants.ACCEPT_TRANSFER)); - } else { - remarks.append(TransactionUtils.getContent(FinanceMsgConstants.TRANSFER_ACCOUNTS)); - } - remarks.append(cuMemberBaseService.getMemberName(member)) - .append("(") - .append(cuMemberBaseService.getMemberNameByVertex(member)) - .append(") ") - .append(TransactionUtils.getContent(FinanceMsgConstants.AMOUNT_MONEY)) - .append(tradeAmount); - return remarks.toString(); - } - - -} - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberWithdrawServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberWithdrawServiceImpl.java deleted file mode 100644 index 76c4430c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/service/impl/CuMemberWithdrawServiceImpl.java +++ /dev/null @@ -1,509 +0,0 @@ -package com.hzs.lenjoy.member.account.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.account.CuMemberTrade; -import com.hzs.common.domain.member.account.CuMemberWithdraw; -import com.hzs.common.domain.member.account.CuMemberWithdrawExt; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.common.domain.system.config.*; -import com.hzs.common.domain.system.config.ext.BdWithdrawalTaxExt; -import com.hzs.lenjoy.member.account.mapper.CuMemberWithdrawMapper; -import com.hzs.lenjoy.member.account.param.CuMemberAccountParam; -import com.hzs.lenjoy.member.account.service.*; - -import com.hzs.lenjoy.member.account.vo.CuMemberBankVO; -import com.hzs.lenjoy.member.account.vo.CuMemberWithdrawVO; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.system.base.dto.CurrencyDTO; - -import com.hzs.system.config.IWithdrawalProcessServiceApi; -import com.hzs.system.config.IWithdrawalTaxServiceApi; - -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import java.util.stream.Collectors; - -/** - *

- * 会员提现表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-06 - */ -@Service -@Slf4j -public class CuMemberWithdrawServiceImpl extends ServiceImpl implements ICuMemberWithdrawService { - - - @DubboReference - private IWithdrawalTaxServiceApi withdrawalTaxServiceApi; - - @Autowired - private ICuMemberTradeService cuMemberTradeService; - - @Autowired - private ICuMemberAccountService cuMemberAccountService; - - @Autowired - private ICuMemberBaseService cuMemberBaseService; - - @Autowired - private ICuMemberBankService cuMemberBankService; - - @Autowired - private ICuMemberService cuMemberService; - - @DubboReference - private IWithdrawalProcessServiceApi withdrawalProcessServiceApi; - - - @Override - public List getWithdrawTimes(Long pkMember) { - return baseMapper.getWithdrawTimes(pkMember); - } - - - private BigDecimal getIncomeTax(BdWithdrawalTaxExt withdrawalTax, Integer pkCountry, BigDecimal curCashAmount) { - //个税比例 - BigDecimal incomeTax = BigDecimal.ZERO; - //计算类型 - Integer serviceType = withdrawalTax.getServiceType(); - //获取个税列表配置 - List withdrawalTaxDetails = withdrawalTax.getWithdrawalTaxDetailsList(); - if (CollUtil.isNotEmpty(withdrawalTaxDetails)) { - for (BdWithdrawalTaxDetails bdWithdrawalTaxDeatail : withdrawalTaxDetails) { - BigDecimal lowerBound = bdWithdrawalTaxDeatail.getLowerBound(); - BigDecimal upperBound = bdWithdrawalTaxDeatail.getUpperBound(); - BigDecimal ratio = bdWithdrawalTaxDeatail.getRatio(); - if (curCashAmount.compareTo(upperBound) <= 0 && curCashAmount.compareTo(lowerBound) >= 0) { - incomeTax = ratio; - break; - } - } - } - incomeTax = serviceType.equals(ECalType.RATIO.getValue()) ? incomeTax.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_HALF_UP) : incomeTax; - return incomeTax; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public Integer saveMemberWithdrawInfo(CuMemberWithdraw cuMemberWithdraw) { - Integer row = baseMapper.insert(cuMemberWithdraw); - this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT); - return row; - - } - - /** - * 更新交易流水和余额 - * - * @param cuMemberWithdraw 提现信息 - * @param eMethodType 提现方式 - */ - public Integer updateTradeAndBalancd(CuMemberWithdraw cuMemberWithdraw, EOperationMethod eMethodType) { - CuMemberTrade cuMemberTrade = this.getCuMemberTrade(cuMemberWithdraw, eMethodType); - cuMemberTradeService.save(cuMemberTrade); - //更新余额表 - Integer pkAccount = cuMemberWithdraw.getPkAccount(); - int accountType = cuMemberBaseService.getAccount(pkAccount).getFieldValue(); - //提现金额 - BigDecimal cashAmount = cuMemberWithdraw.getCashAmount(); - BigDecimal amount = eMethodType.equals(EOperationMethod.INSERT) ? cashAmount.negate() : cashAmount; - CuMemberAccountParam param = CuMemberAccountParam.builder().pkMember(cuMemberWithdraw.getPkMember()) - .accountType(accountType).amount(amount).pkModified(cuMemberWithdraw.getPkCreator()) - .accountClassify(ETradeClassify.WITHDRAWAL.getValue()).pkCountry(cuMemberWithdraw.getPkCountry()) - .transferType(ETransferType.TRANSFER_IN.getValue()).build(); - return cuMemberAccountService.updateMemberAccountByMemberCode(param); - } - - /** - * 构造交易明细 - * - * @param cuMemberWithdraw 提现信息 - * @return CuMemberTrade - */ - private CuMemberTrade getCuMemberTrade(CuMemberWithdraw cuMemberWithdraw, EOperationMethod eMethodType) { - Long pkMember = cuMemberWithdraw.getPkMember(); - //提现金额 - BigDecimal tradeAmount = cuMemberWithdraw.getCashAmount(); - BigDecimal amount = eMethodType.equals(EOperationMethod.INSERT) ? tradeAmount.negate() : tradeAmount; - String remarks = eMethodType.equals(EOperationMethod.INSERT) ? "提现" : cuMemberWithdraw.getPayerRemarks(); - //交易编号 - String tradeCode = eMethodType.equals(EOperationMethod.INSERT) ? cuMemberWithdraw.getWithdrawCode() : CommonUtil.createSerialNumber(EOrderPrefix.WITHDRAWAL_CODE.getValue()); - //来源编号 - String sourceCode = eMethodType.equals(EOperationMethod.INSERT) ? cuMemberWithdraw.getWithdrawCode() : cuMemberWithdraw.getBatch(); - Integer tradeType = eMethodType.equals(EOperationMethod.INSERT) ? ETradeType.WITHDRAW.getValue() : ETradeType.WITHDRAWAL_REFUSED.getValue(); - Integer pkAccount = cuMemberWithdraw.getPkAccount(); - //账户值 - Integer accountValue = cuMemberBaseService.getAccountValueById(pkAccount); - //查询余额 - BigDecimal balance = cuMemberAccountService.selectBalanceByMemberCode(pkMember, accountValue); - CuMemberTrade memberTrade = CuMemberTrade.builder().pkMember(pkMember) - .tradeCode(tradeCode) - .pkAccount(pkAccount) - .tradeType(tradeType) - .tradeClassify(ETradeClassify.WITHDRAWAL.getValue()) - .pkRate(cuMemberWithdraw.getPkRate()) - .tradeAmount(amount) - .tradeBeforeBalance(balance) - .tradeBalance(balance.add(amount)) - .sourceCode(sourceCode) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .remarks(remarks) - .build(); - memberTrade.setPkCountry(cuMemberWithdraw.getPkCountry()); - memberTrade.setPkCreator(cuMemberWithdraw.getPkCreator()); - return memberTrade; - } - - /** - * 页面显示公用参数 - * - * @param cuMemberWithdrawVO 提现VO - * @param memberWithdraw 提现信息 - */ - private void setPublicParam(CuMemberWithdrawVO cuMemberWithdrawVO, CuMemberWithdrawExt memberWithdraw) { - BigDecimal exchangeRate; - Integer pkRate = memberWithdraw.getPkRate(); - if (null != pkRate) { - //汇率 - exchangeRate = cuMemberBaseService.getCurrencyById(memberWithdraw.getPkRate()).getInExchangeRate(); - } else { - //取最新的汇率 - CurrencyDTO currencyDTO = cuMemberBaseService.getCurrency(cuMemberWithdrawVO.getPkCountry()); - exchangeRate = currencyDTO.getInExchangeRate(); - } - - //查询提现账户 - Integer pkAccount = memberWithdraw.getPkAccount(); - Integer accountsType = cuMemberBaseService.getAccountValueById(pkAccount); - //查询账户余额 - CuMemberAccount cuMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(memberWithdraw.getPkMember()); - BigDecimal availableBalance; - if (accountsType.equals(EAccount.BONUS.getValue())) { - BigDecimal balance = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.WITHDRAW_ACCOUNT + accountsType); - BigDecimal lockAccount = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_WITHDRAW_ACCOUNT + accountsType); - availableBalance = null != lockAccount ? balance.subtract(lockAccount) : balance; - } else { - availableBalance = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.ACCOUNT + accountsType); - BigDecimal lockAccount = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_ACCOUNT + accountsType); - BigDecimal lockTransferAccount = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_TRANSFER_ACCOUNT + accountsType); - if (null != lockAccount && null != lockTransferAccount) { - availableBalance = availableBalance.subtract(lockAccount).subtract(lockTransferAccount); - } - } - availableBalance = null == availableBalance ? BigDecimal.ZERO : availableBalance; - cuMemberWithdrawVO.setAvailableAmount(availableBalance.add(memberWithdraw.getCashAmount())); - cuMemberWithdrawVO.setAvailableBalance(availableBalance); - - //提现金额 - BigDecimal settleCashAmount = memberWithdraw.getCashAmount().divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP); - //个税 - BigDecimal settleIncomeTax = memberWithdraw.getIncomeTax().divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP); - //手续费 - BigDecimal settleServiceCharge = memberWithdraw.getServiceCharge().divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP); - //实发金额 - BigDecimal settleIssuedAmount = memberWithdraw.getIssuedAmount().divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP); - - cuMemberWithdrawVO.setExchangeRate(exchangeRate); - cuMemberWithdrawVO.setSettleIncomeTax(settleIncomeTax); - cuMemberWithdrawVO.setSettleServiceCharge(settleServiceCharge); - cuMemberWithdrawVO.setSettleCashAmount(settleCashAmount); - cuMemberWithdrawVO.setSettleIssuedAmount(settleIssuedAmount); - cuMemberWithdrawVO.setPkAccount(cuMemberBaseService.translateAccountValue(pkAccount)); - } - - - /** - * 会员提现 - * - * @param withdrawal 提现配置信息 - * @param cuMemberAccountExts 会员币种表 - * @param bdAccounts 币种信息 - * @param accountsType 配置的提现币种 - * @param pkCountry 国家ID - */ - public void memberWithDrawal(BdWithdrawal withdrawal, List cuMemberAccountExts, List bdAccounts, Integer accountsType, Integer pkCountry) { - //会员ID 银行卡ID - Long pkMember; - Long pkBank; - //余额 锁定金额 - BigDecimal balance, lockAccount; - //最高自动提现金额 - BigDecimal upperBound = withdrawal.getUpperBound(); - //最低自动提现金额 - BigDecimal lowerBound = withdrawal.getLowerBound(); - //配置文件中的提现次数 - Integer withdrawalNumber = withdrawal.getWithdrawalNumber(); - if (CollUtil.isNotEmpty(cuMemberAccountExts)) { - //查询每个会员正在参与审核的次数 - List withdrawTimesByPkCountry = baseMapper.getWithdrawTimesByPkCountry(pkCountry); - Map withdrawTimes = withdrawTimesByPkCountry.stream().collect(Collectors.toMap(CuMemberWithdrawExt::getPkMember, CuMemberWithdrawExt::getTimes)); - //汇率 - CurrencyDTO currencyDTO = cuMemberBaseService.getCurrency(pkCountry); - for (CuMemberAccountExt cuMemberAccountExt : cuMemberAccountExts) { - pkBank = cuMemberAccountExt.getPkBank(); - //是否绑定银行卡 - CuMemberBankVO memberBank = cuMemberBankService.selectCuMemberBankById(pkBank); - log.info("----------是否绑定银行卡"); - if (null != memberBank) { - log.info("----------绑定银行卡"); - pkMember = cuMemberAccountExt.getPkMember(); - //获取余额 - balance = getAvailableBalance(accountsType, cuMemberAccountExt); - //是否取整 - balance = computeRounding(withdrawal, balance); - // 提现金额在配置金额之间 - if (balance.compareTo(lowerBound) > 0 && balance.compareTo(upperBound) < 0) { - log.info("----------提现开始"); - Integer times = withdrawTimes.get(pkMember) == null ? 0 : withdrawTimes.get(pkMember); - //比较正在提现次数与配置的最大提现次数 - if (times <= withdrawalNumber) { - //本次应缴个税 - BigDecimal payIncomeTax = computeIncomeTaxValue(pkMember, balance, pkCountry, lowerBound); - //手续费金额 - BigDecimal serviceChargeAmount = computeServiceCharge(pkCountry, balance); - BigDecimal issuedAmount = balance.subtract(payIncomeTax).subtract(serviceChargeAmount); - String code = CommonUtil.createSerialNumber(EOrderPrefix.WITHDRAWAL_CODE.getValue()); - CuMember member = cuMemberService.getMemberById(pkMember); - String remarks = member.getMemberCode() + "自动申请提现" + balance.toString(); - CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder().pkMember(pkMember) - .pkAccount(bdAccounts.get(0).getPkId()).pkBank(pkBank) - .pkRate(currencyDTO.getPkId()).cashAmount(balance) - .serviceCharge(serviceChargeAmount).incomeTax(payIncomeTax) - .issuedAmount(issuedAmount).withdrawCode(code).remarks(remarks).build(); - cuMemberWithdraw.setApproveState(EApproveStatus.WAIT_SUBMIT.getValue()); - cuMemberWithdraw.setDelFlag(EDelFlag.UN_DELETE.getValue()); - cuMemberWithdraw.setPkCountry(pkCountry); - cuMemberWithdraw.setPkCreator(pkMember); - //保存提现、交易流水、余额信息 - baseMapper.insert(cuMemberWithdraw); - this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT); - } - } - } - } - } - } - - /** - * 获取余额 - * - * @param accountsType 账户值 - * @param cuMemberAccount 账户信息 - * @return BigDecimal - */ - private BigDecimal getAvailableBalance(Integer accountsType, CuMemberAccount cuMemberAccount) { - //账户余额 - BigDecimal accountBalance = getAccountBalance(accountsType, cuMemberAccount); - //可提现账户余额 - BigDecimal withdrawBalance = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.WITHDRAW_ACCOUNT + accountsType); - withdrawBalance = withdrawBalance == null ? BigDecimal.ZERO : withdrawBalance; - BigDecimal lockAccount = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_WITHDRAW_ACCOUNT + accountsType); - if (null != lockAccount && lockAccount.compareTo(BigDecimal.ZERO) > 0) { - withdrawBalance = withdrawBalance.subtract(lockAccount); - } - //取最小余额 - return accountBalance.compareTo(withdrawBalance) < 0 ? accountBalance : withdrawBalance; - } - - /** - * 获取账户余额 - * - * @param accountsType 账户值 - * @param cuMemberAccount 账户信息 - * @return BigDecimal - */ - @Override - public BigDecimal getAccountBalance(Integer accountsType, CuMemberAccount cuMemberAccount) { - //账户金额 - BigDecimal account = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.ACCOUNT + accountsType); - account = account == null ? BigDecimal.ZERO : account; - //锁定消费 - BigDecimal lockConsume = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_ACCOUNT + accountsType); - lockConsume = lockConsume == null ? BigDecimal.ZERO : lockConsume; - //锁定转账 - BigDecimal lockTransfer = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_TRANSFER_ACCOUNT + accountsType); - lockTransfer = lockTransfer == null ? BigDecimal.ZERO : lockTransfer; - return account.subtract(lockConsume).subtract(lockTransfer); - } - - - @Override - public BigDecimal computeIncomeTaxValue(Long pkMember, BigDecimal cashAmount, Integer pkCountry, BigDecimal minAmount) { - //获取个税配置 - R bdWithdrawalTaxExtR = withdrawalTaxServiceApi.queryWithdrawalTax(pkCountry); - BdWithdrawalTaxExt withdrawalTax = bdWithdrawalTaxExtR.getData(); - if (null == withdrawalTax) { - return BigDecimal.ZERO; - } - Integer cycle = withdrawalTax.getTaxCycle(); - - BigDecimal monthCashAmount = BigDecimal.ZERO; - BigDecimal monthTax = BigDecimal.ZERO; - //查询周期内提现金额、总个税 - CuMemberWithdraw cuMemberWithdraw = baseMapper.getIncomeTaxByCycle(pkMember, cycle); - if (null != cuMemberWithdraw) { - monthCashAmount = cuMemberWithdraw.getCashAmount(); - monthTax = cuMemberWithdraw.getIncomeTax(); - } - // 当月提现额度 + 本次提现额度 = 当前提现金额 - BigDecimal curCashAmount = monthCashAmount.add(cashAmount); - //参加提税的金额(总提税金额-最低提现金额) - curCashAmount = curCashAmount.subtract(minAmount); - //个税比例 - BigDecimal incomeTax = getIncomeTax(withdrawalTax, pkCountry, curCashAmount); - //当月总个税 = 当前提现金额*个税比例 - BigDecimal totalTax = curCashAmount.multiply(incomeTax).setScale(4, BigDecimal.ROUND_HALF_UP); - //当总所得税小于当月已缴所得税时，本交不交所得税 - if (totalTax.compareTo(monthTax) < 0) { - return BigDecimal.ZERO; - } - // 本次应缴所得税 = 总所得税 - 当月已缴费所得税 - return totalTax.subtract(monthTax); - } - - @Override - public BigDecimal computeServiceCharge(Integer pkCountry, BigDecimal cashAmount) { - BdWithdrawalProcess withdrawalProcess = withdrawalProcessServiceApi.queryBdWithdrawalProcess(pkCountry).getData(); - //手续费类型 - Integer serviceType = withdrawalProcess.getServiceType(); - BigDecimal serviceRatio = withdrawalProcess.getServiceRatio(); - //按金额 - if (serviceType.equals(ECalType.VALUE.getValue())) { - return serviceRatio; - } else {//按比例 - //转化为百分比比率 - BigDecimal serviceChargeeRatio = serviceRatio.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_HALF_UP); - //手续费金额 = 本次提现金额 * 手续费比例 - return cashAmount.multiply(serviceChargeeRatio).setScale(4, BigDecimal.ROUND_HALF_UP); - } - - } - - @Override - public BigDecimal computeRounding(BdWithdrawal bdWithdrawal, BigDecimal cashAmount) { - BigDecimal roundIngAmount = cashAmount; - Integer isRounding = bdWithdrawal.getIsRounding(); - if (isRounding.equals(EYesNo.YES.getIntValue())) { - //向下取整 - roundIngAmount = cashAmount.setScale(0, BigDecimal.ROUND_DOWN); - } - return roundIngAmount; - } - - - @Override - public Object[] selectMemberWithdrawListByPkMember(Long pkMember, Integer pkCountry) { - CuMemberWithdrawVO cuMemberWithdrawVO; - List cuMemberWithdrawVOList = new ArrayList<>(); - List cuMemberWithdrawList = baseMapper.selectMemberWithdrawListByPkMember(pkMember, pkCountry); - if (CollUtil.isNotEmpty(cuMemberWithdrawList)) { - //查询币种值 - List allAccounts = cuMemberBaseService.getAccountByCountryId(pkCountry); - Map map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o)); - for (CuMemberWithdrawExt ext : cuMemberWithdrawList) { - cuMemberWithdrawVO = BeanUtil.copyProperties(ext, CuMemberWithdrawVO.class); - BdAccount bdAccount = map.get(ext.getPkAccount()); - if (null != bdAccount) { - cuMemberWithdrawVO.setPkAccount(bdAccount.getPkTransactionKey()); - } - cuMemberWithdrawVOList.add(cuMemberWithdrawVO); - } - } - return new Object[]{cuMemberWithdrawList, cuMemberWithdrawVOList}; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer updateWithdrawStatusByPkId(Long pkId, Long pkModified) { - CuMemberWithdraw cuMemberWithdraw = baseMapper.selectById(pkId); - //回退金额 - BigDecimal backAmount = cuMemberWithdraw.getCashAmount(); - if (backAmount.compareTo(BigDecimal.ZERO) > 0) { - //插入交易明细表 - cuMemberTradeService.save(getCuMemberTradeInfo(cuMemberWithdraw)); - //更新余额表 - CuMemberAccount cuMemberAccount = this.getCuMemberAccount(cuMemberWithdraw, backAmount); - cuMemberAccount.setPkCountry(cuMemberWithdraw.getPkCountry()); - cuMemberAccountService.updateMemberAccount(cuMemberAccount, pkModified); - } - return baseMapper.updateWithdrawStatusByPkId(pkId, pkModified); - } - - private CuMemberAccount getCuMemberAccount(CuMemberWithdraw cuMemberWithdraw, BigDecimal backAmount) { - Integer pkAccount = cuMemberWithdraw.getPkAccount(); - BdAccount account = cuMemberBaseService.getAccount(pkAccount); - if (account.getFieldValue().equals(EAccount.BONUS.getValue())) { - return CuMemberAccount.builder() - .account4(backAmount) - .withdrawAccount4(backAmount) - .pkMember(cuMemberWithdraw.getPkMember()) - .build(); - } else { - return CuMemberAccount.builder() - .account14(backAmount) - .pkMember(cuMemberWithdraw.getPkMember()) - .build(); - } - } - - /** - * 获取交易流水信息 - * - * @param cuMemberWithdraw 提现信息 - * @return CuMemberTrade - */ - private CuMemberTrade getCuMemberTradeInfo(CuMemberWithdraw cuMemberWithdraw) { - Long pkMember = cuMemberWithdraw.getPkMember(); - Integer pkAccount = cuMemberWithdraw.getPkAccount(); - BdAccount account = cuMemberBaseService.getAccount(pkAccount); - //交易金额 - BigDecimal tradeAmount = cuMemberWithdraw.getCashAmount(); - //查询余额 - BigDecimal balance = cuMemberAccountService.selectBalanceByMemberCode(pkMember, account.getFieldValue()); - CuMemberTrade memberTrade = CuMemberTrade.builder().pkMember(pkMember) - .tradeCode(CommonUtil.createSerialNumber(EOrderPrefix.WITHDRAWAL_CODE.getValue())) - .pkAccount(pkAccount) - .tradeType(ETradeType.WITHDRAW.getValue()) - .tradeClassify(ETradeClassify.WITHDRAWAL.getValue()) - .pkRate(cuMemberWithdraw.getPkRate()) - .tradeAmount(tradeAmount) - .tradeBeforeBalance(balance) - .tradeBalance(balance.add(tradeAmount)) - .sourceCode(cuMemberWithdraw.getWithdrawCode()) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .pkMember(pkMember) - .remarks("提现撤消返钱") - .build(); - memberTrade.setPkCountry(cuMemberWithdraw.getPkCountry()); - return memberTrade; - } - - @Override - public List selectWithdrawMember(Integer pkCountry, Long pkMember) { - return baseMapper.selectWithdrawMember(pkCountry, pkMember); - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberAccountVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberAccountVO.java deleted file mode 100644 index 02c91583..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberAccountVO.java +++ /dev/null @@ -1,394 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - *

- * 会员账户信息 - *

- * - * @author hzs - * @since 2022-08-11 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberAccountVO implements Serializable { - - - private static final long serialVersionUID = -8992680715020309156L; - - @JsonIgnore - private Integer pkCountry; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 消费账户 - */ - @Excel(name = "消费余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account1; - - /** - * 消费账户 - */ - @Excel(name = "可用消费", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount1; - - /** - * 消费锁定账户 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount1; - - /** - * 消费账户锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount1; - - /** - * 现金账户 - */ - @Excel(name = "现金余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account2; - - /** - * 消费账户 - */ - @Excel(name = "可用现金", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount2; - - /** - * 现金锁定账户 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount2; - - /** - * 现金账户锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount2; - - /** - * 政策账户 - */ - @Excel(name = "政策余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account3; - - /** - * 政策账户 - */ - @Excel(name = "可用政策", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount3; - - /** - * 锁定政策账户 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount3; - - /** - * 政策账户锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount3; - - /** - * 奖金账户 - */ - @Excel(name = "奖金余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account4; - - /** - * 奖金账户 - */ - @Excel(name = "可用奖金", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount4; - - /** - * 可提现账户 - */ - @JsonIgnore - private BigDecimal withdrawAccount4; - - /** - * 可提现账户 - */ - @Excel(name = "可提奖金", scale = 2) - @BigDecimalFormat() - private BigDecimal submitAccount4; - - /** - * 奖金锁定账户 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount4; - - /** - * 奖金账户锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount4; - - /** - * 奖金账户锁定提现 - */ - @Excel(name = "禁止提现", scale = 2) - @BigDecimalFormat() - private BigDecimal lockWithdrawAccount4; - - - /** - * 重消账户 - */ - @Excel(name = "重消余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account5; - - /** - * 重消账户 - */ - @Excel(name = "可用重消", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount5; - - /** - * 锁定重消账户 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount5; - - /** - * 重消账户锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount5; - - /** - * 积分账户 - */ - @Excel(name = "积分余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account6; - - /** - * 重消账户 - */ - @Excel(name = "可用积分", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount6; - - /** - * 锁定积分账户 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount6; - - /** - * 积分账户锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount6; - - /** - * 鼓励账户 - */ - @Excel(name = "鼓励余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account7; - - /** - * 重消账户 - */ - @Excel(name = "可用鼓励", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount7; - - /** - * 锁定鼓励账户 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount7; - - /** - * 鼓励账户锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount7; - - /** - * 复购券账户 - */ - @Excel(name = "复购券余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account8; - - /** - * 重消账户 - */ - @Excel(name = "可用复购券", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount8; - - /** - * 锁定复购券 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount8; - - /** - * 复购券锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount8; - - /** - * 全球积分 - */ - @Excel(name = "全球积分余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account9; - - /** - * 重消账户 - */ - @Excel(name = "可用全球积分", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount9; - - /** - * 锁定全球积分 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount9; - - /** - * 全球积分锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount9; - - /** - * 车奖积分 - */ - @Excel(name = "车奖积分余额", scale = 2) - @BigDecimalFormat() - private BigDecimal account10; - - /** - * 重消账户 - */ - @Excel(name = "可用车奖积分", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAccount10; - - /** - * 锁定车奖积分 - */ - @Excel(name = "禁止消费", scale = 2) - @BigDecimalFormat() - private BigDecimal lockAccount10; - - /** - * 车奖积分锁定转账 - */ - @Excel(name = "禁止转账", scale = 2) - @BigDecimalFormat() - private BigDecimal lockTransferAccount10; - - - /** - * 直播代金券 - */ - @Excel(name = "直播代金券", scale = 2) - @BigDecimalFormat() - private BigDecimal account11; - - - /** - * 乐学代金券 - */ - @Excel(name = "乐学代金券", scale = 2) - @BigDecimalFormat() - private BigDecimal account12; - - - /** - * 钱包总金额 - */ - @BigDecimalFormat() - private BigDecimal walletTotalAmount; - - - /** - * 体系ID - */ - private Integer vertexId; - /** - * 团队ID - */ - private Integer teamId; - - /** - * 币种值 - */ - private List pkAccounts; - - - /** - * 已选取的ID - */ - private List pkIds; - - @Transaction - private List memberWalletBalanceVOList; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberAuthenticationVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberAuthenticationVO.java deleted file mode 100644 index f4102ee3..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberAuthenticationVO.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 实名认证VO - * - * @Description: - * @Author: ljc - * @Time: 2023/4/17 13:52 - * @Classname: CuMemberAuthenticationVO - * @Package_name: com.hzs.member.account.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberAuthenticationVO implements Serializable { - private static final long serialVersionUID = 4142922801656536607L; - - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 证件证号 - */ - private String idCard; - /** - * 性别（0=未知,1=男,2=女） - */ - @Transaction(transactionKey = EnumsPrefixConstants.SEX) - private Integer sex; - - private String sexVal; - - /** - * 证件类型(1:身份证 2：军官证) - */ - @Transaction(transactionKey = EnumsPrefixConstants.ID_TYPE) - private Integer idType; - - private String idTypeVal; - - /** - * 支行名称 - */ - private String subBankName; - - /** - * 真空姓名 - */ - private String accountName; - - /** - * 银行卡号 - */ - private String cardNumber; - - /** - * 手机号 - */ - private String phone; - - /** - * 银行主键 - */ - private Long pkBank; - - - /** - * 银行名称 - */ - private String bankName; - - /** - * 省 - */ - private Integer pkProvince; - - /** - * 市 - */ - private Integer pkCity; - - /** - * 县 - */ - private Integer pkCounty; - - /** - * 详细地址 - */ - private String address; - - /** - * 证件正面 - */ - private String idFront; - - /** - * 证件反面 - */ - private String idBack; - - - /** - * 验证码 - */ - private String verificationCode; - - - /** - * 国家ID - */ - private Integer pkCountry; - - /** - * 省 - */ - private String province; - - /** - * 市 - */ - private String city; - - /** - * 县 - */ - private String county; - /** - * 银行图 - */ - private String backgroundImg; - - /** - * 身份证正面图片地址 - */ - private String idCardUrl; - - /** - * 身份证反面图片地址 - */ - private String idCardBackUrl; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberBankVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberBankVO.java deleted file mode 100644 index c67a83f0..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberBankVO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 会员银行卡VO - * @Description: - * @Author: ljc - * @Time: 2023/2/9 15:31 - * @Classname: CuMemberBankVO - * @Package_name: com.hzs.member.account.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberBankVO implements Serializable { - - - /** - * 银行主键 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_BANK) - private Integer pkBank; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员编号 - */ - private Long pkMember; - - /** - * 银行名称 - */ - private String bankName; - - /** - * 银行名称 - */ - private String pkBankVal; - - /** - * 银行卡号 - */ - private String cardNumber; - - /** - * 背景图 - */ - private String backgroundImg; - - /** - * 是否默认 - */ - private Integer defaultCard; - /** - * logo图片 - */ - private String logo; -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberBaseVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberBaseVO.java deleted file mode 100644 index 41382e31..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberBaseVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 会员财务基础VO - * @Author: ljc - * @Time: 2022/10/11 11:24 - * @Classname: CuMemberBaseVO - * @Package_name: com.hzs.member.account.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberBaseVO implements Serializable { - private static final long serialVersionUID = -1980906573222046594L; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - @JsonIgnore - private Long pkMember; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - private BigDecimal exchangeRate; - - /** - * 国家 - */ - private String country; - @JsonIgnore - private Integer pkCountry; - - - @JsonIgnore - private Integer pkRate; - - - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberTradeVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberTradeVO.java deleted file mode 100644 index 0ede6e16..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberTradeVO.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.*; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - *

- * 会员交易明细 - *

- * - * @author hzs - * @since 2022-09-06 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberTradeVO extends CuMemberBaseVO { - /** - * 主键 - */ - private Long pkId; - /** - * 钱包类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccount; - /** - * 钱包类型 翻译 - */ - @Excel(name = "钱包类型") - private String pkAccountVal; - - /** - * 交易类型: (101: 注册订单,102: 升级订单,103: 复购订单,104: 圣宝云代注册,105: 圣宝云代升级,106: 圣宝云代复购,107: 嗨粉订单,108: 提货订单,109: 礼包订单,110: 消费订单,111: 兑换订单,200: 提现,201: 提现充正,300: 转账,400: 后台充值,401: 线上充值,500: 收益发放,600: 撤单返钱,601: 返还本金) - */ - @Transaction(transactionKey = EnumsPrefixConstants.TRADE_TYPE) - private Integer tradeType; - - @Excel(name = "交易类型") - private String tradeTypeVal; - - /** - * 历史余额 - */ - @Excel(name = "历史余额", scale = 2) - @BigDecimalFormat() - private BigDecimal tradeBeforeBalance; - - /** - * 当前余额 - */ - @Excel(name = "当前余额", scale = 2) - @BigDecimalFormat() - private BigDecimal tradeBalance; - - /** - * 交易金额 - */ - @Excel(name = "交易金额", scale = 2) - @BigDecimalFormat() - private BigDecimal tradeAmount; - - /** - * 历史余额(本币) - */ - @Excel(name = "历史余额($)", scale = 2) - @BigDecimalFormat() - private BigDecimal settleTradeBeforeBalance; - - /** - * 当前余额(本币) - */ - @Excel(name = "当前余额($)", scale = 2) - @BigDecimalFormat() - private BigDecimal settleTradeBalance; - - /** - * 交易金额(本币) - */ - @Excel(name = "交易金额($)", scale = 2) - @BigDecimalFormat() - private BigDecimal settleTradeAmount; - - /** - * 汇率 - */ - @Excel(name = "汇率", scale = 4) - @BigDecimalFormat("#0.0000") - private BigDecimal exchangeRate; - - /** - * 交易时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "交易时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 来源单号 - */ - @Excel(name = "单据编号") - private String sourceCode; - - /** - * 交易分类:(1=消费 2=提现 3=转账 4=充值 5=收益) - */ - @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.TRADE_CLASSIFY) - private Integer tradeClassify; - - @JsonIgnore - private String tradeClassifyVal; - - private String remarks; - - /** - * 交易编号 - */ - private String tradeCode; - - /** - * 已选取的ID - */ - private List pkIds; - - /** - * 开始时间 - */ - private String startDate; - /** - * 结束时间 - */ - private String endDate; - - /** - * 修改人ID - */ - @JsonIgnore - private Long pkModified; - - /** - * 交易编号list - */ - private List tradeCodes; - - /** - * 是否拼接订单号 - */ - private Integer montage; - - /** - * 体系ID - */ - private Long vertexId; - /** - * 团队ID - */ - private Long teamId; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWalletBalanceVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWalletBalanceVO.java deleted file mode 100644 index 1eba390c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWalletBalanceVO.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 钱包余额（钱包余额） - * - * @Description: - * @Author: ljc - * @Time: 2023/3/6 22:01 - * @Classname: CuMemberWalletBalance - * @Package_name: com.hzs.member.account.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberWalletBalanceVO implements Serializable { - private static final long serialVersionUID = 5193310312472555963L; - - /** - * 币种类型值 - */ - private Integer accountType; - - /** - * 币种类型翻译值 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccount; - - /** - * 钱包类型 翻译 - */ - private String pkAccountVal; - - /** - * 币种类型ID - */ - private Integer pkAccountId; - - /** - * 可用余额 - */ - @BigDecimalFormat() - private BigDecimal availableBalance; - /** - * 不可用余额 - */ - @BigDecimalFormat() - private BigDecimal unavailableBalance; - - /** - * 可提余额 - */ - @BigDecimalFormat() - private BigDecimal withdrawBalance; - - /** - * 余额 - */ - @BigDecimalFormat() - private BigDecimal balance; - /** - * 备注 - */ - private String remarks; - - - /** - * 是否转账（0=是,1=否） - */ - private Integer isTransfer; - - /** - * 是否提现0=是,1=否） - */ - private Integer isWithdrawal; - - - /** - * 是否充值0=是,1=否） - */ - private Integer isRecharge; - - - /** - * 背景图 - */ - private String backgroundImg; - - - /** - * 禁止消费金额 - */ - @BigDecimalFormat() - private BigDecimal lockAccount; - - /** - * 禁止转账金额 - */ - @BigDecimalFormat() - private BigDecimal transferAccount; - - /** - * 禁止提现金额 - */ - @BigDecimalFormat() - private BigDecimal withdrawAccount; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWithdrawVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWithdrawVO.java deleted file mode 100644 index 19dcd4da..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWithdrawVO.java +++ /dev/null @@ -1,295 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.*; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - *

- * 会员提现表 - *

- * - * @author hzs - * @since 2022-09-06 - */ - - -@EqualsAndHashCode(callSuper = true) -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberWithdrawVO extends CuMemberBaseVO { - - /** - * 主键 - */ - private Long pkId; - /** - * 币种类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccount; - - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexName; - - /** - * 充值类型 翻译 - */ - @Excel(name = "钱包类型") - private String pkAccountVal; - /** - * 可提金额 - */ - @Excel(name = "可提金额", scale = 2) - @BigDecimalFormat() - private BigDecimal availableAmount; - /** - * 提现金额 - */ - @Excel(name = "本次提现", scale = 2) - @BigDecimalFormat() - private BigDecimal cashAmount; - /** - * 可提余额 - */ - @Excel(name = "可提余额", scale = 2) - @BigDecimalFormat() - private BigDecimal availableBalance; - - /** - * 手续费 - */ - @Excel(name = "手续费", scale = 2) - @BigDecimalFormat() - private BigDecimal serviceCharge; - - /** - * 个人所得税 - */ - @Excel(name = "个税", scale = 2) - @BigDecimalFormat() - private BigDecimal incomeTax; - - /** - * 实发金额 - */ - @Excel(name = "实发金额", scale = 2) - @BigDecimalFormat() - private BigDecimal issuedAmount; - - /** - * 提现金额 - */ - @Excel(name = "本次提现（$）", scale = 2) - @BigDecimalFormat() - private BigDecimal settleCashAmount; - - /** - * 手续费 - */ - @Excel(name = "手续费（$）", scale = 2) - @BigDecimalFormat() - private BigDecimal settleServiceCharge; - - /** - * 个人所得税 - */ - @Excel(name = "个税（$）", scale = 2) - @BigDecimalFormat() - private BigDecimal settleIncomeTax; - - /** - * 实发金额 - */ - @Excel(name = "实发金额（$）", scale = 2) - @BigDecimalFormat() - private BigDecimal settleIssuedAmount; - - /** - * 汇率 - */ - @Excel(name = "汇率", scale = 4) - @BigDecimalFormat("#0.0000") - private BigDecimal exchangeRate; - - - /** - * 申请时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 银行名称 - */ - @Excel(name = "银行名称") - private String bankName; - - /** - * 支行名称 - */ - @Excel(name = "支行名称") - private String subBankName; - - /** - * 银行账户 - */ - @Excel(name = "银行账户") - private String cardNumber; - - /** - * 开户姓名 - */ - @Excel(name = "开户姓名") - private String accountName; - - /** - * 预留电话 - */ - @Excel(name = "预留电话") - private String phone; - - /** - * 身份证号 - */ - @Excel(name = "身份证号") - private String idCard; - - /** - * 提现备注 - */ - @Excel(name = "提现备注") - private String remarks; - - /** - * 审核人 - */ - @Excel(name = "审核人") - private String approveName; - /** - * 审核时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date approveTime; - - /** - * 审核备注 - */ - @Excel(name = "审核备注") - private String approveRemarks; - - /** - * 打款人 - */ - @Excel(name = "打款人") - private String paymentName; - - - /** - * 状态（0=未打款，1=已打款，2=已充正，3=撤消） - */ - @Transaction(transactionKey = EnumsPrefixConstants.ENU_WITHDRAW_STATUS) - private Integer status; - - @Excel(name = "打款状态") - private String statusVal; - - /** - * 打款人 - */ - private Long payer; - - /** - * 打款时间 - */ - @Excel(name = "打款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date paymentTime; - - /** - * 打款备注 - */ - @Excel(name = "打款备注") - private String payerRemarks; - - /** - * 审核状态（1=待提交,2=已提交,3=审核中,4=已驳回,5=已完成,6=已归档） - */ - @Transaction(transactionKey = EnumsPrefixConstants.APPROVE_STATUS) - private Integer approveState; - - @Excel(name = "审核状态") - private String approveStateVal; - - /** - * 单据编号 - */ - @Excel(name = "单据编号") - private String withdrawCode; - - /** - * 隶属体系 - */ - private Integer vertexId; - - /** - * 隶属团队 - */ - private Integer teamId; - /** - * 开始时间 - */ - private String startDate; - /** - * 结束时间 - */ - private String endDate; - /** - * 审核开始时间 - */ - private String startPaymentTime; - /** - * 审核结束时间 - */ - private String endPaymentTime; - - /** - * 已选取的ID - */ - private List pkIds; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 批次 - */ - private String batch; - - /** - * 查询状态 - */ - private Integer queryStatus; - - /** - * 会员编号集合 - */ - private List memberCodeList; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWithdrawalAddVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWithdrawalAddVO.java deleted file mode 100644 index 9cfbabba..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/account/vo/CuMemberWithdrawalAddVO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.lenjoy.member.account.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 会员端提现页面显示信息 - * @Author: ljc - * @Time: 2022/10/18 11:45 - * @Classname: CuMemberWithdrawalAddVO - * @Package_name: com.hzs.member.account.vo - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class CuMemberWithdrawalAddVO implements Serializable { - private static final long serialVersionUID = -2897622616489983066L; - - - /** - * 可提现金额 - */ - private BigDecimal amount; - - - /** - * 余额 - */ - private BigDecimal balance; - - /** - * 最低提现金额 - */ - private BigDecimal minAmount; - - /** - * 最高提现金额 - */ - private BigDecimal maxAmount; - /** - * 手续费 - */ - private BigDecimal srviceCharge; -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/controller/api/ApiCuMemberAchieveDisController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/controller/api/ApiCuMemberAchieveDisController.java deleted file mode 100644 index 294fd602..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/controller/api/ApiCuMemberAchieveDisController.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.hzs.lenjoy.member.achieve.controller.api; - -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EAchievementType; -import com.hzs.common.core.enums.EMonthScoreType; -import com.hzs.common.core.enums.EOrderType; -import com.hzs.common.core.enums.EPlaceDept; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -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.member.achieve.CuMemberSettlePeriod; -import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.achieve.service.ICuMemberAchieveService; -import com.hzs.lenjoy.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.lenjoy.member.achieve.vo.PlaceNewAddAchieveVO; -import com.hzs.member.base.IMemberServiceApi; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalAdjusters; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * description: 会员端查询市场动态的接口 - * - * @author: sui q - * @time: 2023/4/6 16:11 - * @classname: CuMemberAchieveDisController - * @package_name: com.hzs.member.achieve.controller.api - * version 1.0.0 - */ -@Slf4j -@RestController -@RequestMapping("/api/achieve") -public class ApiCuMemberAchieveDisController extends BaseController { - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - @DubboReference - private IMemberServiceApi iMemberServiceApi; - @Autowired - private ICuMemberAchieveService cuMemberAchieveService; - @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; - - /** - * @description: 月度业绩-新增业绩统计 - * @author: zhang jing - * @date: 2023/5/19 9:48 - * @param: - * @return: - **/ - @GetMapping("/place-new-add-achieve-stat") - public AjaxResult placeNewAddAchieveStat(PlaceNewAddAchieveVO pna) { - pna.setPkMember(SecurityUtils.getUserId()); - pna.setPkCountry(SecurityUtils.getPkCountry()); - pna = cuMemberAchieveService.placeNewAddAchieveStat(pna); - return AjaxResult.success(pna); - } - - /** - * @description: 月度业绩-详情 - * @author: zhang jing - * @date: 2023/9/28 11:00 - * @param: [pna] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/place-new-add-achieve-details") - public TableDataInfo placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna) { - //当前日期 - Date startDate = null; - LocalDate localDate = null; - // 当月第一天和最后一天 - String startDateStr =""; - String endDateStr = ""; - if(StringUtils.isNotEmpty(pna.getYear())){ - startDate=cuMemberAchieveService.getDateFromYearAndMonth(pna.getYear(), pna.getMonthType().toString()); - //获取当前月份最后一天 - startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,startDate); - endDateStr= DateUtils.currentMonthLastDateStr(startDate); - }else{ - //当月第一天和最后一天 - localDate = null == pna.getMonthType() ? LocalDate.now() : LocalDate.of(LocalDate.now().getYear(), pna.getMonthType(), 1); - startDate = DateUtils.toDate(localDate); - startDateStr = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - endDateStr= DateUtils.currentMonthLastDateStr(startDate); - pna.setStartDate(startDateStr); - pna.setEndDate(endDateStr); - - } - Integer pkCountry=SecurityUtils.getPkCountry(); - pna.setPkMember(SecurityUtils.getUserId()); - pna.setPkCountry(pkCountry); - - //查询最新期数 - List pnaList=new ArrayList<>(); - CuMemberSettlePeriod csp = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr); - if(csp!=null&&csp.getPkId()!=null){ - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - pna.setMemberRangeTableName(TableNameConstants.CU_MEMBER_RANGE + csp.getPkId()); - //校验表是否存在 - Integer count= cuMemberAchieveService.selectExistTable(pna.getMemberRangeTableName()); - startPage(); - if (count.equals(1)) { - pnaList = cuMemberAchieveService.directAchieveDetails(pna); - } - if(CollectionUtil.isNotEmpty(pnaList)){ - pnaList.forEach(itm->{ - itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getData().getInExchangeRate())); - }); - } - } - return getDataTable(pnaList); - } - - /** - * @description: 导出 - * @author: zhang jing - * @date: 2023/6/6 15:42 - * @param: [response, pna] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ -// @PostMapping("/export") -// public void export(HttpServletResponse response, PlaceNewAddAchieveVO pna) { -// pna.setPkMember(SecurityUtils.getUserId()); -// pna.setPkCountry(SecurityUtils.getPkCountry()); -// if (null == pna.getAchievementType()) { -// pna.setAchievementType(EAchievementType.WHOLE.getValue()); -// } -// pna = cuMemberAchieveService.placeNewAddAchieveStat(pna); -// List list = new ArrayList<>(); -// list.add(pna); -// ExcelUtil util = new ExcelUtil<>(PlaceNewAddAchieveVO.class); -// util.exportExcel(response, list, "血缘业绩"); -// } - - - public static void main(String[] args) { - String firstTime = DateUtils.currentMonthFirstDateStr(DateUtils.currentDate()); - String thisTime = DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, DateUtils.currentDate()); - Date date = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); - System.out.println(DateUtils.parseDateToFormat("M", date)); - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/controller/api/ApiHomePageController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/controller/api/ApiHomePageController.java deleted file mode 100644 index 079425f6..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/controller/api/ApiHomePageController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.lenjoy.member.achieve.controller.api; - - -import com.hzs.common.core.web.domain.AjaxResult; - -import com.hzs.common.security.utils.SecurityUtils; - -import com.hzs.lenjoy.member.achieve.service.ICuMemberRangeMonthService; -import com.hzs.lenjoy.member.achieve.service.ICuMemberRangeService; -import com.hzs.lenjoy.member.achieve.vo.CuMemberNewAddAchieveVO; -import lombok.extern.slf4j.Slf4j; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 会员首页 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/4 21:06 - * @Classname: ApiHomePageController - * @Package_name: com.hzs.member.base.controller.api - */ -@Slf4j -@RequestMapping("/api/member") -@RestController -public class ApiHomePageController { - - @Autowired - private ICuMemberRangeService cuMemberRangeService; - - - @Autowired - private ICuMemberRangeMonthService cuMemberRangeMonthService; - - - - /** - * 首页会员奖衔卡 - * - * @return AjaxResult - */ - @GetMapping("/index-member-awards") - public AjaxResult selectMemberAwards() { - Long pkMember = SecurityUtils.getUserId(); - Integer pkCountry = SecurityUtils.getPkCountry(); - return AjaxResult.success(cuMemberRangeService.selectMemberAwards(pkMember,pkCountry)); - } - - - /** - * 新增业绩 - * - * @param dayType - * @return AjaxResult - */ - @GetMapping("/new-add-achieve") - public AjaxResult newAddAchieve(Integer dayType) { - CuMemberNewAddAchieveVO newAddAchieveVO = CuMemberNewAddAchieveVO.builder().dayType(dayType) - .pkMember(SecurityUtils.getUserId()).pkCountry(SecurityUtils.getPkCountry()).build(); - List cuMemberNewAddAchieveVOList = cuMemberRangeMonthService.selectNewAddAchieve(newAddAchieveVO); - return AjaxResult.success(cuMemberNewAddAchieveVOList); - } - - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberAchieveMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberAchieveMapper.java deleted file mode 100644 index bb1b7d62..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberAchieveMapper.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.lenjoy.member.achieve.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.achieve.CuMemberAchieve; -import com.hzs.lenjoy.member.achieve.vo.PlaceNewAddAchieveVO; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.List; - -/** - *

- * 会员业绩记录 Mapper 接口 - *

- * - * @author hzs - * @since 2022-10-26 - */ -public interface CuMemberAchieveMapper extends BaseMapper { - - /** - * @description: 月度业绩-查询血缘业绩详情 - * @author: zhang jing - * @date: 2023/11/30 14:15 - * @param: [pna] - * @return: java.util.List - **/ - List directAchieveDetails (PlaceNewAddAchieveVO pna); - /** - * @description: 查询直推业绩 - * @author: zhang jing - * @date: 2023/5/19 15:50 - * @param: [pna] - * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO - **/ - PlaceNewAddAchieveVO selectParentAchieve(PlaceNewAddAchieveVO pna); - - /** - * 查询推荐业绩 - * - * @param memberIds - * @param pkCountry - * @param achieveTable - * @return - */ - List selectByParent(@Param("memberIds") List memberIds, @Param("pkCountry") Integer pkCountry, @Param("achieveTable") String achieveTable); - - /** - * @description: 查询表是否存在 - * @author: zhang jing - * @date: 2024/4/7 16:10 - * @param: [tableName] - * @return: java.lang.Integer - **/ - Integer selectExistTable(String tableName); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberRangeMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberRangeMapper.java deleted file mode 100644 index 0d0e527f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberRangeMapper.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.hzs.lenjoy.member.achieve.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.achieve.CuMemberRange; -import com.hzs.lenjoy.member.achieve.vo.CuMemberAchieveVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author hzs - * @since 2024-10-15 - */ -public interface CuMemberRangeMapper extends BaseMapper { - - - /** - * 查询会员直推会员 - * - * @param pkMember 会员主键 - * @return List - */ - - List selectDirectPushByPkMember(@Param("pkMember") Long pkMember); - - /** - * 查询会员的极差业绩 - * - * @param cuMemberAchieveVO 入参 - * @return CuMemberAchieveVO - */ - List selectMemberRangeAchieveByPkMember(CuMemberAchieveVO cuMemberAchieveVO); - - - /** - * 查询会员考核状态 - * - * @param pkMember 会员 - * @return Integer - */ - Integer selectMemberAssessStatusByPkMember(@Param("memberRangeTable") String memberRangeTable, @Param("pkMember") Long pkMember); - - /** - * 查询表名是否存在 - * - * @param tableNames 表名 - * @return List - */ - List selectTableNameIsExist(@Param("tableNames") List tableNames); - - /** - * 查询会员当天是否下订单 - * - * @param pkMember 会员 - * @return Integer - */ - CuMemberAchieveVO selectMemberOrderByPkMember(@Param("pkMember") Long pkMember); - - - /** - * 查询会员的极差业绩 - * - * @param cuMemberAchieveVO 入参 - * @return CuMemberAchieveVO - */ - List selectMemberParentByPkMember(CuMemberAchieveVO cuMemberAchieveVO); - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberRangeMonthMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberRangeMonthMapper.java deleted file mode 100644 index 54c29128..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberRangeMonthMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.lenjoy.member.achieve.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.achieve.CuMemberRangeMonth; -import com.hzs.lenjoy.member.achieve.vo.CuMemberNewAddAchieveVO; -import com.hzs.lenjoy.member.achieve.vo.CuMemberSettlePeriodVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 极差月新增业绩 Mapper 接口 - *

- * - * @author hzs - * @since 2024-10-28 - */ -public interface CuMemberRangeMonthMapper extends BaseMapper { - - - /** - * 昨日新增业绩同步到极差月表 - * - * @param settlePeriodVO 期数信息 - */ - Boolean syncYesterdayMemberRangeMonth(CuMemberSettlePeriodVO settlePeriodVO); - - /** - * 更新最新六天业绩变化的用户 - * - * @param settlePeriodList 存在的表信息 - * @return Boolean - */ - Boolean syncMemberRangeMonth(@Param("settlePeriodList") List settlePeriodList); - - - /** - * 会员端新增业绩 - * - * @param cuMemberNewAddAchieveVO 端新增业绩 - * @return CuMemberNewAddAchieveVO - */ - List selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberSettlePeriodDetailMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberSettlePeriodDetailMapper.java deleted file mode 100644 index 39ea9510..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberSettlePeriodDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.lenjoy.member.achieve.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriodDetail; - -/** - *

- * 会员结算期间明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-07-27 - */ -public interface CuMemberSettlePeriodDetailMapper extends BaseMapper { - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberSettlePeriodMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberSettlePeriodMapper.java deleted file mode 100644 index b3aa9568..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/CuMemberSettlePeriodMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.lenjoy.member.achieve.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.lenjoy.member.achieve.vo.CuMemberSettlePeriodVO; - -import java.util.List; - -/** - *

- * 会员结算期间 Mapper 接口 - *

- * - * @author hzs - * @since 2022-10-26 - */ -public interface CuMemberSettlePeriodMapper extends BaseMapper { - - /** - * 查询会员结算期间（近七天的） - * @return List - */ - List selectMemberSettlePeriod(); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberAchieveMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberAchieveMapper.xml deleted file mode 100644 index 388d42e9..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberAchieveMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberRangeMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberRangeMapper.xml deleted file mode 100644 index e98fcc65..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberRangeMapper.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberRangeMonthMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberRangeMonthMapper.xml deleted file mode 100644 index ebe88f07..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberRangeMonthMapper.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - merge into cu_member_range_month rm - using ( - - select #{item.pkId} period, #{item.settleDate} settle_date, mr.pk_member, mr.new_pv, mr.new_team_pv, mr.team_consume_amount - FROM ${item.memberRangeTable} mr - - ) t0 - on (rm.pk_member = t0.pk_member and rm.period = t0.period and (rm.new_pv != t0.new_pv or rm.new_team_pv != t0.new_team_pv)) - when matched then - update set rm.new_pv = t0.new_pv,rm.new_team_pv = t0.new_team_pv,rm.team_consume_amount = t0.team_consume_amount - - - - - merge into cu_member_range_month rm - using (select #{pkId} period, #{settleDate} settle_date, mr.pk_member, mr.new_pv, mr.new_team_pv, mr.team_consume_amount - FROM ${memberRangeTable} mr) t0 - on (rm.pk_member = t0.pk_member and rm.period = t0.period) - when matched then - update set rm.new_pv = t0.new_pv,rm.new_team_pv = t0.new_team_pv,rm.team_consume_amount = t0.team_consume_amount - when not matched then - insert (pk_member, period, settle_date, new_pv, new_team_pv,team_consume_amount) - values (t0.pk_member, t0.period, t0.settle_date, t0.new_pv, t0.new_team_pv,t0.team_consume_amount) - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberSettlePeriodDetailMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberSettlePeriodDetailMapper.xml deleted file mode 100644 index 4aab7118..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberSettlePeriodDetailMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberSettlePeriodMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberSettlePeriodMapper.xml deleted file mode 100644 index 9e97d1d3..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/mapper/xml/CuMemberSettlePeriodMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/provider/CuMemberRangeMonthProvider.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/provider/CuMemberRangeMonthProvider.java deleted file mode 100644 index 9b1d971a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/provider/CuMemberRangeMonthProvider.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.lenjoy.member.achieve.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.lenjoy.member.achieve.ICuMemberRangeMonthApi; -import com.hzs.lenjoy.member.achieve.service.ICuMemberRangeMonthService; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * 极差Dubbo服务提供者 - * - * @Description: - * @Author: ljc - * @Time: 2024/10/28 13:26 - * @Classname: CuMemberRangeMonthProvider - * @Package_name: com.hzs.lenjoy.member.achieve.provider - */ - -@DubboService -public class CuMemberRangeMonthProvider implements ICuMemberRangeMonthApi { - - @Autowired - private ICuMemberRangeMonthService cuMemberRangeMonthService; - - @Override - public R syncMemberRangeMonth() { - return R.ok(cuMemberRangeMonthService.syncMemberRangeMonth()); - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberAchieveService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberAchieveService.java deleted file mode 100644 index 716b775d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberAchieveService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.achieve.CuMemberAchieve; -import com.hzs.lenjoy.member.achieve.vo.PlaceNewAddAchieveVO; - -import java.util.Date; -import java.util.List; - -/** - *

- * 会员业绩记录 服务类 - *

- * - * @author hzs - * @since 2022-10-26 - */ -public interface ICuMemberAchieveService extends IService { - - /** - * @description: 业绩分布-新增业绩统计 - * @author: zhang jing - * @date: 2023/5/19 10:29 - * @param: [] - * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO - **/ - PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna); - - /** - * @description:月度业绩-查询血缘业绩详情 - * @author: zhang jing - * @date: 2023/11/30 14:13 - * @param: [pna] - * @return: java.util.List - **/ - List directAchieveDetails(PlaceNewAddAchieveVO pna); - - Date getDateFromYearAndMonth(String year, String month); - - /** - * @description: 查询表是否存在 - * @author: zhang jing - * @date: 2024/4/7 16:11 - * @param: [tableName] - * @return: java.lang.Integer - **/ - Integer selectExistTable(String tableName); - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberRangeMonthService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberRangeMonthService.java deleted file mode 100644 index 0b340b90..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberRangeMonthService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.achieve.CuMemberRangeMonth; -import com.hzs.lenjoy.member.achieve.vo.CuMemberNewAddAchieveVO; -import com.hzs.lenjoy.member.achieve.vo.CuMemberSettlePeriodVO; - -import java.util.List; - -/** - *

- * 极差月新增业绩 服务类 - *

- * - * @author hzs - * @since 2024-10-28 - */ -public interface ICuMemberRangeMonthService extends IService { - - /** - * 同步会员极差月业绩（近七天的） - */ - Boolean syncMemberRangeMonth(); - - - - - /** - * 会员端新增业绩 - * - * @param cuMemberNewAddAchieveVO 端新增业绩 - * @return List - */ - List selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO); -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberRangeService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberRangeService.java deleted file mode 100644 index 5ab4f76d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberRangeService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.achieve.CuMemberRange; -import com.hzs.lenjoy.member.achieve.vo.CuMemberAchieveVO; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author hzs - * @since 2024-10-15 - */ -public interface ICuMemberRangeService extends IService { - - /** - * 首页会员业绩卡 - * - * @param pkMember 用户ID - * @param pkCountry 国家ID - * @return CuMemberAwardsUnderVO - */ - CuMemberAchieveVO selectMemberAwards(Long pkMember, Integer pkCountry); - - - /** - * 查询表名是否存在 - * - * @param tableNames 表名 - * @return List - */ - List selectTableNameIsExist(List tableNames); -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberSettlePeriodDetailService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberSettlePeriodDetailService.java deleted file mode 100644 index c3ef3bf1..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberSettlePeriodDetailService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriodDetail; - -/** - *

- * 会员结算期间明细 服务类 - *

- * - * @author hzs - * @since 2023-07-27 - */ -public interface ICuMemberSettlePeriodDetailService extends IService { - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberSettlePeriodService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberSettlePeriodService.java deleted file mode 100644 index 4556366a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/ICuMemberSettlePeriodService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.lenjoy.member.achieve.vo.CuMemberSettlePeriodVO; - -import java.util.List; - - -/** - *

- * 会员结算期间 服务类 - *

- * - * @author hzs - * @since 2022-10-26 - */ -public interface ICuMemberSettlePeriodService extends IService { - - - /** - * 根据日期获得日期对应的期间 - * - * @param date 日期 2023-02-02 - * @return: CuMemberSettlePeriod - * @Author: sui q - * @Date: 2022/11/2 13:32 - */ - CuMemberSettlePeriod getCuMemberSettlePeriodByDate(String date); - - - /** - * 查询会员结算期间（近七天的） - * - * @return List - */ - List selectMemberSettlePeriod(); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberAchieveServiceImpl.java deleted file mode 100644 index 05bcf8c9..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.*; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.utils.*; -import com.hzs.common.domain.member.achieve.CuMemberAchieve; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.achieve.mapper.CuMemberAchieveMapper; -import com.hzs.lenjoy.member.achieve.service.ICuMemberAchieveService; -import com.hzs.lenjoy.member.achieve.vo.PlaceNewAddAchieveVO; -import com.hzs.member.base.IMemberTeamServiceApi; -import com.hzs.system.base.ICountryServiceApi; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.config.IAwardsServiceApi; -import com.hzs.system.config.IVertexServiceApi; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalAdjusters; -import java.util.*; - -/** - *

- * 会员业绩记录 服务实现类 - *

- * - * @author hzs - * @since 2022-10-26 - */ -@Slf4j -@Service -public class CuMemberAchieveServiceImpl extends ServiceImpl implements ICuMemberAchieveService { - - - private CuMemberBonusSettle cuMemberBonusSettle; - - @DubboReference - ICountryServiceApi iCountryServiceApi; - @DubboReference - IAwardsServiceApi awardsServiceApi; - @DubboReference - IVertexServiceApi iVertexServiceApi; - @DubboReference - ICurrencyServiceApi currencyServiceApi; - @DubboReference - IMemberTeamServiceApi teamServiceApi; - - /** - * @description: 业绩分布-新增业绩统计 - * @author: zhang jing - * @date: 2023/5/19 10:33 - * @param: [] - * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO - **/ - @Override - public PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna) { - PlaceNewAddAchieveVO rtupna = new PlaceNewAddAchieveVO(); - BigDecimal constant = new BigDecimal(10000); - //当前日期 - Date currentDate; - LocalDate localDate = null; - LocalDate startDate = null; - if (StringUtils.isNotEmpty(pna.getYear())) { - currentDate = getDateFromYearAndMonth(pna.getYear(), pna.getMonthType().toString()); - LocalDate today = currentDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - //当月第一天 - localDate = null == pna.getMonthType() ? LocalDate.now() : LocalDate.of(today.getYear(), pna.getMonthType(), 1); - startDate = localDate.with(TemporalAdjusters.firstDayOfMonth()); - } else { - currentDate = DateUtils.parseStringToDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate())); - localDate = null == pna.getMonthType() ? LocalDate.now() : LocalDate.of(LocalDate.now().getYear(), pna.getMonthType(), 1); - startDate = localDate.with(TemporalAdjusters.firstDayOfMonth()); - } - Date systemDate = DateUtils.currentDate(); - - // 获取下个月第一天 - LocalDate endDate = localDate.with(TemporalAdjusters.firstDayOfNextMonth()); - Date enddate = DateUtils.toDate(endDate); - if (DateUtils.compareDateBefore(systemDate, enddate)) { - endDate = DateUtils.toLocalDate(DateUtils.beforeDate(1, ChronoUnit.DAYS, systemDate)); - } else { - endDate = DateUtils.toLocalDate(DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.toDate(endDate))); - } - String startDateStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - String endDateStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - //当前日期 - LocalDate currentDateTime = LocalDate.now(); - if (currentDateTime.isBefore(endDate)) { - endDateStr = currentDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - pna.setEndDate(endDateStr); - }else{ - pna.setEndDate(endDateStr); - } - pna.setStartDate(startDateStr); - - //查询结束日期直推业绩 - PlaceNewAddAchieveVO endParentAchieve = selectParentAchieve(pna); - if (StringUtils.isNotNull(endParentAchieve)) { - rtupna.setDirectAchieve(endParentAchieve.getDirectAchieve()); - if (SecurityUtils.getPkCountry() == CountryConstants.CHINA_COUNTRY) { - rtupna.setDirectAchieve(rtupna.getDirectAchieve().multiply(currency.getData().getInExchangeRate())); - } - if (rtupna.getDirectAchieve().compareTo(BigDecimal.ZERO) > 0) { - rtupna.setDirectAchieve(rtupna.getDirectAchieve().divide(constant, 4, RoundingMode.DOWN)); - } else { - rtupna.setDirectAchieve(BigDecimal.ZERO); - } - } else { - rtupna.setDirectAchieve(BigDecimal.ZERO); - } - return rtupna; - } - - /** - * @description: 查询直推业绩 - * @author: zhang jing - * @date: 2023/5/19 15:51 - * @param: [pna] - * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO - **/ - private PlaceNewAddAchieveVO selectParentAchieve(PlaceNewAddAchieveVO pna) { - return baseMapper.selectParentAchieve(pna); - } - - /** - * @description: 根据年月获取日期 - * @author: zhang jing - * @date: 2024/1/3 10:30 - * @param: [year, month] - * @return: java.util.Date - **/ - public Date getDateFromYearAndMonth(String year, String month) { - Calendar calendar = null; - try { - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - // 将月份设置为指定年月的第一天 - String dateString = year + "-" + month + "-01"; - Date date = dateFormat.parse(dateString); - // 获取 Calendar 实例 - calendar = Calendar.getInstance(); - calendar.setTime(date); - // 获取该月份的最大天数 - int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - // 将日期设为该月份的第一天 - calendar.set(Calendar.DAY_OF_MONTH, 1); - } catch (ParseException e) { - e.printStackTrace(); - } - // 返回结果 - return calendar.getTime(); - } - - - - /** - * @description: 月度业绩-查询血缘业绩详情 - * @author: zhang jing - * @date: 2023/11/30 14:15 - * @param: [pna] - * @return: java.util.List - **/ - @Override - public List directAchieveDetails(PlaceNewAddAchieveVO pna) { - return baseMapper.directAchieveDetails(pna); - } - - /** - * @description: 查询表是否存在 - * @author: zhang jing - * @date: 2024/4/7 16:11 - * @param: [tableName] - * @return: java.lang.Integer - **/ - @Override - public Integer selectExistTable(String tableName) { - return baseMapper.selectExistTable(tableName); - } - - public static void main(String[] args) { - System.out.println(DateUtils.beforeMonthLastDateStr(new Date())); - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberBonusSettle.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberBonusSettle.java deleted file mode 100644 index 0ef79139..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberBonusSettle.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service.impl; - -import com.hzs.common.core.constant.MagicNumberConstants; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Description: 奖金计算工具类 - * @Author: sui q - * @Time: 2022/11/2 11:25 - * @Classname: CuMemberBonusSettle - * @PackageName: com.hzs.member.achieve.service.impl - */ -@Component -public class CuMemberBonusSettle { - - public List> handleCutList(List baseEntityList, Integer... batchNum) { - int batchUpdateNum = MagicNumberConstants.BATCH_UPDATE_NUM; - if (batchNum != null && batchNum.length > 0) { - batchUpdateNum = batchNum[0]; - } - List> returnList = new ArrayList<>(); - if (baseEntityList.size() > batchUpdateNum) { - int num = baseEntityList.size() / batchUpdateNum + (baseEntityList.size() % batchUpdateNum > 0 ? 1 : 0); - for (int i = 0; i < num; i++) { - if (i == num - 1) { - returnList.add(baseEntityList.subList(i * batchUpdateNum, baseEntityList.size())); - } else { - returnList.add(baseEntityList.subList(i * batchUpdateNum, (i + 1) * batchUpdateNum)); - } - } - } else { - returnList.add(baseEntityList); - } - return returnList; - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberRangeMonthServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberRangeMonthServiceImpl.java deleted file mode 100644 index ca5f4996..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberRangeMonthServiceImpl.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service.impl; - - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.enums.EDayType; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.achieve.CuMemberRangeMonth; -import com.hzs.lenjoy.member.account.service.ICuMemberBaseService; -import com.hzs.lenjoy.member.achieve.mapper.CuMemberRangeMonthMapper; -import com.hzs.lenjoy.member.achieve.service.ICuMemberRangeMonthService; -import com.hzs.lenjoy.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.lenjoy.member.achieve.vo.CuMemberNewAddAchieveVO; -import com.hzs.lenjoy.member.achieve.vo.CuMemberSettlePeriodVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.Period; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 极差月新增业绩 服务实现类 - *

- * - * @author hzs - * @since 2024-10-28 - */ -@Slf4j -@Service -public class CuMemberRangeMonthServiceImpl extends ServiceImpl implements ICuMemberRangeMonthService { - - @Autowired - private ICuMemberSettlePeriodService settlePeriodService; - - - @Autowired - private CuMemberRangeServiceImpl rangeService; - - - @Autowired - private ICuMemberBaseService iCuMemberBaseService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean syncMemberRangeMonth() { - log.info("----------开始同步会员极差业绩"); - List cuMemberSettlePeriodVOList = settlePeriodService.selectMemberSettlePeriod(); - //同步昨日的业绩（兼容手动执行定时任务） - log.info("----------开始同步昨天会员极差业绩"); - CuMemberSettlePeriodVO cuMemberSettlePeriod = cuMemberSettlePeriodVOList.get(0); - cuMemberSettlePeriod.setMemberRangeTable(TableNameConstants.CU_MEMBER_RANGE + cuMemberSettlePeriod.getPkId()); - baseMapper.syncYesterdayMemberRangeMonth(cuMemberSettlePeriod); - log.info("----------开始同步更新前6天会员极差业绩"); - List sixMonthRangeDate = getSixMonthRangeDate(cuMemberSettlePeriodVOList); - if (CollUtil.isNotEmpty(sixMonthRangeDate)) { - return baseMapper.syncMemberRangeMonth(sixMonthRangeDate); - } - - log.info("----------结束同步会员极差业绩"); - return Boolean.TRUE; - } - - /** - * 获取最近六天表数据 - * - * @param cuMemberSettlePeriodVOList 结算周期 - * @return List - */ - private List getSixMonthRangeDate(List cuMemberSettlePeriodVOList) { - CuMemberSettlePeriodVO cuMemberSettlePeriod = cuMemberSettlePeriodVOList.get(0); - List resultList = new ArrayList<>(); - //表名 - List rangeTableList = cuMemberSettlePeriodVOList.stream().map(memberSettlePeriod -> TableNameConstants.CU_MEMBER_RANGE + memberSettlePeriod.getPkId()).collect(Collectors.toList()); - //查询存在表名 - List tableList = rangeService.selectTableNameIsExist(rangeTableList); - if (CollUtil.isNotEmpty(tableList)) { - for (String table : tableList) { - //查询表名对应的结算周期 - CuMemberSettlePeriodVO settlePeriodVO = cuMemberSettlePeriodVOList.stream().filter(cuMemberSettlePeriodVO -> (TableNameConstants.CU_MEMBER_RANGE + cuMemberSettlePeriodVO.getPkId()).equals(table)).findFirst().get(); - if (!settlePeriodVO.getPkId().equals(cuMemberSettlePeriod.getPkId())) { - settlePeriodVO.setMemberRangeTable(table); - resultList.add(settlePeriodVO); - } - } - } - return resultList; - } - @Override - public List selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO) { - LocalDate endDate = LocalDate.now(); - LocalDate startDate = getStartDateByType(cuMemberNewAddAchieveVO.getDayType(), endDate); - return selectNewAddAchieveByDate(cuMemberNewAddAchieveVO, endDate, startDate); - } - - - /** - * 根据日期查询会员的新增业绩 - * - * @param cuMemberNewAddAchieveVO 入参 - * @param endDate 结束时间 - * @param startDate 开始时间 - * @return List - */ - private List selectNewAddAchieveByDate(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO, LocalDate endDate, LocalDate startDate) { - String startDateStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - String endDateStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - cuMemberNewAddAchieveVO.setStartDate(startDateStr); - cuMemberNewAddAchieveVO.setEndDate(endDateStr); - List cuMemberNewAddAchieveVOList = baseMapper.selectNewAddAchieve(cuMemberNewAddAchieveVO); - if (CollUtil.isNotEmpty(cuMemberNewAddAchieveVOList)) { - //中国转汇率 - Integer pkCountry = cuMemberNewAddAchieveVO.getPkCountry(); - BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate(); - for (CuMemberNewAddAchieveVO newAddAchieveVO : cuMemberNewAddAchieveVOList) { - //转化单位万 - newAddAchieveVO.setNewPv(getBigDecimal(newAddAchieveVO.getNewPv(), rate)); - } - } - initialDate(cuMemberNewAddAchieveVOList, endDate, startDate); - return cuMemberNewAddAchieveVOList; - } - - /** - * 转化万单位、汇率换算 - * - * @param value 值 - * @return BigDecimal - */ - private BigDecimal getBigDecimal(BigDecimal value, BigDecimal rate) { - BigDecimal oldValue = null != value ? value : BigDecimal.ZERO; - return oldValue.divide(new BigDecimal("10000")).multiply(rate); - } - - /** - * 初如化日期值 - * - * @param cuMemberNewAddAchieveVOList 查询结题 - * @param endDate 开始时间 - * @param startDate 结束时间 - * @return List - */ - private List initialDate(List cuMemberNewAddAchieveVOList, LocalDate endDate, LocalDate startDate) { - Period between = Period.between(startDate, endDate); - //相差天数 - int days = between.getDays(); - int months = between.getMonths(); - if (months == 1) { - days = 30; - } - //初始化日期 - if (CollUtil.isEmpty(cuMemberNewAddAchieveVOList)) { - CuMemberNewAddAchieveVO memberNewAddAchieveVO; - cuMemberNewAddAchieveVOList = new ArrayList<>(); - for (int i = 0; i < days; i++) { - memberNewAddAchieveVO = CuMemberNewAddAchieveVO.builder().settleDate(DateUtils.toDate(startDate.plusDays(i))) - .newPv(BigDecimal.ZERO).build(); - cuMemberNewAddAchieveVOList.add(memberNewAddAchieveVO); - } - } else { - CuMemberNewAddAchieveVO memberNewAddAchieveVO; - Map map = cuMemberNewAddAchieveVOList.stream().collect(Collectors.toMap(CuMemberNewAddAchieveVO::getSettleDate, o -> o)); - for (int i = 0; i < days; i++) { - Date localDate = DateUtils.toDate(startDate.plusDays(i)); - if (null == map.get(localDate)) { - memberNewAddAchieveVO = CuMemberNewAddAchieveVO.builder().settleDate(localDate) - .newPv(BigDecimal.ZERO).build(); - cuMemberNewAddAchieveVOList.add(memberNewAddAchieveVO); - } - } - //排序 - cuMemberNewAddAchieveVOList.sort(Comparator.comparing(CuMemberNewAddAchieveVO::getSettleDate)); - } - - return cuMemberNewAddAchieveVOList; - } - - - /** - * 根据天数类型获取开始日期 - * - * @param dayType 天数类型 - * @return LocalDate - */ - public LocalDate getStartDateByType(Integer dayType, LocalDate localDate) { - LocalDate startDate; - if (null == localDate) { - localDate = LocalDate.now(); - } - if (EDayType.LAST_SEVEN_DAY.getValue() == dayType) { - startDate = localDate.minus(7, ChronoUnit.DAYS); - } else if (EDayType.LAST_FIFTEEN_DAY.getValue() == dayType) { - startDate = localDate.minus(15, ChronoUnit.DAYS); - } else { - startDate = localDate.minus(1, ChronoUnit.MONTHS); - } - return startDate; - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberRangeServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberRangeServiceImpl.java deleted file mode 100644 index 85d71f60..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberRangeServiceImpl.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service.impl; - - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.domain.member.achieve.CuMemberRange; -import com.hzs.common.domain.system.config.BdAwards; -import com.hzs.lenjoy.member.account.service.ICuMemberBaseService; -import com.hzs.lenjoy.member.achieve.mapper.CuMemberRangeMapper; -import com.hzs.lenjoy.member.achieve.service.ICuMemberRangeService; -import com.hzs.lenjoy.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.lenjoy.member.achieve.vo.CuMemberAchieveVO; -import com.hzs.system.config.IAwardsServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - - -/** - *

- * 服务实现类 - *

- * - * @author hzs - * @since 2024-10-15 - */ -@Service -public class CuMemberRangeServiceImpl extends ServiceImpl implements ICuMemberRangeService { - - @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; - - @Autowired - private ICuMemberBaseService iCuMemberBaseService; - - @DubboReference - IAwardsServiceApi awardsServiceApi; - - @Override - public CuMemberAchieveVO selectMemberAwards(Long pkMember, Integer pkCountry) { - //查询会员昨日极差 - String memberRangeTable = getTableName(); - CuMemberAchieveVO cuMemberAchieveVO; - //查询直推会员 - List pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember); - if (CollUtil.isNotEmpty(pkMemberList)) { - //判断当前会员 有效单数时显示业绩 - if (selectMemberPlaceOrder(memberRangeTable, pkMember)) { - //查询直推会员实时业绩 - List memberAchieveList = getHistroyMemberAchieve(pkMemberList, memberRangeTable); - cuMemberAchieveVO = getMemberAchieve(memberAchieveList); - } else { //无效单数时，查询当天实时业绩 - cuMemberAchieveVO = selectUsableOrderAchieve(pkMember, pkMemberList); - } - } else { - cuMemberAchieveVO = CuMemberAchieveVO.builder().smallAreaPv(BigDecimal.ZERO).bigArealPv(BigDecimal.ZERO).welfarelPv(BigDecimal.ZERO).build(); - } - //根据国家获取奖衔配置信息 - List awardsList = awardsServiceApi.queryAwards(pkCountry).getData(); - //根据业绩获取奖衔 - BdAwards awards = getMemberAwards(cuMemberAchieveVO.getWelfarelPv(), awardsList); - //根据国家查汇率 - BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate(); - if (null != awards) { - List list = awardsList.stream().filter(a -> a.getAwardsValue() > awards.getAwardsValue()).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(list)) { - Map awardsMap = awardsList.stream().collect(Collectors.toMap(BdAwards::getAwardsValue, o -> o)); - BigDecimal targetPv = awardsMap.get(list.get(0).getAwardsValue()).getCommunityCheck(); - cuMemberAchieveVO.setTargetPv(getBigDecimal(targetPv, rate)); - } else { - cuMemberAchieveVO.setTargetPv(new BigDecimal("-1")); - } - } else { - cuMemberAchieveVO.setTargetPv(new BigDecimal("-1")); - } - //转换为万单位、汇率 - cuMemberAchieveVO.setSmallAreaPv(getBigDecimal(cuMemberAchieveVO.getSmallAreaPv(), rate)); - cuMemberAchieveVO.setBigArealPv(getBigDecimal(cuMemberAchieveVO.getBigArealPv(), rate)); - cuMemberAchieveVO.setWelfarelPv(getBigDecimal(cuMemberAchieveVO.getWelfarelPv(), rate)); - return cuMemberAchieveVO; - } - - /** - * 查询有可用订单会员业绩（当日实时业业绩） - * - * @param pkMember 会员ID - * @param pkMemberList 直推会员 - * @return CuMemberAchieveVO - */ - private CuMemberAchieveVO selectUsableOrderAchieve(Long pkMember, List pkMemberList) { - CuMemberAchieveVO cuMemberAchieveVO; - CuMemberAchieveVO memberOrders = baseMapper.selectMemberOrderByPkMember(pkMember); - //有订单则累加业绩 - if (null != memberOrders && null != memberOrders.getPayTime()) { - List memberAchieveList = baseMapper.selectMemberParentByPkMember(CuMemberAchieveVO.builder().pkMemberList(pkMemberList).payTime(memberOrders.getPayTime()).build()); - cuMemberAchieveVO = getMemberAchieve(memberAchieveList); - } else { - cuMemberAchieveVO = CuMemberAchieveVO.builder().smallAreaPv(BigDecimal.ZERO).bigArealPv(BigDecimal.ZERO).welfarelPv(BigDecimal.ZERO).build(); - } - return cuMemberAchieveVO; - } - - /** - * 获取直推福利小区、大区业绩、小区业绩 - * - * @param memberAchieveList - * @return CuMemberAchieveVO - */ - private CuMemberAchieveVO getMemberAchieve(List memberAchieveList) { - //查询最大业绩 - CuMemberAchieveVO maxAchieveVO = memberAchieveList.stream().max(Comparator.comparing(CuMemberAchieveVO::getArealPv)).get(); - //查询小区业绩 - BigDecimal smallAreaPv = memberAchieveList.stream().filter(achieveVO -> !achieveVO.getPkMember().equals(maxAchieveVO.getPkMember())).map(vo -> null == vo.getArealPv() ? BigDecimal.ZERO : vo.getArealPv()).reduce(BigDecimal.ZERO, BigDecimal::add); - - //查询福利小区业绩 - //查询最大业绩 - CuMemberAchieveVO maxWelfarelPv = memberAchieveList.stream().max(Comparator.comparing(CuMemberAchieveVO::getWelfarelPv)).get(); - //查询小区业绩 - BigDecimal smallWelfarelPv = memberAchieveList.stream().filter(welfarelPv -> !welfarelPv.getPkMember().equals(maxWelfarelPv.getPkMember())).map(vo -> null == vo.getWelfarelPv() ? BigDecimal.ZERO : vo.getWelfarelPv()).reduce(BigDecimal.ZERO, BigDecimal::add); - return CuMemberAchieveVO.builder().smallAreaPv(smallAreaPv).bigArealPv(maxAchieveVO.getArealPv()).welfarelPv(smallWelfarelPv).build(); - } - - - /** - * 转化万单位、汇率换算 - * - * @param value 值 - * @return BigDecimal - */ - private BigDecimal getBigDecimal(BigDecimal value, BigDecimal rate) { - BigDecimal oldValue = null != value ? value : BigDecimal.ZERO; - return oldValue.divide(new BigDecimal("10000")).multiply(rate); - } - - /** - * 获取会员奖衔 - * - * @param awardsList 奖衔列表 - * @param smallPv 小区业绩 - * @return BdAwards - */ - - private BdAwards getMemberAwards(BigDecimal smallPv, List awardsList) { - for (BdAwards awards : awardsList) { - BigDecimal communityCheck = awards.getCommunityCheck(); - BigDecimal communityCheckEnd = awards.getCommunityCheckEnd(); - if (smallPv.compareTo(communityCheck) >= 0 && null != communityCheckEnd && communityCheckEnd.compareTo(smallPv) > 0) { - return awards; - } - } - return null; - } - - /** - * 查询会员的极差业绩 - * - * @param pkMemberList 直推会员ID - * @return CuMemberAchieveVO - */ - private List getHistroyMemberAchieve(List pkMemberList, String memberRangeTable) { - CuMemberAchieveVO memberAchieveVO = CuMemberAchieveVO.builder().memberRangeTable(memberRangeTable).pkMemberList(pkMemberList).build(); - return baseMapper.selectMemberRangeAchieveByPkMember(memberAchieveVO); - } - - - /** - * 判断会员是否下单 - * - * @param memberRangeTable 表名 - * @param pkMember 会员ID - * @return Boolean - */ - private Boolean selectMemberPlaceOrder(String memberRangeTable, Long pkMember) { - Integer records = baseMapper.selectMemberAssessStatusByPkMember(memberRangeTable, pkMember); - return null != records && records > 0; - } - - /** - * 查询会员昨日极差表名 - * - * @return String - */ - private String getTableName() { - String localDate = LocalDate.now().minus(1, ChronoUnit.DAYS).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId(); - return TableNameConstants.CU_MEMBER_RANGE + period; - } - - - @Override - public List selectTableNameIsExist(List tableNames) { - return baseMapper.selectTableNameIsExist(tableNames); - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java deleted file mode 100644 index f2fc8048..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberSettlePeriodDetailServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriodDetail; -import com.hzs.lenjoy.member.achieve.mapper.CuMemberSettlePeriodDetailMapper; -import com.hzs.lenjoy.member.achieve.service.ICuMemberSettlePeriodDetailService; -import org.springframework.stereotype.Service; - -/** - *

- * 会员结算期间明细 服务实现类 - *

- * - * @author hzs - * @since 2023-07-27 - */ -@Service -public class CuMemberSettlePeriodDetailServiceImpl extends ServiceImpl implements ICuMemberSettlePeriodDetailService { - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java deleted file mode 100644 index 9c456a79..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.hzs.lenjoy.member.achieve.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.MagicNumberConstants; - -import com.hzs.common.core.enums.EExpandCapMethod; -import com.hzs.common.core.enums.ESystemConfig; - -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriodDetail; - -import com.hzs.common.domain.system.base.BdCountry; - -import com.hzs.lenjoy.member.achieve.mapper.CuMemberSettlePeriodMapper; -import com.hzs.lenjoy.member.achieve.service.ICuMemberSettlePeriodDetailService; -import com.hzs.lenjoy.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.lenjoy.member.achieve.vo.CuMemberSettlePeriodVO; -import com.hzs.system.base.ICountryServiceApi; -import com.hzs.system.base.ISystemConfigServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.temporal.ChronoUnit; -import java.util.*; - -/** - *

- * 会员结算期间 服务实现类 - *

- * - * @author hzs - * @since 2022-10-26 - */ -@Service -public class CuMemberSettlePeriodServiceImpl extends ServiceImpl implements ICuMemberSettlePeriodService { - - - private RedisService redisService; - - @Autowired - private ICuMemberSettlePeriodDetailService cuMemberSettlePeriodDetailService; - - @DubboReference - private ICountryServiceApi countryServiceApi; - - @DubboReference - private ISystemConfigServiceApi systemConfigServiceApi; - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public CuMemberSettlePeriod getCuMemberSettlePeriodByDate(String date) { - String key = CacheConstants.CU_MEMBER_SETTLE_PERIOD + date; - CuMemberSettlePeriod cuMemberSettlePeriod = redisService.getCacheObject(key); - if (cuMemberSettlePeriod == null) { - cuMemberSettlePeriod = getCuMemberSettlePeriod(date); - if (cuMemberSettlePeriod != null) { - redisService.setCacheObject(key, cuMemberSettlePeriod); - } else { - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.select("max(pk_id) pk_id,max(settle_date) settle_date"); - cuMemberSettlePeriod = baseMapper.selectOne(queryWrapper1); - if (DateUtils.compareDateAfter(DateUtils.parseDate(date), cuMemberSettlePeriod.getSettleDate())) { - int addDayNum = 8 - DateUtils.getRecentlyDay(cuMemberSettlePeriod.getSettleDate()) + MagicNumberConstants.PERIOD_AUTO_INCREASE; - while (true) { - Date laseDate = DateUtils.afterDate(addDayNum, ChronoUnit.DAYS, cuMemberSettlePeriod.getSettleDate()); - // 验证最后一天是否为周一，周一跳出循环 - if (DateUtils.getRecentlyDay(laseDate) == 1) { - break; - } - addDayNum++; - } - // 分为周结和秒结的 - List weekSettleCountry = new ArrayList<>(); - List daySettleCountry = new ArrayList<>(); - packageSettleCountry(weekSettleCountry, daySettleCountry); - List cuMemberSettlePeriodDetailList = new ArrayList<>(); - for (int i = 0; i < addDayNum; i++) { - Date tomorrow = DateUtils.afterDate(i + 1, ChronoUnit.DAYS, cuMemberSettlePeriod.getSettleDate()); - CuMemberSettlePeriod addSettlePeriod = CuMemberSettlePeriod.builder() - .settleDate(tomorrow) - .pkCreator(MagicNumberConstants.PK_ADMIN) - .build(); - save(addSettlePeriod); - if (daySettleCountry.size() > 0) { - for (Integer pkCountry : daySettleCountry) { - CuMemberSettlePeriodDetail cuMemberSettlePeriodDetail = CuMemberSettlePeriodDetail.builder() - .settleCycle(EExpandCapMethod.DAY_SETTLE.getValue()) - .startPeriod(addSettlePeriod.getPkId()) - .endPeriod(addSettlePeriod.getPkId()) - .build(); - cuMemberSettlePeriodDetail.setPkCountry(pkCountry); - cuMemberSettlePeriodDetail.setPkCreator(MagicNumberConstants.PK_ADMIN); - cuMemberSettlePeriodDetailList.add(cuMemberSettlePeriodDetail); - } - } - } - // 查询期间，结算日期前10天 到现在 - if (weekSettleCountry.size() > 0) { - Map memberSettlePeriodMap = queryCuMemberSettlePeriod(DateUtils.beforeDate(10, ChronoUnit.DAYS, cuMemberSettlePeriod.getSettleDate()), DateUtils.afterDate(addDayNum, ChronoUnit.DAYS, cuMemberSettlePeriod.getSettleDate())); - List periodList = new ArrayList<>(); - for (int i = 0; i < addDayNum; i++) { - Date tomorrow = DateUtils.afterDate(i + 1, ChronoUnit.DAYS, cuMemberSettlePeriod.getSettleDate()); - // 获得周期第一天，最后一天 - Integer startPeriod = memberSettlePeriodMap.get(DateUtils.getRecentlyTuesday(tomorrow)).getPkId(); - Integer endPeriod = memberSettlePeriodMap.get(DateUtils.getRecentlyMonday(tomorrow)).getPkId(); - String periodKey = startPeriod.toString() + endPeriod; - if (!periodList.contains(periodKey)) { - for (Integer pkCountry : weekSettleCountry) { - CuMemberSettlePeriodDetail cuMemberSettlePeriodDetail = CuMemberSettlePeriodDetail.builder() - .settleCycle(EExpandCapMethod.WEEK_SETTLE.getValue()) - .startPeriod(startPeriod) - .endPeriod(endPeriod) - .build(); - cuMemberSettlePeriodDetail.setPkCountry(pkCountry); - cuMemberSettlePeriodDetail.setPkCreator(MagicNumberConstants.PK_ADMIN); - cuMemberSettlePeriodDetailList.add(cuMemberSettlePeriodDetail); - } - periodList.add(periodKey); - } - } - } - cuMemberSettlePeriodDetailService.saveBatch(cuMemberSettlePeriodDetailList); - cuMemberSettlePeriod = getCuMemberSettlePeriod(date); - } else { - return null; - } - } - } - return cuMemberSettlePeriod; - } - - private void packageSettleCountry(List weekSettleCountry, List daySettleCountry) { - Map allCountryMap = countryServiceApi.getAllCountryMap().getData(); - for (Integer pkCountry : allCountryMap.keySet()) { - String value = systemConfigServiceApi.getBonusSystemConfig(pkCountry, ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData(); - // 周结 - if (StringUtils.isNotEmpty(value) && Objects.equals(Integer.toString(EExpandCapMethod.WEEK_SETTLE.getValue()), value)) { - weekSettleCountry.add(pkCountry); - } else { - daySettleCountry.add(pkCountry); - } - } - } - - - private CuMemberSettlePeriod getCuMemberSettlePeriod(String date) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("SETTLE_DATE", DateUtils.parseStringToDate(date)); - return baseMapper.selectOne(queryWrapper); - } - - /** - * 获取期间，开始时间到结束时间 - * - * @param startDate 开始时间 - * @param endDate 结束时间 - * @return Map - */ - private Map queryCuMemberSettlePeriod(Date startDate, Date endDate) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("SETTLE_DATE", startDate); - queryWrapper.le("SETTLE_DATE", endDate); - List memberSettlePeriodList = baseMapper.selectList(queryWrapper); - Map cuMemberSettlePeriodMap = new HashMap<>(); - memberSettlePeriodList.forEach(cuMemberSettlePeriod -> - cuMemberSettlePeriodMap.put(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberSettlePeriod.getSettleDate()), cuMemberSettlePeriod)); - return cuMemberSettlePeriodMap; - } - - - @Override - public List selectMemberSettlePeriod() { - return baseMapper.selectMemberSettlePeriod(); - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberAchieveVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberAchieveVO.java deleted file mode 100644 index da392d73..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberAchieveVO.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hzs.lenjoy.member.achieve.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - - -/** - * 会员业绩 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/5 20:08 - * @Classname: CuMemberAwardsUnderVO - * @Package_name: com.hzs.member.achieve.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberAchieveVO implements Serializable { - - - private static final long serialVersionUID = -8398773154034121756L; - /** - * 会员ID - */ - @JsonIgnore - private Long pkMember; - - /** - * 国家ID - */ - private Integer pkCountr; - - /** - * 福利业绩 - */ - @BigDecimalFormat() - private BigDecimal welfarelPv; - - /** - * 小区业绩 - */ - @BigDecimalFormat() - private BigDecimal smallAreaPv; - - /** - * 大区业绩 - */ - @BigDecimalFormat() - private BigDecimal bigArealPv; - - - /** - * 业绩 - */ - @BigDecimalFormat() - private BigDecimal arealPv; - - /** - * 目标业绩 - */ - @BigDecimalFormat() - private BigDecimal targetPv; - - - /** - * 极差业绩表 - */ - @JsonIgnore - private String memberRangeTable; - - - - private List pkMemberList; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - -} - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberNewAddAchieveVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberNewAddAchieveVO.java deleted file mode 100644 index 0b389262..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberNewAddAchieveVO.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hzs.lenjoy.member.achieve.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 会员新增业绩 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/5 14:12 - * @Classname: CuMemberNewAddAchieveVO - * @Package_name: com.hzs.member.achieve.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberNewAddAchieveVO implements Serializable { - - - private static final long serialVersionUID = 8113175388563748549L; - /** - * 新增业绩 - */ - @BigDecimalFormat() - private BigDecimal newPv; - - /** - * 结算日期 - */ - @JsonFormat(pattern = "dd") - private Date settleDate; - - /** - * 天数 - */ - private Long days; - - /** - * 会员ID - */ - private Long pkMember; - - /** - * 国家ID - */ - private Integer pkCountry; - - /** - * 天数类型 - */ - private Integer dayType; - - /** - * 开始时间 - */ - private String startDate; - - /** - * 结束时间 - */ - private String endDate; - /** - * 当月表名 - */ - private String achieveTableName; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberSettlePeriodVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberSettlePeriodVO.java deleted file mode 100644 index c9bec517..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/CuMemberSettlePeriodVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.lenjoy.member.achieve.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 结算期数VO - * - * @Description: - * @Author: ljc - * @Time: 2024/10/28 10:31 - * @Classname: CuMemberSettlePeriodVO - * @Package_name: com.hzs.lenjoy.member.achieve.vo - */ - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberSettlePeriodVO implements Serializable { - private static final long serialVersionUID = 797457544396908944L; - - - /** - * 主键 - */ - private Integer pkId; - - /** - * 结算日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date settleDate; - - - /** - * 极差表 - */ - private String memberRangeTable; -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/PlaceNewAddAchieveVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/PlaceNewAddAchieveVO.java deleted file mode 100644 index 0c8ccff1..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/achieve/vo/PlaceNewAddAchieveVO.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.hzs.lenjoy.member.achieve.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - - -/** - *

- * 伞下新增业绩统计 - *

- * - * @author zhangjing - * @since 2023-05-17 - */ -@Data -public class PlaceNewAddAchieveVO { - - private static final long serialVersionUID = 1L; - - - - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员姓名 - */ - private String memberName; - /** - * 消费金额 - */ - private BigDecimal orderAmount; - /** - * 消费业绩 - */ - private BigDecimal orderAchieve; - - /** - * 创建时间开始时间 - */ - private String startDate; - - /** - * 创建时间结束时间 - */ - private String endDate; - /** - * 时间参数类型 1月2月...12月 - */ - private Integer monthType; - - /** - * 大区业绩 - */ - @Excel(name = "大区业绩(万)") - @BigDecimalFormat("#0.00") - private BigDecimal largeAchieve; - /** - * 小区业绩 - */ - @Excel(name = "小区业绩(万)") - @BigDecimalFormat("#0.00") - private BigDecimal smallAchieve; - - /** - * 直推（血缘）业绩 - */ - @Excel(name = "血缘业绩(万)") - @BigDecimalFormat("#0.00") - private BigDecimal directAchieve; - /** - * 国家 - */ - private Integer pkCountry; - /** - * 期数 - */ - private Integer period; - - /** - * 年份 - */ - private String year; - /** - * 历史网体表 - */ - private String memberRangeTableName; - /** - * 注册等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer pkRegisterGrade; - /** - * 注册等级 - */ - private String pkRegisterGradeVal; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - - - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/api/ApiMemberController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/api/ApiMemberController.java deleted file mode 100644 index 48c40f1a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/api/ApiMemberController.java +++ /dev/null @@ -1,254 +0,0 @@ -package com.hzs.lenjoy.member.base.controller.api; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.DesensitizedUtil; -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.enums.EMemberChangeType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -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.member.base.CuMember; -import com.hzs.common.domain.member.detail.CuMemberChangeLog; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.base.param.ForgetPayPasswordParam; -import com.hzs.lenjoy.member.base.param.InitPasswordParam; -import com.hzs.lenjoy.member.base.param.MemberDataParam; -import com.hzs.lenjoy.member.base.param.ParentListParam; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.base.service.IMemberInfoService; -import com.hzs.lenjoy.member.base.vo.MemberInfoVO; -import com.hzs.lenjoy.member.base.vo.ParentListVO; -import com.hzs.lenjoy.member.sms.service.ISmsService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -/** - * @Description: 会员控制器 - * @Author: jiang chao - * @Time: 2024/10/17 15:02 - * @Classname: MemberController - * @PackageName: com.hzs.lenjoy.member.base.controller.api - */ -@Slf4j -@RequestMapping("/api/member") -@RestController -public class ApiMemberController extends BaseController { - - @Autowired - private IMemberInfoService iMemberInfoService; - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private ISmsService iSmsService; - - /** - * 获取登录会员信息 - * - * @return - */ - @GetMapping("/get-info") - public AjaxResult getInfo() { - MemberInfoVO memberInfo = iMemberInfoService.getMemberInfo(SecurityUtils.getUserId()); - if (null == memberInfo) { - return AjaxResult.error(); - } - return AjaxResult.success(memberInfo); - } - - /** - * 校验会员信息（是否设置支付密码） - * - * @return - */ - @GetMapping("/member-check") - public AjaxResult memberCheck() { - CuMember cuMember = iCuMemberService.getMemberById(SecurityUtils.getUserId()); - if (StringUtils.isAnyEmpty(cuMember.getPayPwd(), cuMember.getPayPassword())) { - // 支付密码为空，需要设置需要密码 - return AjaxResult.success("", EYesNo.YES.getIntValue()); - } - return AjaxResult.success(); - } - - /** - * 初始支付密码 - * - * @param param 支付密码入参 - * @return - */ - @RepeatSubmitSimple - @PostMapping("/init-password") - public AjaxResult initPassword(@Valid @RequestBody InitPasswordParam param) { - if (!param.getPassword().equals(param.getConfirmPassword())) { - return AjaxResult.error("新密码与确认密码不一致"); - } - - CuMember cuMember = iCuMemberService.getMemberById(SecurityUtils.getUserId()); - if (StringUtils.isAllEmpty(cuMember.getPayPwd(), cuMember.getPayPassword())) { - // 支付密码为空，可以进行初始化 - iCuMemberService.initPassword(cuMember.getPkId(), param.getPassword()); - return AjaxResult.success(); - } - return AjaxResult.error("修改支付密码，"); - } - - /** - * 更新个人资料（昵称、真实姓名） - * - * @param param - * @return - */ - @RepeatSubmitSimple - @PostMapping("/update-data") - public AjaxResult updateData(@Valid @RequestBody MemberDataParam param) { - Long memberId = SecurityUtils.getUserId(); - CuMemberExt memberExt = iCuMemberService.getMemberById(memberId); - if (null == memberExt) { - // 会员不存在 - return AjaxResult.error("会员信息不存在，请刷新后重试"); - } - - if (null == param.getNickName()) { - param.setNickName(""); - } - - // 会员修改信息 - CuMember cuMember = new CuMember(); - cuMember.setPkId(memberId); - cuMember.setPkModified(memberId); - cuMember.setModifiedTime(new Date()); - - // 会员修改日志记录 - List cuMemberChangeLogList = new ArrayList<>(); - - if (!param.getMemberName().equals(cuMember.getMemberName())) { - // 会员姓名有修改，需要更新 - cuMember.setMemberName(param.getMemberName()); - - cuMemberChangeLogList.add(CuMemberChangeLog.builder() - .pkMember(memberId) - .changeType(EMemberChangeType.MEMBER_NAME.getValue()) - .changeFront(memberExt.getMemberName()) - .changeAfter(param.getMemberName()) - .build()); - } - - if (!param.getNickName().equals(memberExt.getNickName())) { - // 会员昵称有修改，需要更新 - cuMember.setNickName(param.getNickName()); - - cuMemberChangeLogList.add(CuMemberChangeLog.builder() - .pkMember(memberId) - .changeType(EMemberChangeType.NICK_NAME.getValue()) - .changeFront(memberExt.getNickName()) - .changeAfter(param.getNickName()) - .build()); - } - - iMemberInfoService.updateMemberInfo(cuMember, cuMemberChangeLogList); - return AjaxResult.success(); - } - - /** - * 忘记支付密码更新 - * - * @param param - * @return - */ - @RepeatSubmitSimple - @PutMapping("/forget-pay-password") - public AjaxResult forgetPayPassword(@Valid @RequestBody ForgetPayPasswordParam param) { - Long memberId = SecurityUtils.getUserId(); - CuMemberExt memberExt = iCuMemberService.getMemberById(memberId); - if (null == memberExt) { - // 会员不存在 - return AjaxResult.error("会员信息不存在，请刷新后重试"); - } - - String checkSmsStr = iSmsService.checkPayPasswordCode(memberExt.getPhone(), param.getCode()); - if (null != checkSmsStr) { - return AjaxResult.error(checkSmsStr); - } - - String payPassword = param.getPayPassword(); - - // 会员修改信息 - CuMember cuMember = new CuMember(); - cuMember.setPkId(memberId); - cuMember.setPkModified(memberId); - cuMember.setModifiedTime(new Date()); - cuMember.setPayPwd(SecurityUtils.encryptPassword(payPassword)); - cuMember.setPayPassword(payPassword); - // 会员修改记录信息 - CuMemberChangeLog cuMemberChangeLog = CuMemberChangeLog.builder() - .pkMember(memberId) - .changeType(EMemberChangeType.PAY_PWD.getValue()) - .changeFront(memberExt.getPayPassword()) - .changeAfter(payPassword) - .build(); - iMemberInfoService.updateMemberInfo(cuMember, Collections.singletonList(cuMemberChangeLog)); - - return AjaxResult.success(); - } - - /** - * 推荐列表 - * - * @param param - * @return - */ - @GetMapping("/parent-list") - public TableDataInfo parentList(ParentListParam param) { - if (null != param.getStartPayTime()) { - param.setStartPayTime(DateUtils.getStartTime(param.getStartPayTime())); - } - if (null != param.getEndPayTime()) { - param.setEndPayTime(DateUtils.getEndTime(param.getEndPayTime())); - } - - // 推荐人为当前会员 - param.setPkParent(SecurityUtils.getUserId()); - - // 返回数据列表 - List resultList = new ArrayList<>(); - - startPage(); - List list = iCuMemberService.listParent(param); - if (CollectionUtil.isNotEmpty(list)) { - for (CuMember cuMember : list) { - resultList.add(ParentListVO.builder() - .memberCode(cuMember.getMemberCode()) - .memberName(DesensitizedUtil.mobilePhone(cuMember.getMemberName())) - .payTime(cuMember.getPayTime()) - .pkAwards(cuMember.getPkAwards()) - .build()); - } - } - - TableDataInfo tableDataInfo = getDataTable(list); - tableDataInfo.setRows(resultList); - return tableDataInfo; - } - - /** - * 有效推荐数量 - * - * @return - */ - @GetMapping("/effective-num") - public AjaxResult effectiveNum() { - return AjaxResult.success(iCuMemberService.effectiveParentCount(SecurityUtils.getUserId())); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/api/ApiRegisterController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/api/ApiRegisterController.java deleted file mode 100644 index 55fc4835..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/api/ApiRegisterController.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.hzs.lenjoy.member.base.controller.api; - -import cn.hutool.core.codec.Base64Decoder; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.config.HzsConfig; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.lenjoy.member.base.param.RecoverParam; -import com.hzs.lenjoy.member.base.param.RegisterParam; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.base.vo.RegisterVO; -import com.hzs.lenjoy.member.sms.service.ISmsService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @Description: 会员注册相关控制器 - * @Author: jiang chao - * @Time: 2024/10/15 16:25 - * @Classname: RegisterController - * @PackageName: com.hzs.lenjoy.member.base.controller.api - */ -@Slf4j -@RequestMapping("/api/lenjoy") -@RestController -public class ApiRegisterController extends BaseController { - - @Autowired - private ISmsService iSmsService; - @Autowired - private ICuMemberService iCuMemberService; - - @Autowired - private RedisService redisService; - - /** - * 校验手机号是否存在 - * - * @param phone - * @return - */ - @GetMapping("/check-phone") - public AjaxResult checkPhone(@RequestParam String phone) { - if (iCuMemberService.checkPhoneExist(phone)) { - return AjaxResult.error("手机号码已注册"); - } - return AjaxResult.success(); - } - - /** - * 校验编号是否存在 - * - * @param checkCode - * @return - */ - @GetMapping("/check-code") - public AjaxResult checkCode(@RequestParam String checkCode) { - if (!iCuMemberService.checkMemberCodeExist(checkCode)) { - return AjaxResult.error("推荐人不存在"); - } - return AjaxResult.success(); - } - - /** - * 会员注册 - * - * @param param 注册参数 - * @param source 注册来源 - * @return - */ - @RepeatSubmitSimple - @PostMapping("/register") - public AjaxResult register(@Valid @RequestBody RegisterParam param, - @RequestHeader("Source") Integer source) { - // 注册缓存锁 - String registerLock = CacheConstants.REGISTER_LOCK + param.getPhone(); - try { - // 注册时，手机号码锁3秒 - redisService.lockKeyOnce(registerLock, 3); - - // 校验短信验证码是否有效 - String checkSmsStr = iSmsService.checkRegisterCode(param.getPhone(), param.getSmsCode()); - if (null != checkSmsStr) { - return AjaxResult.error(checkSmsStr); - } - - // 校验手机号号是否已经存在 - if (iCuMemberService.checkPhoneExist(param.getPhone())) { - return AjaxResult.error("手机号码已注册"); - } - - // 推荐人编号 - CuMemberExt parentMember; - if (EYesNo.YES.getIntValue() == param.getType()) { - // 自注册 - parentMember = iCuMemberService.getMemberByCode(param.getParentCode()); - } else { - // 分享注册 - parentMember = iCuMemberService.getMemberById(Long.parseLong(new String(Base64Decoder.decode(param.getParentCode())))); - } - // 校验推荐人编号是否存在 - if (null == parentMember) { - return AjaxResult.error("推荐人不存在，请核对"); - } - - // 会员注册 - CuMember newMember = iCuMemberService.registerMember(param, parentMember, source); - if (null == newMember) { - return AjaxResult.error("会员注册失败，请重试"); - } - - return AjaxResult.success(RegisterVO.builder() - .memberCode(newMember.getMemberCode()) - .phone(newMember.getPhone()) - .urlAddress(HzsConfig.getPc()) - .build()); - } catch (Exception e) { - log.error("会员注册异常，param: {}", param, e); - return AjaxResult.error("会员注册失败，请刷新后重试"); - } finally { - redisService.unlock(registerLock); - } - } - - /** - * 找回密码 - * - * @param param - * @return - */ - @RepeatSubmitSimple - @PostMapping("/recover") - public AjaxResult recover(@Valid @RequestBody RecoverParam param) { - // 校验短信验证码是否有效 - String checkSmsStr = iSmsService.checkRecoverCode(param.getPhone(), param.getSmsCode()); - if (null != checkSmsStr) { - return AjaxResult.error(checkSmsStr); - } - - // 新密码 和 确认密码 是否相同 - if (!param.getNewPassword().equals(param.getConfirmNewPassword())) { - return AjaxResult.error("新密码和确认密码一致"); - } - - // 校验手机号号是否已经存在 - List cuMemberExtList = iCuMemberService.listMemberByPhone(param.getPhone()); - if (!CollectionUtil.isNotEmpty(cuMemberExtList)) { - return AjaxResult.error("手机号码不存在"); - } - - // 会员ID列表 - List pkMemberList = cuMemberExtList.stream().map(CuMemberExt::getPkId).collect(Collectors.toList()); - // 重置密码 - iCuMemberService.resetPassword(pkMemberList, param.getNewPassword(), null); - return AjaxResult.success(); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/manage/CuMemberController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/manage/CuMemberController.java deleted file mode 100644 index 7614b42b..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/manage/CuMemberController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.lenjoy.member.base.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.base.vo.GetMemberVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Description: 乐享会员管理控制器 - * @Author: jiang chao - * @Time: 2024/10/29 14:04 - * @Classname: CuMemberController - * @PackageName: com.hzs.lenjoy.member.base.controller.manage - */ -@RequestMapping("/manager/member") -@RestController -public class CuMemberController { - - @Autowired - private ICuMemberService iCuMemberService; - - /** - * 查询会员信息 - * - * @param memberCode 会员编号 - * @return - */ - @GetMapping("/get-member") - public AjaxResult getMember(@RequestParam("memberCode") String memberCode) { - if (StringUtils.isEmpty(memberCode)) { - return AjaxResult.error("查询编号不能为空"); - } - CuMemberExt cuMemberExt = iCuMemberService.getMemberByCode(memberCode); - if (null != cuMemberExt) { - return AjaxResult.success(BeanUtil.copyProperties(cuMemberExt, GetMemberVO.class)); - } - return AjaxResult.error(); - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/manage/CuRangeStoreController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/manage/CuRangeStoreController.java deleted file mode 100644 index a6499dea..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/controller/manage/CuRangeStoreController.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.hzs.lenjoy.member.base.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -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.member.base.CuRangeStore; -import com.hzs.common.domain.member.base.ext.CuRangeStoreExt; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.base.param.RangeStoreParam; -import com.hzs.lenjoy.member.base.param.RangeStoreStatusParam; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.base.service.ICuRangeStoreService; -import com.hzs.lenjoy.member.base.vo.RangeStoreVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @Description: 乐享店铺控制器 - * @Author: jiang chao - * @Time: 2024/10/29 10:01 - * @Classname: CuRangeStoreController - * @PackageName: com.hzs.lenjoy.member.base.controller.manage - */ -@Slf4j -@RequestMapping("/manage/range-store") -@RestController -public class CuRangeStoreController extends BaseController { - - @Autowired - private ICuRangeStoreService iCuRangeStoreService; - @Autowired - private ICuMemberService iCuMemberService; - - /** - * 查询列表 - * - * @param param 查询入参 - * @return - */ - @Log(module = EOperationModule.RANGE_STORE, business = EOperationBusiness.RANGE_STORE, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(RangeStoreParam param) { - if (null != param.getStartDate()) { - param.setStartDate(DateUtils.getStartTime(param.getStartDate())); - } - if (null != param.getEndDate()) { - param.setEndDate(DateUtils.getEndTime(param.getEndDate())); - } - if (null != param.getFailureStartDate()) { - param.setFailureStartDate(DateUtils.getStartTime(param.getFailureStartDate())); - } - if (null != param.getFailureEndDate()) { - param.setFailureEndDate(DateUtils.getEndTime(param.getFailureEndDate())); - } - - // 返回数据列表 - List resultList = new ArrayList<>(); - startPage(); - List list = iCuRangeStoreService.listRangeStore(param); - if (CollectionUtil.isNotEmpty(list)) { - resultList = BeanUtil.copyToList(list, RangeStoreVO.class); - } - TableDataInfo tableDataInfo = getDataTable(list); - tableDataInfo.setRows(resultList); - return tableDataInfo; - } - - /** - * 列表导出 - * - * @param response - * @param param 查询入参 - */ - @Log(module = EOperationModule.RANGE_STORE, business = EOperationBusiness.RANGE_STORE, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, RangeStoreParam param) { - if (null != param.getStartDate()) { - param.setStartDate(DateUtils.getStartTime(param.getStartDate())); - } - if (null != param.getEndDate()) { - param.setEndDate(DateUtils.getEndTime(param.getEndDate())); - } - - // 返回数据列表 - List resultList = new ArrayList<>(); - List list = iCuRangeStoreService.listRangeStore(param); - if (CollectionUtil.isNotEmpty(list)) { - resultList = BeanUtil.copyToList(list, RangeStoreVO.class); - } - - ExcelUtil util = new ExcelUtil<>(RangeStoreVO.class); - util.exportExcel(response, resultList, "乐享店铺导出"); - } - - /** - * 添加 - * - * @param param 保存入参 - * @return - */ - @Log(module = EOperationModule.RANGE_STORE, business = EOperationBusiness.RANGE_STORE, method = EOperationMethod.CREATE) - @PostMapping("/add") - public AjaxResult add(@Valid @RequestBody RangeStoreParam param) { - CuMemberExt cuMemberExt = iCuMemberService.getMemberByCode(param.getMemberCode()); - if (null == cuMemberExt) { - return AjaxResult.error("会员编号不存在"); - } - - // 校验是否已经添加过 - if (iCuRangeStoreService.count(Wrappers.lambdaQuery() - .eq(CuRangeStore::getPkMember, cuMemberExt.getPkId()) - ) > 0) { - return AjaxResult.error("该会员已经添加店铺"); - } - - CuRangeStore cuRangeStore = new CuRangeStore().setPkMember(cuMemberExt.getPkId()); - cuRangeStore.setPkCreator(SecurityUtils.getUserId()); - cuRangeStore.setPkCountry(CountryConstants.CHINA_COUNTRY); - iCuRangeStoreService.save(cuRangeStore); - return AjaxResult.success(); - } - - /** - * 删除 - * - * @param pkId 乐享店铺ID - * @return - */ - @Log(module = EOperationModule.RANGE_STORE, business = EOperationBusiness.RANGE_STORE, method = EOperationMethod.DELETE) - @DeleteMapping("/delete/{pkId}") - public AjaxResult delete(@PathVariable Integer pkId) { - iCuRangeStoreService.update(Wrappers.lambdaUpdate() - .eq(CuRangeStore::getPkId, pkId) - .set(CuRangeStore::getDelFlag, EDelFlag.DELETE.getValue()) - .set(CuRangeStore::getPkModified, SecurityUtils.getUserId()) - .set(CuRangeStore::getModifiedTime, new Date()) - ); - return AjaxResult.success(); - } - - /** - * 更新状态 - * - * @param param 更新入参 - * @return - */ - @Log(module = EOperationModule.RANGE_STORE, business = EOperationBusiness.RANGE_STORE, method = EOperationMethod.UPDATE) - @PutMapping("/change-status") - public AjaxResult changeStatus(@Valid @RequestBody RangeStoreStatusParam param) { - if (null == ERangeStoreStatus.getEnumByValue(param.getStatus())) { - return AjaxResult.error("更新状态有误"); - } - - iCuRangeStoreService.update(Wrappers.lambdaUpdate() - .eq(CuRangeStore::getPkId, param.getPkId()) - .set(CuRangeStore::getStatus, param.getStatus()) - .set(CuRangeStore::getPkModified, SecurityUtils.getUserId()) - .set(CuRangeStore::getModifiedTime, new Date()) - ); - return AjaxResult.success(); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuMemberChangeLogMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuMemberChangeLogMapper.java deleted file mode 100644 index 589702af..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuMemberChangeLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.lenjoy.member.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.detail.CuMemberChangeLog; - -/** - * @Description: 会员信息修改记录 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/22 10:55 - * @Classname: CuMemberChangeLogMapper - * @PackageName: com.hzs.lenjoy.member.base.mapper - */ -public interface CuMemberChangeLogMapper extends BaseMapper { -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuMemberMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuMemberMapper.java deleted file mode 100644 index b71f5590..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuMemberMapper.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.hzs.lenjoy.member.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.lenjoy.member.base.param.ParentListParam; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * 会员 Mapper 接口 - * - * @author hzs - * @since 2022-08-04 - */ -public interface CuMemberMapper extends BaseMapper { - - /** - * 根据唯一索引查询会员信息 - * - * @param memberCode 会员编号 - * @param pkMember 会员主键 - * @return - */ - CuMemberExt getMemberByUnique(@Param("memberCode") String memberCode, - @Param("pkMember") Long pkMember); - - /** - * 根据手机号获取会员信息 - * - * @param phone 手机号码 - * @return - */ - CuMemberExt getMemberByPhone(@Param("phone") String phone); - - /** - * 根据手机号获取会员信息列表 - * - * @param phone 手机号码 - * @return - */ - List listMemberByPhone(@Param("phone") String phone); - - /** - * 查询血缘上用户是否存在 - * - * @param memberId 需要查询的启点会员ID - * @param topId 血缘线上面的会员ID - * @return - */ - CuMember getBloodTopMember(@Param("memberId") Long memberId, @Param("topId") Long topId); - - /** - * 查找血缘伞上，推荐人 - * - * @param memberId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - List selectBloodKinshipOnUmbrella(@Param("memberId") Long memberId); - - /** - * 查找血缘伞下，推荐人 - * - * @param memberId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - List selectBloodKinshipUnderUmbrella(@Param("memberId") Long memberId); - - /** - * 查询会员以及关联推荐最新编号 - * - * @param pkMember 会员ID - * @param memberCode 会员编号 - * @return - */ - CuMemberExt getMemberAndLastMemberCode(@Param("pkMember") Long pkMember, @Param("memberCode") String memberCode); - - /** - * 查询指定数量会员SEQ - * - * @param param 查询数量 - * @return - */ - List querySeqList(@Param("param") Integer param); - - /** - * 批量保存会员信息 - * - * @param memberList 会员信息列表 - * @return - */ - int insertBatchCuMember(@Param("memberList") List memberList); - - /** - * 查询直推列表 - * - * @param param 查询参数 - * @return - */ - List listParent(@Param("param") ParentListParam param); - - /** - * 查询期间 - * - * @return - */ - Integer getCurrentPeriod(); - - /** - * 查询烧伤数据数量 - * - * @param pkMember 会员ID - * @param period 期间ID - * @return - */ - Integer countFireBurn(@Param("pkMember") Long pkMember, @Param("period") Integer period); - - /** - * 有效推荐数量（来源结算） - * - * @param tableName 表名 - * @param pkParent 推荐人 - * @param startDate 开始时间 - * @param endDate 结束时间 - * @return - */ - int effectiveParentCount(@Param("tableName") String tableName, - @Param("pkParent") Long pkParent, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate); - - /** - * 有效推荐数量（来源订单） - * - * @param pkParent 推荐人 - * @param startDate 开始时间 - * @param endDate 结束时间 - * @return - */ - int effectiveOrderParentCount(@Param("pkParent") Long pkParent, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuRangeStoreMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuRangeStoreMapper.java deleted file mode 100644 index 624599bc..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/CuRangeStoreMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.member.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.base.CuRangeStore; -import com.hzs.common.domain.member.base.ext.CuRangeStoreExt; -import com.hzs.lenjoy.member.base.param.RangeStoreParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 会员乐享店铺 Mapper 接口 - * - * @author hzs - * @since 2024-10-25 - */ -public interface CuRangeStoreMapper extends BaseMapper { - - /** - * 查询会员店铺列表 - * - * @param param 查询入参 - * @return - */ - List listRangeStore(@Param("param") RangeStoreParam param); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuMemberChangeLogMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuMemberChangeLogMapper.xml deleted file mode 100644 index f27c2dbf..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuMemberChangeLogMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuMemberMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuMemberMapper.xml deleted file mode 100644 index c96a8306..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuMemberMapper.xml +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert ALL - - into CU_MEMBER ( - PK_ID, MEMBER_CODE, MEMBER_NAME, CUSTOMER_TYPE, - PHONE, PK_PARENT, PK_COUNTRY, PK_SETTLE_COUNTRY, - SOURCE, PK_REGISTER_GRADE, PK_SETTLE_GRADE, PK_AWARDS, - LOGIN_PWD, LOGIN_PASSWORD, PAY_TIME, PAY_STATUS, - PK_CREATOR, CREATION_TIME, PK_VERTEX, EXPIRE_DATE, STOP_DATE, - SYSTEM_TYPE - ) - values ( - #{item.pkId}, #{item.memberCode}, #{item.memberName}, #{item.customerType}, - #{item.phone}, #{item.pkParent}, #{item.pkCountry}, #{item.pkSettleCountry}, - #{item.source}, #{item.pkRegisterGrade}, #{item.pkSettleGrade}, #{item.pkAwards}, - #{item.loginPwd}, #{item.loginPassword}, #{item.payTime}, #{item.payStatus}, - #{item.pkCreator}, #{item.creationTime}, #{item.pkVertex, jdbcType=NUMERIC}, - #{item.expireDate, jdbcType=DATE}, #{item.stopDate, jdbcType=DATE}, - #{item.systemType} - ) - - SELECT 1 FROM dual - - - - - - - - - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuRangeStoreMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuRangeStoreMapper.xml deleted file mode 100644 index 3fbdcc0e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/mapper/xml/CuRangeStoreMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/ForgetPayPasswordParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/ForgetPayPasswordParam.java deleted file mode 100644 index 1dd0b925..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/ForgetPayPasswordParam.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - -/** - * @Description: - * @Author: jiang chao - * @Time: 2024/10/28 14:16 - * @Classname: ForgetPayPasswordParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class ForgetPayPasswordParam { - - /** - * 支付密码 - */ - @Size(message = "新密码长度为6~20位", min = 6, max = 20) - @NotEmpty(message = "新密码不能为空") - private String payPassword; - - /** - * 验证码 - */ - @NotEmpty(message = "短信验证码不能为空") - private String code; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/InitPasswordParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/InitPasswordParam.java deleted file mode 100644 index 16a0977b..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/InitPasswordParam.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * @Description: 初始化密码入参 - * @Author: jiang chao - * @Time: 2024/10/22 10:14 - * @Classname: InitPasswordParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class InitPasswordParam implements Serializable { - - /** - * 新密码 - */ - @Size(message = "新密码长度为6~20位", min = 6, max = 20) - @NotEmpty(message = "新密码不能为空") - private String password; - - /** - * 确认新密码 - */ - @Size(message = "确认密码长度为6~20位", min = 6, max = 20) - @NotEmpty(message = "确认密码不能为空") - private String confirmPassword; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/MemberDataParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/MemberDataParam.java deleted file mode 100644 index 512f5b16..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/MemberDataParam.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * @Description: 会员资料入参 - * @Author: jiang chao - * @Time: 2024/10/23 16:27 - * @Classname: MemberDataParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class MemberDataParam implements Serializable { - - /** - * 昵称 - */ - @Size(message = "昵称长度不能超过50位", max = 50) - private String nickName; - - /** - * 真实姓名 - */ - @Size(message = "真实姓名不能超过50位", max = 50) - @NotEmpty(message = "真实姓名不能为空") - private String memberName; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/ParentListParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/ParentListParam.java deleted file mode 100644 index c8d18e33..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/ParentListParam.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 推荐列表入参 - * @Author: jiang chao - * @Time: 2024/10/28 11:01 - * @Classname: ParentListParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class ParentListParam implements Serializable { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 注册开始时间 - */ - private Date startPayTime; - - /** - * 注册结束时间 - */ - private Date endPayTime; - - /** - * 推荐人ID - */ - private Long pkParent; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RangeStoreParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RangeStoreParam.java deleted file mode 100644 index f9d96170..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RangeStoreParam.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 乐享店铺查询入参 - * @Author: jiang chao - * @Time: 2024/10/29 10:15 - * @Classname: RangeStoreParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class RangeStoreParam implements Serializable { - - /** - * 会员编号 - */ - @Size(max = 20, message = "会员编号不能超过20位") - @NotNull(message = "会员编号不能为空") - private String memberCode; - - /** - * 生效状态（2=有效，1=无效） - */ - private Integer status; - - /** - * 生效时间（起） - */ - private Date startDate; - - /** - * 生效时间（止） - */ - private Date endDate; - - /** - * 失效时间（起） - */ - private Date failureStartDate; - - /** - * 失效时间（止） - */ - private Date failureEndDate; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RangeStoreStatusParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RangeStoreStatusParam.java deleted file mode 100644 index 2bd468f5..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RangeStoreStatusParam.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * @Description: 乐享店铺状态入参 - * @Author: jiang chao - * @Time: 2024/10/29 10:58 - * @Classname: RangeStoreStatusParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class RangeStoreStatusParam implements Serializable { - - /** - * 主键ID - */ - @NotNull - private Integer pkId; - - /** - * 状态（2=有效，1=无效） - */ - @NotNull - private Integer status; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RecoverParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RecoverParam.java deleted file mode 100644 index 0aac1ba2..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RecoverParam.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * @Description: 找回密码入参 - * @Author: jiang chao - * @Time: 2024/10/16 16:13 - * @Classname: RecoverParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class RecoverParam implements Serializable { - - /** - * 手机号码 - */ - @Size(message = "手机号码长度不能超过{max}位", max = 11) - @NotEmpty(message = "手机号码不能为空") - private String phone; - - /** - * 新密码 - */ - @Size(message = "新密码长度为6~20位", min = 6, max = 20) - @NotEmpty(message = "新密码不能为空") - private String newPassword; - - /** - * 确认密码 - */ - @Size(message = "确认密码长度为6~20位", min = 6, max = 20) - @NotEmpty(message = "确认密码不能为空") - private String confirmNewPassword; - - /** - * 短信验证码 - */ - @NotEmpty(message = "短信验证码不能为空") - private String smsCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RegisterParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RegisterParam.java deleted file mode 100644 index 11af0f1c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/param/RegisterParam.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.lenjoy.member.base.param; - -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * @Description: 注册入参 - * @Author: jiang chao - * @Time: 2024/10/15 16:28 - * @Classname: RegisterParam - * @PackageName: com.hzs.lenjoy.member.base.param - */ -@Data -public class RegisterParam implements Serializable { - - /** - * 手机号码 - */ - @Size(message = "手机号码长度不能超过{max}位", max = 11) - @NotEmpty(message = "手机号码不能为空") - private String phone; - - /** - * 登录密码 - */ - @Size(message = "登录密码长度为6~20位", min = 6, max = 20) - @NotEmpty(message = "登录密码不能为空") - private String loginPassword; - - /** - * 推荐人编号 - */ - @Size(message = "推荐人编号不能超过{max}位", max = 12) - @NotEmpty(message = "推荐人编号不能为空") - private String parentCode; - - /** - * 注册类型（0=自注册，1=分享注册） - */ - @NotNull - private Integer type; - - /** - * 短信验证码 - */ - @NotEmpty(message = "短信验证码不能为空") - private String smsCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/provider/MemberServiceProvider.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/provider/MemberServiceProvider.java deleted file mode 100644 index 33ea92a7..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/provider/MemberServiceProvider.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.hzs.lenjoy.member.base.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.lenjoy.member.base.IMemberServiceApi; -import com.hzs.lenjoy.member.base.service.ICuMemberBusinessService; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 会员dubbo服务 - * @Author: jiang chao - * @Time: 2024/10/18 13:44 - * @Classname: MemberServiceProvider - * @PackageName: com.hzs.lenjoy.member.base.provider - */ -@Slf4j -@DubboService -public class MemberServiceProvider implements IMemberServiceApi { - - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private ICuMemberBusinessService iCuMemberBusinessService; - - @Override - public R getMemberById(Long memberId) { - return R.ok(iCuMemberService.getMemberById(memberId)); - } - - @Override - public R getMemberByCode(String memberCode) { - return R.ok(iCuMemberService.getMemberByCode(memberCode)); - } - - @Override - public R getBloodTopMember(Long memberId, Long topId) { - return R.ok(iCuMemberService.getBloodTopMember(memberId, topId)); - } - - @Override - public R memberOnlinePay(CuMember cuMember, SaOrderExt saOrder) { - try { - iCuMemberService.memberOnlinePay(cuMember, saOrder); - return R.ok(); - } catch (Exception e) { - log.error("订单在线支付处理异常, cuMember: {}, saOrder: {}", cuMember, saOrder, e); - return R.fail(e.getMessage()); - } - } - - @Override - public R memberWalletPay(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt) { - try { - iCuMemberService.memberWalletPay(saOrder, cuMemberAccountExt); - return R.ok(); - } catch (Exception e) { - log.error("订单支付处理异常, cuMemberAccount: {}, saOrder: {}", cuMemberAccountExt, saOrder, e); - return R.fail(e.getMessage()); - } - } - - @Override - public R cancelOrderBackAccount(SaOrder saOrder, Long pkMember) { - try { - String str = iCuMemberBusinessService.cancelOrderBackAccount(saOrder, pkMember); - if (null == str) { - return R.ok(); - } - return R.fail(str); - } catch (Exception e) { - log.error("撤销订单，回退金额异常, saOrder: {}", saOrder, e); - return R.fail("撤销订单，回退金额处理异常"); - } - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/provider/RangeStoreProvider.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/provider/RangeStoreProvider.java deleted file mode 100644 index fcbc6cac..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/provider/RangeStoreProvider.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.hzs.lenjoy.member.base.provider; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hzs.common.core.constant.LenjoySysConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EOrderType; -import com.hzs.common.core.enums.ERangeStoreStatus; -import com.hzs.common.domain.member.base.CuRangeStore; -import com.hzs.lenjoy.member.base.IRangeStoreApi; -import com.hzs.lenjoy.member.base.service.ICuRangeStoreService; -import com.hzs.lenjoy.sale.order.IOrderServiceApi; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -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 java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; - -/** - * @Description: 乐享店铺dubbo服务 - * @Author: jiang chao - * @Time: 2024/10/30 16:58 - * @Classname: RangeStoreProvider - * @PackageName: com.hzs.lenjoy.member.base.provider - */ -@Slf4j -@DubboService -public class RangeStoreProvider implements IRangeStoreApi { - - @Autowired - private ICuRangeStoreService iCuRangeStoreService; - - @DubboReference - IOrderServiceApi iOrderServiceApi; - @DubboReference - ICurrencyServiceApi iCurrencyServiceApi; - - @Override - public R rangeStoreStatusHandle(Long pkMember) { - try { - CuRangeStore cuRangeStore = iCuRangeStoreService.getOne(Wrappers.lambdaQuery() - .eq(CuRangeStore::getPkMember, pkMember) - ); - if (null != cuRangeStore && ERangeStoreStatus.INVALID.getValue() == cuRangeStore.getStatus()) { - // 店铺信息存在，并且为【无效】状态，需要进行处理 - R evResult = iOrderServiceApi.sumOrderAssAchieve(pkMember, Arrays.asList(EOrderType.LENJOY_CONSUME.getValue()), cuRangeStore.getCreationTime()); - if (evResult.isSuccess()) { - CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(cuRangeStore.getPkCountry()).getData(); - - if (evResult.getData().multiply(currencyDTO.getInExchangeRate()).compareTo(LenjoySysConstants.STORE_EFFECTIVE_EV) >= 0) { - // 满足EV条件，需要更新数据为【有效】 - Date nowDate = new Date(); - if (iCuRangeStoreService.update(Wrappers.lambdaUpdate() - .eq(CuRangeStore::getPkId, cuRangeStore.getPkId()) - .eq(CuRangeStore::getStatus, ERangeStoreStatus.INVALID.getValue()) - .set(CuRangeStore::getStatus, ERangeStoreStatus.EFFECTIVE.getValue()) - .set(CuRangeStore::getEffectiveDate, nowDate) - .set(CuRangeStore::getPkModified, pkMember) - .set(CuRangeStore::getModifiedTime, nowDate))) { - log.info("乐享店铺状态处理成功"); - } else { - log.warn("乐享店铺状态处理失败，不需要再次更新"); - } - } - } else { - log.error("乐享店铺状态处理查询EV失败, pkMember: {}", pkMember); - } - } - return R.ok(); - } catch (Exception e) { - log.error("乐享店铺状态处理异常, pkMember: {}", pkMember, e); - return R.fail(); - } - } - - @Override - public R rangeStoreStatusCancelHandle(Long pkMember) { - try { - CuRangeStore cuRangeStore = iCuRangeStoreService.getOne(Wrappers.lambdaQuery() - .eq(CuRangeStore::getPkMember, pkMember) - ); - if (null != cuRangeStore && ERangeStoreStatus.EFFECTIVE.getValue() == cuRangeStore.getStatus()) { - // 店铺信息存在，并且为【有效】状态，需要进行处理 - R evResult = iOrderServiceApi.sumOrderAssAchieve(pkMember, Arrays.asList(EOrderType.LENJOY_CONSUME.getValue()), cuRangeStore.getCreationTime()); - if (evResult.isSuccess()) { - CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(cuRangeStore.getPkCountry()).getData(); - - if (evResult.getData().multiply(currencyDTO.getInExchangeRate()).compareTo(LenjoySysConstants.STORE_EFFECTIVE_EV) < 0) { - // 不满足EV条件，需要更新数据为【无效】 - Date nowDate = new Date(); - if (iCuRangeStoreService.update(Wrappers.lambdaUpdate() - .eq(CuRangeStore::getPkId, cuRangeStore.getPkId()) - .eq(CuRangeStore::getStatus, ERangeStoreStatus.EFFECTIVE.getValue()) - .set(CuRangeStore::getStatus, ERangeStoreStatus.INVALID.getValue()) - .set(CuRangeStore::getFailureDate, nowDate) - .set(CuRangeStore::getPkModified, pkMember) - .set(CuRangeStore::getModifiedTime, nowDate))) { - log.info("乐享店铺状态撤单处理成功"); - } else { - log.warn("乐享店铺状态撤单处理失败，不需要再次更新"); - } - } - } else { - log.error("乐享店铺状态撤单处理查询EV失败, pkMember: {}", pkMember); - } - } - return R.ok(); - } catch (Exception e) { - log.error("乐享店铺状态撤单处理异常, pkMember: {}", pkMember, e); - return R.fail(); - } - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberBusinessService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberBusinessService.java deleted file mode 100644 index 48bdd96a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberBusinessService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hzs.lenjoy.member.base.service; - -import com.hzs.common.domain.sale.order.SaOrder; - -/** - * @Description: 会员业务处理服务 - * @Author: jiang chao - * @Time: 2024/11/22 11:33 - * @Classname: ICuMemberBusinessService - * @PackageName: com.hzs.lenjoy.member.base.service - */ -public interface ICuMemberBusinessService { - - /** - * 撤销订单，回退金额 - * - * @param saOrder - * @return - */ - String cancelOrderBackAccount(SaOrder saOrder, Long pkMember); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberChangeLogService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberChangeLogService.java deleted file mode 100644 index c114b40c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberChangeLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.lenjoy.member.base.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.detail.CuMemberChangeLog; - -/** - * @Description: 会员信息修改记录 - * @Author: jiang chao - * @Time: 2024/10/22 10:49 - * @Classname: ICuMemberChangeLogService - * @PackageName: com.hzs.lenjoy.member.base.service - */ -public interface ICuMemberChangeLogService extends IService { -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberService.java deleted file mode 100644 index a565aff2..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuMemberService.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.hzs.lenjoy.member.base.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.lenjoy.member.base.param.ParentListParam; -import com.hzs.lenjoy.member.base.param.RegisterParam; - -import java.util.List; - -/** - * 会员 服务类 - * - * @author hzs - * @since 2022-08-04 - */ -public interface ICuMemberService extends IService { - - /** - * 根据会员编号获取会员信息 - * - * @param memberCode 会员编号 - * @return - */ - CuMemberExt getMemberByCode(String memberCode); - - /** - * 根据会员ID获取会员信息 - * - * @param pkMember 会员ID - * @return - */ - CuMemberExt getMemberById(Long pkMember); - - /** - * 根据手机号获取会员信息 - * - * @param phone 手机号码 - * @return - */ - CuMemberExt getMemberByPhone(String phone); - - /** - * 根据手机号获取会员信息列表 - * - * @param phone 手机号码 - * @return - */ - List listMemberByPhone(String phone); - - /** - * 查询血缘上用户是否存在 - * - * @param memberId 需要查询的启点会员ID - * @param topId 血缘线上面的会员ID - * @return - */ - CuMember getBloodTopMember(Long memberId, Long topId); - - /** - * 注册会员 - * - * @param param 注册参数 - * @param parentMember 推荐人 - * @param source 注册来源 - * @return - */ - CuMember registerMember(RegisterParam param, CuMemberExt parentMember, Integer source); - - - /** - * 查找血缘伞上，推荐人 - * - * @param memberId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - List queryBloodKinshipOnUmbrella(Long memberId); - - /** - * 查找血缘伞下，推荐人 - * - * @param memberId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - List queryBloodKinshipUnderUmbrella(Long memberId); - - /** - * 校验会员手机号码是否存在 - * - * @param phone 手机号码 - * @return true 已经存在 - */ - boolean checkPhoneExist(String phone); - - /** - * 校验会员编号是否存在 - * - * @param memberCode 会员编号 - * @return true 已经存在 - */ - boolean checkMemberCodeExist(String memberCode); - - /** - * 重置密码 - * - * @param pkMemberList 会员ID列表 - * @param loginPassword 登录密码 - * @param payPassword 支付密码 - * @return - */ - void resetPassword(List pkMemberList, String loginPassword, String payPassword); - - /** - * 初始支付密码 - * - * @param pkMember 会员ID - * @param payPassword 支付密码 - */ - void initPassword(Long pkMember, String payPassword); - - /** - * 会员在线支付 - * - * @param cuMember 会员信息 - * @param saOrder 订单信息 - */ - void memberOnlinePay(CuMember cuMember, SaOrderExt saOrder); - - /** - * 会员钱包支付 - * - * @param saOrder 订单信息 - * @param cuMemberAccountExt 会员账户信息 - */ - void memberWalletPay(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt); - - /** - * 生成流水编号 - * - * @param prefix - * @return - */ - String createTradeCode(String prefix); - - /** - * 查询直推列表 - * - * @param param 查询参数 - * @return - */ - List listParent(ParentListParam param); - - /** - * 有效推荐数量 - * - * @param pkParent 推荐人 - * @return - */ - int effectiveParentCount(Long pkParent); - - /** - * 查询期间 - * - * @return - */ - Integer getCurrentPeriod(); - - /** - * 查询烧伤数据数量 - * - * @param pkMember 会员ID - * @param period 期间ID - * @return - */ - Integer countFireBurn(Long pkMember, Integer period); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuRangeStoreService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuRangeStoreService.java deleted file mode 100644 index b459329f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/ICuRangeStoreService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.member.base.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.base.CuRangeStore; -import com.hzs.common.domain.member.base.ext.CuRangeStoreExt; -import com.hzs.lenjoy.member.base.param.RangeStoreParam; - -import java.util.List; - -/** - * 会员乐享店铺 服务类 - * - * @author hzs - * @since 2024-10-25 - */ -public interface ICuRangeStoreService extends IService { - - /** - * 查询会员店铺列表 - * - * @param param 查询入参 - * @return - */ - List listRangeStore(RangeStoreParam param); - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/IMemberInfoService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/IMemberInfoService.java deleted file mode 100644 index c953a916..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/IMemberInfoService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.lenjoy.member.base.service; - -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.detail.CuMemberChangeLog; -import com.hzs.lenjoy.member.base.vo.MemberInfoVO; - -import java.util.List; - -/** - * @Description: 会员信息服务 - * @Author: jiang chao - * @Time: 2024/10/17 15:05 - * @Classname: IMemberInfoService - * @PackageName: com.hzs.lenjoy.member.base.service - */ -public interface IMemberInfoService { - - /** - * 获取会员信息 - * - * @param pkMember 会员ID - * @return - */ - MemberInfoVO getMemberInfo(Long pkMember); - - /** - * 修改会员资料 - * - * @param cuMember 会员信息 - * @param cuMemberChangeLogList 会员修改记录列表 - * @return - */ - void updateMemberInfo(CuMember cuMember, List cuMemberChangeLogList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberBusinessServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberBusinessServiceImpl.java deleted file mode 100644 index 55eb3e4c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ /dev/null @@ -1,256 +0,0 @@ -package com.hzs.lenjoy.member.base.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.account.CuMemberTrade; -import com.hzs.common.domain.member.account.CuMemberTradeBonus; -import com.hzs.common.domain.member.account.CuMemberTradeDetail; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.lenjoy.member.account.service.ICuMemberAccountService; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeBonusService; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeDetailService; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeService; -import com.hzs.lenjoy.member.base.service.ICuMemberBusinessService; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.system.config.IAreaCurrencyServiceApi; -import com.hzs.system.config.dto.AreaCurrencyDTO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.*; - -/** - * @Description: 会员业务处理服务 - * @Author: jiang chao - * @Time: 2024/11/22 11:34 - * @Classname: CuMemberBusinessServiceImpl - * @PackageName: com.hzs.lenjoy.member.base.service.impl - */ -@Service -public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { - - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private ICuMemberAccountService iCuMemberAccountService; - @Autowired - private ICuMemberTradeService iCuMemberTradeService; - @Autowired - private ICuMemberTradeDetailService iCuMemberTradeDetailService; - @Autowired - private ICuMemberTradeBonusService iCuMemberTradeBonusService; - @Autowired - private RedisService redisService; - - @DubboReference - IAreaCurrencyServiceApi iAreaCurrencyServiceApi; - - @Override - public String cancelOrderBackAccount(SaOrder saOrder, Long pkMember) { - // 查询支付账户 - CuMemberAccount payMemberAccount = iCuMemberAccountService.getPayAccount(saOrder.getPkCreator(), CountryConstants.CHINA_COUNTRY); - - List newCuMemberTradeBonusList = new ArrayList<>(); - List cuMemberTradeDetailList = new ArrayList<>(); - CuMemberAccount updateMemberAccount = new CuMemberAccount(); - List cuMemberTradeList = packageCancelOrderCuMemberTrades(pkMember, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount); - if (newCuMemberTradeBonusList.size() > 0) { - iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList); - } - // 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail - iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList); - saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount); - - return null; - } - - private List packageCancelOrderCuMemberTrades(Long pkMember, SaOrder saOrder, CuMemberAccount payMemberAccount, - List newCuMemberTradeBonusList, List cuMemberTradeDetailList, - CuMemberAccount updateMemberAccount) { - // 最终所属国家 - Integer pkCountry = saOrder.getPkCountry(); - - updateMemberAccount.setPkMember(payMemberAccount.getPkMember()); - updateMemberAccount.setPkCountry(pkCountry); - - // 返回的流水明细 - List cuMemberTradeList = new ArrayList<>(); - List cuMemberTrades = iCuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode()); - // 如果有订单支付流水明细 - if (CollectionUtil.isNotEmpty(cuMemberTrades)) { - // 订单所属国家和订单支付流水国家不相同则为跨国，需要以订单支付流水中的国家为准进行退款 - if (!pkCountry.equals(cuMemberTrades.get(0).getPkCountry())) { - pkCountry = cuMemberTrades.get(0).getPkCountry(); - } - - List currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(pkCountry).getData(); - Map areaCurrencyMap = new HashMap<>(); - currencyDTOList.forEach(areaCurrencyDTO -> areaCurrencyMap.put(areaCurrencyDTO.getPkAccount(), areaCurrencyDTO)); - - // 回退账户余额，余额回退到create_by - cuMemberTrades.forEach(cuMemberTrade -> { - BigDecimal tradeMoney = cuMemberTrade.getTradeAmount().negate(); - AreaCurrencyDTO currencyDto = areaCurrencyMap.get(cuMemberTrade.getPkAccount()); - revokeBonusAccount(pkMember, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount, cuMemberTradeList, cuMemberTrade, tradeMoney, currencyDto); - // 用于更新账户余额 - BigDecimal oriTradeMoney = ReflectUtils.invokeGetter(payMemberAccount, MemberFieldConstants.ACCOUNT + currencyDto.getFieldValue()); - ReflectUtils.invokeSetter(payMemberAccount, MemberFieldConstants.ACCOUNT + currencyDto.getFieldValue(), ComputeUtil.computeAdd(oriTradeMoney, tradeMoney)); - }); - } - return cuMemberTradeList; - } - - /** - * @Description: 撤销订单，回退奖金账户金额 - * @return: void - * @Author: sui q - * @Date: 2023/3/30 15:32 - */ - private void revokeBonusAccount(Long pkApprove, SaOrder saOrder, CuMemberAccount payMemberAccount, List newCuMemberTradeBonusList, - List cuMemberTradeDetailList, CuMemberAccount updateMemberAccount, List cuMemberTradeList, CuMemberTrade cuMemberTrade, BigDecimal tradeMoney, AreaCurrencyDTO currencyDto) { - // 奖金账户单独处理 - if (EAccount.BONUS.getValue() == currencyDto.getFieldValue()) { - updateMemberAccount.setWithdrawAccount4(BigDecimal.ZERO); - updateMemberAccount.setConsumeAccount4(BigDecimal.ZERO); - BigDecimal bonusTradeMoney = tradeMoney; - List consumeTypeList = Arrays.asList(EConsumeType.ORDER.getValue(), EConsumeType.BACK_ORDER.getValue()); - List cuMemberTradeBonusList = iCuMemberTradeBonusService.queryCuMemberTradeBonus(consumeTypeList, saOrder.getPkId()); - for (CuMemberTradeBonus cuMemberTradeBonus : cuMemberTradeBonusList) { - if (!ComputeUtil.compareValue(bonusTradeMoney)) { - break; - } - cuMemberTradeBonus.setConsumeType(EConsumeType.BACK_ORDER.getValue()); - BigDecimal cashTradeMoney = cuMemberTradeBonus.getCashMoney().negate(); - BigDecimal consumeTradeMoney = cuMemberTradeBonus.getConsumeMoney().negate(); - if (ComputeUtil.compareValue(cashTradeMoney)) { - if (ComputeUtil.compareValue(bonusTradeMoney, cashTradeMoney)) { - updateMemberAccount.setWithdrawAccount4(ComputeUtil.computeAdd(updateMemberAccount.getWithdrawAccount4(), cashTradeMoney)); - bonusTradeMoney = ComputeUtil.computeSubtract(bonusTradeMoney, cashTradeMoney); - cuMemberTradeBonus.setCashMoney(cashTradeMoney); - } else { - updateMemberAccount.setWithdrawAccount4(ComputeUtil.computeAdd(updateMemberAccount.getWithdrawAccount4(), bonusTradeMoney)); - bonusTradeMoney = BigDecimal.ZERO; - cuMemberTradeBonus.setCashMoney(bonusTradeMoney); - } - } else if (ComputeUtil.compareValue(consumeTradeMoney)) { - if (ComputeUtil.compareValue(bonusTradeMoney, consumeTradeMoney)) { - updateMemberAccount.setConsumeAccount4(ComputeUtil.computeAdd(updateMemberAccount.getConsumeAccount4(), consumeTradeMoney)); - bonusTradeMoney = ComputeUtil.computeSubtract(bonusTradeMoney, consumeTradeMoney); - cuMemberTradeBonus.setConsumeMoney(consumeTradeMoney); - } else { - updateMemberAccount.setConsumeAccount4(ComputeUtil.computeAdd(updateMemberAccount.getConsumeAccount4(), bonusTradeMoney)); - bonusTradeMoney = BigDecimal.ZERO; - cuMemberTradeBonus.setConsumeMoney(bonusTradeMoney); - } - CuMemberTradeDetail cuMemberTradeDetail = CuMemberTradeDetail.builder() - .pkId(cuMemberTradeBonus.getPkTradeDetail()) - .grantMoney(BigDecimal.ZERO) - .consumeMoney(cuMemberTradeBonus.getConsumeMoney()) - .build(); - cuMemberTradeDetailList.add(cuMemberTradeDetail); - } - cuMemberTradeBonus.setPkCreator(pkApprove); - cuMemberTradeBonus.setPkCountry(saOrder.getPkCountry()); - newCuMemberTradeBonusList.add(cuMemberTradeBonus); - } - } - BigDecimal originalMoney = ReflectUtils.invokeGetter(payMemberAccount, MemberFieldConstants.ACCOUNT + currencyDto.getFieldValue()); - CuMemberTrade memberTrade = packageMemberTrade(saOrder, updateMemberAccount.getPkCountry(), cuMemberTrade.getPkAccount(), originalMoney, tradeMoney, ETradeClassify.REFUND.getValue()); - memberTrade.setCreationTime(DateUtils.currentDateTime()); - // 海粉订单如果自注册，订单创建人和会员相同，需要退给推荐人 - if (EOrderType.FANS_ORDER.getValue() == saOrder.getOrderType() && saOrder.getPkCreator().equals(saOrder.getPkMember())) { - memberTrade.setPkMember(saOrder.getPkReference()); - } - cuMemberTradeList.add(memberTrade); - // 用于更新账户余额 - BigDecimal oriTradeMoney = ReflectUtils.invokeGetter(updateMemberAccount, MemberFieldConstants.ACCOUNT + currencyDto.getFieldValue()); - if (oriTradeMoney == null) { - oriTradeMoney = BigDecimal.ZERO; - } - ReflectUtils.invokeSetter(updateMemberAccount, MemberFieldConstants.ACCOUNT + currencyDto.getFieldValue(), ComputeUtil.computeAdd(oriTradeMoney, tradeMoney)); - } - - /** - * 封装会员 消费的 交易流水 - * - * @param saOrder 订单主表 - * @param pkAccount 账s户类型 - * @param originalMoney 原金额 - * @param tradeMoney 交易金额 - * @return CuMemberTrade - */ - private CuMemberTrade packageMemberTrade(SaOrder saOrder, Integer pkCountry, Integer pkAccount, BigDecimal originalMoney, BigDecimal tradeMoney, Integer tradeClassify) { - CuMemberTrade cuMemberTrade = CuMemberTrade.builder().tradeCode(iCuMemberService.createTradeCode(EOrderPrefix.TRADE_CODE.getValue())) - .tradeClassify(tradeClassify) - .pkMember(saOrder.getPkCreator()) - .pkAccount(pkAccount) - .pkRate(saOrder.getPkRate()) - .tradeAmount(tradeMoney) - .tradeBalance(originalMoney.add(tradeMoney)) - .tradeBeforeBalance(originalMoney) - .sourceCode(saOrder.getOrderCode()) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .build(); - for (ETradeType tradeType : ETradeType.values()) { - if (ETradeClassify.REFUND.getValue() == tradeClassify) { - if (-saOrder.getOrderType() == tradeType.getOrderType()) { - cuMemberTrade.setRemarks(tradeType.getKey()); - cuMemberTrade.setTradeType(tradeType.getValue()); - break; - } - } else { - if (saOrder.getOrderType() == tradeType.getOrderType()) { - cuMemberTrade.setRemarks(tradeType.getKey()); - cuMemberTrade.setTradeType(tradeType.getValue()); - break; - } - } - } - cuMemberTrade.setPkCountry(pkCountry); - cuMemberTrade.setPkCreator(saOrder.getPkCreator()); - cuMemberTrade.setCreationTime(saOrder.getPayTime()); - return cuMemberTrade; - } - - private void saveAndUpdateCuMember(List cuMemberTradeList, CuMemberAccount updateMemberAccount) { - if (cuMemberTradeList.size() > 0) { - iCuMemberTradeService.saveBatch(cuMemberTradeList); - } - updateCuMemberAccount(updateMemberAccount); - } - - /** - * 更新会员账户 - * - * @param updateMemberAccount 账户 - * @throws RuntimeException 抛出异常 - * @return: void - * @Author: sui q - * @Date: 2023/3/16 14:16 - */ - private void updateCuMemberAccount(CuMemberAccount updateMemberAccount) { - Long pkMember = updateMemberAccount.getPkMember(); - if (!redisService.lockKeyMany(CacheConstants.MEMBER_ACCOUNT + pkMember)) { - throw new RuntimeException("该账户有其他付款操作，请等待！"); - } - // 更新账户余额 - try { - if (!iCuMemberAccountService.updateMemberAccount(updateMemberAccount, pkMember)) { - throw new RuntimeException("用户付款失败，请重试！"); - } - } finally { - redisService.unlock(CacheConstants.MEMBER_ACCOUNT + pkMember); - } - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberChangeLogServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberChangeLogServiceImpl.java deleted file mode 100644 index a351c2a7..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberChangeLogServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzs.lenjoy.member.base.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.member.detail.CuMemberChangeLog; -import com.hzs.lenjoy.member.base.mapper.CuMemberChangeLogMapper; -import com.hzs.lenjoy.member.base.service.ICuMemberChangeLogService; -import org.springframework.stereotype.Service; - -/** - * @Description: 会员信息修改记录 - * @Author: jiang chao - * @Time: 2024/10/22 10:49 - * @Classname: CuMemberChangeLogServiceImpl - * @PackageName: com.hzs.lenjoy.member.base.service.impl - */ -@Service -public class CuMemberChangeLogServiceImpl extends ServiceImpl implements ICuMemberChangeLogService { -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberServiceImpl.java deleted file mode 100644 index 1d14b77a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuMemberServiceImpl.java +++ /dev/null @@ -1,671 +0,0 @@ -package com.hzs.lenjoy.member.base.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.*; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.exception.ServiceException; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.account.CuMemberTrade; -import com.hzs.common.domain.member.account.CuMemberTradeBonus; -import com.hzs.common.domain.member.account.CuMemberTradeDetail; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.detail.CuMemberChangeLog; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.system.config.BdAccount; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeBonusService; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeDetailService; -import com.hzs.lenjoy.member.account.service.ICuMemberTradeService; -import com.hzs.lenjoy.member.base.param.ParentListParam; -import com.hzs.lenjoy.member.base.param.RegisterParam; -import com.hzs.lenjoy.member.account.service.ICuMemberAccountService; -import com.hzs.lenjoy.member.base.mapper.CuMemberMapper; -import com.hzs.lenjoy.member.base.service.ICuMemberChangeLogService; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.system.config.IAccountServiceApi; -import com.hzs.system.config.IAreaCurrencyServiceApi; -import com.hzs.system.config.dto.AreaCurrencyDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; - - -/** - * 会员 服务实现类 - * - * @author hzs - * @since 2022-08-04 - */ -@Slf4j -@Service -public class CuMemberServiceImpl extends ServiceImpl implements ICuMemberService { - - @Autowired - private ICuMemberAccountService iCuMemberAccountService; - @Autowired - private ICuMemberChangeLogService iCuMemberChangeLogService; - @Autowired - private ICuMemberTradeService iCuMemberTradeService; - @Autowired - private ICuMemberTradeDetailService iCuMemberTradeDetailService; - @Autowired - private ICuMemberTradeBonusService iCuMemberTradeBonusService; - - @Autowired - private RedisService redisService; - - @DubboReference - IAccountServiceApi iAccountServiceApi; - @DubboReference - IAreaCurrencyServiceApi iAreaCurrencyServiceApi; - - @Override - public CuMemberExt getMemberByCode(String memberCode) { - Assert.notEmpty(memberCode, "会员编号不能为空"); - return baseMapper.getMemberByUnique(memberCode, null); - } - - @Override - public CuMemberExt getMemberById(Long pkMember) { - Assert.notNull(pkMember, "会员ID不能为空"); - return baseMapper.getMemberByUnique(null, pkMember); - } - - @Override - public CuMemberExt getMemberByPhone(String phone) { - Assert.notNull(phone, "手机号码不能为空"); - return baseMapper.getMemberByPhone(phone); - } - - @Override - public List listMemberByPhone(String phone) { - Assert.notNull(phone, "手机号码不能为空"); - return baseMapper.listMemberByPhone(phone); - } - - @Override - public CuMember getBloodTopMember(Long memberId, Long topId) { - return baseMapper.getBloodTopMember(memberId, topId); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public CuMember registerMember(RegisterParam param, CuMemberExt parentMember, Integer source) { - // 当前时间 - Date nowDate = new Date(); - - // 生成会员编号 - String memberCode = createMemberCode(SysConstants.HAI_GOU_PREFIX); - - // 封装入库，添加新会员 - CuMember cuMember = CuMember.builder() - .memberCode(memberCode) - .memberName(param.getPhone()) - .phone(param.getPhone()) - .customerType(ECustomerType.NORMAL.getValue()) - .pkParent(parentMember.getPkId()) - .source(source) - .pkRegisterGrade(1) - .pkSettleGrade(1) - .pkAwards(1) - .payTime(nowDate) - .payStatus(EPayStatus.PAID.getValue()) - .loginPwd(SecurityUtils.encryptPassword(param.getLoginPassword())) - .loginPassword(param.getLoginPassword()) - // 没有支付密码，需要在使用中新设置 - .payPwd("") - .payPassword("") - .pkVertex(parentMember.getPkVertex()) - .pkSettleCountry(CountryConstants.CHINA_COUNTRY) - // 有效期先默认处理为240个月 - .expireDate(DateUtils.addMonths(nowDate, 240)) - .stopDate(DateUtils.addMonths(nowDate, 246)) - .systemType(ESystemType.LENJOY.getValue()) - .build(); - cuMember.setPkCountry(CountryConstants.CHINA_COUNTRY); - cuMember.setPkCreator(parentMember.getPkId()); - cuMember.setCreationTime(nowDate); - - // 保存会员主表 - if (this.save(cuMember)) { - // 保存会员账户表 - CuMemberAccount cuMemberAccount = CuMemberAccount.builder() - .pkMember(cuMember.getPkId()) - .build(); - cuMemberAccount.setPkCreator(cuMember.getPkId()); - cuMemberAccount.setPkCountry(CountryConstants.CHINA_COUNTRY); - iCuMemberAccountService.save(cuMemberAccount); - return cuMember; - } - - return null; - } - - /** - * 生成会员编号 - * - * @param prefix 会员编号前缀 - * @return - */ - public String createMemberCode(String prefix) { - if (null == prefix) { - prefix = SysConstants.HAI_GOU_PREFIX; - } - // 会员编号 - String memberCode = this.createCode(prefix); - - // 校验会员编号是否存在 - if (this.count(Wrappers.lambdaQuery() - .eq(CuMember::getMemberCode, memberCode) - ) > 0) { - return this.createMemberCode(prefix); - } - - return memberCode; - } - - /** - * 生成编号 - * - * @param prefix 编号前端 - * @return - */ - private String createCode(String prefix) { - String memberCode = prefix + String.format("%08d", RandomUtil.randomInt(999999, 99999999)); - - if (memberCode.contains("4") || memberCode.contains("0")) { - // 编号中不能出现 4 和 0 - return createCode(prefix); - } - return memberCode; - } - - @Override - public List queryBloodKinshipOnUmbrella(Long memberId) { - return baseMapper.selectBloodKinshipOnUmbrella(memberId); - } - - @Override - public List queryBloodKinshipUnderUmbrella(Long memberId) { - return baseMapper.selectBloodKinshipUnderUmbrella(memberId); - } - - @Override - public boolean checkPhoneExist(String phone) { - return this.count(Wrappers.lambdaQuery() - .eq(CuMember::getPhone, phone) - .eq(CuMember::getSystemType, ESystemType.LENJOY.getValue()) - ) > 0; - } - - @Override - public boolean checkMemberCodeExist(String memberCode) { - return this.count(Wrappers.lambdaQuery() - .eq(CuMember::getMemberCode, memberCode) - .eq(CuMember::getSystemType, ESystemType.LENJOY.getValue()) - ) > 0; - } - - @Override - public void resetPassword(List pkMemberList, String loginPassword, String payPassword) { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(CuMember::getPkId, pkMemberList); - if (StringUtils.isNotEmpty(loginPassword)) { - updateWrapper.set(CuMember::getLoginPwd, SecurityUtils.encryptPassword(loginPassword)); - updateWrapper.set(CuMember::getLoginPassword, loginPassword); - } - if (StringUtils.isNotEmpty(payPassword)) { - updateWrapper.set(CuMember::getPayPwd, SecurityUtils.encryptPassword(payPassword)); - updateWrapper.set(CuMember::getPayPassword, payPassword); - } - updateWrapper.set(CuMember::getPkModified, pkMemberList.get(0)); - updateWrapper.set(CuMember::getModifiedTime, new Date()); - - this.update(updateWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void initPassword(Long pkMember, String payPassword) { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(CuMember::getPkId, pkMember); - updateWrapper.set(CuMember::getPayPwd, SecurityUtils.encryptPassword(payPassword)); - updateWrapper.set(CuMember::getPayPassword, payPassword); - updateWrapper.set(CuMember::getPkModified, pkMember); - updateWrapper.set(CuMember::getModifiedTime, new Date()); - this.update(updateWrapper); - - // 添加修改日志 - iCuMemberChangeLogService.save(CuMemberChangeLog.builder() - .pkMember(pkMember) - .changeType(EMemberChangeType.LOGIN_PWD.getValue()) - .changeAfter(payPassword) - .build()); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void memberOnlinePay(CuMember cuMember, SaOrderExt saOrder) { - // 查询会员账户 - CuMemberAccount cuMemberAccount = iCuMemberAccountService.getOne(Wrappers.lambdaQuery() - .eq(CuMemberAccount::getPkMember, cuMember.getPkId()) - ); - // 查询消费币 - BdAccount bdAccount = iAccountServiceApi.getBdAccountByFieldValue(saOrder.getPkCountry(), EAccount.CONSUME.getValue()).getData(); - - // 变动金额（订单金额 + 邮费） - BigDecimal tradeAmount = ComputeUtil.computeAdd(saOrder.getOrderAmount(), saOrder.getPostage()); - // 交易流水 - List tradeList = new ArrayList<>(); - // 生成充值流水 - tradeList.add(this.packageMemberTrade(saOrder, bdAccount.getPkId(), - ETradeClassify.RECHARGE, cuMemberAccount.getAccount1(), tradeAmount, "在线充值")); - // 生成消费流水 - tradeList.add(this.packageMemberTrade(saOrder, bdAccount.getPkId(), - ETradeClassify.CONSUME, cuMemberAccount.getAccount1().add(tradeAmount), tradeAmount.negate(), null)); - // 保存会员流水 - iCuMemberTradeService.saveBatch(tradeList); - - // 处理特殊商品生成注册会员 - this.productRegister(saOrder.getOrderItemsExtList(), cuMember.getPkId(), cuMember.getMemberCode()); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void memberWalletPay(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt) { - CuMemberAccount updateMemberAccount = new CuMemberAccount(); - // 生成流水明细 - List cuMemberTradeList = getCuMemberTrade(saOrder, cuMemberAccountExt, updateMemberAccount); - // 更新余额，插入流水 - updateMemberAccount(cuMemberTradeList, updateMemberAccount); - - // 处理特殊商品生成注册会员 - this.productRegister(saOrder.getOrderItemsExtList(), cuMemberAccountExt.getPkMember(), cuMemberAccountExt.getMemberCode()); - } - - /** - * 更新账户余额，插入支付流水 - * - * @param cuMemberTradeList 会员支付流水 - * @param cuMemberAccount 会员账户 - */ - private void updateMemberAccount(List cuMemberTradeList, CuMemberAccount cuMemberAccount) { - if (CollectionUtil.isNotEmpty(cuMemberTradeList)) { - iCuMemberTradeService.saveBatch(cuMemberTradeList); - } - if (!iCuMemberAccountService.updateMemberAccount(cuMemberAccount, cuMemberAccount.getPkMember())) { - throw new ServiceException("用户付款失败，请重试！"); - } - } - - /** - * 获取会员交易流水 - * - * @param saOrder - * @param cuMemberAccount - * @param updateMemberAccount - * @return - */ - private List getCuMemberTrade(SaOrder saOrder, CuMemberAccountExt cuMemberAccount, CuMemberAccount updateMemberAccount) { - List cuMemberTradeList = new ArrayList<>(); - // 获取专区币种，从redis中获得 - List currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(cuMemberAccount.getPkCountry()).getData(); - updateMemberAccount.setPkMember(cuMemberAccount.getPkMember()); - updateMemberAccount.setPkCountry(cuMemberAccount.getPkCountry()); - Set currencyType = new HashSet<>(); - currencyDTOList.forEach(currencyDto -> { - // 交易值,交易值是否已经取返 - BigDecimal tradeMoney = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.PAY_ACCOUNT + currencyDto.getFieldValue()); - // 比较交易值是否大于0 - if (tradeMoney == null || currencyType.contains(currencyDto.getPkAccount())) { - return; - } - if (!ComputeUtil.compareValue(tradeMoney)) { - return; - } - currencyType.add(currencyDto.getPkAccount()); - if (ComputeUtil.compareValue(tradeMoney)) { - // 处理奖金币 - handleBonusConsume(saOrder, cuMemberAccount, updateMemberAccount, currencyDto, tradeMoney); - tradeMoney = tradeMoney.negate(); - BigDecimal originalMoney = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.ACCOUNT + currencyDto.getFieldValue()); - cuMemberTradeList.add(packageMemberTrade(saOrder, currencyDto.getPkAccount(), ETradeClassify.CONSUME, originalMoney, tradeMoney, null)); - // 用于更新账户余额 - ReflectUtils.invokeSetter(updateMemberAccount, MemberFieldConstants.ACCOUNT + currencyDto.getFieldValue(), tradeMoney); - } - }); - return cuMemberTradeList; - } - - /** - * 处理奖金消费 - * - * @param saOrder - * @param cuMemberAccount - * @param updateMemberAccount - * @param currencyDto - * @param tradeMoney - */ - private void handleBonusConsume(SaOrder saOrder, CuMemberAccountExt cuMemberAccount, CuMemberAccount updateMemberAccount, AreaCurrencyDTO currencyDto, BigDecimal tradeMoney) { - // 验证是否是奖金币，奖金币需要记录交易明细，实现先进先出 - if (EAccount.BONUS.getValue() == currencyDto.getFieldValue()) { - BigDecimal bonusTradeMoney = tradeMoney; - // 先扣除可提现金额 - // 会员奖金消费明细，记录订单消费的奖金记录 - List cuMemberTradeBonusList = new ArrayList<>(); - if (ComputeUtil.compareValue(cuMemberAccount.getWithdrawAccount4())) { - CuMemberTradeBonus cuMemberTradeBonus = getCuMemberTradeBonus(saOrder, cuMemberAccount); - if (ComputeUtil.compareValue(bonusTradeMoney, cuMemberAccount.getWithdrawAccount4())) { - bonusTradeMoney = ComputeUtil.computeSubtract(bonusTradeMoney, cuMemberAccount.getWithdrawAccount4()); - updateMemberAccount.setWithdrawAccount4(cuMemberAccount.getWithdrawAccount4().negate()); - cuMemberTradeBonus.setCashMoney(cuMemberAccount.getWithdrawAccount4().negate()); - } else { - updateMemberAccount.setWithdrawAccount4(bonusTradeMoney.negate()); - cuMemberTradeBonus.setCashMoney(bonusTradeMoney.negate()); - bonusTradeMoney = BigDecimal.ZERO; - } - cuMemberTradeBonusList.add(cuMemberTradeBonus); - } - // 查询会员的发放明细 - List cuMemberTradeDetailList = iCuMemberTradeDetailService.queryCuMemberTradeDetail(cuMemberAccount.getPkMember()); - if (cuMemberTradeDetailList.size() > 0 && ComputeUtil.compareValue(bonusTradeMoney)) { - // 会员发放交易明细 - List updMemberTradeDetailList = new ArrayList<>(); - BigDecimal consumeMoney = BigDecimal.ZERO; - for (CuMemberTradeDetail cuMemberTradeDetail : cuMemberTradeDetailList) { - BigDecimal bonusValue = cuMemberTradeDetail.getConsumeMoney(); - BigDecimal subTradeMoney; - // 待消费金额 > 奖金金额 - if (ComputeUtil.compareValue(bonusTradeMoney, bonusValue)) { - bonusTradeMoney = ComputeUtil.computeSubtract(bonusTradeMoney, bonusValue); - subTradeMoney = bonusValue; - } else { - subTradeMoney = bonusTradeMoney; - bonusTradeMoney = BigDecimal.ZERO; - } - CuMemberTradeBonus cuMemberTradeBonus = getCuMemberTradeBonus(saOrder, cuMemberAccount); - cuMemberTradeBonus.setPkTradeDetail(cuMemberTradeDetail.getPkId()); - cuMemberTradeDetail.setConsumeMoney(ComputeUtil.computeSubtract(cuMemberTradeDetail.getConsumeMoney(), subTradeMoney)); - cuMemberTradeBonus.setConsumeMoney(subTradeMoney.negate()); - consumeMoney = ComputeUtil.computeAdd(consumeMoney, subTradeMoney); - cuMemberTradeDetail.setPkModified(saOrder.getPkCreator()); - cuMemberTradeDetail.setModifiedTime(saOrder.getPayTime()); - updMemberTradeDetailList.add(cuMemberTradeDetail); - cuMemberTradeBonusList.add(cuMemberTradeBonus); - if (!ComputeUtil.compareValue(bonusTradeMoney)) { - break; - } - } - // 更新cu_member_account 可提现金额，可消费金额 - if (ComputeUtil.compareValue(consumeMoney)) { - updateMemberAccount.setConsumeAccount4(consumeMoney.negate()); - } - // 更新会员发放交易流水表 - iCuMemberTradeDetailService.updateCuMemberTradeDetail(updMemberTradeDetailList); - } - if (cuMemberTradeBonusList.size() > 0) { - // 新增会员奖金交易流水表 - iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(cuMemberTradeBonusList); - } - } - } - - /** - * 获取会员已发放奖金交易明细 - * - * @param saOrder - * @param cuMemberAccount - * @return - */ - private CuMemberTradeBonus getCuMemberTradeBonus(SaOrder saOrder, CuMemberAccountExt cuMemberAccount) { - CuMemberTradeBonus cuMemberTradeBonus = CuMemberTradeBonus.builder() - .pkMember(cuMemberAccount.getPkMember()) - .consumeType(EConsumeType.ORDER.getValue()) - .pkOrder(saOrder.getPkId()) - .consumeMoney(BigDecimal.ZERO) - .cashMoney(BigDecimal.ZERO) - .build(); - cuMemberTradeBonus.setPkCountry(cuMemberAccount.getPkCountry()); - cuMemberTradeBonus.setPkCreator(saOrder.getPkCreator()); - return cuMemberTradeBonus; - } - - /** - * 创建交易流水明细 - * - * @param saOrder - * @param pkAccount - * @param eTradeClassify - * @param tradeBeforeBalance - * @param tradeMoney - * @return - */ - private CuMemberTrade packageMemberTrade(SaOrder saOrder, Integer pkAccount, ETradeClassify eTradeClassify, - BigDecimal tradeBeforeBalance, BigDecimal tradeMoney, String remark) { - CuMemberTrade cuMemberTrade = CuMemberTrade.builder() - .pkMember(saOrder.getPkCreator()) - .tradeCode(this.createTradeCode(EOrderPrefix.TRADE_CODE.getValue())) - .pkAccount(pkAccount) - .tradeClassify(eTradeClassify.getValue()) - .pkRate(saOrder.getPkRate()) - .tradeBeforeBalance(tradeBeforeBalance) - .tradeAmount(tradeMoney) - .tradeBalance(tradeBeforeBalance.add(tradeMoney)) - .sourceCode(saOrder.getOrderCode()) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .build(); - for (ETradeType tradeType : ETradeType.values()) { - if (saOrder.getOrderType() == tradeType.getOrderType()) { - cuMemberTrade.setRemarks(tradeType.getKey()); - cuMemberTrade.setTradeType(tradeType.getValue()); - break; - } - } - cuMemberTrade.setPkCountry(saOrder.getPkCountry()); - cuMemberTrade.setPkCreator(saOrder.getPkCreator()); - cuMemberTrade.setCreationTime(saOrder.getPayTime()); - if (StringUtils.isNotEmpty(remark)) { - cuMemberTrade.setRemarks(remark); - } - return cuMemberTrade; - } - - /** - * 生成流水号 - * - * @param prefix 前缀 - * @return - */ - @Override - public String createTradeCode(String prefix) { - for (int i = 0; i < MagicNumberConstants.RETRY_COUNT; i++) { - String code = CommonUtil.createSerialNumber(prefix); - if (redisService.lockKeyOnce(code)) { - return code; - } - } - throw new RuntimeException(TransactionUtils.getContent(MemberMsgConstants.MEMBER_IS_OPERATION)); - } - - /** - * 购买特殊商品注册会员信息 - * - * @param orderItemsExtList 订单明细列表 - * @param pkMember 会员ID - * @param memberCode 会员编号 - */ - private void productRegister(List orderItemsExtList, Long pkMember, String memberCode) { - if (CollectionUtil.isNotEmpty(orderItemsExtList)) { - // 如果有指定商品则会员下生成11个新会员账号 - Map lenjoyWaresMap = new HashMap<>(); - for (SaOrderItemsExt saOrderItemsExt : orderItemsExtList) { - if (LenjoyProductConstants.LENJOY_REGISTER_WARES.contains(saOrderItemsExt.getWaresCode())) { - lenjoyWaresMap.put(saOrderItemsExt.getWaresCode(), saOrderItemsExt.getWaresQuantity()); - } - } - if (lenjoyWaresMap.size() > 0) { - // 购买了指定的商品 - int waresSum = 0; - for (String key : lenjoyWaresMap.keySet()) { - waresSum += lenjoyWaresMap.get(key); - } - - // 购买一个给11个子账户 - int registerCount = waresSum * LenjoySysConstants.PRODUCT_REGISTER_COUNT; - // 新注册会员列表 - List saveMemberList = new ArrayList<>(registerCount); - // 新注册会员账户列表 - List saveMemberAccountList = new ArrayList<>(registerCount); - - // 查询当前用户以及下属特殊注册用户信息 - CuMemberExt cuMemberExt = baseMapper.getMemberAndLastMemberCode(pkMember, memberCode); - // 会员ID列表 - List seqList = baseMapper.querySeqList(registerCount); - // 会员账户ID列表 - List seqAccountList = iCuMemberAccountService.querySeqList(registerCount); - // 当前时间 - Date nowDate = new Date(); - - // 最新的编号 - String lastMemberCode = cuMemberExt.getLastMemberCode(); - - for (int i = 0; i < registerCount; i++) { - if (StringUtils.isNotEmpty(lastMemberCode)) { - lastMemberCode = memberCode + String.format("%02d", (Integer.parseInt(lastMemberCode.replaceAll(memberCode, "")) + 1)); - } else { - lastMemberCode = memberCode + "01"; - } - - // 封装会员信息 - saveMemberList.add(this.packageMember(seqList.get(i), lastMemberCode, cuMemberExt.getPhone(), cuMemberExt.getPkId(), - cuMemberExt.getLoginPassword(), cuMemberExt.getPkVertex(), cuMemberExt.getSource(), nowDate)); - - // 封装会员账户信息 - CuMemberAccount cuMemberAccount = CuMemberAccount.builder() - .pkId(seqAccountList.get(i)) - .pkMember(seqList.get(i)) - .build(); - cuMemberAccount.setPkCreator(cuMemberExt.getPkId()); - cuMemberAccount.setCreationTime(nowDate); - cuMemberAccount.setPkCountry(CountryConstants.CHINA_COUNTRY); - saveMemberAccountList.add(cuMemberAccount); - } - - baseMapper.insertBatchCuMember(saveMemberList); - iCuMemberAccountService.saveBatch(saveMemberAccountList); - } - } - } - - /** - * 封装会员信息 - * - * @param pkId 会员ID - * @param memberCode 会员编号 - * @param phone 手机号码 - * @param pkParent 推荐人ID - * @param loginPassword 登录密码 - * @param pkVertex 体系ID - * @param source 来源 - * @param nowDate 当前时间 - * @return - */ - private CuMember packageMember(Long pkId, String memberCode, String phone, - Long pkParent, String loginPassword, Long pkVertex, - Integer source, Date nowDate) { - // 封装入库，添加新会员 - CuMember cuMember = CuMember.builder() - .pkId(pkId) - .memberCode(memberCode) - .memberName(memberCode) - .phone(phone) - .customerType(ECustomerType.NORMAL.getValue()) - .pkParent(pkParent) - .source(source) - .pkRegisterGrade(1) - .pkSettleGrade(1) - .pkAwards(1) - .payTime(nowDate) - .payStatus(EPayStatus.PAID.getValue()) - .loginPwd(SecurityUtils.encryptPassword(loginPassword)) - .loginPassword(loginPassword) - // 没有支付密码，需要在使用中新设置 - .payPwd("") - .payPassword("") - .pkVertex(pkVertex) - .pkSettleCountry(CountryConstants.CHINA_COUNTRY) - // 有效期先默认处理为240个月 - .expireDate(DateUtils.addMonths(nowDate, 240)) - .stopDate(DateUtils.addMonths(nowDate, 246)) - .systemType(ESystemType.LENJOY.getValue()) - .build(); - cuMember.setPkCountry(CountryConstants.CHINA_COUNTRY); - cuMember.setPkCreator(pkParent); - cuMember.setCreationTime(nowDate); - return cuMember; - } - - @Override - public List listParent(ParentListParam param) { - return baseMapper.listParent(param); - } - - @Override - public int effectiveParentCount(Long pkParent) { - // 当前时间 - Date nowDate = new Date(); - // 开始开始时间（今天开始时间） - Date startDate = DateUtils.getStartTime(nowDate); - // 开始结束时间（今天结束时间） - Date endDate = DateUtils.getEndTime(nowDate); - try { - // 获取期数 - Integer periodId = baseMapper.getCurrentPeriod(); - if (null != periodId) { - return baseMapper.effectiveParentCount(TableNameConstants.CU_MEMBER_RANGE + periodId, pkParent, startDate, endDate); - } - } catch (Exception e) { - log.error("查询有效推荐数量异常, pkParent: {}", pkParent, e); - } - - // 本月开始时间 - startDate = DateUtils.getFirstDayOfMonth(nowDate); - // 开月结束时间 - endDate = DateUtils.getLastDayOfMonth(nowDate); - // 查询有效推荐人数（全走订单） - return baseMapper.effectiveOrderParentCount(pkParent, startDate, endDate); - } - - @Override - public Integer getCurrentPeriod() { - return baseMapper.getCurrentPeriod(); - } - - @Override - public Integer countFireBurn(Long pkMember, Integer period) { - return baseMapper.countFireBurn(pkMember, period); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuRangeStoreServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuRangeStoreServiceImpl.java deleted file mode 100644 index e1dfe69a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/CuRangeStoreServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.member.base.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.member.base.CuRangeStore; -import com.hzs.common.domain.member.base.ext.CuRangeStoreExt; -import com.hzs.lenjoy.member.base.mapper.CuRangeStoreMapper; -import com.hzs.lenjoy.member.base.param.RangeStoreParam; -import com.hzs.lenjoy.member.base.service.ICuRangeStoreService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 会员乐享店铺 服务实现类 - * - * @author hzs - * @since 2024-10-25 - */ -@Service -public class CuRangeStoreServiceImpl extends ServiceImpl implements ICuRangeStoreService { - - @Override - public List listRangeStore(RangeStoreParam param) { - return baseMapper.listRangeStore(param); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/MemberInfoServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/MemberInfoServiceImpl.java deleted file mode 100644 index 781def56..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/service/impl/MemberInfoServiceImpl.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.hzs.lenjoy.member.base.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.LenjoySysConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.detail.CuMemberChangeLog; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.lenjoy.member.base.service.ICuMemberChangeLogService; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.base.service.IMemberInfoService; -import com.hzs.lenjoy.member.base.vo.MemberInfoVO; -import com.hzs.system.common.ICommonServiceApi; -import com.hzs.system.common.dto.MemberDataDTO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * @Description: 会员信息服务 - * @Author: jiang chao - * @Time: 2024/10/17 15:05 - * @Classname: MemberInfoServiceImpl - * @PackageName: com.hzs.lenjoy.member.base.service.impl - */ -@Service -public class MemberInfoServiceImpl implements IMemberInfoService { - - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private ICuMemberChangeLogService iCuMemberChangeLogService; - @Autowired - private RedisTemplate redisTemplate; - - @DubboReference - ICommonServiceApi iCommonServiceApi; - - @Override - public MemberInfoVO getMemberInfo(Long pkMember) { - if (null == pkMember) { - return null; - } - - CuMemberExt cuMember = iCuMemberService.getMemberById(pkMember); - if (null != cuMember) { - // 调用system服务，获取国家、币种、等级、奖衔等数据 - MemberDataDTO memberDataDTO = iCommonServiceApi.getMemberData(MemberDataDTO.builder() - .pkCountry(cuMember.getPkCountry()) - .pkSettleCountry(cuMember.getPkSettleCountry()) - .pkAwards(cuMember.getPkAwards()) - .build()) - .getData(); - - // 系统皮肤 - Integer skin = ESkin.DEFAULT.getValue(); - // 系统皮肤缓存（global:skin） - Object skinObj = redisTemplate.opsForValue().get(CacheConstants.SKIN_KEY); - if (null != skinObj) { - skin = Integer.parseInt(skinObj.toString()); - } - - // 账号控制 - String control = null; - if (LenjoySysConstants.CONTROL_MEMBER_LIST.contains(cuMember.getMemberCode())) { - control = "1"; - } - - // 封装返回信息 - return MemberInfoVO.builder() - .memberCode(cuMember.getMemberCode()) - .memberName(cuMember.getMemberName()) - .registerTime(cuMember.getPayTime()) - .pkCountry(cuMember.getPkCountry()) - .pkCountryVal(memberDataDTO.getPkCountryVal()) - .countryCircularIcon(memberDataDTO.getCountryCircularIcon()) - .countrySquareIcon(memberDataDTO.getCountrySquareIcon()) - .pkSettleCountry(cuMember.getPkSettleCountry()) - .pkSettleCountryVal(memberDataDTO.getPkSettleCountryVal()) - .settleCountryCircularIcon(memberDataDTO.getSettleCountryCircularIcon()) - .settleCountrySquareIcon(memberDataDTO.getSettleCountrySquareIcon()) - .settleCountryLightName(memberDataDTO.getSettleCountryLightName()) - .settleCountryImg(memberDataDTO.getSettleCountryImg()) - .pkAwardsId(cuMember.getPkAwards()) - .pkAwards(memberDataDTO.getPkAwards()) - .awardsIcon(memberDataDTO.getAwardsIcon()) - .currencyIcon(memberDataDTO.getCurrencyIcon()) - .headPath(cuMember.getHeadPath()) - .skin(skin) - .control(control) - .build(); - } - return null; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateMemberInfo(CuMember cuMember, List cuMemberChangeLogList) { - // 插入会员修改记录 - if (CollectionUtil.isNotEmpty(cuMemberChangeLogList)) { - iCuMemberChangeLogService.saveBatch(cuMemberChangeLogList); - } - - // 更新会员信息 - if (null != cuMember) { - iCuMemberService.updateById(cuMember); - } - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/GetMemberVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/GetMemberVO.java deleted file mode 100644 index efbadc6e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/GetMemberVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.member.base.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 查询会员返回VO - * @Author: jiang chao - * @Time: 2024/10/29 14:08 - * @Classname: GetMemberVO - * @PackageName: com.hzs.lenjoy.member.base.vo - */ -@Data -public class GetMemberVO implements Serializable { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/MemberInfoVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/MemberInfoVO.java deleted file mode 100644 index c5e912c6..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/MemberInfoVO.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.hzs.lenjoy.member.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 会员信息VO - * @Author: jiang chao - * @Time: 2024/10/17 15:03 - * @Classname: MemberInfoVO - * @PackageName: com.hzs.lenjoy.member.base.vo - */ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class MemberInfoVO implements Serializable { - - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员名称 - */ - private String memberName; - - /** - * 注册时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date registerTime; - - /** - * 自然国ID - */ - private Integer pkCountry; - /** - * 自然国 - */ - private String pkCountryVal; - /** - * 自然国家圆形国旗 - */ - private String countryCircularIcon; - /** - * 自然国家方形图旗 - */ - private String countrySquareIcon; - - /** - * 结算国ID - */ - private Integer pkSettleCountry; - /** - * 结算国 - */ - private String pkSettleCountryVal; - /** - * 结算国家圆形国旗 - */ - private String settleCountryCircularIcon; - /** - * 结算国家方形国旗 - */ - private String settleCountrySquareIcon; - /** - * 结算国家点亮名称 - */ - private String settleCountryLightName; - /* - * 结算国家地图 - */ - private String settleCountryImg; - - /** - * 奖衔ID - */ - private Integer pkAwardsId; - /** - * 奖衔翻译ID - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - /** - * 奖衔名称 - */ - private String pkAwardsVal; - /** - * 奖衔图标 - */ - private String awardsIcon; - - /** - * 币种图标 - */ - private String currencyIcon; - - /** - * 会员头像 - */ - private String headPath; - - /** - * 皮肤标记（ESkin） - */ - private Integer skin; - - /** - * 显示控制账号 - */ - private String control; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/ParentListVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/ParentListVO.java deleted file mode 100644 index 27bf34ae..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/ParentListVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.lenjoy.member.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 推荐列表返回VO - * @Author: jiang chao - * @Time: 2024/10/28 11:16 - * @Classname: ParentListVO - * @PackageName: com.hzs.lenjoy.member.base.vo - */ -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Data -public class ParentListVO implements Serializable { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 注册时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - /** - * 会员奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - private String pkAwardsVal; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/RangeStoreVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/RangeStoreVO.java deleted file mode 100644 index 0eebfa49..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/RangeStoreVO.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hzs.lenjoy.member.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 会员乐享店铺返回VO - * @Author: jiang chao - * @Time: 2024/10/29 10:19 - * @Classname: RangeStoreVO - * @PackageName: com.hzs.lenjoy.member.base.vo - */ -@Data -public class RangeStoreVO implements Serializable { - - /** - * 主键ID - */ - private Integer pkId; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 真实奖衔 - */ - @Excel(name = "真实奖衔") - private String awardsName; - - /** - * 状态（2=有效，1=无效） - */ - @Excel(name = "店铺状态", readConverterExp = "2=有效,1=无效") - private Integer status; - - /** - * 有效时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "有效时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - /** - * 失效时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "失效时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date failureDate; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/RegisterVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/RegisterVO.java deleted file mode 100644 index 5bb8820b..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/base/vo/RegisterVO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.lenjoy.member.base.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: 注册返回VO - * @Author: jiang chao - * @Time: 2024/10/16 15:15 - * @Classname: RegisterVO - * @PackageName: com.hzs.lenjoy.member.base.vo - */ -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Data -public class RegisterVO implements Serializable { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 手机 - */ - private String phone; - - /** - * 登录网址 - */ - private String urlAddress; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/index/api/ApiMemberIndexController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/index/api/ApiMemberIndexController.java deleted file mode 100644 index 8a0ff521..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/index/api/ApiMemberIndexController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.lenjoy.member.index.api; - -import com.hzs.common.core.constant.HttpStatus; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Description: 会员首页控制器 - * @Author: jiang chao - * @Time: 2024/10/31 17:19 - * @Classname: MemberIndexController - * @PackageName: com.hzs.lenjoy.member.index.api - */ -@Slf4j -@RequestMapping("/api/index") -@RestController -public class ApiMemberIndexController { - - @Autowired - private ICuMemberService iCuMemberService; - - /** - * 校验烧伤，ev是否足够 - * - * @return - */ - @GetMapping("/ev-check") - public AjaxResult evCheck() { - Integer period = iCuMemberService.getCurrentPeriod(); - if (period != null) { - if (iCuMemberService.countFireBurn(SecurityUtils.getUserId(), iCuMemberService.getCurrentPeriod()) > 0) { - return new AjaxResult(HttpStatus.NOT_MEETING_EXPECTATIONS, "EV丢失，请尽快购买"); - } - } - return AjaxResult.success(); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/controller/api/ApiLenjoyMemberTokenController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/controller/api/ApiLenjoyMemberTokenController.java deleted file mode 100644 index 54ebe381..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/controller/api/ApiLenjoyMemberTokenController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hzs.lenjoy.member.login.controller.api; - -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.security.auth.AuthMemberUtil; -import com.hzs.common.security.service.MemberTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.login.param.LoginParam; -import com.hzs.lenjoy.member.login.param.SmsLoginParam; -import com.hzs.lenjoy.member.login.service.ILenjoyMemberLoginService; -import com.hzs.member.base.dto.LoginMember; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -/** - * 会员端 token 控制 - * - * @author hzs - */ -@RequestMapping("/api/auth") -@RestController -public class ApiLenjoyMemberTokenController { - - @Autowired - private MemberTokenService memberTokenService; - @Autowired - private ILenjoyMemberLoginService iLenjoyMemberLoginService; - - /** - * 会员登录 - * - * @param param - * @return - */ - @PostMapping("/login") - public AjaxResult login(@Valid @RequestBody LoginParam param) { - // 用户登录 - LoginMember loginMember = iLenjoyMemberLoginService.login(param.getUsername(), param.getPassword()); - - // 获取登录token - return AjaxResult.success(memberTokenService.createToken(loginMember)); - } - - /** - * 短信登录 - * - * @param param - * @return - */ - @PostMapping("/sms-login") - public AjaxResult smsLogin(@Valid @RequestBody SmsLoginParam param) { - // 用户登录 - LoginMember loginMember = iLenjoyMemberLoginService.smsLogin(param.getPhone(), param.getSmsCode()); - - // 获取登录token - return AjaxResult.success(memberTokenService.createToken(loginMember)); - } - - /** - * 会员登出 - * - * @param request - * @return - */ - @DeleteMapping("/logout") - public AjaxResult logout(HttpServletRequest request) { - String token = SecurityUtils.getToken(request); - if (StringUtils.isNotEmpty(token)) { - // 删除用户缓存记录 - AuthMemberUtil.logoutByToken(token); - } - return AjaxResult.success(); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/mapper/CuLenjoyMemberLoginMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/mapper/CuLenjoyMemberLoginMapper.java deleted file mode 100644 index dcfebc03..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/mapper/CuLenjoyMemberLoginMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.lenjoy.member.login.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.detail.CuLenjoyMemberLogin; - -/** - * 会员登录记录 Mapper 接口 - * - * @author hzs - * @since 2022-08-12 - */ -public interface CuLenjoyMemberLoginMapper extends BaseMapper { - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/mapper/xml/CuLenjoyMemberLoginMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/mapper/xml/CuLenjoyMemberLoginMapper.xml deleted file mode 100644 index 67b252bb..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/mapper/xml/CuLenjoyMemberLoginMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/param/LoginParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/param/LoginParam.java deleted file mode 100644 index 904b4d76..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/param/LoginParam.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.lenjoy.member.login.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * @Description: 密码登录入参 - * @Author: jiang chao - * @Time: 2024/11/6 15:39 - * @Classname: LoginParam - * @PackageName: com.hzs.lenjoy.member.login.param - */ -@Data -public class LoginParam implements Serializable { - - /** - * 会员编号/手机号码 - */ - @NotNull(message = "会员编号/手机号码不能为空") - @Size(message = "会员编号/手机号码不能超过{max}位", max = 20) - private String username; - - /** - * 登录密码 - */ - @NotNull(message = "登录密码不能为空") - @Size(message = "登录密码不能超过{max}位", max = 20) - private String password; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/param/SmsLoginParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/param/SmsLoginParam.java deleted file mode 100644 index 9949e11d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/param/SmsLoginParam.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.lenjoy.member.login.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * @Description: 短信登录入参 - * @Author: jiang chao - * @Time: 2024/11/6 15:39 - * @Classname: SmsLoginParam - * @PackageName: com.hzs.lenjoy.member.login.param - */ -@Data -public class SmsLoginParam implements Serializable { - - /** - * 手机号码 - */ - @NotNull(message = "手机号码不能为空") - @Size(message = "手机号码不能超过11位", max = 11) - private String phone; - - /** - * 短信验证码 - */ - @NotNull(message = "验证码不能为空") - @Size(message = "验证码不能超过10位", max = 10) - private String smsCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/ICuLenjoyMemberLoginService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/ICuLenjoyMemberLoginService.java deleted file mode 100644 index 3e001116..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/ICuLenjoyMemberLoginService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.lenjoy.member.login.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.detail.CuLenjoyMemberLogin; - -/** - * 会员登录记录 服务类 - * - * @author hzs - * @since 2022-08-12 - */ -public interface ICuLenjoyMemberLoginService extends IService { - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/ILenjoyMemberLoginService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/ILenjoyMemberLoginService.java deleted file mode 100644 index 09303798..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/ILenjoyMemberLoginService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.lenjoy.member.login.service; - -import com.hzs.member.base.dto.LoginMember; - -/** - * 会员登录/登出服务 - * - * @author hzs - */ -public interface ILenjoyMemberLoginService { - - /** - * 登录 - * - * @param memberCode 会员编号 - * @param password 密码 - * @return - */ - LoginMember login(String memberCode, String password); - - /** - * 短信登录 - * - * @param phone 手机号码 - * @param smsCode 短信验证码 - * @return - */ - LoginMember smsLogin(String phone, String smsCode); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/impl/CuLenjoyMemberLoginServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/impl/CuLenjoyMemberLoginServiceImpl.java deleted file mode 100644 index 34719c3a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/impl/CuLenjoyMemberLoginServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzs.lenjoy.member.login.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.member.detail.CuLenjoyMemberLogin; -import com.hzs.lenjoy.member.login.mapper.CuLenjoyMemberLoginMapper; -import com.hzs.lenjoy.member.login.service.ICuLenjoyMemberLoginService; -import org.springframework.stereotype.Service; - -/** - * 会员登录记录 服务实现类 - * - * @author hzs - * @since 2022-08-12 - */ -@Service -public class CuLenjoyMemberLoginServiceImpl extends ServiceImpl implements ICuLenjoyMemberLoginService { - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/impl/LenjoyMemberLoginServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/impl/LenjoyMemberLoginServiceImpl.java deleted file mode 100644 index 69207cfa..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/login/service/impl/LenjoyMemberLoginServiceImpl.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.hzs.lenjoy.member.login.service.impl; - -import com.hzs.common.core.constant.SysConstants; -import com.hzs.common.core.constant.msg.SystemMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.exception.ServiceException; -import com.hzs.common.core.utils.ServletUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.ip.IpUtils; -import com.hzs.common.domain.member.detail.CuLenjoyMemberLogin; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.lenjoy.member.login.service.ICuLenjoyMemberLoginService; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.login.service.ILenjoyMemberLoginService; -import com.hzs.lenjoy.member.sms.service.ISmsService; -import com.hzs.member.base.dto.LoginMember; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.servlet.http.HttpServletRequest; - -/** - * 登录/登出服务 - * - * @author hzs - */ -@Slf4j -@Component -public class LenjoyMemberLoginServiceImpl implements ILenjoyMemberLoginService { - - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private ISmsService iSmsService; - @Autowired - private ICuLenjoyMemberLoginService iCuLenjoyMemberLoginService; - - /** - * 登录 - * - * @param memberCode 会员编号 - * @param password 密码 - * @return - */ - @Override - public LoginMember login(String memberCode, String password) { - // 用户名或密码为空 错误 - if (StringUtils.isAnyBlank(memberCode, password)) { - throw new ServiceException("会员编号和登录密码不能为空"); - } - - // 查询用户信息 - CuMemberExt cuMember = null; - if (memberCode.startsWith(SysConstants.HAI_GOU_PREFIX)) { - // 登录名登录 - cuMember = iCuMemberService.getMemberByCode(memberCode); - } else if (memberCode.startsWith("1")) { - // 手机号登录 - cuMember = iCuMemberService.getMemberByPhone(memberCode); - } - - // 登录校验 - this.loginCheck(cuMember, memberCode); - - // 密码校验 - if (!SecurityUtils.matchesPassword(password, cuMember.getLoginPwd())) { - recordLoginLog(cuMember.getPkId(), EStatus.NO, "用户密码错误"); - // 用户不存在/密码错误 - throw new ServiceException("用户名或密码错误"); - } - // 记录登录日志 - recordLoginLog(cuMember.getPkId(), EStatus.YES, "登录成功"); - - return LoginMember.builder() - .pkId(cuMember.getPkId()) - .loginType(ELoginType.LENJOY_MEMBER.getValue()) - .cuMember(cuMember) - .build(); - } - - @Override - public LoginMember smsLogin(String phone, String smsCode) { - // 用户名或密码为空 错误 - if (StringUtils.isAnyBlank(phone, smsCode)) { - throw new ServiceException("手机号码和验证码不能为空"); - } - - // 校验短信验证码是否有效 - String checkSmsStr = iSmsService.checkLoginCode(phone, smsCode); - if (null != checkSmsStr) { - throw new ServiceException(checkSmsStr); - } - - // 查询用户信息 - CuMemberExt cuMember = iCuMemberService.getMemberByPhone(phone); - - // 登录校验 - this.loginCheck(cuMember, phone); - // 记录登录日志 - recordLoginLog(cuMember.getPkId(), EStatus.YES, "登录成功"); - - return LoginMember.builder() - .pkId(cuMember.getPkId()) - .loginType(ELoginType.LENJOY_MEMBER.getValue()) - .cuMember(cuMember) - .build(); - } - - /** - * 登录公用校验 - * - * @param cuMember 会员信息 - * @param loginStr 会员编号 或 手机号码 - */ - private void loginCheck(CuMemberExt cuMember, String loginStr) { - if (StringUtils.isNull(cuMember)) { - recordLoginLog(null, EStatus.NO, loginStr + " 登录用户不存在"); - // 登录用户: %s 不存在 - throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, loginStr)); - } - - // 2024.10.15 兼容新团队，不能在直销系统登录 - if (ESystemType.LENJOY.getValue() != cuMember.getSystemType()) { - // 不是乐享海购会员，不能登录 - recordLoginLog(null, EStatus.NO, loginStr + " 登录用户不存在，登录系统错误"); - // 登录用户: %s 不存在 - throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, loginStr)); - } - - // 非正常点位（死点、已注销），不能登录 - if (ECategory.NORMAL.getValue() != cuMember.getCategory()) { - recordLoginLog(cuMember.getPkId(), EStatus.NO, "非正常用户不能进行登录"); - // 登录用户: %s 不存在 - throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, loginStr)); - } - // 账户状态校验 - if (EAccountStatus.FROZEN.getValue() == cuMember.getAccountStatus() - || EAccountStatus.SHUT_DOWN.getValue() == cuMember.getAccountStatus()) { - recordLoginLog(cuMember.getPkId(), EStatus.NO, "用户已冻结或封停"); - // 温馨提示：输入信息有误！请稍后再试！ - throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.ACCCOUNT_STOP, loginStr)); - } - } - - /** - * 记录登录信息 - * - * @param pkMember 用户ID - * @param eStatus 登录状态（成功、失败） - * @param message 消息内容 - */ - private void recordLoginLog(Long pkMember, EStatus eStatus, String message) { - CuLenjoyMemberLogin cuLenjoyMemberLogin = new CuLenjoyMemberLogin(); - cuLenjoyMemberLogin.setPkMember(pkMember); - HttpServletRequest httpServletRequest = ServletUtils.getRequest(); - cuLenjoyMemberLogin.setLoginId(IpUtils.getIpAddr(httpServletRequest)); - cuLenjoyMemberLogin.setLoginDevice(ServletUtils.getHeader(httpServletRequest, "source")); - cuLenjoyMemberLogin.setStatus(eStatus.getValue()); - cuLenjoyMemberLogin.setMessage(message); - // 保存登录日志 - iCuLenjoyMemberLoginService.save(cuLenjoyMemberLogin); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/share/controller/api/ApiShareController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/share/controller/api/ApiShareController.java deleted file mode 100644 index 293f26d8..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/share/controller/api/ApiShareController.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.lenjoy.member.share.controller.api; - -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EShareType; -import com.hzs.common.core.utils.sign.Base64Util; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.third.share.IShareServiceApi; -import com.hzs.third.share.dto.ShareServiceDTO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; - -/** - * @Description: 会员分享控制器 - * @Author: jiang chao - * @Time: 2024/10/17 14:05 - * @Classname: ShareController - * @PackageName: com.hzs.lenjoy.member.share.controller.api - */ -@RequestMapping("/api/share") -@RestController -public class ApiShareController { - - @DubboReference - IShareServiceApi iShareServiceApi; - - /** - * 生成分享地址 - * - * @return - */ - @GetMapping("/url") - public AjaxResult url() { - Long pkMember = SecurityUtils.getUserId(); - - // 乐享海购生成链接 - R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() - .eShareType(EShareType.LENJOY) - .pkBusiness(pkMember) - .pkCountry(SecurityUtils.getPkCountry()) - .userId(pkMember) - .build()); - if (resultR.isSuccess()) { - Map resultMap = new HashMap<>(); - resultMap.put("dataUrl", resultR.getData()); - // 前端无法根据URL生成海报，此处需要转一下base64 - resultMap.put("dataStr", Base64Util.toUrlBase64(resultR.getData())); - return AjaxResult.success(resultMap); - } - return AjaxResult.error(); - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/controller/ApiSmsController.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/controller/ApiSmsController.java deleted file mode 100644 index 76667ef2..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/controller/ApiSmsController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hzs.lenjoy.member.sms.controller; - -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.sms.service.ISmsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Description: 短信发放控制器 - * @Author: jiang chao - * @Time: 2024/10/16 16:07 - * @Classname: SmsController - * @PackageName: com.hzs.lenjoy.member.base.controller.api - */ -@RequestMapping("/api/sms") -@RestController -public class ApiSmsController { - - @Autowired - private ISmsService iSmsService; - @Autowired - private ICuMemberService iCuMemberService; - - /** - * 登录验证码 - * - * @param phone 手机号码 - * @return - */ - @RepeatSubmitSimple - @GetMapping("/login-code") - public AjaxResult loginCode(@RequestParam String phone) { - // 校验手机号号是否已经存在 - if (!iCuMemberService.checkPhoneExist(phone)) { - return AjaxResult.error("手机号码不存在"); - } - - String str = iSmsService.sendLoginCode(phone); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - - /** - * 注册验证码 - * - * @param phone 手机号码 - * @return - */ - @RepeatSubmitSimple - @GetMapping("/register-code") - public AjaxResult registerCode(@RequestParam String phone) { - // 校验手机号号是否已经存在 - if (iCuMemberService.checkPhoneExist(phone)) { - return AjaxResult.error("手机号码已注册"); - } - - String str = iSmsService.sendRegisterCode(phone); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - - /** - * 找回密码验证码 - * - * @param phone 手机号码 - * @return - */ - @RepeatSubmitSimple - @GetMapping("/recover-code") - public AjaxResult recoverCode(@RequestParam String phone) { - // 校验手机号号是否已经存在 - if (!iCuMemberService.checkPhoneExist(phone)) { - return AjaxResult.error("手机号码不存在"); - } - - String str = iSmsService.sendRecoverCode(phone); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - - - /** - * 重置支付密码验证码 - * - * @return - */ - @RepeatSubmitSimple - @GetMapping("/reset-pay-code") - public AjaxResult resetPayCode() { - CuMemberExt cuMemberExt = iCuMemberService.getMemberById(SecurityUtils.getUserId()); - if (null == cuMemberExt) { - // 会员信息不存在 - return AjaxResult.error("会员信息不存在"); - } - - String str = iSmsService.resetPayPasswordCode(cuMemberExt.getPhone()); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/IApiSmsService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/IApiSmsService.java deleted file mode 100644 index 24ee415b..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/IApiSmsService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.lenjoy.member.sms.service; - -import com.hzs.common.core.enums.ESmsTemplate; - -/** - * @Description: 短信处理服务 - * @Author: jiang chao - * @Time: 2023/3/8 15:55 - * @Classname: ISmsService - * @PackageName: com.hzs.member.sms.service - */ -public interface IApiSmsService { - - /** - * 校验验证码 - * - * @param cacheKey 验证码缓存key - * @param code 验证码 - * @return 如果返回null为正确，其它为错误内容 - */ - String checkSms(String cacheKey, String code); - - /** - * 根据会员发送验证码 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param phone 手机号 - * @return boolean - */ - boolean verificationSms(Long pkMember, Integer pkCountry, String phone); - - /** - * 根据会员发送指定模板 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param phone 手机号 - * @param eSmsTemplate 短信模板 - * @return - */ - boolean verificationSms(Long pkMember, Integer pkCountry, String phone, ESmsTemplate eSmsTemplate); - - /** - * 根据手机号发送验证码 - * - * @param pkCountry 国家ID - * @param phone 手机号 - * @return - */ - boolean verificationSmsByPhone(Integer pkCountry, String phone); - - /** - * 根据手机号发送指定模板 - * - * @param pkCountry 国家ID - * @param phone 手机号 - * @param eSmsTemplate 短信模板 - * @return - */ - boolean verificationSmsByPhone(Integer pkCountry, String phone, ESmsTemplate eSmsTemplate); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/ISmsService.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/ISmsService.java deleted file mode 100644 index ecba8dee..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/ISmsService.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hzs.lenjoy.member.sms.service; - -/** - * @Description: 短信服务 - * @Author: jiang chao - * @Time: 2024/10/15 17:30 - * @Classname: ISmsService - * @PackageName: com.hzs.lenjoy.member.sms.service - */ -public interface ISmsService { - - /** - * 短信验证码 - * - * @param phone 手机号码 - * @param checkKey 验证码KEY - * @param sendTimKey 验证码重复发送间隔KEY - * @return - */ - String sendCode(String phone, String checkKey, String sendTimKey); - - /** - * 校验短信验证码 - * - * @param phone 手机号码 - * @param smsCode 短信验证码 - * @param checkKey 验证码KEY - * @return - */ - String checkCode(String phone, String smsCode, String checkKey); - - /** - * 登录发送验证码 - * - * @param phone 手机号码 - * @return - */ - String sendLoginCode(String phone); - - /** - * 校验登录验证码 - * - * @param phone 手机号码 - * @param smsCode 短信验证码 - * @return - */ - String checkLoginCode(String phone, String smsCode); - - /** - * 注册发送验证码 - * - * @param phone 手机号码 - * @return - */ - String sendRegisterCode(String phone); - - /** - * 校验注册验证码 - * - * @param phone 手机号码 - * @param smsCode 短信验证码 - * @return - */ - String checkRegisterCode(String phone, String smsCode); - - /** - * 找回密码发送验证码 - * - * @param phone 手机号码 - * @return - */ - String sendRecoverCode(String phone); - - /** - * 校验找回密码验证码 - * - * @param phone 手机号码 - * @param smsCode 短信验证码 - * @return - */ - String checkRecoverCode(String phone, String smsCode); - - /** - * 重置支付密码发送验证码 - * - * @param phone 手机号码 - * @return - */ - String resetPayPasswordCode(String phone); - - /** - * 校验重置支付密码验证码 - * - * @param phone 手机号码 - * @param smsCode 短信验证码 - * @return - */ - String checkPayPasswordCode(String phone, String smsCode); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/impl/ApiSmsServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/impl/ApiSmsServiceImpl.java deleted file mode 100644 index b3538db3..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/impl/ApiSmsServiceImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.hzs.lenjoy.member.sms.service.impl; - -import com.hzs.common.core.constant.SmsConstants; -import com.hzs.common.core.constant.msg.SystemMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.ESmsTemplate; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.VerificationCodeUtil; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.util.TransactionUtils; - -import com.hzs.lenjoy.member.base.service.ICuMemberService; -import com.hzs.lenjoy.member.sms.service.IApiSmsService; -import com.hzs.third.sms.ISmsServiceApi; -import com.hzs.third.sms.dto.SmsServiceDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Collections; -import java.util.concurrent.TimeUnit; - -/** - * @Description: 短信处理服务 - * @Author: jiang chao - * @Time: 2023/3/8 15:56 - * @Classname: ApiSmsServiceImpjl - * @PackageName: com.hzs.member.sms.service.impl - */ -@Slf4j -@Service -public class ApiSmsServiceImpl implements IApiSmsService { - - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private RedisService redisService; - - @DubboReference - ISmsServiceApi iSmsServiceApi; - - @Override - public String checkSms(String cacheKey, String code) { - Object codeObj = redisService.getCacheObject(cacheKey); - if (null != codeObj) { - if (codeObj.toString().equals(code)) { - // 校验正确之后，删除缓存 - redisService.deleteObject(cacheKey); - return null; - } else { - // 验证码错误 - return TransactionUtils.getContent(SystemMsgConstants.CODE_ERROR); - } - } - // 验证码已失效 - return TransactionUtils.getContent(SystemMsgConstants.CODE_EXPIRE); - } - - @Override - public boolean verificationSms(Long pkMember, Integer pkCountry, String phone) { - return this.verificationSms(pkMember, pkCountry, phone, ESmsTemplate.VERIFICATION); - } - - @Override - public boolean verificationSms(Long pkMember, Integer pkCountry, String phone, ESmsTemplate eSmsTemplate) { - if (StringUtils.isEmpty(phone)) { - // 查询用户，获取手机号 - CuMember cuMember = iCuMemberService.getMemberById(pkMember); - phone = cuMember.getPhone(); - } - - // 生成4位验证码 - String code = VerificationCodeUtil.createCode(); - // 发送短信 - R sendR = iSmsServiceApi.send(SmsServiceDTO.builder() - .templateCode(eSmsTemplate.getCode()) - .pkMember(pkMember) - .phone(phone) - .paramList(Collections.singletonList(code)) - .userId(pkMember) - .pkCountry(pkCountry) - .saveFlag(false) - .build()); - - if (sendR.isSuccess()) { - // 返回成功，验证码放入缓存 - redisService.setCacheObject(eSmsTemplate.getCache() + pkMember, code, SmsConstants.FAILURE_TIME, TimeUnit.MINUTES); - return true; - } - log.error("发送短信失败：{}", sendR.getMsg()); - return false; - } - - @Override - public boolean verificationSmsByPhone(Integer pkCountry, String phone) { - return this.verificationSmsByPhone(pkCountry, phone, ESmsTemplate.VERIFICATION); - } - - @Override - public boolean verificationSmsByPhone(Integer pkCountry, String phone, ESmsTemplate eSmsTemplate) { - // 生成4位验证码 - String code = VerificationCodeUtil.createCode(); - // 发送短信 - R sendR = iSmsServiceApi.send(SmsServiceDTO.builder() - .templateCode(eSmsTemplate.getCode()) - .phone(phone) - .paramList(Collections.singletonList(code)) - .pkCountry(pkCountry) - .saveFlag(false) - .build()); - - if (sendR.isSuccess()) { - // 返回成功，验证码放入缓存 - redisService.setCacheObject(eSmsTemplate.getCache() + phone, code, SmsConstants.FAILURE_TIME, TimeUnit.MINUTES); - return true; - } - log.error("发送短信失败：{}", sendR.getMsg()); - return false; - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/impl/SmsServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/impl/SmsServiceImpl.java deleted file mode 100644 index 772621c6..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/java/com/hzs/lenjoy/member/sms/service/impl/SmsServiceImpl.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.hzs.lenjoy.member.sms.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import com.hzs.common.core.config.HzsConfig; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EAliSmsTemplate; -import com.hzs.common.core.enums.EEnv; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.VerificationCodeUtil; -import com.hzs.lenjoy.member.sms.service.ISmsService; -import com.hzs.third.sms.ISmsServiceApi; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.hibernate.validator.internal.engine.messageinterpolation.ElTermResolver; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.concurrent.TimeUnit; - -/** - * @Description: 短信服务 - * @Author: jiang chao - * @Time: 2024/10/15 17:30 - * @Classname: SmsServiceImpl - * @PackageName: com.hzs.lenjoy.member.sms.service.impl - */ -@Slf4j -@Service -public class SmsServiceImpl implements ISmsService { - - @Autowired - private RedisService redisService; - - @DubboReference - ISmsServiceApi iSmsServiceApi; - - @Override - public String sendCode(String phone, String checkKey, String sendTimKey) { - // 每个手机号每天只能获取30次短信验证码 - String smsCountKey = String.format(CacheConstants.SMS_COUNT, DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN)); - Object smsCountObj = redisService.getCacheMapValue(smsCountKey, phone); - if (smsCountObj != null) { - if (Integer.parseInt(smsCountObj.toString()) >= 30) { - return "当前手机号码获取短信已达当日上限"; - } - } - - if (null != sendTimKey && redisService.hasKey(sendTimKey + phone)) { - return "获取验证码过于频繁，请稍后再试"; - } - - // 生成4位验证码 - String code = VerificationCodeUtil.createCode(); - log.info("发送短信验证码，phone: {}, code: {}", phone, code); - - R sendResult = iSmsServiceApi.sendAliSms(phone, code, EAliSmsTemplate.MEMBER_SMS); - if (sendResult.isSuccess()) { - // 返回成功，验证码放入缓存 - // 验证码缓存有效期5分钟 - redisService.setCacheObject(checkKey + phone, code, 5L, TimeUnit.MINUTES); - - if (null != sendTimKey) { - // 验证码发送间隔不能低于1分钟 - redisService.setCacheObject(sendTimKey + phone, "", 1L, TimeUnit.MINUTES); - } - - // 每天只能发送30次短信验证码 - if (smsCountObj == null) { - redisService.setCacheMapValue(smsCountKey, phone, 1); - redisService.expire(smsCountKey, 1, TimeUnit.DAYS); - } else { - redisService.setCacheMapValue(smsCountKey, phone, Integer.parseInt(smsCountObj.toString()) + 1); - } - - return null; - } - log.error("发送短信失败：{}", sendResult.getMsg()); - return "获取验证码失败，请稍候重试"; - } - - @Override - public String checkCode(String phone, String smsCode, String checkKey) { -// if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { -// // 测试环境暂时不发放短信 -// if (smsCode.length() == 4) { -// // 校验通过，删除验证码缓存 -// redisService.deleteObject(checkKey + phone); -// return null; -// } -// } - - String cacheSmsCode = redisService.getCacheObject(checkKey + phone); - if (null == cacheSmsCode) { - return "验证码已失效"; - } - if (EEnv.TEST.getValue().equals(HzsConfig.getEnv()) && "ASDF".equals(smsCode)) { - // 测试环境暂时不发放短信 - return null; - } - if (!cacheSmsCode.equals(smsCode)) { - // TODO 验证码错误，需不需要清除缓存验证码？？会不会存在暴力破解情况？？ - return "验证码错误"; - } - // 校验通过，删除验证码缓存 - redisService.deleteObject(checkKey + phone); - return null; - } - - @Override - public String sendLoginCode(String phone) { - return this.sendCode(phone, CacheConstants.LOGIN_CHECK, CacheConstants.LOGIN_SEND_TIME); - } - - @Override - public String checkLoginCode(String phone, String smsCode) { - String str = this.checkCode(phone, smsCode, CacheConstants.LOGIN_CHECK); - if (null == str) { - // 删除验证码间隔时间缓存 - redisService.deleteObject(CacheConstants.LOGIN_SEND_TIME + phone); - } - return str; - } - - @Override - public String sendRegisterCode(String phone) { - return this.sendCode(phone, CacheConstants.REGISTER_CHECK, CacheConstants.REGISTER_SEND_TIME); - } - - @Override - public String checkRegisterCode(String phone, String smsCode) { - String str = this.checkCode(phone, smsCode, CacheConstants.REGISTER_CHECK); - if (null == str) { - // 删除验证码间隔时间缓存 - redisService.deleteObject(CacheConstants.REGISTER_SEND_TIME + phone); - } - return str; - } - - @Override - public String sendRecoverCode(String phone) { - return this.sendCode(phone, CacheConstants.RECOVER_CHECK, CacheConstants.RECOVER_SEND_TIME); - } - - @Override - public String checkRecoverCode(String phone, String smsCode) { - String str = this.checkCode(phone, smsCode, CacheConstants.RECOVER_CHECK); - if (null == str) { - // 删除验证码间隔时间缓存 - redisService.deleteObject(CacheConstants.RECOVER_SEND_TIME + phone); - } - return str; - } - - @Override - public String resetPayPasswordCode(String phone) { - return this.sendCode(phone, CacheConstants.RESET_CHECK, CacheConstants.RESET_SEND_TIME); - } - - @Override - public String checkPayPasswordCode(String phone, String smsCode) { - String str = this.checkCode(phone, smsCode, CacheConstants.RESET_CHECK); - if (null == str) { - // 删除验证码间隔时间缓存 - redisService.deleteObject(CacheConstants.RESET_SEND_TIME + phone); - } - return str; - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter deleted file mode 100644 index dc5b71f8..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter +++ /dev/null @@ -1,2 +0,0 @@ -memberProviderFilter=com.hzs.lenjoy.filter.LenjoyMemberProviderFilter -memberConsumerFilter=com.hzs.lenjoy.filter.LenjoyMemberConsumerFilter diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/bootstrap.yml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/bootstrap.yml deleted file mode 100644 index ccf49223..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,95 +0,0 @@ -# 项目配置 -hzs: - # 当前环境（测试=test，生产=online） - env: test - # PC地址 - pc: - # 公众号地址 - gzh: - # IOS地址 - ios: - # android地址 - android: - -# Tomcat -server: - port: 8192 - -# Spring -spring: - application: - # 应用名称 - name: hzs-lenjoy-member - jackson: - # 返回数据序列化时，如果为 null 则不进行返回 - default-property-inclusion: NON_NULL - servlet: - # 文件上传 - multipart: - # 单个文件大小 - max-file-size: 5MB - # 设置总上传的文件大小 - max-request-size: 5MB - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - # 命名空间 -# namespace: public - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 命名空间 -# namespace: public - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - ## 业务模块依赖的公用配置（缓存、数据库、事务、mybatis-plus） - - hzs-business-lenjoy-${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" - # 业务线程池大小 - threads: 400 - protocol: - # 设置协议为dubbo - name: dubbo - # dubbo 协议端口 （-1 表示自增端口，从20880开始） - port: -1 - # 服务线程池大小 - threads: 400 - cloud: - # 订阅服务 - subscribed-services: hzs-system, hzs-third, hzs-lenjoy-sale - scan: - # dubbo 服务扫描包（开启之后才会对外提供服务） - base-packages: com.hzs.lenjoy.member - -# 日志配置 -logging: - level: - com.hzs: debug - org.springframework: warn - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/logback.xml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/logback.xml deleted file mode 100644 index 90815590..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/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/hzs-business-lenjoy/hzs-business-lenjoy-sale/pom.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/pom.xml deleted file mode 100644 index 2c8b1c1b..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - - com.bd - hzs-business-lenjoy - 1.0.0-SNAPSHOT - - - hzs-business-lenjoy-sale - - - hzs-business-lenjoy-sale乐享销售服务 - - - - - - - com.bd - hzs-api-lenjoy-sale - - - - - com.bd - hzs-business-common - - - - - org.springframework.amqp - spring-rabbit - - - - - com.bd - hzs-api-sale - - - - - com.bd - hzs-api-scm - - - - - com.bd - hzs-api-lenjoy-member - - - - - com.bd - hzs-api-third - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - 2.3.12.RELEASE - - - - repackage - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/LenjoySaleApplication.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/LenjoySaleApplication.java deleted file mode 100644 index 9110852d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/LenjoySaleApplication.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy; - -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; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * 销售服务 - * - * @author hzs - */ -@ComponentScan(basePackages = {"com.hzs"}) -@EnableDiscoveryClient -@EnableCustomConfig -@SpringBootApplication -@EnableTransactionManagement -public class LenjoySaleApplication { - - public static void main(String[] args) { - SpringApplication.run(LenjoySaleApplication.class, args); - System.out.println("LenjoySaleApplication 销售服务启动成功"); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/filter/SaleConsumerFilter.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/filter/SaleConsumerFilter.java deleted file mode 100644 index 85fc39ea..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/filter/SaleConsumerFilter.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.filter; - -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.common.constants.CommonConstants; -import org.apache.dubbo.common.extension.Activate; -import org.apache.dubbo.rpc.*; -import org.springframework.context.i18n.LocaleContextHolder; - -/** - * @Description: 会员dubbo服务消费过滤器 - * @Author: jiang chao - * @Time: 2023/9/5 11:42 - * @Classname: RpcFilter - * @PackageName: com.hzs.lenjoy.filter - */ -@Activate(group = CommonConstants.CONSUMER) -@Slf4j -public class SaleConsumerFilter implements Filter { - - @Override - public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { - RpcContext.getContext().setAttachment("locale", LocaleContextHolder.getLocale().toLanguageTag()); - return invoker.invoke(invocation); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/filter/SaleProviderFilter.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/filter/SaleProviderFilter.java deleted file mode 100644 index 3c1875b7..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/filter/SaleProviderFilter.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.lenjoy.filter; - -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.common.constants.CommonConstants; -import org.apache.dubbo.common.extension.Activate; -import org.apache.dubbo.rpc.*; -import org.springframework.context.i18n.LocaleContextHolder; - -import java.util.Locale; - -/** - * @Description: - * @Author: jiang chao - * @Time: 2023/9/5 11:42 - * @Classname: RpcFilter - * @PackageName: com.hzs.lenjoy.filter - */ -@Activate(group = CommonConstants.PROVIDER) -@Slf4j -public class SaleProviderFilter implements Filter { - - @Override - public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { - Object locale = RpcContext.getContext().getAttachment("locale"); - if (null != locale) { - String[] str = locale.toString().split("-"); - LocaleContextHolder.setLocale(new Locale(str[0], str[1])); - } - return invoker.invoke(invocation); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/controller/api/ApiOrderController.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/controller/api/ApiOrderController.java deleted file mode 100644 index 9debc4b9..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/controller/api/ApiOrderController.java +++ /dev/null @@ -1,466 +0,0 @@ -package com.hzs.lenjoy.sale.order.controller.api; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.RepeatSubmit; -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -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.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.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.lenjoy.sale.order.dto.ProductGroup; -import com.hzs.lenjoy.sale.order.dto.ShoppingCartRedis; -import com.hzs.lenjoy.sale.order.param.OrderItemsParam; -import com.hzs.lenjoy.sale.order.param.OrderParam; -import com.hzs.lenjoy.sale.order.param.OrderRevokeParam; -import com.hzs.lenjoy.sale.order.param.WaresItemsParam; -import com.hzs.lenjoy.sale.order.service.*; -import com.hzs.lenjoy.sale.order.vo.OrderAccountVO; -import com.hzs.lenjoy.sale.order.vo.OrderItemsVO; -import com.hzs.lenjoy.sale.order.vo.OrderReturnVO; -import com.hzs.lenjoy.sale.order.vo.OrderRevokeVO; -import com.hzs.system.base.IAreaServiceApi; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 订单相关服务 - * @Author: jiang chao - * @Time: 2024/10/18 13:44 - * @Classname: ApiOrderController - * @PackageName: com.hzs.lenjoy.sale.order.controller.api - */ -@Slf4j -@RestController -@RequestMapping("/api/order") -public class ApiOrderController extends BaseController { - - @Autowired - private IShoppingCartService iShoppingCartService; - @Autowired - private IOrderBusinessService iOrderBusinessService; - @Autowired - private ISaOrderService iSaOrderService; - @Autowired - private ISaOrderItemsService iSaOrderItemsService; - @Autowired - private ISaOrderChargeLogService iSaOrderChargeLogService; - - @DubboReference - IAreaServiceApi iAreaServiceApi; - - /** - * 校验购买人 - * - * @param orderParam - * @return - */ - @PostMapping("/validate-upg-rel") - public AjaxResult validateUpgRel(@RequestBody OrderParam orderParam) { - initOrderParam(orderParam); - // 购买编号是不是在购买人血缘伞下 - String checkStr = validateRelation(orderParam); - if (null != checkStr) { - return AjaxResult.error(checkStr); - } - return AjaxResult.success(orderParam); - } - - /** - * 查询订单邮费 - * - * @param orderParam - * @return - */ - @PostMapping("/query-order-postage") - public AjaxResult queryOrderPostage(@RequestBody OrderParam orderParam) { - if (!CollectionUtil.isNotEmpty(orderParam.getDeleteShopList())) { - return AjaxResult.error("参数不能为空"); - } - - if (checkRecPostageMsgBoolean(orderParam) && orderParam.getDeliveryWay() == EDelivery.FAST_MAIL.getValue()) { - // 验证必输项，一个条件未填写都不计算邮费 - initOrderParam(orderParam); - convertShoppingCarToSku(orderParam); - iOrderBusinessService.queryPostage(orderParam); - } - return AjaxResult.success(OrderReturnVO.builder().postage(orderParam.getPostage()).build()); - } - - /** - * 创建订单 - * - * @param orderParam - * @return - */ - @RepeatSubmit - @PostMapping("/confirm-order") - public AjaxResult confirmOtherOrder(@RequestBody OrderParam orderParam) { - if (!CollectionUtil.isNotEmpty(orderParam.getDeleteShopList())) { - return AjaxResult.error("参数不能为空"); - } - // 初始化参数 - initOrderParam(orderParam); - // 验证必输项 - if (!checkRecMsgBoolean(orderParam)) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - - // 购买编号是不是在购买人血缘伞下 - String checkStr = validateRelation(orderParam); - if (null != checkStr) { - return AjaxResult.error(checkStr); - } - - // 从购物车中转换出商品信息 - convertShoppingCarToSku(orderParam); - - String confirmStr = iOrderBusinessService.confirmSaOrder(orderParam); - if (null != confirmStr) { - return AjaxResult.error("该订单长时间没有支付，已经失效，请重新下单"); - } - - // 删除购物车下单的数据 - if (CollectionUtil.isNotEmpty(orderParam.getDeleteShopList())) { - iShoppingCartService.batchDelShopping(SecurityUtils.getUserId(), orderParam.getDeleteShopList(), SecurityUtils.getPkCountry()); - } - - return AjaxResult.success(orderParam); - } - - /** - * 钱包支付明细 - * - * @param orderParam - * @return - */ - @PostMapping("/query-spend-details") - public AjaxResult queryOrderSpendDetails(@RequestBody OrderParam orderParam) { - if (orderParam.getOrderCode() == null || orderParam.getSpecialArea() == null) { - return AjaxResult.error("参数不能为空"); - } - // 初始化参数 - initOrderParam(orderParam); - - // 验证账户 - CuMemberAccountExt cuMemberAccountExt = iOrderBusinessService.validateMemberAccount(orderParam); - - // 查询订单及明细信息 - SaOrderExt saOrderExt = iOrderBusinessService.getOrderByCode(SaOrder.builder() - .orderCode(orderParam.getOrderCode()) - .orderStatus(EOrderStatus.WAIT_PAY.getValue()) - .orderType(orderParam.getSpecialArea()) - .build()); - if (null == saOrderExt) { - return AjaxResult.error("订单信息不存在"); - } - - // 会员账户余额是否足够支付 - iOrderBusinessService.queryOrderSpendDetails(cuMemberAccountExt, saOrderExt, saOrderExt.getOrderItemsExtList()); - - OrderAccountVO orderAccountVO = BeanUtil.copyProperties(cuMemberAccountExt, OrderAccountVO.class); - return AjaxResult.success(orderAccountVO); - } - - /** - * 钱包支付订单 - * - * @param orderParam - * @return - */ - @RepeatSubmit - @PostMapping("/pay-order") - public AjaxResult payOrder(@RequestBody OrderParam orderParam) { - if (orderParam.getOrderCode() == null || orderParam.getSpecialArea() == null || - StringUtils.isEmpty(orderParam.getPayPwd())) { - return AjaxResult.error("参数不能为空"); - } - // 初始化参数 - initOrderParam(orderParam); - - // 验证账户 - CuMemberAccountExt cuMemberAccountExt = iOrderBusinessService.validateMemberAccount(orderParam); - - // 查询订单及明细信息 - SaOrderExt saOrderExt = iOrderBusinessService.getOrderByCode(SaOrder.builder() - .orderCode(orderParam.getOrderCode()) - .orderStatus(EOrderStatus.WAIT_PAY.getValue()) - .orderType(orderParam.getSpecialArea()) - .build()); - if (null == saOrderExt) { - return AjaxResult.error("订单信息不存在"); - } - - // 会员账户余额是否足够支付 - iOrderBusinessService.queryOrderSpendDetails(cuMemberAccountExt, saOrderExt, saOrderExt.getOrderItemsExtList()); - - if (cuMemberAccountExt.getIsPayment()) { - // 开始支付 扣款 - iOrderBusinessService.payWalletOrder(saOrderExt, cuMemberAccountExt); - return AjaxResult.success(); - } - if (null != cuMemberAccountExt.getErrorMsg()) { - return AjaxResult.error(cuMemberAccountExt.getErrorMsg()); - } - return AjaxResult.error("账户余额不足！"); - } - - /** - * 初始化参数 - * - * @param orderParam - */ - private void initOrderParam(OrderParam orderParam) { - orderParam.setCenterCodeId(SecurityUtils.getUserId()); - orderParam.setPkSettleCountry(SecurityUtils.getPkCountry()); - if (orderParam.getPostage() == null) { - // 邮费默认为0 - orderParam.setPostage(BigDecimal.ZERO); - } - if (orderParam.getTransType() == null) { - // 默认陆运 - orderParam.setTransType(ETransportType.LAND.getValue()); - } - if (StringUtils.isEmpty(orderParam.getUpgradeMemberCode())) { - // 购买编号为空，则为当前登录会员编号 - orderParam.setUpgradeMemberCode(SecurityUtils.getMemberCode()); - } - } - - /** - * 校验会员关系 - * - * @param orderParam 订单参数 - * @return - */ - private String validateRelation(OrderParam orderParam) { - CuMember cuMember = iOrderBusinessService.getCuMemberByCode(orderParam.getUpgradeMemberCode()); - if (cuMember == null) { - return "会员编号不存在"; - } - orderParam.setUpgradeMemberName(cuMember.getMemberName()); - orderParam.setUpgradeMember(cuMember); - - if (!orderParam.getCenterCodeId().equals(cuMember.getPkId())) { - // 可以给推荐伞下购买 - CuMember topMember = iOrderBusinessService.getBloodTopMember(cuMember.getPkId(), orderParam.getCenterCodeId()); - if (null == topMember) { - return "购买编号不在当前会员血缘下"; - } - } - return null; - } - - /** - * 检查输入的条件 - * - * @param orderParam - * @return boolean - */ - private boolean checkRecMsgBoolean(OrderParam orderParam) { - return orderParam.getSpecialArea() != null - && orderParam.getDeliveryWay() != null && orderParam.getTransType() != null - && orderParam.getRecName() != null && orderParam.getRecPhone() != null - && orderParam.getRecProvince() != null && orderParam.getRecCity() != null - && orderParam.getRecAddress() != null && CollectionUtil.isNotEmpty(orderParam.getOrderItemsParams()); - } - - /** - * 检查邮费输入的条件 - * - * @param orderParam - * @return boolean - */ - private boolean checkRecPostageMsgBoolean(@RequestBody OrderParam orderParam) { - return orderParam.getSpecialArea() != null - && orderParam.getDeliveryWay() != null && orderParam.getTransType() != null - && orderParam.getRecProvince() != null && orderParam.getRecCity() != null -// && CollectionUtil.isNotEmpty(orderParam.getOrderItemsParams()) - ; - } - - /** - * 查询购物车商品 - * - * @param orderParam - */ - private void convertShoppingCarToSku(OrderParam orderParam) { - // 查询购物车商品 - List shoppingCartRedisList = iShoppingCartService.queryShopping(orderParam.getCenterCodeId(), orderParam.getDeleteShopList(), orderParam.getPkSettleCountry()); - - List orderItemsParamList = new ArrayList<>(shoppingCartRedisList.size()); - - shoppingCartRedisList.forEach(shoppingCartRedis -> { - OrderItemsParam orderItemsParam = OrderItemsParam.builder() - .pkId(shoppingCartRedis.getPkId()) - .waresCode(shoppingCartRedis.getWaresCode()) - .quantity(shoppingCartRedis.getNumber()) - .build(); - List waresItemsParamList = new ArrayList<>(shoppingCartRedis.getProductGroup().size()); - for (ProductGroup productGroup : shoppingCartRedis.getProductGroup()) { - WaresItemsParam waresItemsParam = WaresItemsParam.builder() - .pkWaresSpecsSku(productGroup.getPkSkuId()) - .quantity(productGroup.getQuantity()) - .build(); - waresItemsParamList.add(waresItemsParam); - } - orderItemsParam.setWaresItemsParamList(waresItemsParamList); - orderItemsParamList.add(orderItemsParam); - }); - orderParam.setOrderItemsParams(orderItemsParamList); - } - - /** - * 自助撤单列表 - * - * @return - */ - @GetMapping("/self-revoke-list") - public TableDataInfo selfRevokeList() { - // 所属国家 - Integer pkCountry = SecurityUtils.getPkCountry(); - // 返回的订单数据 - List orderRevokeVOList = new ArrayList<>(); - - List orderList = iSaOrderService.listSelfRevoke(SecurityUtils.getUserId()); - - if (CollectionUtil.isNotEmpty(orderList)) { - // 获取订单ID列表 - List orderIdList = orderList.stream().map(OrderRevokeVO::getPkId).collect(Collectors.toList()); - - // 查询到的订单对应的订单明细列表 - List orderItemsList = iSaOrderItemsService.listOrderItem(orderIdList); - - // 调用system服务，获取地址 - Map areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData(); - - // 遍历订单，转换成前台显示内容 - for (OrderRevokeVO saOrder : orderList) { - // 订单明细状态 - Integer orderStatus = null; - // 返回订单数据明细列表 - List orderItemsVOList = null; - // 是否处理 - boolean isHandle = false; - // 汇率（目前只有中国需要由美金转人民币显示，其它国家显示就是美金不需要转换） - BigDecimal baseExchangeRate = saOrder.getInExchangeRate(); - - // 遍历订单明细，转换成前台显示内容 - for (OrderItemsVO orderItemsVO : orderItemsList) { - if (EOrderStatus.SHIPPING.getValue() == orderItemsVO.getOrderStatus()) { - // 已合单显示为已付款，因为合单为后台状态，前台不需要显示 - orderItemsVO.setOrderStatus(EOrderStatus.PAY.getValue()); - } - - // 当前订单明细处理 - if (orderItemsVO.getPkOrder().equals(saOrder.getPkId())) { - // 订单明细状态分组处理 - if (!orderItemsVO.getOrderStatus().equals(orderStatus)) { - // 明细状态不相同，则需要新建 - orderStatus = orderItemsVO.getOrderStatus(); - // 前台显示状态为明细状态 - saOrder.setOrderStatus(orderItemsVO.getOrderStatus()); - // 订单显示金额 = 订单金额 + 运费 - saOrder.setOrderAmount(saOrder.getOrderAmount().add(saOrder.getPostage())); - // 业务需要汇率 - saOrder.setOrderAchieve(saOrder.getOrderAchieve().multiply(baseExchangeRate)); - // EV处理汇率 - saOrder.setOrderAssAchieve(saOrder.getOrderAssAchieve().multiply(baseExchangeRate)); - - String recProvince = areaMap.get(saOrder.getRecProvince()); - if (StringUtils.isNotEmpty(recProvince)) { - saOrder.setRecProvinceVal(recProvince); - } - String recCity = areaMap.get(saOrder.getRecCity()); - if (StringUtils.isNotEmpty(recCity)) { - saOrder.setRecCityVal(recCity); - } - String recCounty = areaMap.get(saOrder.getRecCounty()); - if (StringUtils.isNotEmpty(recCounty)) { - saOrder.setRecCountyVal(recCounty); - } - - // 处理订单明细 - orderItemsVOList = new ArrayList<>(); - orderItemsVOList.add(BeanUtil.copyProperties(orderItemsVO, OrderItemsVO.class)); - saOrder.setItemList(orderItemsVOList); - - orderRevokeVOList.add(saOrder); - } else { - // 明细状态相同，直接追加 - orderItemsVOList.add(BeanUtil.copyProperties(orderItemsVO, OrderItemsVO.class)); - } - - // 订单ID处理过 - isHandle = true; - continue; - } - if (isHandle) { - // 订单明细遍历，如果订单曾经处理过，则此处跳出本次订单明细遍历 - break; - } - } - } - } - - TableDataInfo tableDataInfo = getDataTable(orderList); - tableDataInfo.setRows(orderRevokeVOList); - return tableDataInfo; - } - - /** - * 自助撤单 - * - * @param param 撤单参数 - * @return - */ - @RepeatSubmitSimple - @PostMapping("/self-revoke-order") - public AjaxResult selfRevokeOrder(@Valid @RequestBody OrderRevokeParam param) { - Long pkMember = SecurityUtils.getUserId(); - - // 查询订单 - SaOrder saOrder = iSaOrderService.getSelfRevoke(pkMember, param.getOrderCode()); - if (null == saOrder) { - return AjaxResult.error("订单不存在，请刷新后重试"); - } - if (EOrderStatus.WAIT_PAY.getValue() == saOrder.getOrderStatus()) { - return AjaxResult.error("未支付订单不需要撤单"); - } - if (!DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, saOrder.getPayTime()).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { - return AjaxResult.error("超过当天24点请联系客服撤单"); - } - - // 校验订单是否存在进行中的签呈 - if (iSaOrderChargeLogService.checkOrderApprovalExist( - Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(), EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(), - EApprovalBusiness.ORDER_RETURN.getValue(), EApprovalBusiness.ORDER_CANCEL.getValue(), - EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() - ), - Collections.singletonList(saOrder.getOrderCode()), saOrder.getPkCountry()) > 0) { - return AjaxResult.error("订单存在进行中审批，不能再次发起"); - } - - // 撤单操作 - iOrderBusinessService.revokeOrder(pkMember, saOrder); - - return AjaxResult.success(); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/dto/ProductGroup.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/dto/ProductGroup.java deleted file mode 100644 index d9d055d8..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/dto/ProductGroup.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.lenjoy.sale.order.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 购物车产品SKU组合缓存实体类 - * @Author: jiang chao - * @Time: 2024/10/18 16:46 - * @Classname: ProductGroup - * @PackageName: com.hzs.lenjoy.sale.order.dto - */ -@Data -public class ProductGroup implements Serializable { - /** - * 产品主键 - */ - private Integer pkProduct; - /** - * sku ID - */ - private Integer pkSkuId; - /** - * 选择sku的数量 - */ - private Integer quantity = 1; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/dto/ShoppingCartRedis.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/dto/ShoppingCartRedis.java deleted file mode 100644 index 3fe548cc..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/dto/ShoppingCartRedis.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.lenjoy.sale.order.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 购物车缓存实体 - * @Author: jiang chao - * @Time: 2024/10/18 16:46 - * @Classname: ShoppingCartRedis - * @PackageName: com.hzs.lenjoy.sale.order.dto - */ -@Data -public class ShoppingCartRedis implements Serializable { - - /** - * 购物车唯一ID（专区+时间戳） - */ - private String shoppingId; - - /** - * 购物车商品数量 - */ - private Integer number; - - /** - * 创客空间id - */ - private Long pkMakerSpace; - - /** - * 产品 sku 组合 - */ - private List productGroup; - /** - * 组合ID pkProduct+pkSkuId+skuCount - */ - private String groupId; - /** - * 所属专区 - */ - private Integer specialArea; - /** - * 商品编号 - */ - private String waresCode; - /** - * 海粉商品id - */ - private Long pkId; - /** - * 海粉商品来源渠道 - */ - private Integer source; - - /** - * 国家（用于跨国报单） - */ - private Integer pkCountry; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderChargeLogMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderChargeLogMapper.java deleted file mode 100644 index a828af57..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderChargeLogMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.lenjoy.sale.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.order.SaOrderChargeLog; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 订单修改记录 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/11/21 16:53 - * @Classname: SaOrderChargeLogMapper - * @PackageName: com.hzs.lenjoy.sale.order.mapper - */ -public interface SaOrderChargeLogMapper extends BaseMapper { - - /** - * 订单审批是否进行中 - * - * @param typeList 业务类型列表 - * @param orderCodeList 订单编号列表 - * @param pkCountry 所属国家 - * @return - */ - int checkOrderApprovalExist(@Param("typeList") List typeList, - @Param("orderCodeList") List orderCodeList, - @Param("pkCountry") Integer pkCountry); - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderItemsMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderItemsMapper.java deleted file mode 100644 index da60c967..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderItemsMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.lenjoy.sale.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.lenjoy.sale.order.vo.OrderItemsVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 销售订单-明细表 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 13:26 - * @Classname: SaOrderItemsMapper - * @PackageName: com.hzs.lenjoy.sale.order.mapper - */ -public interface SaOrderItemsMapper extends BaseMapper { - - /** - * 查询订单明细等 - * - * @param pkOrder 订单ID - * @return - */ - List listOrderItemsByOrder(@Param("pkOrder") Long pkOrder); - - /** - * 更新订单明细状态 - * - * @param pkOrder 订单ID - * @param orderStatus 订单状态 - * @param pkMember 会员ID - * @return - */ - int updateOrderItemStatus(@Param("pkOrder") Long pkOrder, - @Param("orderStatus") Integer orderStatus, - @Param("pkMember") Long pkMember); - - /** - * 查询订单明细列表 - * - * @param orderIdList 订单ID列表 - * @return - */ - List listOrderItem(@Param("orderIdList") List orderIdList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderMapper.java deleted file mode 100644 index 0264e2ed..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/SaOrderMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hzs.lenjoy.sale.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.lenjoy.sale.order.vo.OrderRevokeVO; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @Description: 销售订单-明细表 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 13:26 - * @Classname: SaOrderMapper - * @PackageName: com.hzs.lenjoy.sale.order.mapper - */ -public interface SaOrderMapper extends BaseMapper { - - /** - * 更新订单状态 - * - * @param pkOrder 订单ID - * @param orderStatus 订单状态 - * @param payType 支付方式 - * @param pkMember 会员ID - * @return - */ - int updateOrderStatus(@Param("pkOrder") Long pkOrder, - @Param("orderStatus") Integer orderStatus, - @Param("payType") Integer payType, - @Param("pkMember") Long pkMember); - - /** - * 查询会员购买EV总计 - * - * @param pkMember 会员ID - * @param orderTypeList 订单类型列表 - * @param queryStartDate 查询开始时间 - * @return - */ - BigDecimal sumOrderAssAchieve(@Param("pkMember") Long pkMember, - @Param("orderTypeList") List orderTypeList, - @Param("queryStartDate") Date queryStartDate); - - /** - * 查询自助撤单列表 - * - * @param pkMember 会员ID - * @return - */ - List listSelfRevoke(@Param("pkMember") Long pkMember); - - /** - * 查询自助撤单订单 - * - * @param pkMember 会员ID - * @param orderCode 订单编号 - * @return - */ - SaOrder getSelfRevoke(@Param("pkMember") Long pkMember, @Param("orderCode") String orderCode); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderChargeLogMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderChargeLogMapper.xml deleted file mode 100644 index 7cf120b9..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderChargeLogMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderItemsMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderItemsMapper.xml deleted file mode 100644 index 49522c30..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderItemsMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - update sa_order_items soi - set soi.order_status = #{orderStatus}, - soi.pk_modified = #{pkMember}, - soi.modified_time = sysdate - where soi.del_flag = 0 - and soi.pk_order = #{pkOrder} - and soi.order_status != #{orderStatus} - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderMapper.xml deleted file mode 100644 index f356a6ed..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/mapper/xml/SaOrderMapper.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - update sa_order so - set so.pay_time = sysdate, - so.order_status = #{orderStatus}, - - so.pay_type = #{payType}, - - so.pk_modified = #{pkMember}, - so.modified_time = sysdate - where so.del_flag = 0 - and so.pk_id = #{pkOrder} - and so.order_status != #{orderStatus} - - - - - - - - where so.del_flag = 0 - and so.system_type = 1 - and so.order_status = 1 - and to_char(so.pay_time, 'yyyy-mm-dd') = to_char(sysdate, 'yyyy-mm-dd') - and (so.pk_member = - #{pkMember} - or - so - . - pk_creator - = - #{pkMember} - ) - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderItemsParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderItemsParam.java deleted file mode 100644 index c3eaa031..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderItemsParam.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.lenjoy.sale.order.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 订单明细入参 - * @Author: jiang chao - * @Time: 2024/10/18 14:07 - * @Classname: OrderItemsParam - * @PackageName: com.hzs.lenjoy.sale.order.param - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class OrderItemsParam implements Serializable { - - /** - * 商品主表主键 - */ - private Long pkId; - - /** - * 商品数量 - */ - private Integer quantity; - - /** - * 商品编号 - */ - private String waresCode; - - /** - * 商品明细 - */ - private List waresItemsParamList; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderParam.java deleted file mode 100644 index c0e8b674..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderParam.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.hzs.lenjoy.sale.order.param; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.domain.member.base.CuMember; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - * @Description: 订单入参 - * @Author: jiang chao - * @Time: 2024/10/18 13:53 - * @Classname: OrderParam - * @PackageName: com.hzs.lenjoy.sale.order.param - */ -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Data -public class OrderParam implements Serializable { - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 购买会员编号 - */ - private String upgradeMemberCode; - /** - * 购买会员姓名 - */ - private String upgradeMemberName; - /** - * 购买会员 - */ - @JsonIgnore - private CuMember upgradeMember; - - /** - * 报单中心编号 - */ - private Long centerCodeId; - - /** - * 邮费 - */ - @BigDecimalFormat - private BigDecimal postage = BigDecimal.ZERO; - /** - * 特殊邮费（处理不参与复购300包邮的邮费） - */ - @BigDecimalFormat - private BigDecimal specialPostage = BigDecimal.ZERO; - /** - * 特殊邮费金额（处理不参与复购300包邮的邮费） - */ - @BigDecimalFormat - private BigDecimal specialPostageAmount = BigDecimal.ZERO; - - /** - * 运输类型 1=陆运，2=空运，3=海运 - */ - private Integer transType; - - /** - * 所属专区 - */ - private Integer specialArea; - - /** - * 发货方式 - */ - private Integer deliveryWay; - - /** - * 收货人 - */ - private String recName; - /** - * 收货电话 - */ - private String recPhone; - /** - * 收货省 - */ - private Integer recProvince; - /** - * 收货市 - */ - private Integer recCity; - /** - * 收货县 - */ - private Integer recCounty; - /** - * 收货地址 - */ - private String recAddress; - - /** - * 订单商品明细 - */ - private List orderItemsParams; - - /** - * 删除购物车 - */ - private List deleteShopList; - - /** - * 结算国家 - */ - private Integer pkSettleCountry; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 备注 - */ - private String remark; - - /** - * 支付密码 - */ - private String payPwd; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderRevokeParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderRevokeParam.java deleted file mode 100644 index 2d6b4519..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/OrderRevokeParam.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.lenjoy.sale.order.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * @Description: 自助撤单入参 - * @Author: jiang chao - * @Time: 2024/11/21 15:51 - * @Classname: OrderRevokeParam - * @PackageName: com.hzs.lenjoy.sale.order.param - */ -@Data -public class OrderRevokeParam implements Serializable { - - /** - * 订单编号 - */ - @NotNull(message = "订单编号不能为空") - private String orderCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/WaresItemsParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/WaresItemsParam.java deleted file mode 100644 index af65dc8c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/param/WaresItemsParam.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.lenjoy.sale.order.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: 商品明细入参 - * @Author: jiang chao - * @Time: 2024/10/18 14:10 - * @Classname: WaresItemsParam - * @PackageName: com.hzs.lenjoy.sale.order.param - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class WaresItemsParam implements Serializable { - - /** - * sku主键 - */ - private Integer pkWaresSpecsSku; - - /** - * 商品数量 - */ - private Integer quantity; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/provider/OrderServiceProvider.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/provider/OrderServiceProvider.java deleted file mode 100644 index 6417b95e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/provider/OrderServiceProvider.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.lenjoy.sale.order.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.lenjoy.sale.order.IOrderServiceApi; -import com.hzs.lenjoy.sale.order.service.IOrderBusinessService; -import com.hzs.lenjoy.sale.order.service.ISaOrderService; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @Description: 订单服务dubbo服务 - * @Author: jiang chao - * @Time: 2024/10/22 15:00 - * @Classname: OrderServiceProvider - * @PackageName: com.hzs.lenjoy.sale.order.provider - */ -@Slf4j -@DubboService -public class OrderServiceProvider implements IOrderServiceApi { - - @Autowired - private IOrderBusinessService iOrderBusinessService; - @Autowired - private ISaOrderService iSaOrderService; - - @Override - public R onlinePaymentCallBack(Long pkMember, String orderCode) { - try { - String resultStr = iOrderBusinessService.onlinePaymentCallBack(pkMember, orderCode); - if (null == resultStr) { - return R.ok(); - } - return R.fail(resultStr); - } catch (Exception e) { - log.error("乐享海购在线支付回调订单处理异常, orderCode: {}", orderCode, e); - return R.fail(e.getMessage()); - } - } - - @Override - public R getOrderByCode(String orderCode) { - return R.ok(iSaOrderService.getOrderByCode(new SaOrder().setOrderCode(orderCode))); - } - - @Override - public R sumOrderAssAchieve(Long pkMember, List orderTypeList, Date queryStartDate) { - return R.ok(iSaOrderService.sumOrderAssAchieve(pkMember, orderTypeList, queryStartDate)); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/IOrderBusinessService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/IOrderBusinessService.java deleted file mode 100644 index 6cc57803..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/IOrderBusinessService.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.hzs.lenjoy.sale.order.service; - -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.ext.SaOrderItemsExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.lenjoy.sale.order.param.OrderParam; - -import java.util.List; - -/** - * @Description: 订单业务处理 - * @Author: jiang chao - * @Time: 2024/10/23 10:04 - * @Classname: IOrderBusinessService - * @PackageName: com.hzs.lenjoy.sale.order.service - */ -public interface IOrderBusinessService { - - /** - * 查询会员 - * - * @param pkId 会员ID - * @return - */ - CuMember getCuMemberById(Long pkId); - - /** - * 查询会员 - * - * @param memberCode 会员编号 - * @return - */ - CuMember getCuMemberByCode(String memberCode); - - /** - * 查询血缘上用户是否存在 - * - * @param memberId 需要查询的启点会员ID - * @param topId 血缘线上面的会员ID - * @return - */ - CuMember getBloodTopMember(Long memberId, Long topId); - - /** - * 查询订单及订单明细 - * - * @param orderParam 订单查询条件 - * @return - */ - SaOrderExt getOrderByCode(SaOrder orderParam); - - /** - * 确认订单 - * - * @param orderParam 订单参数 - * @return - */ - String confirmSaOrder(OrderParam orderParam); - - /** - * 订单以及明细入库等处理 - * - * @param saOrderExt 订单（带明细） - */ - void processOrder(SaOrderExt saOrderExt); - - /** - * 查询邮费 - * - * @param orderParam 订单参数 - */ - void queryPostage(OrderParam orderParam); - - /** - * 校验会员账户 - * - * @param orderParam 订单参数 - * @return - */ - CuMemberAccountExt validateMemberAccount(OrderParam orderParam); - - /** - * 验证会员账户余额是否足够 - * - * @param cuMemberAccount 会员账户 - * @param saOrder 订单信息 - * @param orderItemExtList 订单明细信息 - * @return - */ - void queryOrderSpendDetails(CuMemberAccountExt cuMemberAccount, SaOrderExt saOrder, List orderItemExtList); - - /** - * 支付订单 - * - * @param saOrderExt 订单信息 - * @param cuMemberAccountExt 会员账户 - * @return - */ - void payWalletOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt); - - /** - * 在线支付回调 - * - * @param pkMember 会员ID - * @param orderCode 订单编号 - * @return - */ - String onlinePaymentCallBack(Long pkMember, String orderCode); - - /** - * 撤单处理 - * - * @param pkMember 会员ID - * @param saOrder 订单信息 - * @return - */ - String revokeOrder(Long pkMember, SaOrder saOrder); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderChargeLogService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderChargeLogService.java deleted file mode 100644 index e6906b82..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderChargeLogService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.sale.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.order.SaOrderChargeLog; - -import java.util.List; - -/** - * @Description: 订单修改记录 服务类 - * @Author: jiang chao - * @Time: 2024/11/21 16:51 - * @Classname: ISaOrderChargeLogService - * @PackageName: com.hzs.lenjoy.sale.order.service - */ -public interface ISaOrderChargeLogService extends IService { - - /** - * 订单审批是否进行中 - * - * @param typeList 业务类型列表 - * @param orderCodeList 订单编号列表 - * @param pkCountry 所属国家 - * @return - */ - int checkOrderApprovalExist(List typeList, List orderCodeList, Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderItemsService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderItemsService.java deleted file mode 100644 index 3c566235..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderItemsService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.lenjoy.sale.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.lenjoy.sale.order.vo.OrderItemsVO; - -import java.util.List; - -/** - * @Description: 销售订单-明细表 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 13:25 - * @Classname: ISaOrderItemsService - * @PackageName: com.hzs.lenjoy.sale.order.service - */ -public interface ISaOrderItemsService extends IService { - - /** - * 查询订单明细信息 - * - * @param saOrderItems 订单明细查询条件 - * @return - */ - List listOrderItemsByOrder(SaOrderItems saOrderItems); - - /** - * 订单明细支付 - * - * @param pkOrder 订单ID - * @param orderStatus 订单状态 - * @param pkMember 会员ID - * @return - */ - int updateOrderItemStatus(Long pkOrder, Integer orderStatus, Long pkMember); - - /** - * 查询订单明细列表 - * - * @param orderIdList 订单ID列表 - * @return - */ - List listOrderItem(List orderIdList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderService.java deleted file mode 100644 index 26397fb0..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/ISaOrderService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.lenjoy.sale.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.lenjoy.sale.order.vo.OrderRevokeVO; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @Description: 订单服务 - * @Author: jiang chao - * @Time: 2024/10/18 13:44 - * @Classname: ISaOrderService - * @PackageName: com.hzs.lenjoy.sale.order.service - */ -public interface ISaOrderService extends IService { - - /** - * 查询订单信息 - * - * @param saOrder 订单查询条件 - * @return - */ - SaOrder getOrderByCode(SaOrder saOrder); - - /** - * 更新订单状态 - * - * @param pkOrder 订单ID - * @param orderStatus 订单状态 - * @param payType 支付方式 - * @param pkMember 会员ID - * @return - */ - int updateOrderStatus(Long pkOrder, Integer orderStatus, Integer payType, Long pkMember); - - /** - * 查询会员购买EV总计 - * - * @param pkMember 会员ID - * @param orderTypeList 订单类型列表 - * @param queryStartDate 查询开始时间 - * @return - */ - BigDecimal sumOrderAssAchieve(Long pkMember, List orderTypeList, Date queryStartDate); - - /** - * 查询自助撤单列表 - * - * @param pkMember 会员ID - * @return - */ - List listSelfRevoke(Long pkMember); - - /** - * 查询自助撤单订单 - * - * @param pkMember 会员ID - * @param orderCode 订单编号 - * @return - */ - SaOrder getSelfRevoke(Long pkMember, String orderCode); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/IShoppingCartService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/IShoppingCartService.java deleted file mode 100644 index 7af5e0e1..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/IShoppingCartService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.lenjoy.sale.order.service; - -import com.hzs.lenjoy.sale.order.dto.ShoppingCartRedis; - -import java.util.List; - -/** - * @Description: 购物车服务 - * @Author: jiang chao - * @Time: 2024/10/18 16:46 - * @Classname: IShoppingCartService - * @PackageName: com.hzs.lenjoy.sale.order.service - */ -public interface IShoppingCartService { - - /** - * 查询购物车缓存 - * - * @param pkMember 会员ID - * @param shoppingIdList 购物车ID列表 - * @param pkCountry 所属国家 - * @return - */ - List queryShopping(Long pkMember, List shoppingIdList, Integer pkCountry); - - - /** - * 批量删除购物车 - * - * @param pkMember 会员ID - * @param shoppingIdList 购物车ID列表 - * @param pkCountry 所属国家 - */ - void batchDelShopping(Long pkMember, List shoppingIdList, Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/OrderBusinessServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/OrderBusinessServiceImpl.java deleted file mode 100644 index bad97b80..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/OrderBusinessServiceImpl.java +++ /dev/null @@ -1,437 +0,0 @@ -package com.hzs.lenjoy.sale.order.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hzs.common.core.constant.*; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.exception.ServiceException; -import com.hzs.common.core.utils.*; -import com.hzs.common.core.utils.reflect.ReflectUtils; -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.ext.SaOrderItemsExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.common.domain.system.base.ext.BdProductStorehouseExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.account.IMemberAccountApi; -import com.hzs.lenjoy.member.base.IMemberServiceApi; -import com.hzs.lenjoy.sale.order.param.OrderParam; -import com.hzs.lenjoy.sale.order.service.IOrderBusinessService; -import com.hzs.lenjoy.sale.order.service.ISaOrderItemsService; -import com.hzs.lenjoy.sale.order.service.ISaOrderService; -import com.hzs.lenjoy.sale.wares.param.WaresNumberParam; -import com.hzs.lenjoy.sale.wares.service.IBdWaresExtendService; -import com.hzs.system.base.IAreaServiceApi; -import com.hzs.system.config.IAreaCurrencyServiceApi; -import com.hzs.system.config.dto.AreaCurrencyDTO; -import com.hzs.third.mq.dto.LenjoyOrderDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 订单业务处理 - * @Author: jiang chao - * @Time: 2024/10/23 10:04 - * @Classname: OrderBusinessServiceImpl - * @PackageName: com.hzs.lenjoy.sale.order.service.impl - */ -@Slf4j -@Service -public class OrderBusinessServiceImpl implements IOrderBusinessService { - - @Autowired - private SaOrderHandle saOrderHandle; - @Autowired - private ISaOrderService iSaOrderService; - @Autowired - private ISaOrderItemsService iSaOrderItemsService; - @Autowired - private IBdWaresExtendService iBdWaresExtendService; - - @DubboReference - IMemberServiceApi iMemberServiceApi; - @DubboReference - IMemberAccountApi iMemberAccountApi; - @DubboReference - IAreaServiceApi iAreaServiceApi; - @DubboReference - IAreaCurrencyServiceApi iAreaCurrencyServiceApi; - - @Autowired - private RabbitTemplate rabbitTemplate; - - @Override - public CuMember getCuMemberById(Long pkId) { - return iMemberServiceApi.getMemberById(pkId).getData(); - } - - @Override - public CuMember getCuMemberByCode(String code) { - return iMemberServiceApi.getMemberByCode(code).getData(); - } - - @Override - public CuMember getBloodTopMember(Long memberId, Long topId) { - return iMemberServiceApi.getBloodTopMember(memberId, topId).getData(); - } - - @Override - public SaOrderExt getOrderByCode(SaOrder orderParam) { - // 查询待支付订单 - SaOrder saOrder = iSaOrderService.getOrderByCode(SaOrder.builder() - .orderCode(orderParam.getOrderCode()) - .orderStatus(EOrderStatus.WAIT_PAY.getValue()) - .orderType(orderParam.getOrderType()) - .build()); - if (null == saOrder) { - return null; - } - SaOrderExt saOrderExt = BeanUtil.copyProperties(saOrder, SaOrderExt.class); - // 查询订单明细 - List saOrderItemsList = iSaOrderItemsService.listOrderItemsByOrder(SaOrderItems.builder() - .pkOrder(saOrder.getPkId()) - .build()); - saOrderExt.setOrderItemsExtList(saOrderItemsList); - return saOrderExt; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String confirmSaOrder(OrderParam orderParam) { - // 查询购买人信息 - CuMember cuMember = orderParam.getUpgradeMember(); - if (null == cuMember) { - cuMember = getCuMemberByCode(orderParam.getUpgradeMemberCode()); - } - - SaOrderExt saOrderExt = packageWholeSaOrder(orderParam, cuMember); - if (saOrderExt.getOrderItemsList().size() == 0) { - return "订单商品不存在或者已下架"; - } - - // 支持待支付，直接生成订单 - processOrder(saOrderExt); - return null; - } - - /** - * 封装订单等信息 - * - * @param orderParam - * @param cuMember - * @return - */ - private SaOrderExt packageWholeSaOrder(OrderParam orderParam, CuMember cuMember) { - // 获取订单编号 - String orderCode = CommonUtil.createSerialNumber(EOrderPrefix.ORDER_CODE.getValue()); - - SaOrderExt saOrderExt = saOrderHandle.packageSaveSaOrder(orderParam, orderCode, cuMember); - // 封装订单明细（2024.02.02添加处理订单扩展类型） - saOrderHandle.packSaOrderItems(orderParam, saOrderExt, cuMember); - // 第二次封装订单，根据明细表计算订单主表金额、业绩,处理明细仓库 - // key为产品id - List productIdList = new ArrayList<>(); - saOrderExt.getOrderItemsList().forEach(saOrderItems -> { - saOrderExt.setPkRate(saOrderItems.getPkRate()); - if (EYesNo.YES.getIntValue() == saOrderItems.getIsGift()) { - return; - } - // 总价; - saOrderExt.setOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); - // 总业绩 - saOrderExt.setOrderAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAchieve(), saOrderItems.getAchievement(), saOrderItems.getQuantity())); - // 总考核业绩 - saOrderExt.setOrderAssAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAssAchieve(), saOrderItems.getAssAchievement(), saOrderItems.getQuantity())); - productIdList.add(saOrderItems.getPkProduct()); - }); - - // 中国金额四舍五入保留2位小数 - saOrderExt.setOrderAmount(saOrderExt.getOrderAmount().setScale(2, RoundingMode.HALF_UP)); - - if (productIdList.size() > 0 && saOrderExt.getRecProvince() != null) { - // 根据产品，先查看是否由仓库，有仓库的话修改仓库 - List bdProductStorehouseList = iAreaServiceApi.queryBdProductStorehouseByCondition(productIdList, saOrderExt.getRecProvince()).getData(); - Map bdProductStorehouseMap = new HashMap<>(); - if (CollectionUtil.isNotEmpty(bdProductStorehouseList)) { - bdProductStorehouseList.forEach(bdProductStorehouse -> bdProductStorehouseMap.put(bdProductStorehouse.getPkProduct(), bdProductStorehouse)); - for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { - if (bdProductStorehouseMap.containsKey(saOrderItems.getPkProduct())) { - BdProductStorehouseExt bdProductStorehouseExt = bdProductStorehouseMap.get(saOrderItems.getPkProduct()); - saOrderItems.setPkStorehouse(bdProductStorehouseExt.getPkStorehouse().intValue()); - } - } - } - } - saOrderExt.setUploadAchieve(saOrderExt.getOrderAchieve()); - orderParam.setOrderCode(orderCode); - return saOrderExt; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void processOrder(SaOrderExt saOrderExt) { - // 待支付直接保存订单、会员 - // 保存订单 - iSaOrderService.save(saOrderExt); - // 将订单表主键封装为明细表主键 - List waresNumberParamList = new ArrayList<>(); - saOrderExt.getOrderItemsList().forEach(saOrderItems -> { - saOrderItems.setPkOrder(saOrderExt.getPkId()); - if (saOrderItems.getPkWares() != null && saOrderItems.getPkWares() != 0 - && saOrderItems.getWaresQuantity() != 0) { - // 换货或者二次发货等，商品为0，则不需要处理 - waresNumberParamList.add(WaresNumberParam.builder().pkWares(saOrderItems.getPkWares()).number(saOrderItems.getWaresQuantity()).build()); - } - }); - // 保存订单明细 - iSaOrderItemsService.saveBatch(saOrderExt.getOrderItemsList()); - - // 过滤相同商品主键数据 - List waresNumberList = waresNumberParamList.stream().filter(DeduplicationUtil.distinctByKey(WaresNumberParam::getPkWares)).collect(Collectors.toList()); - iBdWaresExtendService.updateWaresSales(waresNumberList); - } - - @Override - public void queryPostage(OrderParam orderParam) { - CuMember cuMember = getCuMemberById(orderParam.getCenterCodeId()); - saOrderHandle.queryPostage(cuMember, orderParam); - } - - @Override - public CuMemberAccountExt validateMemberAccount(OrderParam orderParam) { - CuMemberAccountExt cuMemberAccountExt = iMemberAccountApi.getPayAccount(orderParam.getCenterCodeId(), orderParam.getPkSettleCountry()).getData(); - // 验证密码 - if (StringUtils.isNotEmpty(orderParam.getPayPwd())) { - if (!SecurityUtils.matchesPassword(orderParam.getPayPwd(), cuMemberAccountExt.getPayPwd())) { - throw new ServiceException("支付密码错误"); - } - } - // 验证账户状态、钱包状态 - if (cuMemberAccountExt.getAccountStatus() != EAccountStatus.NORMAL.getValue()) { - throw new ServiceException("会员账户存在异常，请及时联系客服"); - } - return cuMemberAccountExt; - } - - @Override - public void queryOrderSpendDetails(CuMemberAccountExt cuMemberAccount, SaOrderExt saOrder, List orderItemExtList) { - // 订单支付金额 - BigDecimal payMoney = saOrder.getOrderAmount(); - // 订单支付邮费 - BigDecimal postage = saOrder.getPostage(); - - // 验证商品是否存在特殊消费配置 - if (CollectionUtil.isNotEmpty(orderItemExtList)) { - for (SaOrderItemsExt saOrderItemsExt : orderItemExtList) { - if (saOrderItemsExt.getPkSpecialCurrency() != null) { - BigDecimal orderItemPayMoney = ComputeUtil.computeMultiply(saOrderItemsExt.getPrice(), saOrderItemsExt.getQuantity()); - payMoney = ComputeUtil.computeSubtract(payMoney, orderItemPayMoney); - // 查询配置的特殊支付配置 - List areaCurrencyDtoList = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrderItemsExt.getPkSpecialCurrency()).getData(); - - if (!handleSaOrderAmount(cuMemberAccount, orderItemPayMoney, BigDecimal.ZERO, areaCurrencyDtoList)) { - return; - } - } - } - } - - // 查询专区所属币种 - List areaCurrencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), cuMemberAccount.getPkCountry()).getData(); - handleSaOrderAmount(cuMemberAccount, payMoney, postage, areaCurrencyDTOList); - } - - /** - * 计算订单币种扣款 - * - * @param cuMemberAccount 会员账户 - * @param payMoney 支付金额 - * @param postage 邮费 - * @param areaCurrencyDTOList 支付配置 - * @return - */ - private boolean handleSaOrderAmount(CuMemberAccountExt cuMemberAccount, BigDecimal payMoney, BigDecimal postage, - List areaCurrencyDTOList) { - boolean flag = true; - if (!ComputeUtil.compareValue(ComputeUtil.computeAdd(payMoney, postage))) { - return true; - } - cuMemberAccount.setIsPayment(Boolean.FALSE); - // 原始支付金额（订单金额 + 邮费） - BigDecimal original = payMoney; - - for (AreaCurrencyDTO areaCurrencyDTO : areaCurrencyDTOList) { - // 开始扣款 - // 待支付金额>0进行扣减 - if (ComputeUtil.compareValue(payMoney)) { - // 获得特殊处理 - // 判断比例是否 > 0, 为强制扣除金额 ，强制扣除金额不满足，直接支付失败 - if (!ComputeUtil.compareValue(areaCurrencyDTO.getDeductRatio())) { - // 支付比例为0处理 - // 最大支付金额 - if (null != areaCurrencyDTO.getDeductMaxRatio() - && areaCurrencyDTO.getDeductMaxRatio().compareTo(BigDecimal.ZERO) > 0) { - // 并且有最大支付比例也不为0，则需要进行使用限制 - areaCurrencyDTO.setDeductMaxRatioAmount(ComputeUtil.computeDivide(original.multiply(areaCurrencyDTO.getDeductMaxRatio()), BigDecimal.valueOf(100))); - } - payMoney = saOrderHandle.subtract(payMoney, cuMemberAccount, areaCurrencyDTO); - } else { - // 最小支付金额 - BigDecimal minPayMoney = ComputeUtil.computeDivide(original.multiply(areaCurrencyDTO.getDeductRatio()), BigDecimal.valueOf(100)); - BigDecimal accountValue = saOrderHandle.getAccountByKey(cuMemberAccount, areaCurrencyDTO.getFieldValue()); - - if (minPayMoney.compareTo(accountValue) > 0) { - flag = false; - if (cuMemberAccount.getErrorMsg() == null) { - cuMemberAccount.setErrorMsg(areaCurrencyDTO.getAccountName() + "账户余额不足！"); - } else { - cuMemberAccount.setErrorMsg(cuMemberAccount.getErrorMsg() + areaCurrencyDTO.getAccountName() + "账户余额不足！"); - } - } - - BigDecimal originalPayMoney = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.PAY_ACCOUNT + areaCurrencyDTO.getFieldValue()); - if (originalPayMoney == null) { - originalPayMoney = BigDecimal.ZERO; - } - ReflectUtils.invokeSetter(cuMemberAccount, MemberFieldConstants.PAY_ACCOUNT + areaCurrencyDTO.getFieldValue(), ComputeUtil.computeAdd(originalPayMoney, minPayMoney)); - payMoney = payMoney.subtract(minPayMoney); - } - } - // 对邮费进行单独处理 邮费>0 进行扣减 - if (areaCurrencyDTO.getIsPostage() != null && areaCurrencyDTO.getIsPostage() == EYesNo.YES.getIntValue() && postage.compareTo(BigDecimal.ZERO) > 0) { - postage = saOrderHandle.subtract(postage, cuMemberAccount, areaCurrencyDTO); - } - // 每次扣除后判断是否扣除完毕，扣除完毕结束 - if (flag && payMoney.compareTo(BigDecimal.ZERO) == 0 && postage.compareTo(BigDecimal.ZERO) == 0) { - cuMemberAccount.setIsPayment(Boolean.TRUE); - break; - } - } - return flag; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void payWalletOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt) { - // 更新订单信息 - this.updateOrderStatus(saOrderExt.getPkId(), cuMemberAccountExt.getPkMember(), EOrderPayType.WALLET.getValue()); - - // TODO 后续进销存处理 - - R payResult = iMemberServiceApi.memberWalletPay(saOrderExt, cuMemberAccountExt); - if (!payResult.isSuccess()) { - log.error("订单钱包支付失败! saOrderExt: {}, msg: {}", saOrderExt, payResult.getMsg()); - throw new ServiceException("订单付款失败!"); - } - - // 推送MQ处理 - this.pushOrderMQ(saOrderExt); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String onlinePaymentCallBack(Long pkMember, String orderCode) { - // 查询订单及明细信息 - SaOrderExt saOrderExt = this.getOrderByCode(SaOrder.builder() - .orderCode(orderCode) - .orderStatus(EOrderStatus.WAIT_PAY.getValue()) - .build()); - if (null == saOrderExt) { - return "订单信息不存在"; - } - - // 更新订单信息 - this.updateOrderStatus(saOrderExt.getPkId(), pkMember, EOrderPayType.ONLINE.getValue()); - - // TODO 后续进销存处理 - - // 处理会员流水 - CuMember cuMember = this.getCuMemberById(pkMember); - if (null != cuMember) { - iMemberServiceApi.memberOnlinePay(cuMember, saOrderExt); - } - - // 推送MQ处理 - this.pushOrderMQ(saOrderExt); - - return null; - } - - /** - * 更新订单信息 - * - * @param pkOrder 订单ID - * @param pkMember 会员ID - * @param payType 支付类型 - */ - private void updateOrderStatus(Long pkOrder, Long pkMember, Integer payType) { - // 更新订单状态 - iSaOrderService.updateOrderStatus(pkOrder, EOrderStatus.PAY.getValue(), payType, pkMember); - // 更新订单明细状态 - iSaOrderItemsService.updateOrderItemStatus(pkOrder, EOrderStatus.PAY.getValue(), pkMember); - } - - /** - * 推送订单MQ处理 - * - * @param saOrderExt 订单数据 - */ - private void pushOrderMQ(SaOrderExt saOrderExt) { - // 推送秒结数据 - rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); - - if (EOrderType.LENJOY_CONSUME.getValue() == saOrderExt.getOrderType() - && saOrderExt.getOrderAssAchieve().compareTo(BigDecimal.ZERO) > 0) { - // 乐享海购订单 并且 EV大于0 ，推送MQ处理是否店铺 - rabbitTemplate.convertAndSend(RabbitMqConstants.LENJOY_ORDER_EXCHANGE, RabbitMqConstants.LENJOY_ORDER_KEY, BeanUtil.copyProperties(saOrderExt, LenjoyOrderDTO.class)); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String revokeOrder(Long pkMember, SaOrder saOrder) { - Date nowDate = new Date(); - - // 更新订单状态 - if (iSaOrderService.update(Wrappers.lambdaUpdate() - .eq(SaOrder::getPkId, saOrder.getPkId()) - .eq(SaOrder::getDelFlag, EDelFlag.UN_DELETE.getValue()) - .set(SaOrder::getDelFlag, EDelFlag.DELETE.getValue()) - .set(SaOrder::getPkModified, pkMember) - .set(SaOrder::getModifiedTime, nowDate) - )) { - // 更新订单明细状态 - iSaOrderItemsService.update(Wrappers.lambdaUpdate() - .eq(SaOrderItems::getPkOrder, saOrder.getPkId()) - .eq(SaOrderItems::getDelFlag, EDelFlag.UN_DELETE.getValue()) - .set(SaOrderItems::getDelFlag, EDelFlag.DELETE.getValue()) - .set(SaOrderItems::getPkModified, pkMember) - .set(SaOrderItems::getModifiedTime, nowDate) - ); - - // 处理会员流水以及余额 - R resultR = iMemberServiceApi.cancelOrderBackAccount(saOrder, pkMember); - if (!resultR.isSuccess()) { - log.error("自助撤销订单异常，msg: {}", resultR.getMsg()); - throw new ServiceException("撤销订单异常，请刷新后重试"); - } - - return null; - } - return "撤销订单失败，请刷新后重试"; - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderChargeLogServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderChargeLogServiceImpl.java deleted file mode 100644 index dd8f6b79..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderChargeLogServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.order.SaOrderChargeLog; -import com.hzs.lenjoy.sale.order.mapper.SaOrderChargeLogMapper; -import com.hzs.lenjoy.sale.order.service.ISaOrderChargeLogService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 订单修改记录 服务实现类 - * @Author: jiang chao - * @Time: 2024/11/21 16:51 - * @Classname: SaOrderChargeLogServiceImpl - * @PackageName: com.hzs.lenjoy.sale.order.service.impl - */ -@Service -public class SaOrderChargeLogServiceImpl extends ServiceImpl implements ISaOrderChargeLogService { - - @Override - public int checkOrderApprovalExist(List typeList, List orderCodeList, Integer pkCountry) { - return baseMapper.checkOrderApprovalExist(typeList, orderCodeList, pkCountry); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderHandle.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderHandle.java deleted file mode 100644 index a4c93d01..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderHandle.java +++ /dev/null @@ -1,663 +0,0 @@ -package com.hzs.lenjoy.sale.order.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.activity.base.IActivityServiceApi; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.exception.ServiceException; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.common.domain.sale.ext.BdPostageFailAreaExt; -import com.hzs.common.domain.sale.ext.BdWaresDetailExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.common.domain.sale.postage.BdPostage; -import com.hzs.common.domain.sale.postage.BdPostageArea; -import com.hzs.common.domain.sale.postage.BdPostageDetail; -import com.hzs.common.domain.sale.product.BdProduct; -import com.hzs.common.domain.system.base.BdStorehouse; -import com.hzs.common.domain.system.config.BdAreaFreePostage; -import com.hzs.lenjoy.sale.order.param.OrderParam; -import com.hzs.lenjoy.sale.postage.service.IBdPostageAreaService; -import com.hzs.lenjoy.sale.postage.service.IBdPostageDetailService; -import com.hzs.lenjoy.sale.postage.service.IBdPostageFailAreaService; -import com.hzs.lenjoy.sale.postage.service.IBdPostageService; -import com.hzs.lenjoy.sale.product.service.IBdProductService; -import com.hzs.lenjoy.sale.wares.service.IBdWaresDetailService; -import com.hzs.lenjoy.sale.wares.service.IBdWaresSpecialPostageService; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.ISystemConfigServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.config.IAreaFreePostageServiceApi; -import com.hzs.system.config.dto.AreaCurrencyDTO; -import lombok.extern.slf4j.Slf4j; -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.util.*; - -/** - * @Description: 订单处理组件 - * @Author: jiang chao - * @Time: 2024/10/21 9:49 - * @Classname: SaOrderHandle - * @PackageName: com.hzs.lenjoy.sale.order.service.impl - */ -@Slf4j -@Component -public class SaOrderHandle { - - @Autowired - private IBdProductService iBdProductService; - @Autowired - private IBdWaresDetailService iBdWaresDetailService; - @Autowired - private IBdWaresSpecialPostageService iBdWaresSpecialPostageService; - @Autowired - private IBdPostageService iBdPostageService; - @Autowired - private IBdPostageDetailService iBdPostageDetailService; - @Autowired - private IBdPostageAreaService iBdPostageAreaService; - @Autowired - private IBdPostageFailAreaService iBdPostageFailAreaService; - - @DubboReference - IActivityServiceApi iActivityServiceApi; - @DubboReference - ICurrencyServiceApi iCurrencyServiceApi; - @DubboReference - ISystemConfigServiceApi systemConfigServiceApi; - @DubboReference - IAreaFreePostageServiceApi iAreaFreePostageServiceApi; - - /** - * 封装订单 - * - * @param orderParam 订单参数 - * @param orderCode 订单编号 - * @param cuMember 当前会员 - * @return - */ - SaOrderExt packageSaveSaOrder(OrderParam orderParam, String orderCode, CuMember cuMember) { - SaOrderExt saOrderExt = new SaOrderExt(); - saOrderExt.setOrderCode(orderCode); - saOrderExt.setOrderAmount(BigDecimal.ZERO); - saOrderExt.setOrderAchieve(BigDecimal.ZERO); - saOrderExt.setOrderAssAchieve(BigDecimal.ZERO); - saOrderExt.setPkMember(cuMember.getPkId()); - saOrderExt.setOrderType(orderParam.getSpecialArea()); - saOrderExt.setPkReference(cuMember.getPkParent()); - saOrderExt.setPkPlacement(cuMember.getPkPlaceParent()); - saOrderExt.setRecName(orderParam.getRecName()); - saOrderExt.setRecPhone(orderParam.getRecPhone()); - saOrderExt.setRecProvince(orderParam.getRecProvince()); - if (CountryConstants.CHINA_COUNTRY.equals(cuMember.getPkSettleCountry()) || null == orderParam.getPkStorehouse()) { - if (orderParam.getRecProvince() != null) { - // 根据收货省获取仓库 - BdStorehouse bdStorehouse = iCurrencyServiceApi.queryBdStorehouseByProvince(orderParam.getRecProvince()).getData(); - if (bdStorehouse != null) { - saOrderExt.setPkStorehouse(bdStorehouse.getPkId()); - } - } - } else { - saOrderExt.setPkStorehouse(orderParam.getPkStorehouse()); - } - saOrderExt.setRecCity(orderParam.getRecCity()); - saOrderExt.setRecCounty(orderParam.getRecCounty()); - saOrderExt.setRecAddress(orderParam.getRecAddress()); - saOrderExt.setRemark(orderParam.getRemark()); - saOrderExt.setTranType(orderParam.getTransType()); - saOrderExt.setDeliveryWay(orderParam.getDeliveryWay()); - // 如果发货方式为空，或者为0，则重置为快递发货 - if (null == saOrderExt.getDeliveryWay() || saOrderExt.getDeliveryWay().equals(0)) { - saOrderExt.setDeliveryWay(EDelivery.FAST_MAIL.getValue()); - } - // 订单状态先设置为待支付，支付的时候更新 - saOrderExt.setOrderStatus(EOrderStatus.WAIT_PAY.getValue()); - saOrderExt.setPkVertex(cuMember.getPkVertex()); - saOrderExt.setPkCreator(orderParam.getCenterCodeId()); - saOrderExt.setPkCountry(cuMember.getPkSettleCountry()); - saOrderExt.setCreationTime(DateUtils.currentDateTime()); - // 海圣优选订单添加系统标记 - saOrderExt.setSystemType(ESystemType.LENJOY.getValue()); - orderParam.setOrderCode(orderCode); - return saOrderExt; - } - - /** - * 封装订单明细 - * - * @param orderParam 订单参数 - * @param saOrder 订单信息 - * @param cuMember 当前会员 - */ - void packSaOrderItems(OrderParam orderParam, SaOrderExt saOrder, CuMember cuMember) { - List saOrderItemsList; - orderParam.setPostage(BigDecimal.ZERO); - try { - saOrderItemsList = getSaOrderItems(orderParam, saOrder, cuMember); - } catch (Exception e) { - log.error("下单封装订单明细异常, orderParam: {}", orderParam, e); - throw new ServiceException("会员下单处理失败，请重新下单"); - } - saOrder.setPostage(orderParam.getPostage()); - saOrder.setOrderItemsList(saOrderItemsList); - } - - /** - * 获取订单明细列表 - * - * @param orderParam 订单参数 - * @param saOrder 订单信息 - * @param cuMember 当前会员 - * @return - */ - private List getSaOrderItems(OrderParam orderParam, SaOrderExt saOrder, CuMember cuMember) { - // 订单明细 - List saOrderItemsList = new ArrayList<>(); - // 当前国家 - Integer pkCountry = orderParam.getPkSettleCountry(); - - // 商品编号 + sku主键 + 数量 - List bdWaresDetailExtList = getWaresDetailExtList(orderParam, cuMember); - if (CollectionUtil.isEmpty(bdWaresDetailExtList)) { - throw new ServiceException("没有找到商品，请刷新重试！"); - } - - // 包邮邮费合计 - BigDecimal resultPostage = BigDecimal.ZERO; - // 特殊邮费模板 -- 2023.10.27 指定特殊邮费模板不走写死的300包邮逻辑 - List specialPostageList = iBdWaresSpecialPostageService.querySpecialPostagePkWares(pkCountry); - - // 邮费map - // 处理邮费 根据专区获得邮费模板 邮费 先进行分类，把邮费模板一样的放在一起 - Map> postageMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdWaresDetailExtList.size())); - - // 获取汇率 - CurrencyDTO currency = iCurrencyServiceApi.getCurrency(pkCountry).getData(); - - for (BdWaresDetailExt waresDetailExt : bdWaresDetailExtList) { - SaOrderItems saOrderItems = getSaOrderItems(cuMember, saOrder, currency, saOrderItemsList, waresDetailExt); - - // 免邮的话不需要计算邮费 - if (EYesNo.YES.getIntValue() == waresDetailExt.getIsFreeMail()) { - continue; - } - if (EDelivery.FAST_MAIL.getValue() == orderParam.getDeliveryWay()) { - setPostageTmpMap(orderParam, postageMap, waresDetailExt, saOrderItems); - } - // 累积产品价格（计算包邮使用） - resultPostage = resultPostage.add(saOrderItems.getPrice().multiply(new BigDecimal(saOrderItems.getQuantity()))); - } - - if (EDelivery.FAST_MAIL.getValue() == orderParam.getDeliveryWay()) { - // 获取邮费配置 - String postageConfig = systemConfigServiceApi.getBonusSystemConfig(pkCountry, ESystemConfig.POSTAGE_CONFIG.getKey()).getData(); - if (null == postageConfig) { - log.error("邮费模板缓存为空，按取最大值处理"); - // 缓存值为空，按取最大值进行处理 - postageConfig = EPostageConfig.MAXIMUM.getValue(); - } - - String tmpPostageConfig = postageConfig; - // 开始计算邮费 - postageMap.forEach((pkPostage, postageOrderItemsList) -> { - calculatePostageByPkId(orderParam, tmpPostageConfig, pkPostage, postageOrderItemsList, pkCountry, specialPostageList); - }); - - // 计算包邮时，需要把特殊运费金额减掉 - resultPostage = resultPostage.subtract(orderParam.getSpecialPostageAmount()); - - // 专区包邮配置 - BdAreaFreePostage bdAreaFreePostage = iAreaFreePostageServiceApi.queryAreaFreePostage(orderParam.getSpecialArea(), pkCountry).getData(); - if (null != bdAreaFreePostage && null != bdAreaFreePostage.getFreeAmount()) { - // 存在包邮配置，获取包邮金额 - BigDecimal freeAmount = bdAreaFreePostage.getFreeAmount(); - - // 大于包邮金额，则进行包邮 - if (resultPostage.compareTo(freeAmount) >= 0) { - orderParam.setPostage(BigDecimal.ZERO); - } - } - - // 最终邮费取值 - if (postageConfig.equals(EPostageConfig.CUMULATIVE.getValue())) { - // 累计值 - orderParam.setPostage(orderParam.getPostage().add(orderParam.getSpecialPostage())); - } else if (postageConfig.equals(EPostageConfig.MAXIMUM.getValue())) { - // 最大值 - if (ComputeUtil.compareValue(orderParam.getSpecialPostage(), orderParam.getPostage())) { - orderParam.setPostage(orderParam.getSpecialPostage()); - } - } else { - // 最小值 - if (ComputeUtil.compareValue(orderParam.getSpecialPostage(), orderParam.getPostage())) { - if (orderParam.getPostage().compareTo(BigDecimal.ZERO) == 0) { - // 最小值如果等于0，则还是取大值 - orderParam.setSpecialPostage(orderParam.getSpecialPostage()); - } - } - } - } - - return saOrderItemsList; - } - - /** - * 获取订单明细 - * - * @param cuMember - * @param saOrder - * @param currency - * @param saOrderItemsList - * @param waresDetailExt - * @return - */ - private SaOrderItems getSaOrderItems(CuMember cuMember, SaOrderExt saOrder, CurrencyDTO currency, List saOrderItemsList, BdWaresDetailExt waresDetailExt) { - SaOrderItems saOrderItems = SaOrderItems.builder() - .pkProduct(waresDetailExt.getPkProduct()) - .pkWares(waresDetailExt.getPkWares()) - .pkWaresDetail(waresDetailExt.getPkId()) - .pkWaresSpecsSku(waresDetailExt.getPkWaresSpecsSku().longValue()) - .price(waresDetailExt.getPrice()) - .achievement(waresDetailExt.getAchieve()) - .assAchievement(waresDetailExt.getAssAchieve()) - .quantity(waresDetailExt.getQuantity() * waresDetailExt.getWaresQuantity()) - .waresQuantity(waresDetailExt.getWaresQuantity()) - .pkRate(currency.getPkId()) - .isGift(waresDetailExt.getIsGift()) - .specsName(waresDetailExt.getSpecsName()) - .specsNameId(waresDetailExt.getSpecsNameId()) - .isMakerGift(waresDetailExt.getIsMakerGift()) - .pkMakerSpace(waresDetailExt.getPkMakerSpace()) - .pkSpecialCurrency(waresDetailExt.getPkSpecialCurrency()) - .shippingChannel(waresDetailExt.getShippingChannel()) - .pkSupplier(waresDetailExt.getPkSupplier()) - .skuCode(CommonUtil.createSkuCode(waresDetailExt.getProductCode(), waresDetailExt.getSpecsNameId())) - .wareCode(waresDetailExt.getWaresCode()) - .build(); - if (saOrderItems.getIsGift() != null && EYesNo.YES.getIntValue() == saOrderItems.getIsGift()) { - saOrderItems.setPrice(BigDecimal.ZERO); - } - if (cuMember != null) { - saOrderItems.setPkGrade(cuMember.getPkSettleGrade()); - saOrderItems.setPkAwards(cuMember.getPkAwards()); - } - if (saOrder != null) { - saOrderItems.setPkStorehouse(saOrder.getPkStorehouse()); - saOrderItems.setOrderStatus(saOrder.getOrderStatus()); - saOrderItems.setPkCreator(saOrder.getPkCreator()); - saOrderItems.setCreationTime(saOrderItems.getCreationTime()); - saOrderItems.setPkCountry(saOrder.getPkCountry()); - } - saOrderItemsList.add(saOrderItems); - return saOrderItems; - } - - /** - * 获取商品明细 - * - * @param orderParam - * @param cuMember - * @return - */ - private List getWaresDetailExtList(OrderParam orderParam, CuMember cuMember) { - // 商品编号 + sku列表找到所有的商品信息 - // 查找所有商品 - List bdWaresDetailExtList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(orderParam.getOrderItemsParams())) { - List waresDetailExtList = iBdWaresDetailService.queryWaresDetailByCondition(orderParam.getSpecialArea(), orderParam.getTransType(), orderParam.getOrderItemsParams()); - if (waresDetailExtList.size() > 0) { - bdWaresDetailExtList.addAll(waresDetailExtList); - } - } - - // 活动赠品 赠送封装 - List newWaresDetailExtList = iActivityServiceApi.generateActivityGiftWaresAchieve(orderParam.getSpecialArea(), orderParam.getPkSettleCountry(), bdWaresDetailExtList, - null, cuMember).getData(); - if (newWaresDetailExtList.size() > 0) { - bdWaresDetailExtList.addAll(newWaresDetailExtList); - } - return bdWaresDetailExtList; - } - - /** - * 设置临时邮费模板 - * - * @param orderParam - * @param postageMap - * @param waresDetailExt - * @param saOrderItems - */ - private void setPostageTmpMap(OrderParam orderParam, Map> postageMap, BdWaresDetailExt waresDetailExt, SaOrderItems saOrderItems) { - Integer pkPostage; - // 判断运输方式 - if (ETransportType.OCEAN.getValue() == orderParam.getTransType()) { - pkPostage = waresDetailExt.getPkOceanPostage(); - } else if (ETransportType.AIR.getValue() == orderParam.getTransType()) { - pkPostage = waresDetailExt.getPkAirPostage(); - } else { - pkPostage = waresDetailExt.getPkLandPostage(); - } - if (postageMap.containsKey(pkPostage)) { - List postageOrderItemsList = postageMap.get(pkPostage); - postageOrderItemsList.add(saOrderItems); - } else { - List postageOrderItemsList = new ArrayList<>(); - postageOrderItemsList.add(saOrderItems); - postageMap.put(pkPostage, postageOrderItemsList); - } - } - - /** - * 计算邮费 - * - * @param orderParam - * @param postageConfig - * @param pkPostage - * @param postageOrderItemsList - * @param pkCountry - * @param specialPostageList - */ - private void calculatePostageByPkId(OrderParam orderParam, String postageConfig, Integer pkPostage, - List postageOrderItemsList, Integer pkCountry, - List specialPostageList) { - // 获取专区设置的不能发货区域 - List failAreaList = iBdPostageFailAreaService.queryPostageFailAreaList(pkPostage); - if (CollectionUtil.isNotEmpty(failAreaList)) { - for (BdPostageFailAreaExt postageFailArea : failAreaList) { - if (orderParam.getRecProvince().equals(postageFailArea.getProvince()) && orderParam.getRecCity().equals(postageFailArea.getCity())) { - // 指定省、市不配置 - throw new ServiceException(postageFailArea.getProvinceVal() + postageFailArea.getCityVal() + "," + (StringUtils.isNotEmpty(postageFailArea.getWarnNotice()) ? postageFailArea.getWarnNotice() : "目前不能发货")); - } else if (orderParam.getRecProvince().equals(postageFailArea.getProvince()) && null == postageFailArea.getCity()) { - // 指定省不配置 - throw new ServiceException(postageFailArea.getProvinceVal() + "," + (StringUtils.isNotEmpty(postageFailArea.getWarnNotice()) ? postageFailArea.getWarnNotice() : "目前不能发货")); - } - } - } - - // 获取邮费模板主表 - BdPostage postage = iBdPostageService.getPostage(pkPostage); - List postageDetailList = iBdPostageDetailService.getPostageDetail(orderParam.getTransType(), pkPostage); - BdPostageDetail postageDetail = null; - // 验证省、市 - for (BdPostageDetail bdPostageDetail : postageDetailList) { - // 验证省 - if (orderParam.getRecProvince().equals(bdPostageDetail.getProvince())) { - if (orderParam.getRecCity().equals(bdPostageDetail.getCity()) || - bdPostageDetail.getCity() == null) { - postageDetail = bdPostageDetail; - break; - } - } - } - if (postageDetail == null) { - throw new RuntimeException("没有找到运费模板，不能下单"); - } - - // 特殊邮费标记 - boolean specialFlag = specialPostageList.contains(pkPostage); - - // 获取专区设置的免邮金额 - List postageAreaList = iBdPostageAreaService.getPostageArea(orderParam.getTransType(), pkPostage, orderParam.getSpecialArea(), pkCountry); - BigDecimal freeAmount = null; - if (CollectionUtil.isNotEmpty(postageAreaList)) { - BdPostageArea allPostageAres = null; - // 验证省、市 - for (BdPostageArea postageArea : postageAreaList) { - // 验证省 - if (orderParam.getRecProvince().equals(postageArea.getProvince())) { - if (orderParam.getRecCity().equals(postageArea.getCity()) || - postageArea.getCity() == null) { - freeAmount = postageArea.getFreeAmount(); - break; - } - } - if (postageArea.getProvince() == null && postageArea.getCity() == null) { - allPostageAres = postageArea; - } - } - if (allPostageAres != null && freeAmount == null) { - freeAmount = allPostageAres.getFreeAmount(); - } - } - - // 获取系统参数，累计、取最大、取最小 - BigDecimal newPostage = getSaleOrderPostage(postageOrderItemsList, postage, postageDetail, freeAmount, orderParam, specialFlag); - - // 如果邮费为0元，则不进行赋值处理 - if (newPostage.compareTo(BigDecimal.ZERO) > 0) { - // 2023.10.27 指定特殊邮费模板不走写死的300包邮逻辑 - if (specialFlag) { - // 特殊邮费模板，不走包邮逻辑 - if (postageConfig.equals(EPostageConfig.CUMULATIVE.getValue())) { - orderParam.setSpecialPostage(orderParam.getSpecialPostage().add(newPostage)); - } else if (postageConfig.equals(EPostageConfig.MAXIMUM.getValue())) { - if (ComputeUtil.compareValue(newPostage, orderParam.getSpecialPostage())) { - orderParam.setSpecialPostage(newPostage); - } - } else { - if (ComputeUtil.compareValue(orderParam.getSpecialPostage(), newPostage)) { - orderParam.setSpecialPostage(newPostage); - } - } - } else { - if (postageConfig.equals(EPostageConfig.CUMULATIVE.getValue())) { - orderParam.setPostage(orderParam.getPostage().add(newPostage)); - } else if (postageConfig.equals(EPostageConfig.MAXIMUM.getValue())) { - if (ComputeUtil.compareValue(newPostage, orderParam.getPostage())) { - orderParam.setPostage(newPostage); - } - } else { - if (ComputeUtil.compareValue(orderParam.getPostage(), newPostage)) { - orderParam.setPostage(newPostage); - } - } - } - } - } - - /** - * 设置订单邮费 - * - * @param postageOrderItemsList 订单明细表，计算产品 - * @param postage - * @param postageDetail 邮费模板 - * @param freeAmount - * @param orderParam - * @param specialFlag - * @return - */ - private BigDecimal getSaleOrderPostage(List postageOrderItemsList, BdPostage postage, BdPostageDetail postageDetail, - BigDecimal freeAmount, OrderParam orderParam, boolean specialFlag) { - // 计算邮费 判断价格 - // 获取重量 获取体积 获取价格 - BigDecimal weight = BigDecimal.ZERO; - BigDecimal amount = BigDecimal.ZERO; - BigDecimal volume = BigDecimal.ZERO; - // 产品数量 - int number = 0; - // 商品数量记录map - Map waresNumberMap = new HashMap<>(); - - // 计算商品价格 - for (SaOrderItems saOrderItems : postageOrderItemsList) { - // 根据产品获得产品 - BdProduct product = iBdProductService.getById(saOrderItems.getPkProduct()); - amount = amount.add(saOrderItems.getPrice().multiply(BigDecimal.valueOf(saOrderItems.getQuantity()))); - weight = weight.add(product.getPostageWeight().multiply(BigDecimal.valueOf(saOrderItems.getQuantity()))); - - // 按产品计数量 - number += saOrderItems.getQuantity(); - - // 每个商品ID只记录一次商品数量 - waresNumberMap.computeIfAbsent(saOrderItems.getPkWares(), k -> saOrderItems.getWaresQuantity()); - } - - // 按商品数量收取邮费 - if (null != postage.getQuantityMode() && EPostageMode.WARES.getValue() == postage.getQuantityMode()) { - int waresNumber = 0; - for (Integer key : waresNumberMap.keySet()) { - waresNumber += waresNumberMap.get(key); - } - number = waresNumber; - } - - if (specialFlag) { - // 特殊邮费金额累加 - orderParam.setSpecialPostageAmount(orderParam.getSpecialPostageAmount().add(amount)); - } - - // 获取免邮金额 判断免邮金额 金额大于免邮金额，免邮 - if (freeAmount != null && ComputeUtil.compareValue(amount, freeAmount)) { - return BigDecimal.ZERO; - } - // 按重量 - if (EChargeType.WEIGHT.getValue() == postage.getChargeType()) { - return computePostage(postageDetail, weight); - } else if (EChargeType.VOLUME.getValue() == postage.getChargeType()) { - // 按体积 - volume = ComputeUtil.mathCeil(volume); - BigDecimal weightPostage = computePostage(postageDetail, weight); - BigDecimal volumePostage = computePostage(postageDetail, volume); - if (weightPostage.compareTo(volumePostage) >= 0) { - return weightPostage; - } else { - return volumePostage; - } - } else { - // 按件数 - return computePostagePieces(postageDetail, number); - } - } - - /** - * 计算邮费 - * - * @param postageDetail 邮费模板 - * @param weight 重量 - * @Description: 1) 重量计费 - * 首重重量>=实际重量 邮费 = 首重邮费 - * 反之 ：邮费 = 首重邮费+((实际重量-首重重量)/续重重量)*续重邮费 - * 2) 体积计费 - * 实际重量 = 长*宽*高/6000 利用重量计费公式计算实际邮费 - * 判断重量计费跟体积计费哪个大使用哪个计费方法 - * 陆运、空运、海运（国内默认陆运） - * @return: BigDecimal - */ - private BigDecimal computePostage(BdPostageDetail postageDetail, BigDecimal weight) { - BigDecimal postage = postageDetail.getFirstPostage(); - if (weight.compareTo(postageDetail.getFirstWeight()) > 0) { -// postage = ComputeUtil.computeDivideRoundUp(weight.subtract(postageDetail.getFirstWeight()), postageDetail.getContinuedWeight()) -// .multiply(postageDetail.getContinuedPostage()) -// .add(postage); - postage = postage.add(postageDetail.getContinuedPostage()); - } - return postage; - } - - /** - * 按件数处理邮费 - * - * @param postageDetail 邮费模板 - * @param number 数量 - * @return - */ - private BigDecimal computePostagePieces(BdPostageDetail postageDetail, int number) { - // 首件邮费 - BigDecimal postage = postageDetail.getFirstPostage(); - if (number > postageDetail.getFirstWeight().intValue()) { - // 如果数量大于首件，则需要处理续重 -// postage = postage.add(postageDetail.getContinuedPostage().multiply(new BigDecimal(number - postageDetail.getFirstWeight().intValue()))); - postage = postage.add(postageDetail.getContinuedPostage()); - } - return postage; - } - - /** - * 查询邮费 - * - * @param cuMember 会员信息 - * @param orderParam 查询参数 - * @return - */ - List queryPostage(CuMember cuMember, OrderParam orderParam) { - return getSaOrderItems(orderParam, null, cuMember); - } - - - /** - * 订单支付按币种扣款 - * - * @param payMoney 待支付金额 - * @param cuMemberAccount 会员账户 - * @param areaCurrencyDTO 支付配置DTO - */ - BigDecimal subtract(BigDecimal payMoney, CuMemberAccountExt cuMemberAccount, AreaCurrencyDTO areaCurrencyDTO) { - Integer key = areaCurrencyDTO.getFieldValue(); - - // 扣款最大比例金额 - BigDecimal deductMaxRatioAmount = areaCurrencyDTO.getDeductMaxRatioAmount(); - - if (payMoney.compareTo(BigDecimal.ZERO) > 0) { - BigDecimal accountValue = getAccountByKey(cuMemberAccount, key); - if (!ComputeUtil.compareValue(accountValue)) { - return payMoney; - } - BigDecimal value = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.PAY_ACCOUNT + key); - if (value == null) { - value = BigDecimal.ZERO; - } - if (null != deductMaxRatioAmount - && payMoney.compareTo(deductMaxRatioAmount) >= 0) { - // 待支付金额 大于等于 最大比例金额大，按最大比例金额处理 - if (deductMaxRatioAmount.compareTo(accountValue) > 0) { - value = value.add(accountValue); - payMoney = payMoney.subtract(accountValue); - } else { - value = value.add(deductMaxRatioAmount); - payMoney = payMoney.subtract(deductMaxRatioAmount); - } - } else { - if (payMoney.compareTo(accountValue) > 0) { - value = value.add(accountValue); - payMoney = payMoney.subtract(accountValue); - } else { - value = value.add(payMoney); - payMoney = payMoney.subtract(payMoney); - } - } - ReflectUtils.invokeSetter(cuMemberAccount, MemberFieldConstants.PAY_ACCOUNT + key, value); - } - return payMoney; - } - - - /** - * 通过反射获取账户余额 - * - * @param cuMemberAccount 账户 - * @param key 键 - * @return 余额 - */ - BigDecimal getAccountByKey(CuMemberAccountExt cuMemberAccount, Integer key) { - BigDecimal accountValue = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.ACCOUNT + key); - BigDecimal lockAccountValue = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_ACCOUNT + key); - BigDecimal payAccountValue = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.PAY_ACCOUNT + key); - accountValue = accountValue.add(lockAccountValue.negate()); - if (payAccountValue != null && ComputeUtil.compareValue(accountValue, payAccountValue)) { - accountValue = accountValue.subtract(payAccountValue); - } - return accountValue; - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderItemsServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderItemsServiceImpl.java deleted file mode 100644 index 27b13514..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.lenjoy.sale.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.lenjoy.sale.order.mapper.SaOrderItemsMapper; -import com.hzs.lenjoy.sale.order.service.ISaOrderItemsService; -import com.hzs.lenjoy.sale.order.vo.OrderItemsVO; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 销售订单-明细表 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 13:26 - * @Classname: SaOrderItemsServiceImpl - * @PackageName: com.hzs.lenjoy.sale.order.service.impl - */ -@Service -public class SaOrderItemsServiceImpl extends ServiceImpl implements ISaOrderItemsService { - - @Override - public List listOrderItemsByOrder(SaOrderItems saOrderItems) { - return baseMapper.listOrderItemsByOrder(saOrderItems.getPkOrder()); - } - - @Override - public int updateOrderItemStatus(Long pkOrder, Integer orderStatus, Long pkMember) { - return baseMapper.updateOrderItemStatus(pkOrder, orderStatus, pkMember); - } - - @Override - public List listOrderItem(List orderIdList) { - return baseMapper.listOrderItem(orderIdList); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderServiceImpl.java deleted file mode 100644 index 895fdc3d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/SaOrderServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.lenjoy.sale.order.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.domain.sale.order.*; -import com.hzs.lenjoy.sale.order.mapper.SaOrderMapper; -import com.hzs.lenjoy.sale.order.service.ISaOrderService; -import com.hzs.lenjoy.sale.order.vo.OrderRevokeVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @Description: 订单服务 - * @Author: jiang chao - * @Time: 2024/10/18 13:44 - * @Classname: SaOrderServiceImpl - * @PackageName: com.hzs.lenjoy.sale.order.service - */ -@Slf4j -@Service -public class SaOrderServiceImpl extends ServiceImpl implements ISaOrderService { - - @Override - public SaOrder getOrderByCode(SaOrder saOrder) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SaOrder::getOrderCode, saOrder.getOrderCode()); - if (null != saOrder.getPkCountry()) { - queryWrapper.eq(SaOrder::getPkCountry, saOrder.getPkCountry()); - } else { - queryWrapper.eq(SaOrder::getPkCountry, CountryConstants.CHINA_COUNTRY); - } - if (null != saOrder.getOrderStatus()) { - queryWrapper.eq(SaOrder::getOrderStatus, saOrder.getOrderStatus()); - } - if (null != saOrder.getOrderType()) { - queryWrapper.eq(SaOrder::getOrderType, saOrder.getOrderType()); - } - return this.getOne(queryWrapper); - } - - @Override - public int updateOrderStatus(Long pkOrder, Integer orderStatus, Integer payType, Long pkMember) { - return baseMapper.updateOrderStatus(pkOrder, orderStatus, payType, pkMember); - } - - @Override - public BigDecimal sumOrderAssAchieve(Long pkMember, List orderTypeList, Date queryStartDate) { - return baseMapper.sumOrderAssAchieve(pkMember, orderTypeList, queryStartDate); - } - - @Override - public List listSelfRevoke(Long pkMember) { - return baseMapper.listSelfRevoke(pkMember); - } - - @Override - public SaOrder getSelfRevoke(Long pkMember, String orderCode) { - return baseMapper.getSelfRevoke(pkMember, orderCode); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/ShoppingCartServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/ShoppingCartServiceImpl.java deleted file mode 100644 index d436af17..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/service/impl/ShoppingCartServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.hzs.lenjoy.sale.order.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.service.RedisService; -import com.hzs.lenjoy.sale.order.dto.ShoppingCartRedis; -import com.hzs.lenjoy.sale.order.service.IShoppingCartService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * @Description: 购物车服务 - * @Author: jiang chao - * @Time: 2024/10/18 16:46 - * @Classname: ShoppingCartServiceImpl - * @PackageName: com.hzs.lenjoy.sale.order.service.impl - */ -@Slf4j -@Service -public class ShoppingCartServiceImpl implements IShoppingCartService { - - @Autowired - private RedisService redisService; - - @Override - public List queryShopping(Long pkMember, List shoppingIdList, Integer pkCountry) { - List newShoppingCartRedis = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(shoppingIdList)) { - String key = CacheConstants.SHOPPIN_GCART + pkCountry + "_" + pkMember; - Map shoppingCartRedisMap = redisService.getCacheMap(key); - if (shoppingCartRedisMap.containsKey(key)) { - Map innerShopMap = (Map) shoppingCartRedisMap.get(key); - if (null != innerShopMap) { - for (String innKey : innerShopMap.keySet()) { - String value = innerShopMap.get(innKey); - ShoppingCartRedis shoppingCartRedis = JSONUtil.toBean(value, ShoppingCartRedis.class); - if (shoppingIdList.contains(shoppingCartRedis.getShoppingId())) { - newShoppingCartRedis.add(shoppingCartRedis); - } - } - } - } - } - return newShoppingCartRedis; - } - - @Override - public void batchDelShopping(Long pkMember, List shoppingIdList, Integer pkCountry) { - // 购物车是否清空，不影响主业务流程处理 - try { - if (CollectionUtil.isNotEmpty(shoppingIdList)) { - String key = CacheConstants.SHOPPIN_GCART + pkCountry + "_" + pkMember; - Map shoppingCartRedisMap = redisService.getCacheMap(key); - if (shoppingCartRedisMap.containsKey(key)) { - Map innerShopMap = (Map) shoppingCartRedisMap.get(key); - if (null != innerShopMap) { - Iterator> iterator = innerShopMap.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = iterator.next(); - String innKey = entry.getKey(); - String value = innerShopMap.get(innKey); - ShoppingCartRedis shoppingCartRedis = JSONUtil.toBean(value, ShoppingCartRedis.class); - if (shoppingIdList.contains(shoppingCartRedis.getShoppingId())) { - iterator.remove(); - } - } - shoppingCartRedisMap.put(key, innerShopMap); - } - redisService.setCacheMap(key, shoppingCartRedisMap); - } - } - } catch (Exception e) { - log.error("下单完成删除购物车失败，pkMember: {}, shoppingIdList: {}", pkMember, shoppingIdList, e); - } - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderAccountVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderAccountVO.java deleted file mode 100644 index 0cd29250..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderAccountVO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hzs.lenjoy.sale.order.vo; - -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 订单支付账户信息返回 - * @Author: jiang chao - * @Time: 2024/10/23 15:50 - * @Classname: OrderAccountVO - * @PackageName: com.hzs.lenjoy.sale.order.vo - */ -@Data -public class OrderAccountVO implements Serializable { - - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 消费账户 - */ - @BigDecimalFormat - private BigDecimal account1; - - /** - * 现金账户 - */ - @BigDecimalFormat - private BigDecimal account2; - - /** - * 奖金账户 - */ - @BigDecimalFormat - private BigDecimal account4; - - /** - * 消费账户 - */ - @BigDecimalFormat - private BigDecimal payAccount1; - - /** - * 现金账户 - */ - @BigDecimalFormat - private BigDecimal payAccount2; - - /** - * 奖金账户 - */ - @BigDecimalFormat - private BigDecimal payAccount4; - - /** - * 支付是否成功 - */ - private Boolean isPayment = Boolean.FALSE; - - /** - * 消息 - */ - private String errorMsg; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderItemsVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderItemsVO.java deleted file mode 100644 index f0ac6b89..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderItemsVO.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hzs.lenjoy.sale.order.vo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 订单明细返回VO - * @Author: jiang chao - * @Time: 2024/11/21 15:11 - * @Classname: OrderItemVO - * @PackageName: com.hzs.lenjoy.sale.order.vo - */ -@Data -public class OrderItemsVO implements Serializable { - - /** - * 订单明细ID - */ - @JsonIgnore - private Long pkId; - - /** - * 订单ID - */ - @JsonIgnore - private Long pkOrder; - - /** - * 产品ID - */ - @JsonIgnore - private Integer pkProduct; - - /** - * 商品ID - */ - @JsonIgnore - private Integer pkWares; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 产品价格 - */ - @BigDecimalFormat - private BigDecimal price; - - /** - * 产品数量 - */ - private Integer quantity; - - /** - * 是否赠品（0=是） - */ - private Integer isGift; - - /** - * 订单明细状态 - */ - @JsonIgnore - private Integer orderStatus; - - /** - * 产品图片 - */ - private String cover; - - /** - * 产品名称 - */ - private String productName; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderReturnVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderReturnVO.java deleted file mode 100644 index 9ce4768e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderReturnVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.lenjoy.sale.order.vo; - -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 订单返回实体 - * @Author: jiang chao - * @Time: 2024/10/21 16:16 - * @Classname: OrderReturn - * @PackageName: com.hzs.lenjoy.sale.order.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class OrderReturnVO implements Serializable { - - /** - * 邮费 - */ - @BigDecimalFormat - private BigDecimal postage; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderRevokeVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderRevokeVO.java deleted file mode 100644 index c8606307..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/order/vo/OrderRevokeVO.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.hzs.lenjoy.sale.order.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @Description: 撤单列表返回VO - * @Author: jiang chao - * @Time: 2024/11/21 14:43 - * @Classname: OrderRevokeVO - * @PackageName: com.hzs.lenjoy.sale.order.vo - */ -@Data -public class OrderRevokeVO implements Serializable { - - /** - * 订单ID - */ - @JsonIgnore - private Long pkId; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 订单类型 - */ - @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE) - private Integer orderType; - - private String orderTypeVal; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - /** - * 订单金额 - */ - @BigDecimalFormat - private BigDecimal orderAmount; - - /** - * 订单业绩 - */ - @BigDecimalFormat - private BigDecimal orderAchieve; - - /** - * 订单EV - */ - @BigDecimalFormat - private BigDecimal orderAssAchieve; - - /** - * 邮费 - */ - @JsonIgnore - private BigDecimal postage; - - /** - * 支付编号 - */ - private String creatorCode; - /** - * 支付姓名 - */ - private String creatorName; - - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员姓名 - */ - private String memberName; - - /** - * 订单状态 - */ - @JsonIgnore - private Integer orderStatus; - - /** - * 收货人 - */ - private String recName; - /** - * 收货电话 - */ - private String recPhone; - /** - * 省 - */ - @JsonIgnore - private Integer recProvince; - /** - * 省显示 - */ - private String recProvinceVal; - /** - * 市 - */ - @JsonIgnore - private Integer recCity; - /** - * 市显示 - */ - private String recCityVal; - /** - * 区 - */ - @JsonIgnore - private Integer recCounty; - /** - * 区显示 - */ - private String recCountyVal; - /** - * 详细地址 - */ - private String recAddress; - - /** - * 汇率 - */ - @JsonIgnore - private BigDecimal inExchangeRate; - - /** - * 订单明细列表 - */ - private List itemList; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageAreaMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageAreaMapper.java deleted file mode 100644 index bcc858da..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageAreaMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.lenjoy.sale.postage.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.postage.BdPostageArea; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 邮费地区表 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 11:21 - * @Classname: BdPostageAreaMapper - * @PackageName: com.hzs.lenjoy.sale.postage.mapper.xml - */ -public interface BdPostageAreaMapper extends BaseMapper { - - /** - * 根据模板主键获得邮费专区配置 - * - * @param tranType 运输方式 - * @param pkPostage 邮费模板ID - * @param specialArea 专区 - * @param pkCountry 所属国家 - * @return - */ - List getPostageArea(@Param("tranType") Integer tranType, - @Param("pkPostage") Integer pkPostage, - @Param("specialArea") Integer specialArea, - @Param("pkCountry") Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageDetailMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageDetailMapper.java deleted file mode 100644 index 95bd860c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageDetailMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.sale.postage.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.postage.BdPostageDetail; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 邮费详情设置 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 11:21 - * @Classname: BdPostageDetailMapper - * @PackageName: com.hzs.lenjoy.sale.postage.mapper.xml - */ -public interface BdPostageDetailMapper extends BaseMapper { - - /** - * 获取邮费详情 - * - * @param tranType - * @param pkPostage - * @return - */ - List queryPostageDetail(@Param("tranType") Integer tranType, @Param("pkPostage") Integer pkPostage); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageFailAreaMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageFailAreaMapper.java deleted file mode 100644 index af6f4a67..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageFailAreaMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.sale.postage.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.BdPostageFailAreaExt; -import com.hzs.common.domain.sale.postage.BdPostageFailArea; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 邮费不支持地区表 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 11:23 - * @Classname: BdPostageFailAreaMapper - * @PackageName: com.hzs.lenjoy.sale.postage.mapper - */ -public interface BdPostageFailAreaMapper extends BaseMapper { - - /** - * 查询邮费模板不配送地区 - * - * @param pkPostage 邮费模板ID - * @return - */ - List queryPostageFailAreaList(@Param("pkPostage") Integer pkPostage); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageMapper.java deleted file mode 100644 index b9310b6e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/BdPostageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.lenjoy.sale.postage.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.postage.BdPostage; - -/** - * @Description: 邮费设置 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 11:21 - * @Classname: BdPostageMapper - * @PackageName: com.hzs.lenjoy.sale.postage.mapper.xml - */ -public interface BdPostageMapper extends BaseMapper { -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageAreaMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageAreaMapper.xml deleted file mode 100644 index add0dce1..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageAreaMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageDetailMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageDetailMapper.xml deleted file mode 100644 index 8de9329c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageDetailMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageFailAreaMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageFailAreaMapper.xml deleted file mode 100644 index 3b00af74..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageFailAreaMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageMapper.xml deleted file mode 100644 index 95dd83cf..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/mapper/xml/BdPostageMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageAreaService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageAreaService.java deleted file mode 100644 index 5a07441d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageAreaService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.postage.BdPostageArea; - -import java.util.List; - -/** - * @Description: 邮费地区表 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 11:21 - * @Classname: IBdPostageAreaService - * @PackageName: com.hzs.lenjoy.sale.postage.service - */ -public interface IBdPostageAreaService extends IService { - - /** - * 根据模板主键获得邮费专区配置 - * - * @param tranType - * @param pkPostage - * @param specialArea - * @param pkCountry - * @return - */ - List getPostageArea(Integer tranType, Integer pkPostage, Integer specialArea, Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageDetailService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageDetailService.java deleted file mode 100644 index 8377ca5a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageDetailService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.postage.BdPostageDetail; - -import java.util.List; - -/** - * @Description: 邮费详情设置 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 11:20 - * @Classname: IBdPostageDetailService - * @PackageName: com.hzs.lenjoy.sale.postage.service - */ -public interface IBdPostageDetailService extends IService { - - /** - * 获取邮费详情 - * - * @param tranType - * @param pkPostage - * @return - */ - List getPostageDetail(Integer tranType, Integer pkPostage); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageFailAreaService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageFailAreaService.java deleted file mode 100644 index 3381e7c7..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageFailAreaService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.BdPostageFailAreaExt; -import com.hzs.common.domain.sale.postage.BdPostageFailArea; - -import java.util.List; - -/** - * @Description: 邮费不支持地区表服务 - * @Author: jiang chao - * @Time: 2024/10/21 11:23 - * @Classname: IBdPostageFailAreaService - * @PackageName: com.hzs.lenjoy.sale.postage.service - */ -public interface IBdPostageFailAreaService extends IService { - - /** - * 查询邮费不配送区域列表 - * - * @param pkPostage 邮费模板ID - * @return - */ - List queryPostageFailAreaList(Integer pkPostage); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageService.java deleted file mode 100644 index bcb8121c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/IBdPostageService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.postage.BdPostage; - -/** - * @Description: 邮费设置 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 11:20 - * @Classname: IBdPostageService - * @PackageName: com.hzs.lenjoy.sale.postage.service - */ -public interface IBdPostageService extends IService { - - /** - * 根据id 查询相关邮费模板信息 - * - * @param postageId - * @return - */ - BdPostage getPostage(Integer postageId); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageAreaServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageAreaServiceImpl.java deleted file mode 100644 index d9c8a542..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageAreaServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.postage.BdPostageArea; -import com.hzs.lenjoy.sale.postage.mapper.BdPostageAreaMapper; -import com.hzs.lenjoy.sale.postage.service.IBdPostageAreaService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 邮费地区表 服务实现类 - * @Author: jiang chao - * @Time: 2024/10/21 11:30 - * @Classname: BdPostageAreaServiceImpl - * @PackageName: com.hzs.lenjoy.sale.postage.service.impl - */ -@Service -public class BdPostageAreaServiceImpl extends ServiceImpl implements IBdPostageAreaService { - - @Override - public List getPostageArea(Integer tranType, Integer pkPostage, Integer specialArea, Integer pkCountry) { - return baseMapper.getPostageArea(tranType, pkPostage, specialArea, pkCountry); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageDetailServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageDetailServiceImpl.java deleted file mode 100644 index 2211f0af..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageDetailServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.postage.BdPostageDetail; -import com.hzs.lenjoy.sale.postage.mapper.BdPostageDetailMapper; -import com.hzs.lenjoy.sale.postage.service.IBdPostageDetailService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 邮费详情设置 服务实现类 - * @Author: jiang chao - * @Time: 2024/10/21 11:30 - * @Classname: BdPostageDetailServiceImpl - * @PackageName: com.hzs.lenjoy.sale.postage.service.impl - */ -@Service -public class BdPostageDetailServiceImpl extends ServiceImpl implements IBdPostageDetailService { - - @Override - public List getPostageDetail(Integer tranType, Integer pkPostage) { - return baseMapper.queryPostageDetail(tranType, pkPostage); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageFailAreaServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageFailAreaServiceImpl.java deleted file mode 100644 index 0538e199..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageFailAreaServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.ext.BdPostageFailAreaExt; -import com.hzs.common.domain.sale.postage.BdPostageFailArea; -import com.hzs.lenjoy.sale.postage.mapper.BdPostageFailAreaMapper; -import com.hzs.lenjoy.sale.postage.service.IBdPostageFailAreaService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 邮费不支持地区表服务 - * @Author: jiang chao - * @Time: 2024/10/21 11:29 - * @Classname: BdPostageFailAreaServiceImpl - * @PackageName: com.hzs.lenjoy.sale.postage.service.impl - */ -@Service -public class BdPostageFailAreaServiceImpl extends ServiceImpl implements IBdPostageFailAreaService { - - @Override - public List queryPostageFailAreaList(Integer pkPostage) { - return baseMapper.queryPostageFailAreaList(pkPostage); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageServiceImpl.java deleted file mode 100644 index d882ee58..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/postage/service/impl/BdPostageServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.lenjoy.sale.postage.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.domain.sale.postage.BdPostage; -import com.hzs.lenjoy.sale.postage.mapper.BdPostageMapper; -import com.hzs.lenjoy.sale.postage.service.IBdPostageService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @Description: 邮费设置 服务实现类 - * @Author: jiang chao - * @Time: 2024/10/21 11:31 - * @Classname: BdPostageServiceImpl - * @PackageName: com.hzs.lenjoy.sale.postage.service.impl - */ -@Service -public class BdPostageServiceImpl extends ServiceImpl implements IBdPostageService { - - @Autowired - private RedisService redisService; - - @Override - public BdPostage getPostage(Integer postageId) { - String redisKey = CacheConstants.BD_POSTAGE + postageId; - BdPostage postage = redisService.getCacheObject(redisKey); - if (null == postage) { - postage = baseMapper.selectById(postageId); - if (null != postage) { - redisService.setCacheObject(redisKey, postage); - } - } - return postage; - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/mapper/BdProductMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/mapper/BdProductMapper.java deleted file mode 100644 index 3aad9738..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/mapper/BdProductMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.lenjoy.sale.product.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.product.BdProduct; - -/** - * @Description: 产品相关 mapper - * @Author: jiang chao - * @Time: 2024/10/21 11:14 - * @Classname: BdProductMapper - * @PackageName: com.hzs.lenjoy.sale.product.mapper - */ -public interface BdProductMapper extends BaseMapper { - - - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/mapper/xml/BdProductMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/mapper/xml/BdProductMapper.xml deleted file mode 100644 index 7db22ae8..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/mapper/xml/BdProductMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/service/IBdProductService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/service/IBdProductService.java deleted file mode 100644 index d606c62f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/service/IBdProductService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.lenjoy.sale.product.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.product.BdProduct; - -/** - * @Description: 产品相关服务 - * @Author: jiang chao - * @Time: 2024/10/21 11:13 - * @Classname: IBdProductService - * @PackageName: com.hzs.lenjoy.sale.product.service - */ -public interface IBdProductService extends IService { -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/service/impl/BdProductServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/service/impl/BdProductServiceImpl.java deleted file mode 100644 index d849443f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/product/service/impl/BdProductServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzs.lenjoy.sale.product.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.product.BdProduct; -import com.hzs.lenjoy.sale.product.mapper.BdProductMapper; -import com.hzs.lenjoy.sale.product.service.IBdProductService; -import org.springframework.stereotype.Service; - -/** - * @Description: 产品相关服务 - * @Author: jiang chao - * @Time: 2024/10/21 11:13 - * @Classname: BdProductServiceImpl - * @PackageName: com.hzs.lenjoy.sale.product.service.impl - */ -@Service -public class BdProductServiceImpl extends ServiceImpl implements IBdProductService { -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/controller/api/ApiWaresController.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/controller/api/ApiWaresController.java deleted file mode 100644 index d7b88714..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/controller/api/ApiWaresController.java +++ /dev/null @@ -1,258 +0,0 @@ -package com.hzs.lenjoy.sale.wares.controller.api; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSONArray; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.DistinctByKeyUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.sale.ext.BdWaresExt; -import com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt; -import com.hzs.common.domain.sale.wares.*; -import com.hzs.common.domain.system.config.BdLabel; -import com.hzs.common.domain.system.ext.BdLabelExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.member.base.IMemberServiceApi; -import com.hzs.lenjoy.sale.wares.param.WaresDetailParams; -import com.hzs.lenjoy.sale.wares.param.WaresParams; -import com.hzs.lenjoy.sale.wares.param.WaresRecommendParam; -import com.hzs.lenjoy.sale.wares.service.IBdWaresLabelService; -import com.hzs.lenjoy.sale.wares.service.IBdWaresService; -import com.hzs.lenjoy.sale.wares.service.IBdWaresSpecsSkuService; -import com.hzs.lenjoy.sale.wares.vo.WaresDetailVO; -import com.hzs.lenjoy.sale.wares.vo.WaresVO; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -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; - -import javax.validation.Valid; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 商品相关服务 - * @Author: jiang chao - * @Time: 2024/10/17 16:00 - * @Classname: WaresController - * @PackageName: com.hzs.lenjoy.sale.wares.controller.api - */ -@RestController -@RequestMapping("/api/wares") -@Slf4j -public class ApiWaresController extends BaseController { - - @Autowired - private IBdWaresService iBdWaresService; - @Autowired - private IBdWaresLabelService iBdWaresLabelService; - @Autowired - private IBdWaresSpecsSkuService iBdWaresSpecsSkuService; - - @DubboReference - ICurrencyServiceApi currencyServiceApi; - @DubboReference - IMemberServiceApi iMemberServiceApi; - - /** - * 商品列表 - * - * @param params 商品查询参数 - * @return - */ - @PostMapping("/wares-list") - public AjaxResult waresList(@Valid @RequestBody WaresParams params) { - // 直接默认为中国 - Integer pkCountry = CountryConstants.CHINA_COUNTRY; - // 会员信息 - CuMemberExt cuMemberExt = iMemberServiceApi.getMemberById(SecurityUtils.getUserId()).getData(); - - // 返回商品列表 - List resultList = new ArrayList<>(); - - // 商品列表 - List bdWaresExtList = iBdWaresService.listWaresByCondition(params.getSpecialArea(), params.getPkAreaClassify(), params.getWaresName(), cuMemberExt.getPkAwards(), null, pkCountry); - - if (CollectionUtil.isNotEmpty(bdWaresExtList)) { - resultList = this.waresShowHandle(bdWaresExtList, true); - } - return AjaxResult.success(resultList); - } - - - /** - * 商品详情 - * - * @param params - * @return - */ - @PostMapping("/wares-detail") - public AjaxResult waresDetail(@Valid @RequestBody WaresDetailParams params) { - // 直接默认为中国 - Integer pkCountry = CountryConstants.CHINA_COUNTRY; - - // 商品详情 - WaresDetailVO waresDetailVO = iBdWaresSpecsSkuService.queryWaresDetail(params.getSpecialArea(), params.getWaresCode(), pkCountry); - - // 预计发货时间（秒） - if (waresDetailVO.getArrivalTime() != null && waresDetailVO.getCreationTime() != null) { - long arrivalTime = waresDetailVO.getArrivalTime().getTime(); - long thisTime = System.currentTimeMillis(); - if (arrivalTime < thisTime) { - waresDetailVO.setDeliveryTimeMs(0L); - } else { - - waresDetailVO.setDeliveryTimeMs(DateUtil.betweenMs(waresDetailVO.getArrivalTime(), new Date()) / 1000); - } - } - return AjaxResult.success(waresDetailVO); - } - - /** - * 商品推荐列表 - * - * @param params - * @return - */ - @RequestMapping("/wares-recommend") - public AjaxResult waresRecommend(@Valid @RequestBody WaresRecommendParam params) { - // 直接默认为中国 - Integer pkCountry = CountryConstants.CHINA_COUNTRY; - // 会员信息 - CuMemberExt cuMemberExt = iMemberServiceApi.getMemberById(SecurityUtils.getUserId()).getData(); - - // 返回商品列表 - List resultList = new ArrayList<>(); - - // 商品推荐列表（默认只取3条） - startPage(3); - List bdWaresExtList = iBdWaresService.listWaresByCondition(params.getSpecialArea(), null, null, cuMemberExt.getPkAwards(), EYesNo.YES.getIntValue(), pkCountry); - - if (CollectionUtil.isNotEmpty(bdWaresExtList)) { - resultList = this.waresShowHandle(bdWaresExtList, false); - } - return AjaxResult.success(resultList); - } - - /** - * 商品显示处理 - * - * @param bdWaresExtList 商品列表 - * @param showLabel 是否显示标签 - * @return - */ - private List waresShowHandle(List bdWaresExtList, boolean showLabel) { - // 返回商品列表 - List resultList = new ArrayList<>(); - - // 汇率比例 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); - - // 商品主键列表 - List waresIdList = bdWaresExtList.stream().map(BdWares::getPkId).collect(Collectors.toList()); - // 查询默认规格 - List waresSpecsSkuList = iBdWaresSpecsSkuService.listWaresSpecsSku(waresIdList); - - // 商品sku 最小值 和 数量 - Map> waresSpecsSkuMap = waresSpecsSkuList.stream().collect(Collectors.groupingBy(BdWaresSpecsSkuExt::getPkWares)); - - List list = null; - if (showLabel) { - // 查询标签列表 - BdWaresLabel waresLabel = new BdWaresLabel(); - waresLabel.setPkIdList(waresIdList); - list = iBdWaresLabelService.listData(waresLabel); - } - - // 标签 - for (BdWaresExt bdWaresExt : bdWaresExtList) { - if (null != list) { - // 保证标签 - List ensureLabelList = new ArrayList<>(); - // 卖点标签 - List sellingLabelList = new ArrayList<>(); - - for (BdLabelExt bdLabel : list) { - if (ELabelType.PREFIX.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { - // 前缀标签 - bdWaresExt.setPrefixLabelTarget(bdLabel); - } - if (ELabelType.COOL.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { - // 酷炫标签 - bdWaresExt.setCoolLabelTarget(bdLabel); - } - if (ELabelType.ENSURE.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { - // 保证标签 - ensureLabelList.add(bdLabel); - } - if (ELabelType.SELLING.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { - // 卖点标签 - sellingLabelList.add(bdLabel); - } - } - // 保证标签 - bdWaresExt.setEnsureLabelList(ensureLabelList.stream().filter(DistinctByKeyUtil.distinctByKey(BdLabel::getPkId)).collect(Collectors.toList())); - // 卖点标签 - bdWaresExt.setSellingLabelList(sellingLabelList.stream().filter(DistinctByKeyUtil.distinctByKey(BdLabel::getPkId)).collect(Collectors.toList())); - } - - WaresVO waresVO = BeanUtil.copyProperties(bdWaresExt, WaresVO.class); - // 价格 - BigDecimal waresPrice = BigDecimal.ZERO; - // 业绩 - BigDecimal waresAchieve = BigDecimal.ZERO; - // EV - BigDecimal assAchieve = BigDecimal.ZERO; - - // 计算商品的价格和业绩 sku价格最小值 * 商品数量 - List waresSpecsSku = waresSpecsSkuMap.get(bdWaresExt.getPkId()); - waresSpecsSku = waresSpecsSku.stream().peek(a -> a.setProductGift(a.getPkProduct() + "" + a.getIsGift())).collect(Collectors.toList()); - Map> col = waresSpecsSku.stream().collect(Collectors.groupingBy(BdWaresSpecsSkuExt::getProductGift)); - for (Map.Entry> integerListEntry : col.entrySet()) { - // 取得每一个商品价格最小值 - Optional minBdWaresSpecsSkuExt = integerListEntry.getValue().stream().filter(Objects::nonNull).min(Comparator.comparing(BdWaresSpecsSkuExt::getPrice)); - BdWaresSpecsSkuExt bdWaresSpecsSkuExt = minBdWaresSpecsSkuExt.get(); - waresPrice = waresPrice.add(bdWaresSpecsSkuExt.getPrice().multiply(new BigDecimal(bdWaresSpecsSkuExt.getQuantity()))); - waresAchieve = waresAchieve.add(bdWaresSpecsSkuExt.getAchieve().multiply(new BigDecimal(bdWaresSpecsSkuExt.getQuantity()))); - assAchieve = assAchieve.add(bdWaresSpecsSkuExt.getAssAchieve().multiply(new BigDecimal(bdWaresSpecsSkuExt.getQuantity()))); - } - - // 计算商品列表价格和业绩最小值 - waresVO.setWaresPrice(waresPrice); - waresVO.setWaresAchieve(waresAchieve.multiply(inExchangeRate)); - waresVO.setAssAchieve(assAchieve.multiply(inExchangeRate)); - waresVO.setIsMakerGift(bdWaresExt.getIsMakerGift()); - - // 查询默认规格 - JSONArray jsonArray = new JSONArray(); - List collect = waresSpecsSkuList.stream().filter(DistinctByKeyUtil.distinctByKey(BdWaresSpecsSku::getPkWaresDetail)).collect(Collectors.toList()); - for (BdWaresSpecsSkuExt bdWaresSpecsSku : collect) { - if (bdWaresSpecsSku.getPkWares().equals(bdWaresExt.getPkId())) { - JSONObject js = new JSONObject(); - js.put("pkProduct", bdWaresSpecsSku.getPkProduct()); - js.put("pkSkuId", bdWaresSpecsSku.getPkId()); - js.put("quantity", bdWaresSpecsSku.getQuantity()); - jsonArray.add(js); - } - } - waresVO.setProductGroup(jsonArray); - resultList.add(waresVO); - } - - return resultList; - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresDetailMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresDetailMapper.java deleted file mode 100644 index e9e42e05..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresDetailMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hzs.lenjoy.sale.wares.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.BdWaresDetailExt; -import com.hzs.common.domain.sale.wares.BdWaresDetail; -import com.hzs.lenjoy.sale.order.param.OrderItemsParam; -import com.hzs.lenjoy.sale.wares.vo.ProductVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商品发布明细表 Mapper 接口 - * - * @author hzs - * @since 2022-09-09 - */ -public interface BdWaresDetailMapper extends BaseMapper { - - - /** - * 商品编号查询产品详情 - * - * @param specialArea 专区ID - * @param waresCode 商品编号 - * @return - */ - List selectByWaresCode(@Param("specialArea") Integer specialArea, - @Param("waresCode") String waresCode); - - /** - * 根据条件查询商品详情列表 - * - * @param specialArea 专区 - * @param transType 运输方式 - * @param orderItemsParams 查询参数列表 - * @return - */ - List queryWaresDetailByCondition(@Param("specialArea") Integer specialArea, - @Param("transType") Integer transType, - @Param("orderItemsParams") List orderItemsParams); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresExtendMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresExtendMapper.java deleted file mode 100644 index ec84b802..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresExtendMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.sale.wares.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.wares.BdWaresExtend; -import com.hzs.lenjoy.sale.wares.param.WaresNumberParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 商品发布扩展表 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 13:47 - * @Classname: BdWaresExtendMapper - * @PackageName: com.hzs.lenjoy.sale.wares.mapper - */ -public interface BdWaresExtendMapper extends BaseMapper { - - /** - * 商品销量累计 - * - * @param waresNumberList 商品销量列表 - * @return - */ - int updateWaresSales(@Param("waresNumberList") List waresNumberList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresLabelMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresLabelMapper.java deleted file mode 100644 index 9d4311fa..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresLabelMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.wares.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.wares.BdWaresLabel; -import com.hzs.common.domain.system.ext.BdLabelExt; - -import java.util.List; - -/** - * @Description: 商品标签表 Mapper - * @Author: jiang chao - * @Time: 2024/10/17 17:15 - * @Classname: BdWaresLabelMapper - * @PackageName: com.hzs.lenjoy.sale.wares.mapper - */ -public interface BdWaresLabelMapper extends BaseMapper { - - /** - * 查询列表数据 - * - * @param waresLabel - * @return - */ - List listData(BdWaresLabel waresLabel); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresMapper.java deleted file mode 100644 index d3d6e98f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.lenjoy.sale.wares.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.BdWaresExt; -import com.hzs.common.domain.sale.wares.BdWares; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 商品 mapper - * @Author: jiang chao - * @Time: 2024/10/17 16:22 - * @Classname: BdWaresMapper - * @PackageName: com.hzs.lenjoy.sale.wares.mapper - */ -public interface BdWaresMapper extends BaseMapper { - - /** - * 查询商品列表 - * - * @param specialArea 所属专区 - * @param pkAreaClassify 所属分类 - * @param waresName 商品名称 - * @param pkWares 会员奖衔 - * @param isRecommend 是否推荐 - * @param pkCountry 所属国家 - * @return - */ - List listWaresByCondition(@Param("specialArea") Integer specialArea, - @Param("pkAreaClassify") Integer pkAreaClassify, - @Param("waresName") String waresName, - @Param("pkWares") Integer pkWares, - @Param("isRecommend") Integer isRecommend, - @Param("pkCountry") Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresSpecialPostageMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresSpecialPostageMapper.java deleted file mode 100644 index 1b006764..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresSpecialPostageMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzs.lenjoy.sale.wares.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.wares.BdWaresSpecialPostage; - -/** - * @Description: 商品特殊邮费配置 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/21 10:57 - * @Classname: BdWaresSpecialPostageMapper - * @PackageName: com.hzs.lenjoy.sale.wares.mapper - */ -public interface BdWaresSpecialPostageMapper extends BaseMapper { - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresSpecsSkuMapper.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresSpecsSkuMapper.java deleted file mode 100644 index 989c028f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/BdWaresSpecsSkuMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.lenjoy.sale.wares.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt; -import com.hzs.common.domain.sale.wares.BdWaresSpecsSku; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Set; - -/** - * @Description: 规格sku表 Mapper 接口 - * @Author: jiang chao - * @Time: 2024/10/17 17:25 - * @Classname: BdWaresSpecsSkuMapper - * @PackageName: com.hzs.lenjoy.sale.wares.mapper - */ -public interface BdWaresSpecsSkuMapper extends BaseMapper { - - /** - * 根据商品ID列表查询 - * - * @param waresIdList 商品ID列表 - * @return - */ - List listWaresSpecsSku(@Param("waresIdList") List waresIdList); - - /** - * 根据专区、商品编号查询商品等 - * - * @param specialArea 所属专区 - * @param waresCode 商品编号 - * @return - */ - List queryWaresSpecsSku(@Param("specialArea") Integer specialArea, - @Param("waresCode") String waresCode); - - /** - * 根据产品规格ID查询名称 - * - * @param pkSkuIdList 产品规格ID列表 - * @return - */ - List queryWaresSpecsNameSku(@Param("pkSkuIdList") Set pkSkuIdList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresDetailMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresDetailMapper.xml deleted file mode 100644 index e96f9a6c..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresDetailMapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresExtendMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresExtendMapper.xml deleted file mode 100644 index b1a65d2a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresExtendMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - merge into BD_WARES_EXTEND bwe - using ( - - select #{item.pkWares} pkWares, #{item.number} SALES - from dual - - ) tmp - on (tmp.pkWares = bwe.pk_wares) - when matched then - update set bwe.SALES = bwe.SALES + tmp.SALES - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresLabelMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresLabelMapper.xml deleted file mode 100644 index 2ffd59a2..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresLabelMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresMapper.xml deleted file mode 100644 index faea47e5..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresMapper.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresSpecialPostageMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresSpecialPostageMapper.xml deleted file mode 100644 index b40203c6..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresSpecialPostageMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresSpecsSkuMapper.xml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresSpecsSkuMapper.xml deleted file mode 100644 index 219a0eea..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/mapper/xml/BdWaresSpecsSkuMapper.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresDetailParams.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresDetailParams.java deleted file mode 100644 index 297fae93..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresDetailParams.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.lenjoy.sale.wares.param; - -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * @Description: 商品详情查询入参 - * @Author: jiang chao - * @Time: 2024/10/17 16:04 - * @Classname: WaresDetailParams - * @PackageName: com.hzs.lenjoy.sale.wares.param - */ -@Data -public class WaresDetailParams implements Serializable { - - /** - * 所属专区 - */ - @NotNull(message = "所属专区不能为空") - private Integer specialArea; - - /** - * 商品编号 - */ - @NotEmpty(message = "商品编号不能为空") - private String waresCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresNumberParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresNumberParam.java deleted file mode 100644 index aa31bb9f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresNumberParam.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.lenjoy.sale.wares.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: 商品销量参数 - * @Author: jiang chao - * @Time: 2024/10/21 13:29 - * @Classname: WaresNumberParam - * @PackageName: com.hzs.lenjoy.sale.wares.param - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class WaresNumberParam implements Serializable { - - /** - * 商品主键 - */ - private Integer pkWares; - - /** - * 数量 - */ - private Integer number; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresParams.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresParams.java deleted file mode 100644 index 6eb7e970..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresParams.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.lenjoy.sale.wares.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * @Description: 商品查询入参 - * @Author: jiang chao - * @Time: 2024/10/17 16:04 - * @Classname: WaresParams - * @PackageName: com.hzs.lenjoy.sale.wares.param - */ -@Data -public class WaresParams implements Serializable { - - /** - * 所属专区 - */ - @NotNull(message = "所属专区不能为空") - private Integer specialArea; - - /** - * 商品分类 - */ - private Integer pkAreaClassify; - - /** - * 商品名称 - */ - private String waresName; - - /** - * 商品编号 - */ - private String waresCode; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresRecommendParam.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresRecommendParam.java deleted file mode 100644 index 8bebcec6..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/param/WaresRecommendParam.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.lenjoy.sale.wares.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * @Description: 商品推荐查询入参 - * @Author: jiang chao - * @Time: 2024/10/25 13:36 - * @Classname: WaresRecommendParam - * @PackageName: com.hzs.lenjoy.sale.wares.param - */ -@Data -public class WaresRecommendParam implements Serializable { - - /** - * 所属专区 - */ - @NotNull(message = "所属专区不能为空") - private Integer specialArea; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresDetailService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresDetailService.java deleted file mode 100644 index 7fe9f299..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresDetailService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.BdWaresDetailExt; -import com.hzs.common.domain.sale.wares.BdWaresDetail; -import com.hzs.lenjoy.sale.order.param.OrderItemsParam; -import com.hzs.lenjoy.sale.wares.vo.ProductVO; - -import java.util.List; - -/** - * @Description: 商品发布明细表 服务类 - * @Author: jiang chao - * @Time: 2024/18/17 11:24 - * @Classname: IBdWaresSpecsSkuService - * @PackageName: com.hzs.lenjoy.sale.wares.servic - */ -public interface IBdWaresDetailService extends IService { - - /** - * 商品编号查询产品详情 - * - * @param specialArea 专区ID - * @param waresCode 商品编号 - * @return - */ - List selectByWaresCode(Integer specialArea, String waresCode); - - /** - * 根据条件查询商品详情列表 - * - * @param specialArea 专区 - * @param transType 运输方式 - * @param orderItemsParams 查询参数列表 - * @return - */ - List queryWaresDetailByCondition(Integer specialArea, Integer transType, List orderItemsParams); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresExtendService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresExtendService.java deleted file mode 100644 index 3e70c154..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresExtendService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.wares.BdWaresExtend; -import com.hzs.lenjoy.sale.wares.param.WaresNumberParam; - -import java.util.List; - -/** - * @Description: 商品发布扩展表 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 13:44 - * @Classname: IBdWaresExtendService - * @PackageName: com.hzs.lenjoy.sale.wares.service - */ -public interface IBdWaresExtendService extends IService { - - /** - * 商品销量累计 - * - * @param waresNumberList 商品销量列表 - */ - void updateWaresSales(List waresNumberList); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresLabelService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresLabelService.java deleted file mode 100644 index d451486d..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresLabelService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.wares.BdWaresLabel; -import com.hzs.common.domain.system.ext.BdLabelExt; - -import java.util.List; - -/** - * @Description: 商品标签表 服务类 - * @Author: jiang chao - * @Time: 2024/10/17 17:14 - * @Classname: IBdWaresLabelService - * @PackageName: com.hzs.lenjoy.sale.wares.service - */ -public interface IBdWaresLabelService extends IService { - - /** - * 查询列表数据 - * - * @param waresLabel - * @return - */ - List listData(BdWaresLabel waresLabel); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresService.java deleted file mode 100644 index db90bcd5..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.BdWaresExt; -import com.hzs.common.domain.sale.wares.BdWares; - -import java.util.List; - -/** - * @Description: 商品服务 - * @Author: jiang chao - * @Time: 2024/10/17 16:21 - * @Classname: IBdWaresService - * @PackageName: com.hzs.lenjoy.sale.wares.service - */ -public interface IBdWaresService extends IService { - - /** - * 查询商品列表 - * - * @param specialArea 所属专区 - * @param pkAreaClassify 所属分类 - * @param waresName 商品名称 - * @param pkWares 会员奖衔 - * @param isRecommend 是否推荐 - * @param pkCountry 所属国家 - * @return - */ - List listWaresByCondition(Integer specialArea, - Integer pkAreaClassify, - String waresName, - Integer pkWares, - Integer isRecommend, - Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresSpecialPostageService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresSpecialPostageService.java deleted file mode 100644 index b7d3a227..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresSpecialPostageService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.wares.BdWaresSpecialPostage; - -import java.util.List; - -/** - * @Description: 商品特殊邮费配置 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 10:56 - * @Classname: IBdWaresSpecialPostageService - * @PackageName: com.hzs.lenjoy.sale.order.service - */ -public interface IBdWaresSpecialPostageService extends IService { - - /** - * 查询特殊邮费商品ID列表 - * - * @param pkCountry 所属国家 - * @return - */ - List querySpecialPostagePkWares(Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresSpecsSkuService.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresSpecsSkuService.java deleted file mode 100644 index 41b78400..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/IBdWaresSpecsSkuService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt; -import com.hzs.common.domain.sale.wares.BdWaresSpecsSku; -import com.hzs.lenjoy.sale.wares.vo.WaresDetailVO; - -import java.util.List; - -/** - * @Description: 规格sku表 服务类 - * @Author: jiang chao - * @Time: 2024/10/17 17:24 - * @Classname: IBdWaresSpecsSkuService - * @PackageName: com.hzs.lenjoy.sale.wares.service - */ -public interface IBdWaresSpecsSkuService extends IService { - - /** - * 根据商品ID列表查询 - * - * @param waresIdList 商品ID列表 - * @return - */ - List listWaresSpecsSku(List waresIdList); - - - /** - * 查询商品详情 - * - * @param specialArea 专区ID - * @param waresCode 商品编号 - * @param pkCountry 所属国家 - * @return - */ - WaresDetailVO queryWaresDetail(Integer specialArea, String waresCode, Integer pkCountry); - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresDetailServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresDetailServiceImpl.java deleted file mode 100644 index fca268e9..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresDetailServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.ext.BdWaresDetailExt; -import com.hzs.common.domain.sale.wares.BdWaresDetail; -import com.hzs.lenjoy.sale.order.param.OrderItemsParam; -import com.hzs.lenjoy.sale.order.param.WaresItemsParam; -import com.hzs.lenjoy.sale.wares.mapper.BdWaresDetailMapper; -import com.hzs.lenjoy.sale.wares.service.IBdWaresDetailService; -import com.hzs.lenjoy.sale.wares.vo.ProductVO; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Description: 商品发布明细表 服务实现类 - * @Author: jiang chao - * @Time: 2024/10/18 11:24 - * @Classname: BdWaresSpecsSkuServiceImpl - * @PackageName: com.hzs.lenjoy.sale.wares.service.impl - */ -@Service -public class BdWaresDetailServiceImpl extends ServiceImpl implements IBdWaresDetailService { - - @Override - public List selectByWaresCode(Integer specialArea, String waresCode) { - return baseMapper.selectByWaresCode(specialArea, waresCode); - } - - @Override - public List queryWaresDetailByCondition(Integer specialArea, Integer transType, List orderItemsParams) { - List bdWaresDetailExtList = new ArrayList<>(); - for (OrderItemsParam orderItemsParam : orderItemsParams) { - for (WaresItemsParam waresItemsParam : orderItemsParam.getWaresItemsParamList()) { - BdWaresDetailExt bdWaresDetailExt = BdWaresDetailExt.builder() - .waresCode(orderItemsParam.getWaresCode()) - .pkWaresSpecsSku(waresItemsParam.getPkWaresSpecsSku()) - .waresQuantity(orderItemsParam.getQuantity()) - .price(BigDecimal.ZERO) - .achieve(BigDecimal.ZERO) - .build(); - bdWaresDetailExt.setQuantity(waresItemsParam.getQuantity()); - bdWaresDetailExtList.add(bdWaresDetailExt); - } - } - List waresDetailExtList = baseMapper.queryWaresDetailByCondition(specialArea, transType, orderItemsParams); - if (CollectionUtil.isNotEmpty(waresDetailExtList)) { - Map bdWaresDetailExtMap = new HashMap<>(); - waresDetailExtList.forEach(waresDetailExt -> { - bdWaresDetailExtMap.put(waresDetailExt.getWaresCode() + waresDetailExt.getPkWaresSpecsSku(), waresDetailExt); - }); - bdWaresDetailExtList.forEach(waresDetailExt -> { - String key = waresDetailExt.getWaresCode() + waresDetailExt.getPkWaresSpecsSku(); - if (bdWaresDetailExtMap.containsKey(key)) { - BeanUtil.copyProperties(bdWaresDetailExtMap.get(key), waresDetailExt, "waresQuantity", "quantity"); - } - }); - } else { - bdWaresDetailExtList.clear(); - } - return bdWaresDetailExtList; - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresExtendServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresExtendServiceImpl.java deleted file mode 100644 index 584dd5f0..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresExtendServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.wares.BdWaresExtend; -import com.hzs.lenjoy.sale.wares.mapper.BdWaresExtendMapper; -import com.hzs.lenjoy.sale.wares.param.WaresNumberParam; -import com.hzs.lenjoy.sale.wares.service.IBdWaresExtendService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 商品发布扩展表 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 13:45 - * @Classname: BdWaresExtendServiceImpl - * @PackageName: com.hzs.lenjoy.sale.wares.service.impl - */ -@Service -public class BdWaresExtendServiceImpl extends ServiceImpl implements IBdWaresExtendService { - - @Override - public void updateWaresSales(List waresNumberList) { - if (CollectionUtil.isNotEmpty(waresNumberList)) { - baseMapper.updateWaresSales(waresNumberList); - } - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresLabelServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresLabelServiceImpl.java deleted file mode 100644 index 5fedf41a..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresLabelServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.wares.BdWaresLabel; -import com.hzs.common.domain.system.ext.BdLabelExt; -import com.hzs.lenjoy.sale.wares.mapper.BdWaresLabelMapper; -import com.hzs.lenjoy.sale.wares.service.IBdWaresLabelService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 商品标签表 服务实现类 - * @Author: jiang chao - * @Time: 2024/10/17 17:14 - * @Classname: BdWaresLabelServiceImpl - * @PackageName: com.hzs.lenjoy.sale.wares.service.impl - */ -@Service -public class BdWaresLabelServiceImpl extends ServiceImpl implements IBdWaresLabelService { - - @Override - public List listData(BdWaresLabel waresLabel) { - return baseMapper.listData(waresLabel); - } -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresServiceImpl.java deleted file mode 100644 index 0013fa16..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.sale.ext.BdWaresExt; -import com.hzs.common.domain.sale.wares.BdWares; -import com.hzs.lenjoy.sale.wares.mapper.BdWaresMapper; -import com.hzs.lenjoy.sale.wares.service.IBdWaresService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 商品服务 - * @Author: jiang chao - * @Time: 2024/10/17 16:21 - * @Classname: BdWaresServiceImpl - * @PackageName: com.hzs.lenjoy.sale.wares.service - */ -@Service -public class BdWaresServiceImpl extends ServiceImpl implements IBdWaresService { - - @Override - public List listWaresByCondition(Integer specialArea, Integer pkAreaClassify, String waresName, Integer pkWares, Integer isRecommend, Integer pkCountry) { - return baseMapper.listWaresByCondition(specialArea, pkAreaClassify, waresName, pkWares, isRecommend, pkCountry); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresSpecialPostageServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresSpecialPostageServiceImpl.java deleted file mode 100644 index 672c102e..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresSpecialPostageServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.domain.sale.wares.BdWaresSpecialPostage; -import com.hzs.lenjoy.sale.wares.mapper.BdWaresSpecialPostageMapper; -import com.hzs.lenjoy.sale.wares.service.IBdWaresSpecialPostageService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * @Description: 商品特殊邮费配置 服务类 - * @Author: jiang chao - * @Time: 2024/10/21 10:57 - * @Classname: BdWaresSpecialPostageServiceImpl - * @PackageName: com.hzs.lenjoy.sale.order.service.impl - */ -@Service -public class BdWaresSpecialPostageServiceImpl extends ServiceImpl implements IBdWaresSpecialPostageService { - - @Override - public List querySpecialPostagePkWares(Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - List pkWaresList = this.list(queryWrapper); - return pkWaresList.stream().map(BdWaresSpecialPostage::getPkPostage).collect(Collectors.toList()); - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java deleted file mode 100644 index 2b57e904..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.hzs.lenjoy.sale.wares.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.ELabelType; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.utils.DistinctByKeyUtil; -import com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt; -import com.hzs.common.domain.sale.wares.BdWaresLabel; -import com.hzs.common.domain.sale.wares.BdWaresSpecsSku; -import com.hzs.common.domain.system.config.BdLabel; -import com.hzs.common.domain.system.ext.BdLabelExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.lenjoy.sale.wares.mapper.BdWaresSpecsSkuMapper; -import com.hzs.lenjoy.sale.wares.service.IBdWaresDetailService; -import com.hzs.lenjoy.sale.wares.service.IBdWaresLabelService; -import com.hzs.lenjoy.sale.wares.service.IBdWaresSpecsSkuService; -import com.hzs.lenjoy.sale.wares.vo.ProductVO; -import com.hzs.lenjoy.sale.wares.vo.WaresDetailVO; -import com.hzs.lenjoy.sale.wares.vo.WaresItemsVO; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 规格sku表 服务类 - * @Author: jiang chao - * @Time: 2024/10/17 17:24 - * @Classname: BdWaresSpecsSkuServiceImpl - * @PackageName: com.hzs.lenjoy.sale.wares.service.impl - */ -@Service -public class BdWaresSpecsSkuServiceImpl extends ServiceImpl implements IBdWaresSpecsSkuService { - - @Autowired - private IBdWaresLabelService iBdWaresLabelService; - @Autowired - private IBdWaresDetailService iBdWaresDetailService; - - @DubboReference - ICurrencyServiceApi iCurrencyServiceApi; - - @Override - public List listWaresSpecsSku(List waresIdList) { - return baseMapper.listWaresSpecsSku(waresIdList); - } - - @Override - public WaresDetailVO queryWaresDetail(Integer specialArea, String waresCode, Integer pkCountry) { - // 查询商品明细、规格等列表数据 - List waresSpecsSkuExtList = baseMapper.queryWaresSpecsSku(specialArea, waresCode); - - if (CollectionUtil.isNotEmpty(waresSpecsSkuExtList)) { - // 获取汇率 - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - - // 商品关联产品规格ID - Set pkSkuIdList = waresSpecsSkuExtList.stream().map(BdWaresSpecsSkuExt::getPkId).collect(Collectors.toSet()); - // 查询规格名称等 - List waresSpecsSkuList = baseMapper.queryWaresSpecsNameSku(pkSkuIdList); - // 规格名称map - Map specsNameMap = new HashMap<>(ComputeUtil.mapInitCapacity(waresSpecsSkuExtList.size())); - - for (BdWaresSpecsSkuExt waresSpecsSku : waresSpecsSkuList) { - String specsName = waresSpecsSku.getSpecsName(); - if (specsNameMap.containsKey(waresSpecsSku.getPkId())) { - String oldSpecsName = specsNameMap.get(waresSpecsSku.getPkId()); - specsName = oldSpecsName + "," + specsName; - } - specsNameMap.put(waresSpecsSku.getPkId(), specsName); - } - - WaresDetailVO waresDetailVO = BeanUtil.copyProperties(waresSpecsSkuExtList.get(0), WaresDetailVO.class); - waresDetailVO.setPkWares(waresSpecsSkuExtList.get(0).getPkWares()); - waresDetailVO.setWaresPrice(waresSpecsSkuExtList.get(0).getPrice()); - - //查询标签合集 - BdWaresLabel waresLabel = new BdWaresLabel(); - waresLabel.setPkWares(waresSpecsSkuExtList.get(0).getPkWares()); - List labelList = iBdWaresLabelService.listData(waresLabel); - - // 保证标签 - List ensureLabelList = new ArrayList<>(); - // 卖点标签 - List sellingLabelList = new ArrayList<>(); - for (BdLabel bdLabel : labelList) { - if (bdLabel.getLabelType() == ELabelType.PREFIX.getValue()) { - // 前缀标签 - waresDetailVO.setPrefixLabelTarget(bdLabel); - } - if (bdLabel.getLabelType() == ELabelType.COOL.getValue()) { - // 酷炫标签 - waresDetailVO.setCoolLabelTarget(bdLabel); - } - if (bdLabel.getLabelType() == ELabelType.ENSURE.getValue()) { - // 保证标签 - ensureLabelList.add(bdLabel); - } - if (bdLabel.getLabelType() == ELabelType.SELLING.getValue()) { - // 卖点标签 - sellingLabelList.add(bdLabel); - } - waresDetailVO.setEnsureLabelList(ensureLabelList.stream().filter(DistinctByKeyUtil.distinctByKey(BdLabel::getPkId)).collect(Collectors.toList())); - waresDetailVO.setSellingLabelList(sellingLabelList.stream().filter(DistinctByKeyUtil.distinctByKey(BdLabel::getPkId)).collect(Collectors.toList())); - } - waresDetailVO.setInExchangeRate(currency.getData().getInExchangeRate()); - - // 封装商品明细 - List cuWaresItemsParamsList = setUpWaresItems(waresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); - // 商品编号查询产品详情 - List productList = iBdWaresDetailService.selectByWaresCode(specialArea, waresCode); - List productResultList = new ArrayList<>(); - for (ProductVO productVO : productList) { - List list = new ArrayList<>(); - for (WaresItemsVO waresItemsVO : cuWaresItemsParamsList) { - if (waresItemsVO.getIsGift().equals(productVO.getIsGift()) - && waresItemsVO.getPkProduct().equals(productVO.getProductId())) { - list.add(waresItemsVO); - } - } - productVO.setWaresItemsParamsList(list); - if (list.size() > 0) { - //定义新列表 过滤掉 为空的详情 - productResultList.add(productVO); - } - waresDetailVO.setIsMakerGift(productVO.getIsMakerGift()); - } - productList.clear(); - productList.addAll(productResultList); - - waresDetailVO.setProductList(productList); - return waresDetailVO; - } - return null; - } - - /** - * 设置商品明细 - * - * @param waresSpecsSkuExtList 商品规格明细等列表 - * @param specsNameMap 商品名称map - * @param inExchangeRate 汇率 - * @return - */ - private List setUpWaresItems(List waresSpecsSkuExtList, - Map specsNameMap, - BigDecimal inExchangeRate) { - List cuWaresItemsParamsList = new ArrayList<>(); - - waresSpecsSkuExtList.forEach(waresSpecsSkuExt -> { - // 累积业绩 - BigDecimal achieveTotal = waresSpecsSkuExt.getAchieve().multiply(new BigDecimal(waresSpecsSkuExt.getQuantity())).multiply(inExchangeRate); - // 累计EV - BigDecimal assAchieveTotal = waresSpecsSkuExt.getAssAchieve().multiply(new BigDecimal(waresSpecsSkuExt.getQuantity())).multiply(inExchangeRate); - - cuWaresItemsParamsList.add(WaresItemsVO.builder() - .quantity(waresSpecsSkuExt.getQuantity()) - .isGift(waresSpecsSkuExt.getIsGift()) - .pkProduct(waresSpecsSkuExt.getPkProduct()) - .pkWaresDetail(waresSpecsSkuExt.getPkWaresDetail()) - .price(waresSpecsSkuExt.getPrice()) - .priceTotal(waresSpecsSkuExt.getPrice().multiply(new BigDecimal(waresSpecsSkuExt.getQuantity()))) - .achieve(waresSpecsSkuExt.getAchieve()) - .achieveTotal(achieveTotal) - .assAchieve(waresSpecsSkuExt.getAssAchieve()) - .assAchieveTotal(assAchieveTotal) - .specCover(waresSpecsSkuExt.getSpecCover()) - .pkSkuId(waresSpecsSkuExt.getPkId()) - .specsName(specsNameMap.get(waresSpecsSkuExt.getPkId())) - .build()); - }); - - return cuWaresItemsParamsList; - } - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/ProductVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/ProductVO.java deleted file mode 100644 index 88ebd313..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/ProductVO.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.hzs.lenjoy.sale.wares.vo; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 产品详情返回VO - * @Author: jiang chao - * @Time: 2024/10/18 11:09 - * @Classname: ProductVO - * @PackageName: com.hzs.lenjoy.sale.wares.vo - */ -@Data -public class ProductVO implements Serializable { - - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 产品id - */ - private Integer productId; - - /** - * 数量 - */ - private Integer quantity; - /** - * 产品封面图 - */ - private String cover; - - /** - * 是否创客礼包 - */ - private Integer isMakerGift; - - /** - * 是否赠品 0 是 1 否 - */ - private Integer isGift; - - /** - * 明细 - */ - private List waresItemsParamsList; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresDetailVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresDetailVO.java deleted file mode 100644 index 5d6a08df..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresDetailVO.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.hzs.lenjoy.sale.wares.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.domain.system.config.BdLabel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @Description: 商品详情返回VO - * @Author: jiang chao - * @Time: 2024/10/18 10:43 - * @Classname: WaresDetailVO - * @PackageName: com.hzs.lenjoy.sale.wares.vo - */ -@Data -public class WaresDetailVO implements Serializable { - - /** - * - */ - private Long pkId; - /** - * 商品主键 - */ - private Integer pkWares; - - /** - * 商品编号 - */ - private String waresCode; - /** - * 商品名称 - */ - private String waresName; - - /** - * 商品价格 - */ - @BigDecimalFormat - private BigDecimal waresPrice; - - /** - * 商品业绩 - */ - @BigDecimalFormat - private BigDecimal waresAchieve; - - /** - * 商品类型（0=创客礼包，1=普通商品，2=生态科技舱，3=嘉厨天下礼包，4=生态科技舱卡） - */ - private Integer isMakerGift; - - /** - * 封面1 - */ - private String cover1; - /** - * 封面2 - */ - private String cover2; - /** - * 封面3 - */ - private String cover3; - /** - * 封面4 - */ - private String cover4; - /** - * 封面5 - */ - private String cover5; - /** - * 封面6 - */ - private String cover6; - /** - * 商品图文 - */ - private String details; - - /** - * 所属专区 - */ - private Integer specialArea; - - /** - * 提示信息 - */ - private String warnMessage; - - /** - * 到货时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date arrivalTime; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 视频地址 - */ - private String videoUrl; - /** - * 视频主图 - */ - private String cover; - - /** - * 预售状态 - */ - private Integer preSaleStatus; - /** - * 是否出售 - */ - private Integer isSale; - - /** - * 销量 - */ - private Integer sales; - /** - * 售后保障 - */ - private String afterGuarantee; - - /** - * 前缀标签 - */ - private BdLabel prefixLabelTarget; - /** - * 酷炫标签 - */ - private BdLabel coolLabelTarget; - /** - * 保证标签 - */ - private List ensureLabelList; - /** - * 卖点标签 - */ - private List sellingLabelList; - - /** - * 入汇率 - */ - private BigDecimal inExchangeRate; - - /** - * 产品 - */ - private List productList; - - /** - * 预计发货时间 （秒） - */ - private Long deliveryTimeMs; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresItemsVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresItemsVO.java deleted file mode 100644 index d735c08f..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresItemsVO.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hzs.lenjoy.sale.wares.vo; - -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 商品详情明细列表 - * @Author: jiang chao - * @Time: 2024/10/18 11:12 - * @Classname: WaresItemsVO - * @PackageName: com.hzs.lenjoy.sale.wares.vo - */ -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Data -public class WaresItemsVO implements Serializable { - - /** - * 数量 - */ - private Integer quantity; - - /** - * 是否赠品 - */ - private Integer isGift; - - /** - * 商品明细主键,用于查询sku - */ - private Integer pkWaresDetail; - - /** - * 产品主键 - */ - private Integer pkProduct; - - /** - * 价格 - */ - @BigDecimalFormat - private BigDecimal price; - /** - * 价格总值 （价格*数量） - */ - @BigDecimalFormat - private BigDecimal priceTotal; - - /** - * 业绩（PV） - */ - private BigDecimal achieve; - /** - * 业绩总值 （业绩*数量） - */ - @BigDecimalFormat - private BigDecimal achieveTotal; - - /** - * EV - */ - private BigDecimal assAchieve; - /** - * EV总值（业绩*数量） - */ - @BigDecimalFormat - private BigDecimal assAchieveTotal; - - - /** - * 规格封面 - */ - private String specCover; - - /** - * skuID - */ - private Integer pkSkuId; - - /** - * 规格名称 - */ - private String specsName; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresVO.java b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresVO.java deleted file mode 100644 index 126a5dd2..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/java/com/hzs/lenjoy/sale/wares/vo/WaresVO.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.hzs.lenjoy.sale.wares.vo; - -import com.alibaba.fastjson2.JSONArray; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.domain.system.config.BdLabel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @Description: 商品列表查询返回VO - * @Author: jiang chao - * @Time: 2024/10/17 16:15 - * @Classname: WaresVO - * @PackageName: com.hzs.lenjoy.sale.wares.vo - */ -@Data -public class WaresVO implements Serializable { - - /** - * 商品ID - */ - private Long pkId; - /** - * 商品编号 - */ - private String waresCode; - /** - * 商品名称 - */ - private String waresName; - - /** - * 商品价格 - */ - @BigDecimalFormat - private BigDecimal waresPrice; - /** - * 商品业绩 - */ - @BigDecimalFormat - private BigDecimal waresAchieve; - /** - * 商品EV - */ - @BigDecimalFormat - private BigDecimal assAchieve; - - /** - * 商品类型（0=创客礼包，1=普通商品，2=生态科技舱，3=嘉厨天下礼包，4=生态科技舱卡） - */ - private Integer isMakerGift; - - /** - * 商品分类 - */ - private Integer pkAreaClassify; - /** - * 所属专区 - */ - private Integer specialArea; - - /** - * 封面1 - */ - private String cover1; - - /** - * 前缀标签 最大4个字 - */ - private String prefixLabel; - /** - * 酷炫标签 - */ - private String coolLabel; - /** - * 小标签 以逗号分隔，4个字一组 - */ - private String sLabel; - - /** - * 到货时间 - */ - private Date arrivalTime; - /** - * 预售状态 - */ - private Integer preSaleStatus; - /** - * 是否出售 - */ - private Integer isSale; - - /** - * 销量 - */ - private Integer sales; - - /** - * 前缀标签 - */ - private BdLabel prefixLabelTarget; - - /** - * 酷炫标签 - */ - private BdLabel coolLabelTarget; - - /** - * 保证标签 - */ - private List ensureLabelList; - - /** - * 卖点标签 - */ - private List sellingLabelList; - - /** - * 默认规格 - */ - private JSONArray productGroup; - - /** - * 提示信息 - */ - private String warnMessage; - -} diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter deleted file mode 100644 index 62dd3966..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter +++ /dev/null @@ -1,2 +0,0 @@ -saleProviderFilter=com.hzs.lenjoy.filter.SaleProviderFilter -saleConsumerFilter=com.hzs.lenjoy.filter.SaleConsumerFilter diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/bootstrap.yml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/bootstrap.yml deleted file mode 100644 index 41ac5ba0..00000000 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,93 +0,0 @@ -# 项目配置 -hzs: - # 当前环境（测试=test，生产=online） - env: test - # PC地址 - pc: - # 公众号地址 - gzh: - # IOS地址 - ios: - # android地址 - android: - # 当前环境（0=启用 1=禁用） - enable: 1 - -# Tomcat -server: - port: 8193 - -# Spring -spring: - application: - # 应用名称 - name: hzs-lenjoy-sale - jackson: - # 返回数据序列化时，如果为 null 则不进行返回 - default-property-inclusion: NON_NULL - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - # 命名空间 - # namespace: public - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 命名空间 - # namespace: public - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - ## 业务模块依赖的公用配置（缓存、数据库、事务、mybatis-plus） - - hzs-business-lenjoy-${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 - provider: - # 业务线程池大小 - threads: 400 - consumer: - # 远程服务调用超时时间（毫秒） - timeout: 10000 - # 重试次数（默认：2） - retries: 0 - # 启动时不检查dubbo服务是否启动 - check: false - # 负载策略(random：随机，roundrobin：轮询，leastactive：最少活跃调用) - loadbalance: "leastactive" - # 业务线程池大小 - threads: 400 - protocol: - # 设置协议为dubbo - name: dubbo - # dubbo 协议端口 （-1 表示自增端口，从20880开始） - port: -1 - # 业务线程池大小 - threads: 400 - cloud: - # 订阅服务 - subscribed-services: hzs-system, hzs-sale, hzs-scm, hzs-lenjoy-member - scan: - # dubbo 服务扫描包（开启之后才会对外提供服务） - base-packages: com.hzs.lenjoy.sale - -# 日志配置 -logging: - level: - com.hzs: debug - org.springframework: warn - diff --git a/hzs-business-lenjoy/pom.xml b/hzs-business-lenjoy/pom.xml deleted file mode 100644 index a686f442..00000000 --- a/hzs-business-lenjoy/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - - com.bd - hzs - 1.0.0-SNAPSHOT - - - hzs-business-lenjoy - - pom - - - hzs-business-lenjoy乐享业务服务 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - org.springframework.boot - spring-boot-starter-web - - - - - com.alibaba.cloud - spring-cloud-starter-dubbo - - - - - com.bd - hzs-common-security - - - - - cn.hutool - hutool-all - - - - - com.bd - hzs-common-aop - - - - - - - - - - diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/DeptMemberNumberVo.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/DeptMemberNumberVo.java deleted file mode 100644 index e84a3dd3..00000000 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/DeptMemberNumberVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.member.achieve.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/9/12 15:59 - * @Classname: DeptMemberNumber - * @PackageName: com.hzs.member.achieve.vo - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.achieve.vo - *@Author: yh - *@CreateTime: 2023-09-12 15:59 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class DeptMemberNumberVo { - - /** - * 所属区域 - */ - private Integer placeDept; - - /** - * 人数 - */ - private Long quantity; -} diff --git a/hzs-business/hzs-business-member/src/main/resources/logback.xml b/hzs-business/hzs-business-member/src/main/resources/logback.xml deleted file mode 100644 index 90815590..00000000 --- a/hzs-business/hzs-business-member/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/hzs-business/hzs-business-report/src/main/resources/logback.xml b/hzs-business/hzs-business-report/src/main/resources/logback.xml deleted file mode 100644 index 6658434e..00000000 --- a/hzs-business/hzs-business-report/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/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MemberConstants.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MemberConstants.java deleted file mode 100644 index fff219fb..00000000 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MemberConstants.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.common.core.constant; - -public class MemberConstants { - - /** - * 会员顶点 - */ - public static final String GJ30720200CODE = "GJ30720200"; - - /** - * 安置左区 - */ - public static final String LEFT_DEPT = "安置左区"; - - /** - * 安置右区 - */ - public static final String RIGHT_DEPT = "安置右区"; - -} diff --git a/hzs-gateway/src/main/resources/banner.txt b/hzs-gateway/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee9..00000000 --- a/hzs-gateway/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/hzs-gateway/src/main/resources/logback.xml b/hzs-gateway/src/main/resources/logback.xml deleted file mode 100644 index c6035567..00000000 --- a/hzs-gateway/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/hzs-shop/pom.xml b/hzs-shop/pom.xml deleted file mode 100644 index 8c954c97..00000000 --- a/hzs-shop/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - 4.0.0 - - - com.bd - hzs - 1.0.0-SNAPSHOT - - - hzs-shop - - - hzs-shop店铺服务 - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.alibaba.cloud - spring-cloud-starter-dubbo - - - - - com.bd - hzs-common-security - - - - - com.bd - hzs-common-core - - - - - commons-validator - commons-validator - - - - - com.bd - hzs-common-aop - - - - - com.bd - hzs-business-common - - - - - com.bd - hzs-api-member - - - - - com.bd - hzs-api-sale - - - - - org.springframework.amqp - spring-rabbit - - - - - com.github.javen205 - IJPay-WxPay - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - 2.3.12.RELEASE - - - - repackage - - - - - - - - diff --git a/hzs-shop/src/main/java/com/hzs/ShopApplication.java b/hzs-shop/src/main/java/com/hzs/ShopApplication.java deleted file mode 100644 index 358c1f09..00000000 --- a/hzs-shop/src/main/java/com/hzs/ShopApplication.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs; - -import com.hzs.common.security.annotation.EnableCustomConfig; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - -/** - * 店铺服务 - * - * @author hzs - */ -@EnableDiscoveryClient -@EnableCustomConfig -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -public class ShopApplication { - - public static void main(String[] args) { - SpringApplication.run(ShopApplication.class, args); - System.out.println("ShopApplication 店铺服务启动成功"); - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/banner/controller/api/ApiShopBannerController.java b/hzs-shop/src/main/java/com/hzs/shop/banner/controller/api/ApiShopBannerController.java deleted file mode 100644 index 814313f9..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/banner/controller/api/ApiShopBannerController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.shop.banner.controller.api;/** - * @Description: - * @Author: yuhui - * @Time: 2024/9/5 15:46 - * @Classname: ApiShopBannerController - * @PackageName: com.hzs.shop.banner.controller.api - */ - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.shop.banner.ShopBanner; -import com.hzs.shop.banner.service.IShopBannerService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.shop.banner.controller.api - *@Author: yh - *@CreateTime: 2024-09-05 15:46 - *@Description: 会员店铺列表 - *@Version: 1.0 - */ -@Slf4j -@RequestMapping("/shop/shop-banner") -@RestController -public class ApiShopBannerController extends BaseController { - @Autowired - private IShopBannerService shopBannerService; - - - @GetMapping("list") - public AjaxResult list(){ - return AjaxResult.success(shopBannerService.list(new QueryWrapper().orderByAsc("SORT"))); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/banner/controller/manage/ShopBannerController.java b/hzs-shop/src/main/java/com/hzs/shop/banner/controller/manage/ShopBannerController.java deleted file mode 100644 index 15e96248..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/banner/controller/manage/ShopBannerController.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.hzs.shop.banner.controller.manage;/** - * @Description: - * @Author: yuhui - * @Time: 2024/9/5 15:13 - * @Classname: ShopBannerController - * @PackageName: com.hzs.shop.banner.controller - */ - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.constant.msg.WaresMsgConstants; -import com.hzs.common.core.utils.DateUtils; -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.shop.banner.ShopBanner; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.shop.banner.service.IShopBannerService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.shop.banner.controller - *@Author: yh - *@CreateTime: 2024-09-05 15:13 - *@Description: 会员店铺列表 - *@Version: 1.0 - */ -@Slf4j -@RequestMapping("/manage/shop-banner") -@RestController -public class ShopBannerController extends BaseController { - - @Autowired - private IShopBannerService shopBannerService; - - - /** - * 列表 - * @param startCreateDate 开始创建时间 - * @param endCreateDate 结束创建时间 - * @param startEffectiveDate 开始有效时间 - * @param endEffectiveDate 结束有效时间 - * @return - */ - @GetMapping("list") - public TableDataInfo list(Date startCreateDate, Date endCreateDate,Date startEffectiveDate,Date endEffectiveDate){ - - startPage(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (startCreateDate != null && endCreateDate != null){ - queryWrapper.between("CREATION_TIME",startCreateDate,endCreateDate); - } - if (startEffectiveDate != null && endEffectiveDate != null){ - queryWrapper.between("EFFECTIVE_DATE",startEffectiveDate,endEffectiveDate); - } - queryWrapper.orderByAsc("SORT"); - List shopBannerList = shopBannerService.list(queryWrapper); - return getDataTable(shopBannerList); - } - - - /** - * 新增 - */ - @PostMapping("save") - public AjaxResult save(@RequestBody ShopBanner shopBanner){ - QueryWrapper shopWrapper = new QueryWrapper<>(); - shopWrapper.eq("SORT",shopBanner.getSort()); - int count = shopBannerService.count(shopWrapper); - if (count > 0){ - return AjaxResult.error(TransactionUtils.getContent(WaresMsgConstants.SORT_DUPLICATES)); - } - shopBanner.setPkCountry(SecurityUtils.getPkCountry()); - shopBanner.setPkCreator(SecurityUtils.getUserId()); - shopBanner.setCreationTime(DateUtils.currentDateTime()); - shopBannerService.save(shopBanner); - return AjaxResult.success(); - } - - /** - * 修改 - * @param shopBanner - * @return - */ - @PostMapping("update") - public AjaxResult update(@RequestBody ShopBanner shopBanner){ - QueryWrapper shopWrapper = new QueryWrapper<>(); - shopWrapper.eq("SORT",shopBanner.getSort()); - shopWrapper.notIn("PK_ID",shopBanner.getPkId()); - int count = shopBannerService.count(shopWrapper); - if (count > 0){ - return AjaxResult.error(TransactionUtils.getContent(WaresMsgConstants.SORT_DUPLICATES)); - } - - shopBanner.setPkModified(SecurityUtils.getUserId()); - shopBanner.setModifiedTime(DateUtils.currentDateTime()); - shopBannerService.updateById(shopBanner); - return AjaxResult.success(); - } - - - /** - * 详情 - * @param pkId - * @return - */ - @GetMapping("detail") - public AjaxResult detail(Integer pkId){ - ShopBanner shopBanner = shopBannerService.getById(pkId); - return AjaxResult.success(shopBanner); - } - /** - * 删除 - * @param pkId - * @return - */ - @GetMapping("remove") - public AjaxResult remove(Integer pkId){ - shopBannerService.removeById(pkId); - return AjaxResult.success(); - } - - /** - * 置顶 - */ - @GetMapping("top-up") - public AjaxResult topUp(Integer pkId){ - - Integer sort = shopBannerService.getMaxSort(); - ShopBanner shopBanner = new ShopBanner(); - shopBanner.setSort(sort); - shopBanner.setPkId(pkId); - shopBannerService.updateById(shopBanner); - - return AjaxResult.success(); - } - - - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/banner/mapper/ShopBannerMapper.java b/hzs-shop/src/main/java/com/hzs/shop/banner/mapper/ShopBannerMapper.java deleted file mode 100644 index b6273fce..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/banner/mapper/ShopBannerMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.shop.banner.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.banner.ShopBanner; - -/** - *

- * Mapper 接口 - *

- * - * @author hzs - * @since 2024-09-05 - */ -public interface ShopBannerMapper extends BaseMapper { - /** - * 查询最大序号 - * @return - */ - Integer getMaxSort(); -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/banner/service/IShopBannerService.java b/hzs-shop/src/main/java/com/hzs/shop/banner/service/IShopBannerService.java deleted file mode 100644 index da726f7a..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/banner/service/IShopBannerService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hzs.shop.banner.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.banner.ShopBanner; - -/** - *

- * 服务类 - *

- * - * @author hzs - * @since 2024-09-05 - */ -public interface IShopBannerService extends IService { - - /** - * 查询最大序号 - * @return - */ - Integer getMaxSort(); -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/banner/service/impl/ShopBannerServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/banner/service/impl/ShopBannerServiceImpl.java deleted file mode 100644 index 596d0c7d..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/banner/service/impl/ShopBannerServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.shop.banner.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.shop.banner.ShopBanner; -import com.hzs.shop.banner.mapper.ShopBannerMapper; -import com.hzs.shop.banner.service.IShopBannerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author hzs - * @since 2024-09-05 - */ -@Service -public class ShopBannerServiceImpl extends ServiceImpl implements IShopBannerService { - - @Autowired - private ShopBannerMapper shopBannerMapper; - - /** - * 查询最大序号 - * @return - */ - @Override - public Integer getMaxSort() { - return shopBannerMapper.getMaxSort(); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/controller/api/ApiShopMemberCardController.java b/hzs-shop/src/main/java/com/hzs/shop/card/controller/api/ApiShopMemberCardController.java deleted file mode 100644 index c5653168..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/controller/api/ApiShopMemberCardController.java +++ /dev/null @@ -1,362 +0,0 @@ -package com.hzs.shop.card.controller.api; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.crypto.symmetric.SymmetricAlgorithm; -import cn.hutool.crypto.symmetric.SymmetricCrypto; -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.enums.EMemberCardType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.StringUtils; -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.shop.card.ShopMemberCardShare; -import com.hzs.common.domain.shop.card.ext.ShopMemberCardExt; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.shop.card.service.IShopMemberCardService; -import com.hzs.shop.card.service.IShopMemberCardShareService; -import com.hzs.shop.card.vo.QrCodeVO; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.info.vo.ShopInfoVO; -import org.apache.commons.codec.binary.Base64; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; - - -/** - *

- * 店铺会员卡表 前端控制器 - *

- * - * @author hzs - * @since 2024-08-15 - */ -@RestController -@RequestMapping("/api/member-card") -public class ApiShopMemberCardController extends BaseController { - - @Autowired - private IShopMemberCardService shopMemberCardService; - - @Autowired - private IShopInfoService shopInfoService; - - @Autowired - private IShopMemberCardShareService shopMemberCardShareService; - - @Autowired - private RedisService redisService; - - - @Value("${memberCard.key}") - private String key; - - /** - * 查询我的会员卡 - * - * @return AjaxResult - */ - @GetMapping("/my-card") - public AjaxResult myCard() { - Long pkShopMember = SecurityUtils.getUserId(); - if (pkShopMember == null) { - return AjaxResult.error("请先登录"); - } - return AjaxResult.success(shopMemberCardService.selectMyMemberCard(pkShopMember)); - } - - - /** - * 会员卡二维码 - * - * @param pkCardId 会员卡ID - * @return AjaxResult - */ - @GetMapping("/member-qr-code") - public AjaxResult memberQrCode(Long pkCardId) { - byte[] secretKey = Base64.decodeBase64(key); - StringBuilder sb = new StringBuilder(); - sb.append("?pkCardId=").append(pkCardId.toString()) - .append("&type=").append(1); - String qrCode = sb.toString(); - SymmetricCrypto symmetricCrypto = new SymmetricCrypto(SymmetricAlgorithm.AES, secretKey); - HashMap map = new HashMap<>(); - map.put("qrCode", new String(Base64.encodeBase64(symmetricCrypto.encrypt(qrCode)))); - return AjaxResult.success(map); - } - - /** - * 扫描二维码(会员卡核销详情) - * - * @param qrCodeVO 二维码字符 - * @return AjaxResult - */ - @PostMapping("/card-declare_detail") - public AjaxResult memberCardDeclareDetail(@RequestBody QrCodeVO qrCodeVO) { - Integer cardType = 0; - Long pkShopMember = SecurityUtils.getUserId(); - // Long pkShopMember = 10001L; - ShopMemberCardVO shopMemberCardVO = null; - String qrCode = qrCodeVO.getQrCode(); - if (StringUtils.isEmpty(qrCode)) { - return AjaxResult.error("二维码失效"); - } - //解密二维码 - byte[] secretKey = Base64.decodeBase64(key); - SymmetricCrypto symmetricCrypto = new SymmetricCrypto(SymmetricAlgorithm.AES, secretKey); - String code = new String(symmetricCrypto.decryptStr(qrCode)); - QrCodeVO qrCodeVOParam = getQrCodeVO(code); - - Long pkCardId = qrCodeVOParam.getPkCardId(); - Integer type = qrCodeVOParam.getType(); - //查询会员卡 - ShopMemberCardExt shopMemberCard = shopMemberCardService.selectShopMemberCardByPkId(pkCardId); - //会员卡核销 - if (type == 1 && null != pkCardId) { - if (null == shopMemberCard) { - return AjaxResult.success("会员卡不存在戓已过期"); - } - if ((shopMemberCard.getTotalNum() - shopMemberCard.getUsedNum()) == 0) { - return AjaxResult.success("会员卡次数已用尽，请联系客户充卡"); - } - cardType = shopMemberCard.getCardType(); - } - //会员卡分享核消 - Long pkShareId = qrCodeVOParam.getPkShareId(); - if (type == 2 && null != pkShareId) { - ShopMemberCardShare shopMemberCardShare = shopMemberCardShareService.getById(pkShareId); - if (null == shopMemberCardShare) { - return AjaxResult.error("分享码已失效"); - } - Date validDate = shopMemberCardShare.getValidDate(); - if (validDate.before(new Date())) { - return AjaxResult.error("分享码已过期"); - } - Integer usedStatus = shopMemberCardShare.getUsedStatus(); - if (usedStatus == EYesNo.YES.getIntValue()) { - return AjaxResult.error("分享码已使用"); - } - cardType = shopMemberCardShare.getCardType(); - } - - //查询当前门店 - List shopInfos = shopInfoService.queryShopInfoByCondition(ShopParam.builder().pkShopMember(pkShopMember).build()); - if (CollUtil.isEmpty(shopInfos)) { - return AjaxResult.error("门店不存在"); - } - ShopInfo shopInfo = shopInfos.get(0); - Long pkShop = shopInfo.getPkId(); - - //校验门店使用是否是当前门店 - if (cardType == EMemberCardType.STORE.getValue() && !shopMemberCard.getPkShopId().equals(pkShop)) { - return AjaxResult.success("请在指定门店使用"); - } - - if (cardType == EMemberCardType.COUNTRY.getValue() && !shopMemberCard.getPkShopId().equals(pkShop)) { - shopMemberCard.setShopName(shopInfo.getShopName()); - shopMemberCard.setPkShopId(shopInfo.getPkId()); - } - - shopMemberCardVO = BeanUtil.copyProperties(shopMemberCard, ShopMemberCardVO.class); - shopMemberCardVO.setType(type); - shopMemberCardVO.setPkShareId(pkShareId); - return AjaxResult.success(shopMemberCardVO); - - } - - - /** - * 会员卡分享二维码 - * - * @param pkCardId 会员卡ID - * @return AjaxResult - */ - @GetMapping("/member-share-code") - @RepeatSubmitSimple - public AjaxResult memberShareQrCode(Long pkCardId) { - if (null == pkCardId) { - return AjaxResult.error("参数错误"); - } - ShopMemberCardExt shopMemberCard = shopMemberCardService.selectShopMemberCardByPkId(pkCardId); - if (null == shopMemberCard) { - return AjaxResult.error("会员卡不存在"); - } - if (shopMemberCard.getTotalNum() - shopMemberCard.getUsedNum() == 0) { - return AjaxResult.error("会员卡次数已用完"); - } - Long pkShopMember = SecurityUtils.getUserId(); - ShopInfoVO shopInfoVO = shopMemberCardService.memberCardShareQrCode(pkShopMember, shopMemberCard); - - byte[] secretKey = Base64.decodeBase64(key); - StringBuilder sb = new StringBuilder(); - sb.append("?pkCardId=").append(pkCardId) - .append("&type=").append(2) - .append("&pkShareId=").append(shopInfoVO.getPkShareId()); - SymmetricCrypto symmetricCrypto = new SymmetricCrypto(SymmetricAlgorithm.AES, secretKey); - shopInfoVO.setQrCode(new String(Base64.encodeBase64(symmetricCrypto.encrypt(sb.toString())))); - return AjaxResult.success(shopInfoVO); - } - - /** - * 获取二维码信息 - * - * @param code 二维码字符 - * @return QrCodeVO - */ - private QrCodeVO getQrCodeVO(String code) { - QrCodeVO qrCodeVO = new QrCodeVO(); - String[] params = code.split("&"); - for (String param : params) { - if (param.contains("pkCardId=")) { - String[] pkCardIds = param.split("pkCardId="); - qrCodeVO.setPkCardId(Long.valueOf(pkCardIds[1])); - } - //二维码类型（1：会员扫码 2：分享扫码） - if (param.contains("type=")) { - String[] types = param.split("type="); - qrCodeVO.setType(Integer.valueOf(types[1])); - } - - //分享ID - if (param.contains("pkShareId=")) { - String[] pkShareIds = param.split("pkShareId="); - qrCodeVO.setPkShareId(Long.valueOf(pkShareIds[1])); - } - } - return qrCodeVO; - } - - /** - * 分享卡核销 - * - * @param shopMemberCardVO 入参 - * @return AjaxResult - */ - @PostMapping("/member-share-cancel") - @RepeatSubmitSimple - public AjaxResult memberShareQrCodeCancel(@RequestBody ShopMemberCardVO shopMemberCardVO) { - Long pkShareId = shopMemberCardVO.getPkShareId(); - Long pkShopId = shopMemberCardVO.getPkShopId(); - shopMemberCardVO.setPkModified(SecurityUtils.getUserId()); - - if (null == pkShareId || null == pkShopId) { - return AjaxResult.error("参数错误"); - } - // 锁定的key - String bankKey = CacheConstants.MEMBER_SHARE_CODE + pkShareId; - try { - // 锁定8秒，防止出现重复操作 - if (redisService.lockKeyOnce(bankKey, 8)) { - ShopMemberCardShare cardShare = shopMemberCardShareService.getById(pkShareId); - if (null == cardShare) { - return AjaxResult.error("分享码已失效"); - } - Integer usedStatus = cardShare.getUsedStatus(); - if (usedStatus == EYesNo.YES.getIntValue()) { - return AjaxResult.error("分享码已使用"); - } - Date validDate = cardShare.getValidDate(); - if (validDate.before(new Date())) { - return AjaxResult.error("分享码已过期"); - } - return toAjax(shopMemberCardService.memberShareQrCodeCancel(shopMemberCardVO)); - } - } finally { - // 执行结束释放锁 - redisService.unlock(bankKey); - } - return AjaxResult.error("数据正在操作中，请稍后刷新重试"); - } - - - /** - * 分享卡温馨提示 - * - * @param shopMemberCardVO 入参 - * @return AjaxResult - */ - @PostMapping("/member-share-tip") - @RepeatSubmitSimple - public AjaxResult memberShareQrCodeTip(@RequestBody ShopMemberCardVO shopMemberCardVO) { - Long pkShareId = shopMemberCardVO.getPkShareId(); - shopMemberCardVO.setPkModified(SecurityUtils.getUserId()); - if (null == pkShareId) { - return AjaxResult.error("参数错误"); - } - if (StringUtils.isEmpty(shopMemberCardVO.getMobile()) || StringUtils.isEmpty(shopMemberCardVO.getRemarks())) { - return AjaxResult.error("手机号、备注至少填写一项"); - } - return toAjax(shopMemberCardService.memberShareQrCodeTip(shopMemberCardVO)); - } - - /** - * 我的分享记录 - * - * @return TableDataInfo - */ - @GetMapping("/my-share") - public TableDataInfo myShare() { - Long userId = SecurityUtils.getUserId(); - // Long userId = 10023L; - startPage(); - List shopMemberCardVOList = shopMemberCardService.selectShopMemberCardShareRecord(userId); - return getDataTable(shopMemberCardVOList); - } - - - /** - * 查看会员卡分享二维码 - * - * @param shopMemberCardVO 入参 - * @return AjaxResult - */ - @PostMapping("/show-share-code") - @RepeatSubmitSimple - public AjaxResult memberShareQrCode(@RequestBody ShopMemberCardVO shopMemberCardVO) { - ShopInfoVO shopInfoVO; - Long pkShopIdParam = shopMemberCardVO.getPkShopId(); - //会员卡ID - Long pkCardId = shopMemberCardVO.getPkId(); - // 分享ID - Long pkShareId = shopMemberCardVO.getPkShareId(); - if (null == pkCardId || null == pkShareId) { - return AjaxResult.error("参数错误"); - } - ShopMemberCardExt shopMemberCard = shopMemberCardService.selectShopMemberCardByPkId(pkCardId); - if (null == shopMemberCard) { - return AjaxResult.error("会员卡不存在"); - } - if (shopMemberCard.getTotalNum() - shopMemberCard.getUsedNum() == 0) { - return AjaxResult.error("会员卡次数已用完"); - } - byte[] secretKey = Base64.decodeBase64(key); - StringBuilder sb = new StringBuilder(); - sb.append("?pkCardId=").append(pkCardId) - .append("&type=").append(2) - .append("&pkShareId=").append(pkShareId); - //查询门店信息 - Long pkShopId = null== pkShopIdParam ? shopMemberCard.getPkShopId() : pkShopIdParam; - List shopInfoList = shopInfoService.getShopInfoByPkShopMember(null, pkShopId); - if (CollUtil.isNotEmpty(shopInfoList)) { - shopInfoVO = BeanUtil.copyProperties(shopInfoList.get(0), ShopInfoVO.class); - } else { - shopInfoVO = new ShopInfoVO(); - } - shopInfoVO.setPkShareId(pkShareId); - SymmetricCrypto symmetricCrypto = new SymmetricCrypto(SymmetricAlgorithm.AES, secretKey); - shopInfoVO.setQrCode(new String(Base64.encodeBase64(symmetricCrypto.encrypt(sb.toString())))); - return AjaxResult.success(shopInfoVO); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/controller/manage/ShopMemberCardController.java b/hzs-shop/src/main/java/com/hzs/shop/card/controller/manage/ShopMemberCardController.java deleted file mode 100644 index f3e40ea8..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/controller/manage/ShopMemberCardController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hzs.shop.card.controller.manage; - - -import cn.hutool.core.collection.CollUtil; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.shop.card.ext.ShopMemberCardShareExt; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.shop.card.service.IShopMemberCardService; -import com.hzs.shop.card.service.IShopMemberCardShareService; -import com.hzs.shop.card.vo.ShopMemberCardManagerVO; -import com.hzs.shop.card.vo.ShopMemberCardShareVO; -import com.hzs.shop.order.service.IShopCalendarTradeService; -import com.hzs.shop.order.vo.ShopCalendarTradeVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - *

- * 会员卡管理 - *

- * - * @author hzs - * @since 2024-08-15 - */ -@RestController -@RequestMapping("/manager/member-card") -public class ShopMemberCardController extends BaseController { - - @Autowired - private IShopMemberCardService shopMemberCardService; - - @Autowired - private IShopCalendarTradeService shopCalendarTradeService; - - - @Autowired - private ITransactionCommonService iTransactionCommonService; - - - @Autowired - private IShopMemberCardShareService shopMemberCardShareService; - - - /** - * 会员卡管理列表 - * - * @return TableDataInfo - */ - @PostMapping("/card-list") - public TableDataInfo getMemberCardList(@RequestBody ShopMemberCardManagerVO shopMemberCardManagerVO) { - startPage(); - List shopMemberCardManagerVOList = shopMemberCardService.selectShopMemberCardManager(shopMemberCardManagerVO); - return getDataTable(shopMemberCardManagerVOList); - } - - /** - * 会员卡管理列表导出 - * - * @param response 响应 - * @param shopMemberCardManagerVO 入参 - */ - - @PostMapping("/card-export") - public void memberCardExport(HttpServletResponse response, ShopMemberCardManagerVO shopMemberCardManagerVO) { - List shopMemberCardManagerVOList = shopMemberCardService.selectShopMemberCardManager(shopMemberCardManagerVO); - //多语言翻译 - if (CollUtil.isNotEmpty(shopMemberCardManagerVOList)) { - //枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EMemberCardType.values()); - for (ShopMemberCardManagerVO cardManagerVO : shopMemberCardManagerVOList) { - cardManagerVO.setCardTypeVal(transactionMap.get(EnumsPrefixConstants.MEMBER_CARD_TYPE + cardManagerVO.getCardType())); - } - } - ExcelUtil util = new ExcelUtil<>(ShopMemberCardManagerVO.class); - util.exportExcel(response, shopMemberCardManagerVOList, "会员卡管理"); - } - - /** - * 会员卡消费明细 - * - * @return TableDataInfo - */ - @GetMapping("/card-used") - public TableDataInfo getMemberCardUsed(Long pkCard) { - ShopCalendarTradeVO shopCalendarTradeVO = ShopCalendarTradeVO.builder().pkCard(pkCard).build(); - startPage(); - List shopCalendarTradeVOList = shopCalendarTradeService.selectShopCalendarDetailByCondition(shopCalendarTradeVO); - return getDataTable(shopCalendarTradeVOList); - } - - /** - * 会员卡分享列表 - * - * @return TableDataInfo - */ - @GetMapping("/card-shar") - public TableDataInfo getMemberCardShar(Long pkCard) { - startPage(); - Object[] objects = shopMemberCardShareService.selectShopMemberCardShareByCondition(pkCard); - TableDataInfo tableDataInfo = getDataTable((List) objects[0]); - tableDataInfo.setRows((List) objects[1]); - return tableDataInfo; - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/mapper/ShopMemberCardMapper.java b/hzs-shop/src/main/java/com/hzs/shop/card/mapper/ShopMemberCardMapper.java deleted file mode 100644 index 900c464d..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/mapper/ShopMemberCardMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.shop.card.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.card.ShopMemberCard; -import com.hzs.common.domain.shop.card.ext.ShopMemberCardExt; -import com.hzs.shop.card.vo.ShopMemberCardManagerVO; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 店铺会员卡表 Mapper 接口 - *

- * - * @author hzs - * @since 2024-08-15 - */ -public interface ShopMemberCardMapper extends BaseMapper { - - /** - * 查询我的会员卡 - * - * @param pkShopMember 会员id - * @return List - */ - List selectMyMemberCard(@Param("pkShopMember") Long pkShopMember); - - /** - * 根据条件查询店铺会员卡 - * - * @param shopMemberCard 入参 - * @return List - */ - List selectShopMemberCardByCondition(ShopMemberCard shopMemberCard); - - /** - * 根据IDs查询会员卡信息 - * - * @param pkId ID - * @return ShopMemberCard - */ - ShopMemberCardExt selectShopMemberCardByPkId(Long pkId); - - /** - * 查询会员卡分享记录 - * - * @param pkShopMember 会员ID - * @return List - */ - List selectShopMemberCardShareRecord(@Param("pkShopMember") Long pkShopMember); - - - /** - * 查询会员卡管理列表 - * - * @param shopMemberCardManagerVO 入参 - * @return List - */ - List selectShopMemberCardManager(ShopMemberCardManagerVO shopMemberCardManagerVO); - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/mapper/ShopMemberCardShareMapper.java b/hzs-shop/src/main/java/com/hzs/shop/card/mapper/ShopMemberCardShareMapper.java deleted file mode 100644 index cbaac4a4..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/mapper/ShopMemberCardShareMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.shop.card.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.card.ShopMemberCardShare; -import com.hzs.common.domain.shop.card.ext.ShopMemberCardShareExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 会员卡分享 Mapper 接口 - *

- * - * @author hzs - * @since 2024-08-29 - */ -public interface ShopMemberCardShareMapper extends BaseMapper { - - /** - * 查询会员卡的分享记录 - * - * @param pkCard 会员卡的ID - * @return List - */ - List selectShopMemberCardShareByCondition(@Param("pkCard") Long pkCard); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/service/IShopMemberCardService.java b/hzs-shop/src/main/java/com/hzs/shop/card/service/IShopMemberCardService.java deleted file mode 100644 index 88daa1bd..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/service/IShopMemberCardService.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.hzs.shop.card.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.card.ShopMemberCard; -import com.hzs.common.domain.shop.card.ext.ShopMemberCardExt; -import com.hzs.sale.order.dto.SaCabinCardDetailDTO; -import com.hzs.shop.card.vo.ShopMemberCardManagerVO; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.info.vo.ShopInfoVO; - -import java.util.List; - -/** - *

- * 店铺会员卡表 服务类 - *

- * - * @author hzs - * @since 2024-08-15 - */ -public interface IShopMemberCardService extends IService { - - /** - * 查询我的会员卡 - * - * @param pkShopMember 会员id - * @return List - */ - List selectMyMemberCard(Long pkShopMember); - - - /** - * 根据条件查询店铺会员卡 - * - * @param shopMemberCard 入参 - * @return List - */ - List selectShopMemberCardByCondition(ShopMemberCard shopMemberCard); - - - /** - * 保存会员卡和交易流水 - * - * @param shopMemberCardVO 会员卡 - * @return Boolean - */ - Boolean saveShopMemberCardAndTrade(ShopMemberCardVO shopMemberCardVO); - - - /** - * 获取会员卡信息 - * - * @param pkShopMember 会员ID - * @param saCabinCardDetail 生态科技能量仓 - * @param pkShop 店铺ID - * @return boolean - */ - ShopMemberCardVO getShopMemberCard(Long pkShopMember, SaCabinCardDetailDTO saCabinCardDetail, Long pkShop); - - - /** - * 根据IDs查询会员卡信息 - * - * @param pkId ID - * @return ShopMemberCard - */ - ShopMemberCardExt selectShopMemberCardByPkId(Long pkId); - - - /** - * 会员分享二维码 - * - * @param pkShopMember 会员主键 - * @param shopMemberCard 会员卡主键 - * @return ShopInfoVO - */ - ShopInfoVO memberCardShareQrCode(Long pkShopMember, ShopMemberCardExt shopMemberCard); - - - /** - * 会员二维码核销 - * - * @param shopMemberCardVO 入参 - * @return Boolean - */ - Boolean memberShareQrCodeCancel(ShopMemberCardVO shopMemberCardVO); - - /** - * 会员二维码核销提示 - * - * @param shopMemberCardVO 入参 - * @return Boolean - */ - Boolean memberShareQrCodeTip(ShopMemberCardVO shopMemberCardVO); - - - /** - * 查询会员卡分享记录 - * - * @param pkShopMember 会员ID - * @return List - */ - List selectShopMemberCardShareRecord(Long pkShopMember); - - - /** - * 查询会员卡管理列表 - * - * @param shopMemberCardManagerVO 入参 - * @return List - */ - List selectShopMemberCardManager(ShopMemberCardManagerVO shopMemberCardManagerVO); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/service/IShopMemberCardShareService.java b/hzs-shop/src/main/java/com/hzs/shop/card/service/IShopMemberCardShareService.java deleted file mode 100644 index 82adf057..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/service/IShopMemberCardShareService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.shop.card.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.card.ShopMemberCardShare; -import com.hzs.shop.card.vo.ShopMemberCardShareVO; - - -import java.util.List; - -/** - *

- * 会员卡分享 服务类 - *

- * - * @author hzs - * @since 2024-08-29 - */ -public interface IShopMemberCardShareService extends IService { - - - /** - * 查询会员卡的分享记录 - * - * @param pkCard 会员卡的ID - * @return List - */ - Object[] selectShopMemberCardShareByCondition(Long pkCard); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/service/impl/ShopMemberCardServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/card/service/impl/ShopMemberCardServiceImpl.java deleted file mode 100644 index 649a4d1d..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/service/impl/ShopMemberCardServiceImpl.java +++ /dev/null @@ -1,288 +0,0 @@ -package com.hzs.shop.card.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.ECabinCardType; -import com.hzs.common.core.enums.EMemberCardType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.shop.card.ShopMemberCard; -import com.hzs.common.domain.shop.card.ShopMemberCardConfig; -import com.hzs.common.domain.shop.card.ShopMemberCardShare; -import com.hzs.common.domain.shop.card.ext.ShopMemberCardExt; -import com.github.pagehelper.Page; -import com.hzs.sale.order.dto.SaCabinCardDetailDTO; -import com.hzs.shop.card.mapper.ShopMemberCardMapper; -import com.hzs.shop.card.service.IShopMemberCardService; -import com.hzs.shop.card.service.IShopMemberCardShareService; -import com.hzs.shop.card.vo.ShopMemberCardManagerVO; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.config.card.service.IShopMemberCardConfigService; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.info.vo.ShopInfoVO; -import com.hzs.shop.order.service.IShopCalendarTradeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -/** - *

- * 店铺会员卡表 服务实现类 - *

- * - * @author hzs - * @since 2024-08-15 - */ -@Service -public class ShopMemberCardServiceImpl extends ServiceImpl implements IShopMemberCardService { - - @Autowired - private IShopCalendarTradeService shopCalendarTradeService; - - @Autowired - private IShopMemberCardConfigService shopMemberCardConfigService; - - - @Autowired - private IShopMemberCardShareService shopMemberCardShareService; - - - @Autowired - private IShopInfoService shopInfoService; - - - @Override - public List selectMyMemberCard(Long pkShopMember) { - List shopMemberCardVOList = baseMapper.selectMyMemberCard(pkShopMember); - if (CollUtil.isNotEmpty(shopMemberCardVOList)) { - shopMemberCardVOList.forEach(memberCardVO -> { - memberCardVO.setCardTypeVal(EMemberCardType.getLabelByIntValue(memberCardVO.getCardType())); - }); - } - return shopMemberCardVOList; - } - - - @Override - public List selectShopMemberCardByCondition(ShopMemberCard shopMemberCard) { - return baseMapper.selectShopMemberCardByCondition(shopMemberCard); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveShopMemberCardAndTrade(ShopMemberCardVO shopMemberCardVO) { - //保存更新会员卡 - Long pkId = saveAndUpdateShopMemberCard(shopMemberCardVO); - if (null == pkId) { - return false; - } else { - shopMemberCardVO.setPkId(pkId); - // 添加交易流水 - return shopCalendarTradeService.fillInShopCalendarTrade(shopMemberCardVO); - - } - } - - /** - * 保存更新会员卡 - * - * @param shopMemberCardVO 入参 - * @return ID - */ - private Long saveAndUpdateShopMemberCard(ShopMemberCardVO shopMemberCardVO) { - Long pkId = shopMemberCardVO.getPkId(); - ShopMemberCard shopMemberCard = BeanUtil.copyProperties(shopMemberCardVO, ShopMemberCard.class); - if (null == pkId) { - shopMemberCard.setPkCreator(shopMemberCardVO.getPkMember()); - shopMemberCard.setValidDate(getMemberCardValidDate(shopMemberCard.getCardType())); - baseMapper.insert(shopMemberCard); - return shopMemberCard.getPkId(); - } else { - shopMemberCard.setPkModified(shopMemberCardVO.getPkMember()); - shopMemberCard.setModifiedTime(new Date()); - return baseMapper.updateById(shopMemberCard) > 0 ? pkId : null; - } - - } - - /** - * 根据配置获取会员卡的有效期 - * - * @param cardType 卡类型 - * @return Date - */ - private Date getMemberCardValidDate(Integer cardType) { - List cardConfigList = shopMemberCardConfigService.getCardConfigByCardType(cardType); - if (CollUtil.isNotEmpty(cardConfigList)) { - ShopMemberCardConfig shopMemberCardConfig = cardConfigList.get(0); - LocalDate date = LocalDate.now().plusMonths(shopMemberCardConfig.getValidTime()); - return DateUtils.toDate(date); - } - return null; - } - - /** - * 获取会员卡信息 - * - * @param pkShopMember 会员ID - * @param saCabinCardDetail 生态科技能量仓 - * @param pkShop 店铺ID - * @return boolean - */ - @Override - public ShopMemberCardVO getShopMemberCard(Long pkShopMember, SaCabinCardDetailDTO saCabinCardDetail, Long pkShop) { - ShopMemberCardVO shopMemberCardVO; - //查询会员卡信息 - ShopMemberCard shopMemberCard = ShopMemberCard.builder() - .pkShopMember(pkShopMember).cardType(EMemberCardType.COUNTRY.getValue()) - .pkShopId(pkShop).cardSource(1) - .build(); - List shopMemberCards = baseMapper.selectShopMemberCardByCondition(shopMemberCard); - //购买会员卡数量 - int buyMemberCardNum = getBuyMemberCardNum(saCabinCardDetail); - if (CollUtil.isEmpty(shopMemberCards)) { - shopMemberCardVO = ShopMemberCardVO.builder() - .cardType(EMemberCardType.COUNTRY.getValue()).cardNum(getDateTime()) - .pkShopId(pkShop).usedNum(0).totalNum(buyMemberCardNum) - .pkShopMember(pkShopMember).build(); - } else { - ShopMemberCard shopMemberCardResult = shopMemberCards.get(0); - shopMemberCardVO = ShopMemberCardVO.builder().pkId(shopMemberCardResult.getPkId()) - .totalNum(shopMemberCardResult.getTotalNum() + buyMemberCardNum) - .build(); - - } - shopMemberCardVO.setPkOrder(saCabinCardDetail.getPkOrder()); - shopMemberCardVO.setPkMember(saCabinCardDetail.getPkMember()); - shopMemberCardVO.setFillNum(buyMemberCardNum); - return shopMemberCardVO; - - } - - - @Override - public ShopMemberCardExt selectShopMemberCardByPkId(Long pkId) { - return baseMapper.selectShopMemberCardByPkId(pkId); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public ShopInfoVO memberCardShareQrCode(Long pkShopMember, ShopMemberCardExt shopMemberCardExt) { - ShopInfoVO shopInfoVO; - //保存会员分享记录 - ShopMemberCardShare shopMemberCardShare = ShopMemberCardShare.builder().pkCard(shopMemberCardExt.getPkId()) - .pkShopMember(pkShopMember).cardType(shopMemberCardExt.getCardType()) - .validDate(getMemberCardValidDate(EMemberCardType.SHARE.getValue())) - .build(); - shopMemberCardShare.setPkCreator(pkShopMember); - shopMemberCardShareService.save(shopMemberCardShare); - //更新会员卡次数 - ShopMemberCard shopMemberCard = ShopMemberCard.builder().pkId(shopMemberCardExt.getPkId()).usedNum(shopMemberCardExt.getUsedNum() + 1).build(); - shopMemberCard.setPkModified(pkShopMember); - shopMemberCard.setModifiedTime(new Date()); - updateById(shopMemberCard); - //查询门店信息 - List shopInfoList = shopInfoService.getShopInfoByPkShopMember(pkShopMember, null); - if (CollUtil.isNotEmpty(shopInfoList)) { - shopInfoVO = BeanUtil.copyProperties(shopInfoList.get(0), ShopInfoVO.class); - } else { - shopInfoVO = new ShopInfoVO(); - } - shopInfoVO.setPkShareId(shopMemberCardShare.getPkId()); - return shopInfoVO; - } - - /** - * 获取会员卡的数量 - * - * @param saCabinCardDetail 生态科技能量仓 - * @return int - */ - private int getBuyMemberCardNum(SaCabinCardDetailDTO saCabinCardDetail) { - //卡类型（1=荟享卡，2=钻石卡） - Integer cardType = saCabinCardDetail.getCardType(); - //购买数量 - Integer quantity = saCabinCardDetail.getQuantity(); - if (cardType.equals(ECabinCardType.HUIXIANG.getValue())) { - return ECabinCardType.HUIXIANG.getCardCount() * quantity; - } else { - return ECabinCardType.DIAMOND.getCardCount() * quantity; - } - - } - - /** - * 获取当前时间 - * - * @return - */ - private String getDateTime() { - LocalDateTime time = LocalDateTime.now(); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); - return dtf.format(time); - } - - - @Override - public Boolean memberShareQrCodeCancel(ShopMemberCardVO shopMemberCardVO) { - ShopMemberCardShare shopMemberCardShare = ShopMemberCardShare.builder() - .pkId(shopMemberCardVO.getPkShareId()) - .pkShop(shopMemberCardVO.getPkShopId()) - .usedStatus(EYesNo.YES.getIntValue()).build(); - shopMemberCardShare.setPkModified(shopMemberCardVO.getPkModified()); - shopMemberCardShare.setModifiedTime(new Date()); - return shopMemberCardShareService.updateById(shopMemberCardShare); - } - - @Override - public Boolean memberShareQrCodeTip(ShopMemberCardVO shopMemberCardVO) { - String mobile = shopMemberCardVO.getMobile(); - String remarks = shopMemberCardVO.getRemarks(); - ShopMemberCardShare shopMemberCardShare = ShopMemberCardShare.builder() - .pkId(shopMemberCardVO.getPkShareId()).build(); - if (StringUtils.isNotEmpty(mobile)) { - shopMemberCardShare.setMobile(mobile); - } - if (StringUtils.isNotEmpty(remarks)) { - shopMemberCardShare.setRemarks(remarks); - } - shopMemberCardShare.setPkModified(shopMemberCardVO.getPkModified()); - shopMemberCardShare.setModifiedTime(new Date()); - return shopMemberCardShareService.updateById(shopMemberCardShare); - } - - - @Override - public List selectShopMemberCardShareRecord(Long pkShopMember) { - ShopMemberCardVO shopMemberCardVO; - Page page = new Page<>(); - Page shopMemberCardExtList = (Page) baseMapper.selectShopMemberCardShareRecord(pkShopMember); - if (CollUtil.isNotEmpty(shopMemberCardExtList)) { - for (ShopMemberCardExt shopMemberCardExt : shopMemberCardExtList) { - shopMemberCardVO = BeanUtil.copyProperties(shopMemberCardExt, ShopMemberCardVO.class); - page.add(shopMemberCardVO); - } - } - page.setTotal(shopMemberCardExtList.getTotal()); - return page; - } - - @Override - public List selectShopMemberCardManager(ShopMemberCardManagerVO shopMemberCardManagerVO) { - return baseMapper.selectShopMemberCardManager(shopMemberCardManagerVO); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/service/impl/ShopMemberCardShareServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/card/service/impl/ShopMemberCardShareServiceImpl.java deleted file mode 100644 index b8dd0b52..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/service/impl/ShopMemberCardShareServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.shop.card.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.shop.card.ShopMemberCardShare; -import com.hzs.common.domain.shop.card.ext.ShopMemberCardShareExt; -import com.hzs.shop.card.mapper.ShopMemberCardShareMapper; -import com.hzs.shop.card.service.IShopMemberCardShareService; -import com.hzs.shop.card.vo.ShopMemberCardShareVO; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 会员卡分享 服务实现类 - *

- * - * @author hzs - * @since 2024-08-29 - */ -@Service -public class ShopMemberCardShareServiceImpl extends ServiceImpl implements IShopMemberCardShareService { - - - @Override - public Object[] selectShopMemberCardShareByCondition(Long pkCard) { - List shopMemberCardShareExtList = baseMapper.selectShopMemberCardShareByCondition(pkCard); - return new Object[]{shopMemberCardShareExtList, BeanUtil.copyToList(shopMemberCardShareExtList, ShopMemberCardShareVO.class)}; - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/vo/QrCodeVO.java b/hzs-shop/src/main/java/com/hzs/shop/card/vo/QrCodeVO.java deleted file mode 100644 index bd313974..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/vo/QrCodeVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.shop.card.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 二维码VO - * - * @Description: - * @Author: ljc - * @Time: 2024/8/30 11:31 - * @Classname: QrCodeVO - * @Package_name: com.hzs.shop.card.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class QrCodeVO implements Serializable { - private static final long serialVersionUID = 5683734371991998094L; - - /** - * 会员卡ID - */ - private Long pkCardId; - /** - * 二维码类型（1：会员扫码 2：分享扫码） - */ - private Integer type; - - /** - * 分享ID - */ - private Long pkShareId; - - /** - * 二维码 - */ - private String qrCode; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardManagerVO.java b/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardManagerVO.java deleted file mode 100644 index 55be52b2..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardManagerVO.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.hzs.shop.card.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 会员卡管理VO - * - * @Description: - * @Author: ljc - * @Time: 2024/9/19 16:46 - * @Classname: ShopMemberCardManagerVO - * @Package_name: com.hzs.shop.card.vo - */ - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ShopMemberCardManagerVO implements Serializable { - private static final long serialVersionUID = -8839052176094423507L; - - private Long pkId; - - /** - * 店铺会员ID - */ - private Long pkShopId; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 微信昵称 - */ - @Excel(name = "微信昵称") - private String nickName; - - /** - * 卡类型（1=全网通用，2=门店使用 ） - */ - @Transaction(transactionKey = EnumsPrefixConstants.MEMBER_CARD_TYPE) - private Integer cardType; - - @Excel(name = "卡类型") - private String cardTypeVal; - - /** - * 店铺名称 - */ - @Excel(name = "店铺名称") - private String shopName; - - - /** - * 店铺省 - */ - @Excel(name = "省") - private String province; - /** - * 店铺市 - */ - @Excel(name = "市") - private String city; - /** - * 店铺县 - */ - @Excel(name = "县") - private String county; - - /** - * 店铺详细地址 - */ - @Excel(name = "详细地址") - private String shopAddress; - - - @Excel(name = "店长会员编号") - private String shopMemberCode; - - /** - * 总次数 - */ - @Excel(name = "总次数") - private Integer totalNum; - - /** - * 剩余次数 - */ - @Excel(name = "剩余次数") - private Integer balanceNum; - - /** - * 有效期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "有效期", dateFormat = "yyyy-MM-dd") - private Date validDate; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 有效期开始时间 - */ - private String startValidDate; - - /** - * 有效期结束时间 - */ - private String endValidDate; - - - /** - * 创建时间开始时间 - */ - private String startCreationTime; - - /** - * 创建时间结束时间 - */ - private String endCreationTime; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardShareVO.java b/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardShareVO.java deleted file mode 100644 index fb972ec3..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardShareVO.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.hzs.shop.card.vo; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 分享卡VO - * - * @Description: - * @Author: ljc - * @Time: 2024/9/20 15:21 - * @Classname: ShopMemberCardShareVO - * @Package_name: com.hzs.shop.card.vo - */ - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ShopMemberCardShareVO implements Serializable { - private static final long serialVersionUID = -3844023822413779614L; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 微信昵称 - */ - @Excel(name = "微信昵称") - private String nickName; - - /** - * 店铺名称 - */ - @Excel(name = "店铺名称") - private String shopName; - - - /** - * 使用状态（0：已使用 1：未使用） - */ - @Transaction(transactionKey = EnumsPrefixConstants.MEMBER_CARD_USED_STATUS) - private Integer usedStatus; - - @Excel(name = "使用状态") - private String usedStatusVal; - - /** - * 使用次数 - */ - private Integer usedNum; - - - /** - * 有效期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "有效期", dateFormat = "yyyy-MM-dd") - private Date validDate; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - - /** - * 卡类型（1=全网通用，2=门店使用 ） - */ - @Transaction(transactionKey = EnumsPrefixConstants.MEMBER_CARD_TYPE) - private Integer cardType; - - @Excel(name = "卡类型") - private String cardTypeVal; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardVO.java b/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardVO.java deleted file mode 100644 index 37ca64c9..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/card/vo/ShopMemberCardVO.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.hzs.shop.card.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 会员卡VO - * - * @Description: - * @Author: ljc - * @Time: 2024/8/15 14:22 - * @Classname: ShopMemberCardVO - * @Package_name: com.hzs.shop.card.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ShopMemberCardVO implements Serializable { - private static final long serialVersionUID = -59148636509216227L; - - - private Long pkId; - - /** - * 店铺会员ID - */ - private Long pkShopMember; - - /** - * 会员卡名称 - */ - private String cardName; - - /** - * 卡号 - */ - private String cardNum; - - /** - * 会员卡图片 - */ - private String cardImage; - - /** - * 有效期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date validDate; - - - /** - * 卡类型（1=全网通用，2=门店使用 ） - */ - private Integer cardType; - - private String cardTypeVal; - - /** - * 店铺ID - */ - private Long pkShopId; - - /** - * 总次数 - */ - private Integer totalNum; - - /** - * 已使用次数 - */ - private Integer usedNum; - /** - * 充值次数 - */ - private Integer fillNum; - - /** - * 剩余次数 - */ - private Integer balanceNum; - - - /** - * 来源（1：私域 2：公域） - */ - private Integer cardSource; - - /** - * 卡的状态（1：正常 2：停用） - */ - private Integer cardStatus; - - /** - * 订单ID - */ - private Long pkOrder; - - /** - * 会员ID(创建人或者修改人) - */ - private Long pkMember; - - /** - * 二维码类型（1：会员扫码 2：分享扫码） - */ - private Integer type; - - /** - * 店铺名称 - */ - private String shopName; - - /** - * 分享ID - */ - private Long pkShareId; - - - /** - * 修改人ID - */ - private Long pkModified; - /** - * 手机号 - */ - private String mobile; - - - /** - * 备注 - */ - private String remarks; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 分享次数 - */ - private Integer shareNum; - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/card/controller/manage/ShopMemberCardConfigController.java b/hzs-shop/src/main/java/com/hzs/shop/config/card/controller/manage/ShopMemberCardConfigController.java deleted file mode 100644 index bf641bfe..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/card/controller/manage/ShopMemberCardConfigController.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.hzs.shop.config.card.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.constant.HttpStatus; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EMemberCardType; -import com.hzs.common.core.utils.StringUtils; -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.shop.card.ShopMemberCardConfig; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.shop.config.card.service.IShopMemberCardConfigService; -import com.hzs.shop.config.card.vo.ShopMemberCardConfigVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -import java.util.List; - -/** - *

- * 会员卡配置 前端控制器 - *

- * - * @author hzs - * @since 2024-08-15 - */ -@RestController -@RequestMapping("/manager/card-config") -public class ShopMemberCardConfigController extends BaseController { - - - @Autowired - private IShopMemberCardConfigService shopMemberCardConfigService; - - - /** - * 查询列表 - * - * @return - */ - @PostMapping("list") - public TableDataInfo list(@RequestBody ShopMemberCardConfigVO shopMemberCardConfigVO) { - startPage(); - List list = shopMemberCardConfigService.getCardConfigList(shopMemberCardConfigVO); - return getDataTable(list); - } - - - /** - * 更新转账配置白名单信息 - * - * @param cardConfigVO 入参 - * @return AjaxResult - */ - @PostMapping("/update") - public AjaxResult updateCardConfig(@RequestBody ShopMemberCardConfigVO cardConfigVO) { - AjaxResult ajaxResult = parametersVerify(cardConfigVO); - if ((Integer) ajaxResult.get(AjaxResult.CODE_TAG) == HttpStatus.ERROR) { - return ajaxResult; - } - cardConfigVO.setPkCreator(SecurityUtils.getUserId()); - cardConfigVO.setPkCountry(SecurityUtils.getPkCountry()); - return toAjax(shopMemberCardConfigService.updateCardConfig(cardConfigVO)); - } - - /** - * 新增配置信息 - * - * @return - */ - @PostMapping("save") - public AjaxResult save(@RequestBody ShopMemberCardConfigVO shopMemberCardConfigVO) { - AjaxResult ajaxResult = parametersVerify(shopMemberCardConfigVO); - if ((Integer) ajaxResult.get(AjaxResult.CODE_TAG) == HttpStatus.ERROR) { - return ajaxResult; - } - ShopMemberCardConfig shopMemberCardConfig = BeanUtil.copyProperties(shopMemberCardConfigVO, ShopMemberCardConfig.class); - shopMemberCardConfig.setPkCreator(SecurityUtils.getUserId()); - return AjaxResult.success(shopMemberCardConfigService.save(shopMemberCardConfig)); - } - - - /** - * 删除会员卡配置 - * - * @param pkId 主键ID - * @return AjaxResult - */ - @GetMapping("/delete") - public AjaxResult deleteCardConfig(Integer pkId) { - if (null == pkId) { - return AjaxResult.error(ConfigMsgConstants.DELETE_INFO); - } - return toAjax(shopMemberCardConfigService.deleteCardConfigById(pkId, SecurityUtils.getUserId())); - } - - - /** - * 查看详情 - * - * @param pkId 主键ID - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult selectCardConfigDetail(Integer pkId) { - if (null == pkId) { - return AjaxResult.error(ConfigMsgConstants.DELETE_INFO); - } - ShopMemberCardConfigVO shopMemberCardConfigVO = BeanUtil.copyProperties(shopMemberCardConfigService.getById(pkId), ShopMemberCardConfigVO.class); - shopMemberCardConfigVO.setCardTypeVal(EMemberCardType.getLabelByIntValue(shopMemberCardConfigVO.getCardType())); - return AjaxResult.success(shopMemberCardConfigVO); - } - - /** - * 公共参数校验 - * - * @param shopMemberCardConfigVO 入参 - * @return AjaxResult - */ - private AjaxResult parametersVerify(ShopMemberCardConfigVO shopMemberCardConfigVO) { - if (StringUtils.isEmpty(shopMemberCardConfigVO.getCardName())) { - return AjaxResult.error("会员卡名称不能为空"); - } - if (null == shopMemberCardConfigVO.getEffectiveDate()) { - return AjaxResult.error("生效时间不能为空"); - } - if (null == shopMemberCardConfigVO.getEnableState()) { - return AjaxResult.error("启用状态不能为空"); - } - if (StringUtils.isEmpty(shopMemberCardConfigVO.getCardImage())) { - return AjaxResult.error("会员卡图片不能为空"); - } - if (null == shopMemberCardConfigVO.getValidTime()) { - return AjaxResult.error("有效月份不能为空"); - } - - if (null == shopMemberCardConfigVO.getCardType()) { - return AjaxResult.error("卡类型不能为空"); - } - - return AjaxResult.success(); - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/card/mapper/ShopMemberCardConfigMapper.java b/hzs-shop/src/main/java/com/hzs/shop/config/card/mapper/ShopMemberCardConfigMapper.java deleted file mode 100644 index ac941310..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/card/mapper/ShopMemberCardConfigMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.shop.config.card.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.card.ShopMemberCardConfig; - -/** - *

- * 会员卡配置 Mapper 接口 - *

- * - * @author hzs - * @since 2024-08-15 - */ -public interface ShopMemberCardConfigMapper extends BaseMapper { - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/card/service/IShopMemberCardConfigService.java b/hzs-shop/src/main/java/com/hzs/shop/config/card/service/IShopMemberCardConfigService.java deleted file mode 100644 index ace86e18..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/card/service/IShopMemberCardConfigService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.shop.config.card.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.card.ShopMemberCardConfig; -import com.hzs.shop.config.card.vo.ShopMemberCardConfigVO; - -import java.util.List; - -/** - *

- * 会员卡配置 服务类 - *

- * - * @author hzs - * @since 2024-08-15 - */ -public interface IShopMemberCardConfigService extends IService { - - /** - * 查询配置列表 - * - * @param cardConfigVO 入参 - * @return List - */ - List getCardConfigList(ShopMemberCardConfigVO cardConfigVO); - - /** - * 更新会员卡配置 - * - * @param cardConfigVO 入参 - * @return Integer - */ - Integer updateCardConfig(ShopMemberCardConfigVO cardConfigVO); - - /** - * 删除会员卡配置 - * - * @param pkId 主键 - * @param pkModify 修改人 - * @return Integer - */ - Boolean deleteCardConfigById(Integer pkId, Long pkModify); - - /** - * 根据卡类型查询配置 - * - * @param cardType 卡类型 - * @return ShopMemberCardConfig - */ - List getCardConfigByCardType(Integer cardType); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/card/service/impl/ShopMemberCardConfigServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/config/card/service/impl/ShopMemberCardConfigServiceImpl.java deleted file mode 100644 index 79ad7cb7..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/card/service/impl/ShopMemberCardConfigServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.hzs.shop.config.card.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -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.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EMemberCardType; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.shop.card.ShopMemberCardConfig; -import com.hzs.shop.config.card.service.IShopMemberCardConfigService; -import com.hzs.shop.config.card.mapper.ShopMemberCardConfigMapper; -import com.hzs.shop.config.card.vo.ShopMemberCardConfigVO; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 会员卡配置 服务实现类 - *

- * - * @author hzs - * @since 2024-08-15 - */ -@Service -public class ShopMemberCardConfigServiceImpl extends ServiceImpl implements IShopMemberCardConfigService { - - - @Override - public List getCardConfigList(ShopMemberCardConfigVO cardConfigVO) { - List cardConfigVOList = new ArrayList<>(); - String cardName = cardConfigVO.getCardName(); - QueryWrapper queryWrapper = new QueryWrapper(); - if (StringUtils.isNotEmpty(cardName)) { - queryWrapper.eq("CARD_NAME", cardName); - } - List configList = this.list(queryWrapper); - if (CollUtil.isNotEmpty(configList)) { - configList.forEach(config -> { - ShopMemberCardConfigVO shopMemberCardConfigVO = BeanUtil.copyProperties(config, ShopMemberCardConfigVO.class); - shopMemberCardConfigVO.setCardTypeVal(EMemberCardType.getLabelByIntValue(config.getCardType())); - cardConfigVOList.add(shopMemberCardConfigVO); - }); - } - return cardConfigVOList; - } - - - @Override - public Integer updateCardConfig(ShopMemberCardConfigVO cardConfigVO) { - ShopMemberCardConfig shopMemberCardConfig = BeanUtil.copyProperties(cardConfigVO, ShopMemberCardConfig.class); - shopMemberCardConfig.setPkModified(cardConfigVO.getPkCreator()); - shopMemberCardConfig.setModifiedTime(new Date()); - return baseMapper.updateById(shopMemberCardConfig); - } - - - @Override - public Boolean deleteCardConfigById(Integer pkId, Long pkModify) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", pkModify); - updateWrapper.set("MODIFIED_TIME", new Date()); - return this.update(updateWrapper); - } - - - /** - * 根据卡类型查询配置 - * - * @param cardType 卡类型 - * @return ShopMemberCardConfig - */ - @Override - public List getCardConfigByCardType(Integer cardType) { - return baseMapper.selectList(new QueryWrapper() - .eq("CARD_TYPE", cardType) - .le("EFFECTIVE_DATE", new Date()) - .eq("ENABLE_STATE", 0) - .orderByDesc("EFFECTIVE_DATE") - ); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/card/vo/ShopMemberCardConfigVO.java b/hzs-shop/src/main/java/com/hzs/shop/config/card/vo/ShopMemberCardConfigVO.java deleted file mode 100644 index 3c08377c..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/card/vo/ShopMemberCardConfigVO.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.hzs.shop.config.card.vo; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 会员卡配置信息 - * - * @Description: - * @Author: ljc - * @Time: 2024/8/15 17:04 - * @Classname: ShopMemberCardConfigVO - * @Package_name: com.hzs.shop.config.card.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ShopMemberCardConfigVO implements Serializable { - private static final long serialVersionUID = 6139385723910936170L; - /** - * 主键 - */ - private Long pkId; - - /** - * 会员卡名称 - */ - private String cardName; - - /** - * 生效时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDate; - - /** - * 启用状态 0启用1禁用 - */ - @Transaction(transactionKey = EnumsPrefixConstants.ENABLE_STATUS) - private Integer enableState; - - - private String enableStateVal; - - /** - * 会员卡图片 - */ - private String cardImage; - - /** - * 有效月数 - */ - private Integer validTime; - - /** - * 卡类型（1=全网通用，2=门店使用 ） - */ - private Integer cardType; - - private String cardTypeVal; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 创建人ID - */ - private Long pkCreator; - - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/controller/api/ApiShopNoticeController.java b/hzs-shop/src/main/java/com/hzs/shop/config/controller/api/ApiShopNoticeController.java deleted file mode 100644 index 03478ff1..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/controller/api/ApiShopNoticeController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.shop.config.controller.api; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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.shop.config.ShopNotice; -import com.hzs.shop.config.service.IShopNoticeService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @Description: 店铺公告api控制器 - * @Author: jiang chao - * @Time: 2024/8/22 14:52 - * @Classname: ApiShopNoticeController - * @PackageName: com.hzs.shop.notice.controller.api - */ -@Slf4j -@RequestMapping("/api/shop-notice") -@RestController -public class ApiShopNoticeController extends BaseController { - - @Autowired - private IShopNoticeService shopNoticeService; - - - /** - * 公告列表 - * @return - */ - @GetMapping("list") - public TableDataInfo list(){ - startPage(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.orderByAsc("RECOMMEND_FLAG"); - queryWrapper.orderByDesc("SHOW_BEGIN"); - List list = shopNoticeService.list(queryWrapper); - return getDataTable(list); - } - - - /** - * 详情 - * @param pkId - * @return - */ - @GetMapping("detail") - public AjaxResult detail(Integer pkId){ - return AjaxResult.success(shopNoticeService.getById(pkId)); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/controller/api/ApiShopSysConfigController.java b/hzs-shop/src/main/java/com/hzs/shop/config/controller/api/ApiShopSysConfigController.java deleted file mode 100644 index 2fd25682..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/controller/api/ApiShopSysConfigController.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.shop.config.controller.api; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.shop.config.ShopSysConfig; -import com.hzs.shop.config.service.IShopSysConfigService; -import com.hzs.shop.config.vo.ShopSysConfigVO; -import com.hzs.shop.core.enums.EShopParamKey; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Description: 系统配置api控制器 - * @Author: jiang chao - * @Time: 2024/8/22 15:04 - * @Classname: ApiShopSysConfigController - * @PackageName: com.hzs.shop.config.controller.api - */ -@Slf4j -@RequestMapping("/api/shop-sys-config") -@RestController -public class ApiShopSysConfigController extends BaseController { - - @Autowired - private IShopSysConfigService iShopSysConfigService; - /** - * @description: 查询列表 - * @author: zhang jing - * @date: 2024/8/23 10:29 - * @param: [sysConfig] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - @Log(module = EOperationModule.SHOP_SYS_CONFIG, method = EOperationMethod.SELECT) - public AjaxResult list() { - List sysConfigs =iShopSysConfigService.list(); - List sscList = new ArrayList<>(); - if(CollectionUtil.isNotEmpty(sysConfigs)){ - sysConfigs.forEach(itm -> - sscList.add(BeanUtil.copyProperties(itm, ShopSysConfigVO.class))); - Map sccMap = sscList.stream() - .collect(Collectors.toMap(ShopSysConfigVO::getParamKey, Function.identity())); - for (EShopParamKey value : EShopParamKey.values()) { - if(sccMap.get(value.getValue())!=null){ - sccMap.get(value.getValue()).setLabel(value.getLabel()); - } - } - } - return AjaxResult.success(sscList); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/controller/manage/ShopNoticeController.java b/hzs-shop/src/main/java/com/hzs/shop/config/controller/manage/ShopNoticeController.java deleted file mode 100644 index 74943224..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/controller/manage/ShopNoticeController.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.hzs.shop.config.controller.manage; - -import cn.hutool.core.codec.Base64; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -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.shop.config.ShopNotice; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.shop.config.param.ShopNoticeParam; -import com.hzs.shop.config.service.IShopNoticeService; -import com.hzs.shop.config.vo.ShopNoticeVo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - * @Description: 店铺公告manage控制器 - * @Author: jiang chao - * @Time: 2024/8/22 14:52 - * @Classname: ShopNoticeController - * @PackageName: com.hzs.shop.notice.controller.manage - */ -@Slf4j -@RequestMapping("/manage/shop-notice") -@RestController -public class ShopNoticeController extends BaseController { - - @Autowired - private IShopNoticeService shopNoticeService; - - - /** - * 公告列表 - * @return - */ - @GetMapping("list") - public TableDataInfo list(String title, Date startShowBegin,Date endShowBegin, Date startShowEnd,Date endShowEnd,Integer recommendFlag){ - startPage(); - ShopNoticeParam shopNoticeParam = new ShopNoticeParam(); -// QueryWrapper queryWrapper = new QueryWrapper<>(); - if (StringUtils.isNotBlank(title)){ - shopNoticeParam.setTitle(title); - } - if (startShowBegin != null && endShowBegin != null ){ - startShowBegin = DateUtils.getStartTime(startShowBegin); - endShowBegin = DateUtils.getEndTime(endShowBegin); - shopNoticeParam.setStartShowBegin(startShowBegin); - shopNoticeParam.setEndShowBegin(endShowBegin); - } - if (startShowEnd != null && endShowEnd != null ){ - startShowEnd = DateUtils.getStartTime(startShowEnd); - endShowEnd = DateUtils.getEndTime(endShowEnd); - shopNoticeParam.setStartShowEnd(startShowEnd); - shopNoticeParam.setEndShowEnd(endShowEnd); - } - if (recommendFlag != null){ - shopNoticeParam.setRecommendFlag(recommendFlag); - } - // queryWrapper.orderByDesc("SHOW_BEGIN"); - List list = shopNoticeService.queryList(shopNoticeParam); - for (ShopNoticeVo shopNoticeVo : list) { - shopNoticeVo.setRecommendFlagVal(EYesNo.getLabelByIntValue(shopNoticeVo.getRecommendFlag())); - } - return getDataTable(list); - } - - /** - * 详情 - * @param pkId - * @return - */ - @GetMapping("detail") - public AjaxResult detail(Integer pkId){ - ShopNoticeVo shopNoticeVo = shopNoticeService.queryById(pkId); - return AjaxResult.success(shopNoticeVo); - } - - /** - * 新增 - * @return - */ - @PostMapping("save") - public AjaxResult save(@RequestBody ShopNotice shopNotice){ - shopNotice.setCreationTime(DateUtils.currentDateTime()); - shopNotice.setPkCountry(SecurityUtils.getPkCountry()); - shopNotice.setPkCreator(SecurityUtils.getUserId()); - shopNoticeService.save(shopNotice); - return AjaxResult.success(); - } - - - /** - * 修改 - * @param shopNotice - * @return - */ - @PostMapping("update") - public AjaxResult update(@RequestBody ShopNotice shopNotice){ - shopNotice.setModifiedTime(DateUtils.currentDateTime()); - shopNotice.setPkModified(SecurityUtils.getUserId()); - shopNoticeService.updateById(shopNotice); - return AjaxResult.success(); - } - - /** - * 删除 - * @param pkId - * @return - */ - @GetMapping("remove") - public AjaxResult remove(Integer pkId){ - return AjaxResult.success(shopNoticeService.removeById(pkId)); - } - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/controller/manage/ShopSysConfigController.java b/hzs-shop/src/main/java/com/hzs/shop/config/controller/manage/ShopSysConfigController.java deleted file mode 100644 index 9d025a15..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/controller/manage/ShopSysConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.hzs.shop.config.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.shop.config.ShopSysConfig; -import com.hzs.shop.config.service.IShopSysConfigService; -import com.hzs.shop.config.vo.ShopSysConfigVO; -import com.hzs.shop.core.enums.EShopParamKey; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Description: 系统配置manage控制器 - * @Author: jiang chao - * @Time: 2024/8/22 15:04 - * @Classname: ShopSysConfigController - * @PackageName: com.hzs.shop.config.controller.manage - */ -@Slf4j -@RequestMapping("/manage/shop-sys-config") -@RestController -public class ShopSysConfigController extends BaseController { - @Autowired - private IShopSysConfigService iShopSysConfigService; - - /** - * @description: 查询列表 - * @author: zhang jing - * @date: 2024/8/23 10:29 - * @param: [sysConfig] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - @Log(module = EOperationModule.SHOP_SYS_CONFIG, method = EOperationMethod.SELECT) - public AjaxResult list() { - List sysConfigs =iShopSysConfigService.list(); - List sscList = new ArrayList<>(); - if(CollectionUtil.isNotEmpty(sysConfigs)){ - sysConfigs.forEach(itm -> - sscList.add(BeanUtil.copyProperties(itm, ShopSysConfigVO.class))); - Map sccMap = sscList.stream() - .collect(Collectors.toMap(ShopSysConfigVO::getParamKey, Function.identity())); - for (EShopParamKey value : EShopParamKey.values()) { - if(sccMap.get(value.getValue())==null){ - ShopSysConfigVO ssco=new ShopSysConfigVO(); - ssco.setParamKey(value.getValue()); - ssco.setLabel(value.getLabel()); - sscList.add(ssco); - }else{ - sccMap.get(value.getValue()).setLabel(value.getLabel()); - } - } - }else{ - for (EShopParamKey value : EShopParamKey.values()) { - ShopSysConfigVO ssco=new ShopSysConfigVO(); - ssco.setParamKey(value.getValue()); - ssco.setLabel(value.getLabel()); - sscList.add(ssco); - } - } - return AjaxResult.success(sscList); - } - - /** - * @description: 新增店铺参数配置 - * @author: zhang jing - * @date: 2024/8/23 14:22 - * @param: [shopSysConfigVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/save") - @Log(module = EOperationModule.SHOP_SYS_CONFIG, method = EOperationMethod.INSERT) - public AjaxResult save(@RequestBody List sscList) { - if(CollectionUtil.isNotEmpty(sscList)){ - sscList.forEach(itm->{ - ShopSysConfig shopSysConfig = BeanUtil.copyProperties(itm, ShopSysConfig.class); - iShopSysConfigService.saveShopSysConfig(shopSysConfig); - }); - } - return AjaxResult.success(); - } - - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/mapper/ShopNoticeMapper.java b/hzs-shop/src/main/java/com/hzs/shop/config/mapper/ShopNoticeMapper.java deleted file mode 100644 index 536058c5..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/mapper/ShopNoticeMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.shop.config.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.config.ShopNotice; -import com.hzs.shop.config.param.ShopNoticeParam; -import com.hzs.shop.config.vo.ShopNoticeVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 店铺公告表 Mapper 接口 - * - * @author hzs - * @since 2024-08-22 - */ -public interface ShopNoticeMapper extends BaseMapper { - - - /** - * 查询所有数据 - * @return - */ - List queryList(ShopNoticeParam shopNoticeParam ); - - /** - * 根据id 查询 - * @param pkId - * @return - */ - ShopNoticeVo queryById(@Param("pkId") Integer pkId); -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/mapper/ShopSysConfigMapper.java b/hzs-shop/src/main/java/com/hzs/shop/config/mapper/ShopSysConfigMapper.java deleted file mode 100644 index e1cae2c0..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/mapper/ShopSysConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.shop.config.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.config.ShopSysConfig; - -/** - * 店铺配置表 Mapper 接口 - * - * @author hzs - * @since 2024-08-22 - */ -public interface ShopSysConfigMapper extends BaseMapper { - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/param/ShopNoticeParam.java b/hzs-shop/src/main/java/com/hzs/shop/config/param/ShopNoticeParam.java deleted file mode 100644 index adcc0985..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/param/ShopNoticeParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.shop.config.param;/** - * @Description: - * @Author: yuhui - * @Time: 2024/8/26 10:03 - * @Classname: ShopNoticeParam - * @PackageName: com.hzs.shop.config.param - */ - -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.shop.config.param - *@Author: yh - *@CreateTime: 2024-08-26 10:03 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ShopNoticeParam { - - - /** - * 标题 - */ - private String title; - - /** - * 开始显示时间（起） - */ - private Date startShowBegin; - - - /** - * 开始显示时间（止） - */ - private Date endShowBegin; - - /** - * 结束显示时间（起） - */ - private Date startShowEnd; - - /** - * 结束显示时间（止） - */ - private Date endShowEnd; - - /** - * 推荐公告（0=是，1=否） - */ - private Integer recommendFlag; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/service/IShopNoticeService.java b/hzs-shop/src/main/java/com/hzs/shop/config/service/IShopNoticeService.java deleted file mode 100644 index 74dd5bb1..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/service/IShopNoticeService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.shop.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.config.ShopNotice; -import com.hzs.shop.config.param.ShopNoticeParam; -import com.hzs.shop.config.vo.ShopNoticeVo; - -import java.util.List; - -/** - * 店铺公告表 服务类 - * - * @author hzs - * @since 2024-08-22 - */ -public interface IShopNoticeService extends IService { - - /** - * 查询所有数据 - * @return - */ - List queryList(ShopNoticeParam shopNoticeParam); - - /** - * 根据id 查询 - * @param pkId - * @return - */ - ShopNoticeVo queryById(Integer pkId); -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/service/IShopSysConfigService.java b/hzs-shop/src/main/java/com/hzs/shop/config/service/IShopSysConfigService.java deleted file mode 100644 index 3a01a5bc..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/service/IShopSysConfigService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.shop.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.config.ShopSysConfig; - -/** - * 店铺配置表 服务类 - * - * @author hzs - * @since 2024-08-22 - */ -public interface IShopSysConfigService extends IService { - - /** - * @description: 新增店铺参数配置 - * @author: zhang jing - * @date: 2024/8/23 15:10 - * @param: [shopSysConfig] - * @return: void - **/ - void saveShopSysConfig(ShopSysConfig shopSysConfig); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/service/impl/ShopNoticeServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/config/service/impl/ShopNoticeServiceImpl.java deleted file mode 100644 index 7b5f9171..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/service/impl/ShopNoticeServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.shop.config.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.shop.config.ShopNotice; -import com.hzs.shop.config.mapper.ShopNoticeMapper; -import com.hzs.shop.config.param.ShopNoticeParam; -import com.hzs.shop.config.service.IShopNoticeService; -import com.hzs.shop.config.vo.ShopNoticeVo; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 店铺公告表 服务实现类 - * - * @author hzs - * @since 2024-08-22 - */ -@Service -public class ShopNoticeServiceImpl extends ServiceImpl implements IShopNoticeService { - - /** - * 查询所有数据 - * @return - */ - @Override - public List queryList(ShopNoticeParam shopNoticeParam ) { - return baseMapper.queryList(shopNoticeParam); - } - - /** - * 根据id 查询 - * @param pkId - * @return - */ - @Override - public ShopNoticeVo queryById(Integer pkId) { - return baseMapper.queryById(pkId); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/service/impl/ShopSysConfigServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/config/service/impl/ShopSysConfigServiceImpl.java deleted file mode 100644 index 9dd81a24..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/service/impl/ShopSysConfigServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.shop.config.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.common.domain.shop.config.ShopSysConfig; -import com.hzs.shop.config.mapper.ShopSysConfigMapper; -import com.hzs.shop.config.service.IShopSysConfigService; -import org.springframework.stereotype.Service; - -/** - * 店铺配置表 服务实现类 - * - * @author hzs - * @since 2024-08-22 - */ -@Service -public class ShopSysConfigServiceImpl extends ServiceImpl implements IShopSysConfigService { - - /** - * @description: 新增店铺参数配置 - * @author: zhang jing - * @date: 2024/8/23 15:09 - * @param: [shopSysConfig] - * @return: void - **/ - @Override - public void saveShopSysConfig(ShopSysConfig shopSysConfig) { - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.eq("PARAM_KEY",shopSysConfig.getParamKey()); - ShopSysConfig ssc= baseMapper.selectOne(queryWrapper); - if(ssc!=null){ - ssc.setParamValue(shopSysConfig.getParamValue()); - baseMapper.updateById(ssc); - }else{ - baseMapper.insert(shopSysConfig); - } - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/vo/ShopNoticeVo.java b/hzs-shop/src/main/java/com/hzs/shop/config/vo/ShopNoticeVo.java deleted file mode 100644 index ddc3ad20..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/vo/ShopNoticeVo.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hzs.shop.config.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/8/26 9:59 - * @Classname: ShopVo - * @PackageName: com.hzs.shop.config.vo - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; - -import java.sql.Blob; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.shop.config.vo - *@Author: yh - *@CreateTime: 2024-08-26 09:59 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ShopNoticeVo extends BaseEntity { - - /** - * 主键ID - */ - - private Long pkId; - - /** - * 标题 - */ - - private String title; - - /** - * 显示时间（起） - */ - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date showBegin; - - /** - * 显示时间（止） - */ - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date showEnd; - - /** - * 推荐公告（0=是，1=否） - */ - - private Integer recommendFlag; - - - private String recommendFlagVal; - - /** - * 公告内容 - */ - - private Blob content; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/config/vo/ShopSysConfigVO.java b/hzs-shop/src/main/java/com/hzs/shop/config/vo/ShopSysConfigVO.java deleted file mode 100644 index b6adc457..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/config/vo/ShopSysConfigVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.shop.config.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 店铺参数配置 - * @author: zhang jing - * @date: 2024/8/23 10:42 - * @param: - * @return: - **/ -@Data -public class ShopSysConfigVO implements Serializable { - /** - * 标题 - */ - private String label; - /** - * 参数KEY（EShopParamKey） - */ - private String paramKey; - - /** - * 参数值 - */ - private String paramValue; - - private ShopSysConfigVO shopSysConfigVO; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/core/config/WeChatConfig.java b/hzs-shop/src/main/java/com/hzs/shop/core/config/WeChatConfig.java deleted file mode 100644 index d047a133..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/core/config/WeChatConfig.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hzs.shop.core.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * 微信相关配置 - */ -@Data -@Component -@ConfigurationProperties(prefix = "wechat") -public class WeChatConfig { - - //////////////////// 基础支付相关 //////////////////// - /** - * 商户号 - */ - private String mchId; - /** - * v2密钥 - */ - private String v2Key; - /** - * 微信支付回调地址 - */ - private String notifyUrl; - - //////////////////// 店务小程序 //////////////////// - /** - * 小程序appId - */ - private String shopAppletAppId; - /** - * 小程序appSecret - */ - private String shopAppletAppSecret; - - //////////////////// 店务公众号 //////////////////// - /** - * 公众号appId - */ - private String shopPublicAppId; - /** - * 公众号appSecret - */ - private String shopPublicAppSecret; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/core/constants/WeChatConstants.java b/hzs-shop/src/main/java/com/hzs/shop/core/constants/WeChatConstants.java deleted file mode 100644 index e6ca9a60..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/core/constants/WeChatConstants.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hzs.shop.core.constants; - -import com.hzs.common.core.constant.CacheConstants; - -/** - * @Description: 微信使用常量类 - * @Author: jiang chao - * @Time: 2022/11/24 17:23 - * @Classname: WeChatConstants - * @PackageName: com.hzs.common.core.constant.CacheConstants - */ -public class WeChatConstants extends CacheConstants { - - /** - * 微信AccessToken缓存key - */ - public static final String ACCESS_TOKEN_KEY = CACHE_PREFIX + "WECHAT:APPLET:ACCESS_TOKEN"; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/core/enums/EShopParamKey.java b/hzs-shop/src/main/java/com/hzs/shop/core/enums/EShopParamKey.java deleted file mode 100644 index 6f76d020..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/core/enums/EShopParamKey.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.shop.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @Description: 系统参数配置枚举 - * @Author: jiang chao - * @Time: 2024/8/22 13:53 - * @Classname: EParam - * @PackageName: com.hzs.shop.core.enums - */ -@AllArgsConstructor -@Getter -public enum EShopParamKey { - - /** - * 咨询联系人 - */ - CONSULT_CONTACTS("CONSULT_CONTACTS", "咨询联系人"), - /** - * 咨询联系方式 - */ - CONSULT_PHONE("CONSULT_PHONE", "咨询联系方式"), - - /** - * 店铺图标 - */ - SHOP_ICON("SHOP_ICON", "店铺图标"), - /** - * 店铺标题 - */ - SHOP_TITLE("SHOP_TITLE", "店铺标题"), - - ; - - - /** - * 实际值 - */ - private final String value; - /** - * 显示标签 - */ - private final String label; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/controller/api/ApiShopInfoController.java b/hzs-shop/src/main/java/com/hzs/shop/info/controller/api/ApiShopInfoController.java deleted file mode 100644 index af3a5156..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/controller/api/ApiShopInfoController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.hzs.shop.info.controller.api; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hzs.common.core.annotation.RepeatSubmitSimple; -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.shop.info.ShopInfo; -import com.hzs.common.domain.shop.info.ext.ShopInfoExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.param.ShopUpdateParam; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.info.vo.ShopInfoVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; - -/** - * 店铺信息表 前端控制器 - * - * @author hzs - * @since 2024-08-13 - */ -@RestController -@RequestMapping("/api/info") -public class ApiShopInfoController extends BaseController { - - @Autowired - private IShopInfoService shopInfoService; - - /** - * 店铺查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - public TableDataInfo listShopMachine(@RequestBody ShopParam shopParam) { - shopParam.setPkCountry(SecurityUtils.getPkCountry()); - List shopInfoExtList = shopInfoService.queryShopExtInfoByCondition(shopParam); - List shopInfoVoList = new ArrayList<>(); - for (ShopInfoExt shopInfoExt : shopInfoExtList) { - ShopInfoVO shopInfoVO = BeanUtil.copyProperties(shopInfoExt, ShopInfoVO.class); - shopInfoVoList.add(shopInfoVO); - } - return getDataTable(shopInfoVoList); - } - - /** - * 查询列表,查询存在店铺的省市县 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/address") - public TableDataInfo listShopProvince(@RequestBody ShopParam shopParam) { - shopParam.setPkCountry(SecurityUtils.getPkCountry()); - return getDataTable(shopInfoService.queryShopProvinceByShop(shopParam)); - } - - /** - * 获取店铺信息 - * - * @param pkShopInfo 店铺ID - * @return - */ - @GetMapping("/shop-info") - public AjaxResult shopInfo(@RequestParam("pkShop") Long pkShopInfo) { - ShopInfoExt shopInfoExt = shopInfoService.getShopDetail(pkShopInfo, SecurityUtils.getUserId()); - if (null != shopInfoExt) { - return AjaxResult.success(BeanUtil.copyProperties(shopInfoExt, ShopInfoVO.class)); - } - return AjaxResult.error("店铺不存在"); - } - - /** - * 更新店铺信息 - * - * @param param 更新店铺参数 - * @return - */ - @RepeatSubmitSimple - @PostMapping("/shop-update") - public AjaxResult shopUpdate(@Valid @RequestBody ShopUpdateParam param) { - // 当前登录人 - Long pkShopMember = SecurityUtils.getUserId(); - - // 获取当前登录人的店铺信息 - ShopInfo shopInfo = shopInfoService.getOne(Wrappers.lambdaQuery() - .eq(ShopInfo::getPkShopMember, pkShopMember) - ); - if (null == shopInfo) { - return AjaxResult.error("更新店铺信息不存在"); - } - - ShopInfo updateInfo = BeanUtil.copyProperties(param, ShopInfo.class); - updateInfo.setPkId(shopInfo.getPkId()); - // 更新店铺信息 - shopInfoService.updateById(updateInfo); - return AjaxResult.success(); - } - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/controller/manage/ShopInfoController.java b/hzs-shop/src/main/java/com/hzs/shop/info/controller/manage/ShopInfoController.java deleted file mode 100644 index aa420f24..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/controller/manage/ShopInfoController.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.hzs.shop.info.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ShopMsgConstants; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.enums.EShopStatus; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.utils.reflect.ReflectUtils; -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.shop.info.ext.ShopInfoExt; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.info.vo.ShopInfoVO; -import com.hzs.shop.member.service.IShopMemberService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - *

- * 店铺信息表 前端控制器 - *

- * - * @author hzs - * @since 2024-08-13 - */ -@RestController -@RequestMapping("/manage/info") -public class ShopInfoController extends BaseController { - - @Autowired - private IShopMemberService shopMemberService; - - @Autowired - private IShopInfoService shopInfoService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - public TableDataInfo listShopMachine(@RequestBody ShopParam shopParam) { - shopParam.setPkCountry(SecurityUtils.getPkCountry()); - return getDataTable(shopInfoService.queryShopExtInfoByCondition(shopParam)); - } - - /** - * 列表导出 - * - * @param response - * @param shopParam - */ - @PostMapping("/export") - public void export(HttpServletResponse response, ShopParam shopParam) { - List exportList = new ArrayList<>(); - - List list = shopInfoService.queryShopExtInfoByCondition(shopParam); - if (CollectionUtil.isNotEmpty(list)) { - for (ShopInfoExt shopInfoExt : list) { - ShopInfoVO shopInfoVO = BeanUtil.copyProperties(shopInfoExt, ShopInfoVO.class); - - EShopStatus shopStatus = EShopStatus.getEnumByIntValue(shopInfoVO.getShopStatus()); - if (null != shopStatus) { - shopInfoVO.setShopStatusVal(shopStatus.getLabel()); - } - exportList.add(shopInfoVO); - } - } - - ExcelUtil util = new ExcelUtil<>(ShopInfoVO.class); - util.exportExcel(response, exportList, "店铺信息导出"); - } - - - /** - * @param shopParam 入参 - */ - @PostMapping("/insert") - @Log(module = EOperationModule.SHOP_INFO, business = EOperationBusiness.SHOP_INFO, method = EOperationMethod.INSERT) - public AjaxResult insertShopInfo(@RequestBody ShopParam shopParam) { - if (validateFieldNotNull(shopParam, shopParam.getValidConfirmField())) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - ShopMember shopMember = packageShopParam(shopParam); - if (shopMember == null) { - AjaxResult.error(TransactionUtils.getContent(ShopMsgConstants.MEMBER_SHOP_NOT_EXISTS)); - } - shopInfoService.insertOrUpdateShopInfoByParam(shopParam, shopMember); - return AjaxResult.success(); - } - - /** - * @param shopParam 入参 - */ - @PostMapping("/update") - @Log(module = EOperationModule.SHOP_INFO, business = EOperationBusiness.SHOP_INFO, method = EOperationMethod.INSERT) - public AjaxResult updateShopInfo(@RequestBody ShopParam shopParam) { - if (shopParam.getPkId() == null || validateFieldNotNull(shopParam, shopParam.getValidConfirmField())) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - ShopMember shopMember = packageShopParam(shopParam); - if (shopMember == null) { - AjaxResult.error(TransactionUtils.getContent(ShopMsgConstants.MEMBER_SHOP_NOT_EXISTS)); - } - shopInfoService.insertOrUpdateShopInfoByParam(shopParam, shopMember); - return AjaxResult.success(); - } - - /** - * 修改采购入库 - * - * @param pkId 入参 - */ - @DeleteMapping("/{pkId}") - public AjaxResult deleteShopInfo(@PathVariable Long pkId) { - if (pkId == null) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - shopInfoService.deleteShopInfoByParam(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - private ShopMember packageShopParam(ShopParam shopParam) { - // 根据会员编号查找 店铺会员主键 - ShopMember shopMember = shopMemberService.queryShopMemberByPkMember(shopParam.getMemberCode()); - if (shopMember == null) { - return null; - } - shopParam.setPkShopMember(shopMember.getPkId()); - shopParam.setPkMember(shopParam.getPkMember()); - shopParam.setPkCreator(SecurityUtils.getUserId()); - shopParam.setPkCountry(SecurityUtils.getPkCountry()); - return shopMember; - } - - /** - * @param fieldList 需要验证的字段 - * @Description: 验证字段是否必输 - * @return: boolean - * @Author: sui q - * @Date: 2022/8/29 11:13 - */ - private boolean validateFieldNotNull(ShopParam shopParam, List fieldList) { - return fieldList.stream().anyMatch(field -> { - Object obj = ReflectUtils.invokeGetter(shopParam, field); - if (obj == null) { - return Boolean.TRUE; - } else { - if (obj instanceof String) { - return "".equals(obj); - } - } - return Boolean.FALSE; - }); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/mapper/ShopInfoMapper.java b/hzs-shop/src/main/java/com/hzs/shop/info/mapper/ShopInfoMapper.java deleted file mode 100644 index c665dce3..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/mapper/ShopInfoMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.shop.info.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.info.ext.ShopInfoExt; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.vo.ShopProvinceVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 店铺信息表 Mapper 接口 - * - * @author hzs - * @since 2024-08-13 - */ -public interface ShopInfoMapper extends BaseMapper { - - /* - * @description: 根据条件查询店铺信息，向页面返回值 - * @author: sui q - * @date: 2024/8/21 10:10 - * @param: null null - **/ - List queryShopExtInfoByCondition(ShopParam shopParam); - - /* - * @description: 根据参数查询存在店铺的省市县 - * @author: sui q - * @date: 2024/8/22 13:51 - * @param: null null - **/ - List queryShopProvinceByShop(ShopParam shopParam); - - /** - * 查询店铺详情 - * - * @param pkShopInfo 店铺ID - * @param pkShopMember 店长会员ID - * @return - */ - ShopInfoExt getShopDetail(@Param("pkShopInfo") Long pkShopInfo, - @Param("pkShopMember") Long pkShopMember); - - /** - * 根据会员查询店铺信息 - * - * @param pkShopMember 会员主键 - * @param pkShopMember 店铺主键 - * @return List - */ - List getShopInfoByPkShopMember(@Param("pkShopMember") Long pkShopMember, @Param("pkShop") Long pkShop); - - /** - * 插入店铺信息 - * - * @param shopInfo 店铺信息 - * @return - */ - int insertShopInfo(ShopInfo shopInfo); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/param/ShopParam.java b/hzs-shop/src/main/java/com/hzs/shop/info/param/ShopParam.java deleted file mode 100644 index 35c3a3bb..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/param/ShopParam.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.hzs.shop.info.param; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @description: 查询店铺的参数 - * @author: sui q - * @time: 2024/8/14 13:26 - * @classname: ShopParam - * @package_name: com.hzs.shop.info.param - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ShopParam implements Serializable { - - /** - * 主键ID - */ - private Long pkId; - - /** - * 预约会员 shop_member - */ - private Long pkShopMember; - - /** - * 会员信息表ID - */ - private Long pkMember; - - /** - * 店铺状态（营运中，已闭店） - */ - private Integer shopStatus; - - /** - * 店铺名称 - */ - private String shopName; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 店铺联系人 - */ - private String shopContacts; - - /** - * 店铺联系电话 - */ - private String shopPhone; - - /** - * 店铺省 - */ - private Integer shopProvince; - - /** - * 店铺市 - */ - private Integer shopCity; - - /** - * 店铺县 - */ - private Integer shopCounty; - - /** - * 店铺详细地址 - */ - private String shopAddress; - - /** - * 开始营业时间（年月日） - */ - private String openingTimeStart; - - /** - * 结束营业时间（年月日） - */ - private String openingTimeEnd; - - /** - * 推荐店铺（0=是，1=否） - */ - private Integer recommendFlag; - - /** - * 创建人ID - */ - private Long pkCreator; - /** - * 国家 - */ - private Integer pkCountry; - - @JsonIgnore - public List getValidConfirmField() { - List fieldList = new ArrayList<>(); - fieldList.add("shopName"); - fieldList.add("memberCode"); - fieldList.add("shopContacts"); - fieldList.add("shopPhone"); - fieldList.add("shopProvince"); - fieldList.add("shopCity"); - fieldList.add("shopCounty"); - fieldList.add("shopAddress"); - fieldList.add("openingTimeStart"); - fieldList.add("openingTimeEnd"); - fieldList.add("recommendFlag"); - fieldList.add("shopStatus"); - return fieldList; - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/param/ShopUpdateParam.java b/hzs-shop/src/main/java/com/hzs/shop/info/param/ShopUpdateParam.java deleted file mode 100644 index 109bc6c2..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/param/ShopUpdateParam.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hzs.shop.info.param; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * @Description: 编辑店铺保存参数 - * @Author: jiang chao - * @Time: 2024/8/30 10:33 - * @Classname: ShopUpdateParam - * @PackageName: com.hzs.shop.info.param - */ -@Data -public class ShopUpdateParam implements Serializable { - - /** - * 店铺名称 - */ - @NotNull - private String shopName; - - /** - * 店铺联系人 - */ - @NotNull - private String shopContacts; - - /** - * 店铺联系电话 - */ - @NotNull - private String shopPhone; - - /** - * 开始营业时间（时分） - */ - @NotNull - private String openingTimeStart; - - /** - * 结束营业时间（时分） - */ - @NotNull - private String openingTimeEnd; - - /** - * 营业状态（1=营运中，2=已闭店，3=已休息） - */ - @NotNull - private Integer shopStatus; - - /** - * 店铺省 - */ - @NotNull - private Integer shopProvince; - - /** - * 店铺市 - */ - @NotNull - private Integer shopCity; - - /** - * 店铺县 - */ - @NotNull - private Integer shopCounty; - - /** - * 店铺详细地址 - */ - @NotNull - private String shopAddress; - -// /** -// * 设备数量 -// */ -// private Integer machineCount; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/service/IShopInfoService.java b/hzs-shop/src/main/java/com/hzs/shop/info/service/IShopInfoService.java deleted file mode 100644 index a5736bfe..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/service/IShopInfoService.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.hzs.shop.info.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.info.ext.ShopInfoExt; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.vo.ShopInfoVO; -import com.hzs.shop.info.vo.ShopProvinceVO; - -import java.util.List; - -/** - * 店铺信息表 服务类 - * - * @author hzs - * @since 2024-08-13 - */ -public interface IShopInfoService extends IService { - - /* - * @description: 根据条件查询店铺信息 - * @author: sui q - * @date: 2024/8/14 13:28 - * @param: null null - **/ - List queryShopInfoByCondition(ShopParam shopParam); - - /* - * @description: 根据条件查询店铺信息，向页面返回值 - * @author: sui q - * @date: 2024/8/21 10:10 - * @param: null null - **/ - List queryShopExtInfoByCondition(ShopParam shopParam); - - /* - * @description: 根据参数查询存在店铺的省市县 - * @author: sui q - * @date: 2024/8/22 13:51 - * @param: null null - **/ - List queryShopProvinceByShop(ShopParam shopParam); - - /* - * @description: 店铺参数 - * @author: sui q - * @date: 2024/8/20 10:47 - * @param: null null - **/ - void insertOrUpdateShopInfoByParam(ShopParam shopParam, ShopMember shopMember); - - /* - * @description: 删除店铺 - * @author: sui q - * @date: 2024/8/21 9:57 - * @param: null null - **/ - void deleteShopInfoByParam(Long pkId, Long pkCreator); - - /** - * 根据发起人查询店铺信息 - * - * @param pkMember 发起人主键 - * @return ShopInfo - */ - ShopInfo queryShopInfoByPkMember(Long pkMember); - - /** - * 查询店铺详情 - * - * @param pkShopInfo 店铺ID - * @param pkShopMember 店长会员ID - * @return - */ - ShopInfoExt getShopDetail(Long pkShopInfo, Long pkShopMember); - - /** - * 根据会员查询店铺信息 - * - * @param pkShopMember 会员主键 - * @param pkShopMember 店铺主键 - * @return List - */ - List getShopInfoByPkShopMember(Long pkShopMember, Long pkShop); - - /** - * 插入店铺信息 - * - * @param shopInfo 店铺信息 - * @return - */ - int insertShopInfo(ShopInfo shopInfo); - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/service/impl/ShopInfoServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/info/service/impl/ShopInfoServiceImpl.java deleted file mode 100644 index 8618e7d8..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/service/impl/ShopInfoServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hzs.shop.info.service.impl; - -import cn.hutool.core.bean.BeanUtil; -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.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.info.ext.ShopInfoExt; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.shop.info.mapper.ShopInfoMapper; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.info.vo.ShopInfoVO; -import com.hzs.shop.info.vo.ShopProvinceVO; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 店铺信息表 服务实现类 - * - * @author hzs - * @since 2024-08-13 - */ -@Service -public class ShopInfoServiceImpl extends ServiceImpl implements IShopInfoService { - - @Override - public List queryShopInfoByCondition(ShopParam shopParam) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (shopParam.getPkShopMember() != null) { - queryWrapper.eq("PK_SHOP_MEMBER", shopParam.getPkShopMember()); - } - return baseMapper.selectList(queryWrapper); - } - - @Override - public List queryShopExtInfoByCondition(ShopParam shopParam) { - return baseMapper.queryShopExtInfoByCondition(shopParam); - } - - @Override - public List queryShopProvinceByShop(ShopParam shopParam) { - return baseMapper.queryShopProvinceByShop(shopParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertOrUpdateShopInfoByParam(ShopParam shopParam, ShopMember shopMember) { - if (shopParam.getPkId() != null) { - ShopInfo shopInfo = getById(shopParam.getPkId()); - if (shopInfo != null) { - shopInfo.setPkShopMember(shopParam.getPkShopMember()); - shopInfo.setPkMember(shopParam.getPkMember()); - shopInfo.setShopStatus(shopParam.getShopStatus()); - shopInfo.setShopName(shopParam.getShopName()); - shopInfo.setShopContacts(shopParam.getShopContacts()); - shopInfo.setShopPhone(shopParam.getShopPhone()); - shopInfo.setShopProvince(shopParam.getShopProvince()); - shopInfo.setShopCity(shopParam.getShopCity()); - shopInfo.setShopCounty(shopParam.getShopCounty()); - shopInfo.setShopAddress(shopParam.getShopAddress()); - shopInfo.setOpeningTimeStart(shopParam.getOpeningTimeStart()); - shopInfo.setOpeningTimeEnd(shopParam.getOpeningTimeEnd()); - shopInfo.setRecommendFlag(shopParam.getRecommendFlag()); - shopInfo.setModifiedTime(DateUtils.currentDateTime()); - shopInfo.setPkModified(shopParam.getPkCreator()); - // 修改 - updateById(shopInfo); - } - } else { - ShopInfo shopInfo = BeanUtil.copyProperties(shopParam, ShopInfo.class); - save(shopInfo); - } - } - - @Override - public void deleteShopInfoByParam(Long pkId, Long pkCreator) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkCreator); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - - @Override - public ShopInfo queryShopInfoByPkMember(Long pkMember) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", pkMember); - return baseMapper.selectOne(queryWrapper); - } - - @Override - public ShopInfoExt getShopDetail(Long pkShopInfo, Long pkShopMember) { - return baseMapper.getShopDetail(pkShopInfo, pkShopMember); - } - - @Override - public List getShopInfoByPkShopMember(Long pkShopMember, Long pkShop) { - return BeanUtil.copyToList(baseMapper.getShopInfoByPkShopMember(pkShopMember, pkShop), ShopInfoVO.class); - } - - @Override - public int insertShopInfo(ShopInfo shopInfo) { - return baseMapper.insertShopInfo(shopInfo); - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/vo/ShopInfoVO.java b/hzs-shop/src/main/java/com/hzs/shop/info/vo/ShopInfoVO.java deleted file mode 100644 index 414d39d5..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/vo/ShopInfoVO.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.hzs.shop.info.vo; - -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 返回到会员段 - * @author: sui q - * @time: 2024/8/22 14:50 - * @classname: ShopInfoVO - * @package_name: com.hzs.shop.info.vo - * version 1.0.0 - */ -@Data -public class ShopInfoVO implements Serializable { - - /** - * 店铺ID - */ - private Long pkId; - - /** - * 店铺名称 - */ - @Excel(name = "店铺名称") - private String shopName; - - /** - * 店铺状态（营运中，已闭店） - */ - @Transaction(transactionKey = EnumsPrefixConstants.SHOP_STATUS) - private Integer shopStatus; - - @Excel(name = "店铺状态") - private String shopStatusVal; - - /** - * 店铺联系人 - */ - @Excel(name = "店铺联系人") - private String shopContacts; - - /** - * 店铺联系电话 - */ - @Excel(name = "联系电话") - private String shopPhone; - - /** - * 店铺详细地址 - */ - private String shopAddress; - - /** - * 店铺省 - */ - @Excel(name = "店铺省") - private String shopProvinceName; - /** - * 店铺市 - */ - @Excel(name = "店铺市") - private String shopCityName; - /** - * 店铺县 - */ - @Excel(name = "店铺县") - private String shopCountyName; - - /** - * 开始营业时间（时分） - */ - private String openingTimeStart; - - /** - * 结束营业时间（时分） - */ - private String openingTimeEnd; - - /** - * 推荐店铺（0=是，1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer recommendFlag; - - private String recommendFlagVal; - - /** - * 店铺省 - */ - private Integer shopProvince; - /** - * 店铺市 - */ - private Integer shopCity; - /** - * 店铺县 - */ - private Integer shopCounty; - - /** - * 设备数量 - */ - private Integer machineCount; - /** - * 二维码 - */ - private String qrCode; - - /** - * 分享二维码ID - */ - private Long pkShareId; - - @Excel(name = "店长会员姓名") - private String memberName; - - @Excel(name = "店长会员编号") - private String memberCode; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/info/vo/ShopProvinceVO.java b/hzs-shop/src/main/java/com/hzs/shop/info/vo/ShopProvinceVO.java deleted file mode 100644 index cdc6c4b7..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/info/vo/ShopProvinceVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.shop.info.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 省市区的返回vo - * @author: sui q - * @time: 2024/8/22 13:46 - * @classname: ShopProvinceVO - * @package_name: com.hzs.shop.info.vo - * version 1.0.0 - */ -@Data -public class ShopProvinceVO implements Serializable { - - /** - * 店铺省 - */ - private Integer shopProvince; - - /** - * 店铺市 - */ - private Integer shopCity; - - /** - * 店铺县 - */ - private Integer shopCounty; - - /** - * 店铺省 - */ - private String shopProvinceName; - - /** - * 店铺市 - */ - private String shopCityName; - - /** - * 店铺县 - */ - private String shopCountyName; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/controller/api/ApiShopMemberController.java b/hzs-shop/src/main/java/com/hzs/shop/member/controller/api/ApiShopMemberController.java deleted file mode 100644 index 6580d05b..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/controller/api/ApiShopMemberController.java +++ /dev/null @@ -1,217 +0,0 @@ -package com.hzs.shop.member.controller.api; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.attest.CuMakerSpace; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.common.domain.shop.member.ShopMemberRole; -import com.hzs.common.domain.shop.member.ext.ShopMemberExt; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.member.attest.ICuMakerSpaceServiceApi; -import com.hzs.member.base.IMemberServiceApi; -import com.hzs.member.base.dto.LoginMember; -import com.hzs.sale.order.ISaCabinCardDetailServiceApi; -import com.hzs.sale.order.dto.SaCabinCardDetailDTO; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.member.param.BindMemberParam; -import com.hzs.shop.member.service.IShopMemberService; -import com.hzs.shop.member.vo.ShopMemberInfoVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * @Description: 店铺会员控制器 - * @Author: jiang chao - * @Time: 2024/8/13 17:16 - * @Classname: ApiShopMemberController - * @PackageName: com.hzs.shop.member.controller.api - */ -@Slf4j -@RequestMapping("/api/shop-member") -@RestController -public class ApiShopMemberController { - - @Autowired - private IShopMemberService iShopMemberService; - @Autowired - private IShopInfoService iShopInfoService; - - @DubboReference - IMemberServiceApi iMemberServiceApi; - @DubboReference - ICuMakerSpaceServiceApi iCuMakerSpaceServiceApi; - @DubboReference - ISaCabinCardDetailServiceApi iSaCabinCardDetailServiceApi; - - /** - * 获取登录会员信息 - * - * @return - */ - @GetMapping("/get-info") - public AjaxResult getInfo() { - ShopMemberExt shopMemberExt = iShopMemberService.getShopMemberInfo(SecurityUtils.getUserId()); - if (null != shopMemberExt) { - ShopMemberInfoVO shopMemberInfoVO = BeanUtil.copyProperties(shopMemberExt, ShopMemberInfoVO.class); - return AjaxResult.success(shopMemberInfoVO); - } - return AjaxResult.error(); - } - - /** - * 绑定会员 - * - * @param param - * @return - */ - @RepeatSubmitSimple - @PostMapping("/bind-member") - public AjaxResult bindMember(@RequestBody BindMemberParam param) { - if (StringUtils.isAnyEmpty(param.getMemberCode(), param.getPasswordOne(), param.getPasswordTwo())) { - return AjaxResult.error("缺少参数"); - } - // 当前登录会员 - Long pkShopMember = SecurityUtils.getUserId(); - - ShopMember shopMember = iShopMemberService.getById(pkShopMember); - if (null != shopMember.getPkMember()) { - return AjaxResult.error("当前用户已经绑定会员"); - } - - R loginMemberR = iMemberServiceApi.getMemberInfo(param.getMemberCode()); - if (!loginMemberR.isSuccess()) { - return AjaxResult.error("当前会员不存在"); - } - CuMemberExt cuMemberExt = loginMemberR.getData().getCuMember(); - if (null == cuMemberExt) { - return AjaxResult.error("当前会员不存在"); - } - - // 未支付 或 已撤单、已退单 等 - if (EPayStatus.UNPAID.getValue() == cuMemberExt.getPayStatus() - || ECategory.NORMAL.getValue() != cuMemberExt.getCategory()) { - return AjaxResult.error("当前会员不存在"); - } - - // 店铺信息 - ShopInfo shopInfo = null; - // 店铺设备信息 - ShopMachine shopMachine = null; - // 店铺角色 - ShopMemberRole shopMemberRole = null; - - // 查询会员是否为发起人，如果是发起人，需要同步店铺信息并且绑定店铺角色 - CuMakerSpace cuMakerSpace = iCuMakerSpaceServiceApi.selectMakerSpaceByPkMember(cuMemberExt.getPkId(), EStoreType.MAKER_SPACE.getValue()).getData(); - if (null != cuMakerSpace) { - // 存在创客空间数据 - if (EApproveStatus.FINISH.getValue() == cuMakerSpace.getApplyStatus() - && EApproveStatus.FINISH.getValue() == cuMakerSpace.getApproveStatus()) { - // 审核通过的创客空间 - - // 创客空间是否已经绑定 - ShopInfo queryShopInfo = iShopInfoService.getOne(Wrappers.lambdaQuery() - .eq(ShopInfo::getPkMakerSpace, cuMakerSpace.getPkId()) - ); - if (null == queryShopInfo) { - // 同步创建店铺信息 - shopInfo = new ShopInfo(); - shopInfo.setPkId(cuMakerSpace.getPkId()); - shopInfo.setPkMember(cuMemberExt.getPkId()); - shopInfo.setPkShopMember(pkShopMember); - shopInfo.setShopStatus(EShopStatus.CLOSE_STORE.getIntValue()); - shopInfo.setShopName(cuMakerSpace.getStoreName()); - shopInfo.setShopContacts(cuMakerSpace.getStorePerson()); - shopInfo.setShopPhone(cuMakerSpace.getStorePhone()); - shopInfo.setShopProvince(cuMakerSpace.getStoreProvince()); - shopInfo.setShopCity(cuMakerSpace.getStoreCity()); - shopInfo.setShopCounty(cuMakerSpace.getStoreCounty()); - shopInfo.setShopAddress(cuMakerSpace.getStoreAddress()); - shopInfo.setPkCreator(pkShopMember); - shopInfo.setPkMakerSpace(cuMakerSpace.getPkId()); - - shopMachine = new ShopMachine(); - shopMachine.setPkShop(cuMakerSpace.getPkId()); - shopMachine.setMachineCode(IdWorker.get32UUID()); - shopMachine.setProjectName("生态科技仓体验"); - shopMachine.setPkCreator(pkShopMember); - } else { - if (null == queryShopInfo.getPkMember()) { - // 存在店铺数据，但是绑定会员为空，则更新为当前会员 - shopInfo = queryShopInfo; - shopInfo.setPkMember(cuMemberExt.getPkId()); - shopInfo.setModifiedTime(new Date()); - } else { - if (cuMemberExt.getPkId().equals(queryShopInfo.getPkMember())) { - // 店铺绑定的店长就是当前会员 - shopInfo = queryShopInfo; - } else { - // 店铺绑定的店长不是当前会员 - log.warn("绑定会员时，关联店铺信息已被其它会员绑定，shopInfo：{}", queryShopInfo); - } - } - } - - if (null != shopInfo) { - // 店长身份 - shopMemberRole = new ShopMemberRole(); - shopMemberRole.setPkShopMember(pkShopMember); - shopMemberRole.setShopRole(EShopRole.SHOPOWNER.getValue()); - shopMemberRole.setPkCreator(pkShopMember); - } - } - } - - // 店铺会员卡列表 - List shopMemberCardList = new ArrayList<>(); - // 查询 2980 或 19900 卡项 - List cabinCardDetailList = iSaCabinCardDetailServiceApi.getCabinCardDetailByCondition(null, cuMemberExt.getPkId(), Arrays.asList(EOrderType.REGISTER_ORDER.getValue(), EOrderType.UPGRADE_ORDER.getValue())).getData(); - if (CollectionUtil.isNotEmpty(cabinCardDetailList)) { - for (SaCabinCardDetailDTO saCabinCardDetailDTO : cabinCardDetailList) { - if (null == saCabinCardDetailDTO.getCardType()) { - log.error("绑定会员处理卡项失败，卡类型为空"); - continue; - } - // 卡类型 - ECabinCardType cabinCardType = ECabinCardType.getEnumByValue(saCabinCardDetailDTO.getCardType()); - if (null == cabinCardType) { - log.error("绑定会员处理卡项失败，卡类型不存在"); - continue; - } - - // 封装会员卡数据 - shopMemberCardList.add(ShopMemberCardVO.builder() - .pkShopMember(pkShopMember) - .cardType(saCabinCardDetailDTO.getCardType()) - .pkShopId(saCabinCardDetailDTO.getPkMakerSpace()) - .totalNum(cabinCardType.getCardCount() * saCabinCardDetailDTO.getQuantity()) - .pkOrder(saCabinCardDetailDTO.getPkOrder()) - .pkMember(saCabinCardDetailDTO.getPkMember()) - .build()); - } - } - - // 正常会员处理 - shopMember.setPkMember(cuMemberExt.getPkId()); - iShopMemberService.bindShopMember(shopMember, shopInfo, shopMachine, shopMemberRole, shopMemberCardList); - return AjaxResult.success(); - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/controller/api/ApiShopWechatController.java b/hzs-shop/src/main/java/com/hzs/shop/member/controller/api/ApiShopWechatController.java deleted file mode 100644 index d3d26257..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/controller/api/ApiShopWechatController.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.hzs.shop.member.controller.api; - -import cn.hutool.core.util.RandomUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.enums.ELoginType; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.common.security.service.MemberTokenService; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.member.base.dto.LoginMember; -import com.hzs.shop.core.config.WeChatConfig; -import com.hzs.shop.member.dto.WeChatCodeDTO; -import com.hzs.shop.member.param.WeChatDataParam; -import com.hzs.shop.member.service.IShopMemberService; -import com.hzs.shop.util.WeChatUtil; -import com.hzs.shop.wechat.service.IWeChatAppletService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * @Description: 店铺微信控制器 - * @Author: jiang chao - * @Time: 2024/8/13 15:39 - * @Classname: WechatController - * @PackageName: com.hzs.shop.member.controller - */ -@Slf4j -@RequestMapping("/api/shop-wechat") -@RestController -public class ApiShopWechatController { - - @Autowired - private MemberTokenService memberTokenService; - @Autowired - private IShopMemberService iShopMemberService; - @Autowired - private IWeChatAppletService iWeChatAppletService; - - @Autowired - private WeChatConfig weChatConfig; - - /** - * 获取token（微信静默授权，根据code获取token） - * - * @param code 微信授权code - * @return - */ - @RepeatSubmitSimple - @GetMapping("/get-token") - public AjaxResult getToken(@RequestParam String code) { - // 微信请求参数 - Map requestParam = new HashMap<>(); - requestParam.put("appid", weChatConfig.getShopAppletAppId()); - requestParam.put("secret", weChatConfig.getShopAppletAppSecret()); - requestParam.put("js_code", code); - requestParam.put("grant_type", "authorization_code"); - - // 根据code调用微信 auth.code2Session 接口，获取用户 openId 和 unionId - String resultStr = HttpUtil.get("https://api.weixin.qq.com/sns/jscode2session", requestParam); - if (StringUtils.isEmpty(resultStr)) { - return AjaxResult.error("请求微信授权异常"); - } - log.info("请求微信授权返回，resultStr: {}", resultStr); - - // 微信返回json转操作对象 - WeChatCodeDTO weChatCodeDTO = JSONUtil.parseObj(resultStr).toBean(WeChatCodeDTO.class); - - // 判断返回内容是否成功 - String errorMsg = WeChatUtil.handErrorCode(weChatCodeDTO.getErrcode()); - if (StringUtils.isNotEmpty(errorMsg)) { - log.error("请求微信授权失败,msg: {}", errorMsg); - return AjaxResult.error("请求微信授权失败"); - } - - // 微信授权成功 - String unionId = weChatCodeDTO.getUnionid(); - String openId = weChatCodeDTO.getOpenid(); - - // 查询会员微信信息以及是否绑定关联账号 - ShopMember shopMember = iShopMemberService.queryByUnionAndOpen(unionId, openId); - if (null == shopMember) { - // 第一次进入小程序，需要生成信息 - shopMember = new ShopMember(); - shopMember.setUnionId(unionId); - shopMember.setOpenId(openId); - shopMember.setNickName("游客" + RandomUtil.randomString(8)); - if (!iShopMemberService.save(shopMember)) { - log.error("游客第一次进入小程序生成数据失败"); - return AjaxResult.error("微信授权处理失败，请退出小程序重新进入"); - } - } - // 登录 - LoginMember loginMember = new LoginMember(); - loginMember.setShopMember(shopMember); - loginMember.setLoginType(ELoginType.SHOP_MEMBER.getValue()); - return AjaxResult.success(memberTokenService.createToken(loginMember)); - } - - /** - * 设置微信信息 - * - * @param param 微信数据入参 - * @return - */ - @RepeatSubmitSimple - @PostMapping("/set-data") - public AjaxResult setData(@RequestBody WeChatDataParam param) { - if (StringUtils.isEmpty(param.getNickName())) { - return AjaxResult.error("缺少昵称"); - } -// if (StringUtils.isEmpty(param.getHeadPath())) { -// return AjaxResult.error("缺少头像"); -// } - - // 店铺会员ID - Long pkId = SecurityUtils.getUserId(); - - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ShopMember::getPkId, pkId); - updateWrapper.set(ShopMember::getNickName, param.getNickName()); -// updateWrapper.set(ShopMember::getHeadPath, param.getHeadPath()); - updateWrapper.set(ShopMember::getPkModified, pkId); - updateWrapper.set(ShopMember::getModifiedTime, new Date()); - iShopMemberService.update(updateWrapper); - return AjaxResult.success(); - } - - /** - * 设置手机号 - * - * @param param 微信数据入参 - * @return - */ - @RepeatSubmitSimple - @PostMapping("/set-phone") - public AjaxResult setPhone(@RequestBody WeChatDataParam param) { - if (StringUtils.isEmpty(param.getPhoneCode())) { - return AjaxResult.error("缺少手机号参数"); - } - - // 从缓存中获取accessToken（定时任务生成写入缓存） - String accessToken = iWeChatAppletService.getAccAccessToken(); - if (null == accessToken) { - log.error("设置手机号请求微信获取 accessToken 缓存不存在"); - return AjaxResult.error("请求微信异常处理异常"); - } - - // 微信请求参数 - Map requestParam = new HashMap<>(); - requestParam.put("code", param.getPhoneCode()); - - // 根据code调用微信获取手机号 - String resultStr = HttpUtil.post("https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + accessToken, JSONUtil.toJsonStr(requestParam)); - if (StringUtils.isEmpty(resultStr)) { - return AjaxResult.error("请求微信获取手机号异常"); - } - log.info("请求微信获取手机号返回，resultStr: {}", resultStr); - - // 微信返回json转操作对象 - JSONObject resultObj = JSONUtil.parseObj(resultStr); - Object errCodeObj = resultObj.get("errcode"); - if (null == errCodeObj || 0 == (int) errCodeObj) { - // errCode 为 空 或 0，表示请求成功 - JSONObject phoneInfoObj = resultObj.getJSONObject("phone_info"); - String phone = phoneInfoObj.getStr("purePhoneNumber"); - - // 店铺会员ID - Long pkId = SecurityUtils.getUserId(); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ShopMember::getPkId, pkId); - updateWrapper.set(ShopMember::getPhone, phone); - updateWrapper.set(ShopMember::getPkModified, pkId); - updateWrapper.set(ShopMember::getModifiedTime, new Date()); - iShopMemberService.update(updateWrapper); - return AjaxResult.success("", phone); - } - return AjaxResult.error("请求微信获取手机号失败"); - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/controller/manage/CuMakerSpaceStoreController.java b/hzs-shop/src/main/java/com/hzs/shop/member/controller/manage/CuMakerSpaceStoreController.java deleted file mode 100644 index a323e8ae..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/controller/manage/CuMakerSpaceStoreController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.hzs.shop.member.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.member.attest.ext.CuMakerSpaceExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.shop.member.service.IShopMemberService; -import com.hzs.shop.member.vo.CuMakerSpaceStoreVO; -import com.hzs.shop.member.vo.ShopMemberVO; -import com.hzs.system.base.IAreaServiceApi; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -/** - * @description: 门店发起人数据 - * @author: zhang jing - * @date: 2024/9/9 14:37 - * @param: - * @return: - **/ -@Slf4j -@RequestMapping("/manage/maker-space") -@RestController -public class CuMakerSpaceStoreController extends BaseController { - @Autowired - private IShopMemberService iShopMemberService; - @DubboReference - private IAreaServiceApi iAreaServiceApi; - @Autowired - private ITransactionCommonService iTransactionCommonService; - - /** - * @description: 门店发起人数据 - * @author: zhang jing - * @date: 2024/9/9 15:32 - * @param: [shopMemberVO] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @GetMapping("/list") - @Log(module = EOperationModule.MAKER_SPACE_STORE, method = EOperationMethod.SELECT) - public TableDataInfo list(CuMakerSpaceStoreVO mss) { - startPage(); - mss.setPkCountry(SecurityUtils.getPkCountry()); - List spMemberList = iShopMemberService.makerSpaceStoreList(mss); - // 获取行政区划map - Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); - if (CollectionUtil.isNotEmpty(spMemberList)) { - spMemberList.forEach(itm -> { - itm.setStoreTypeVal(EStoreType.getEnumByValue(itm.getStoreType()).getLabel()); - itm.setCertificateStatusVal(ECertificateStatus.getEnumByValue(itm.getCertificateStatus()).getLabel()); - if (itm.getStoreProvince() != null) { - itm.setProvince(areaMap.get(itm.getStoreProvince())); - } - if (itm.getStoreCity() != null) { - itm.setCity(areaMap.get(itm.getStoreCity())); - } - if (itm.getStoreCounty() != null) { - itm.setCounty(areaMap.get(itm.getStoreCounty())); - } - }); - } - return getDataTable(spMemberList); - } - - /** - * @description: 导出 店务会员列表 - * @author: zhang jing - * @date: 2024/8/28 14:15 - * @param: [response, shopMemberVO] - * @return: void - **/ - @Log(module = EOperationModule.SHOP_MEMBER, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, CuMakerSpaceStoreVO mss) { - mss.setPkCountry(SecurityUtils.getPkCountry()); - List spMemberList = iShopMemberService.makerSpaceStoreList(mss); - // 获取行政区划map - Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_AWARD); - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EDealerYesNo.values()); - if (CollectionUtil.isNotEmpty(spMemberList)) { - spMemberList.forEach(itm -> { - itm.setStoreTypeVal(EStoreType.getEnumByValue(itm.getStoreType()).getLabel()); - itm.setCertificateStatusVal(ECertificateStatus.getEnumByValue(itm.getCertificateStatus()).getLabel()); - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - itm.setCabinStatusVal(transactionMap.get(EnumsPrefixConstants.DEALER_YES_NO+itm.getCabinStatus())); - itm.setProtocolStatusVal(transactionMap.get(EnumsPrefixConstants.DEALER_YES_NO+itm.getProtocolStatus())); - if (itm.getStoreProvince() != null) { - itm.setProvince(areaMap.get(itm.getStoreProvince())); - } - if (itm.getStoreCity() != null) { - itm.setCity(areaMap.get(itm.getStoreCity())); - } - if (itm.getStoreCounty() != null) { - itm.setCounty(areaMap.get(itm.getStoreCounty())); - } - }); - } - ExcelUtil util = new ExcelUtil<>(CuMakerSpaceStoreVO.class); - util.exportExcel(response, spMemberList, "店务会员导出"); - } - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/controller/manage/ShopMemberController.java b/hzs-shop/src/main/java/com/hzs/shop/member/controller/manage/ShopMemberController.java deleted file mode 100644 index 7d9c9c16..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/controller/manage/ShopMemberController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzs.shop.member.controller.manage; - -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.poi.ExcelUtil; -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.shop.member.service.IShopMemberService; -import com.hzs.shop.member.vo.ShopMemberVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * @description: 店务会员 - * @author: zhang jing - * @date: 2024/8/28 10:57 - * @param: - * @return: - **/ -@Slf4j -@RequestMapping("/manage/shop-member") -@RestController -public class ShopMemberController extends BaseController { - @Autowired - private IShopMemberService iShopMemberService; - - /** - * @description: 店务会员列表 - * @author: zhang jing - * @date: 2024/8/28 14:15 - * @param: [shopMemberVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/list") - @Log(module = EOperationModule.SHOP_MEMBER, method = EOperationMethod.SELECT) - public TableDataInfo list(ShopMemberVO shopMemberVO) { - startPage(); - List spMemberList =iShopMemberService.spMemberList(shopMemberVO); - return getDataTable(spMemberList); - } - - /** - * @description: 导出 店务会员列表 - * @author: zhang jing - * @date: 2024/8/28 14:15 - * @param: [response, shopMemberVO] - * @return: void - **/ - @Log(module = EOperationModule.SHOP_MEMBER, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ShopMemberVO shopMemberVO) { - List spMemberList =iShopMemberService.spMemberList(shopMemberVO); - ExcelUtil util = new ExcelUtil<>(ShopMemberVO.class); - util.exportExcel(response, spMemberList, "店务会员导出"); - } - - - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/dto/WeChatCodeDTO.java b/hzs-shop/src/main/java/com/hzs/shop/member/dto/WeChatCodeDTO.java deleted file mode 100644 index 14ee5eca..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/dto/WeChatCodeDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.shop.member.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 微信授权DTO - * @Author: jiang chao - * @Time: 2023/8/4 15:19 - * @Classname: WeChatCodeDTO - * @PackageName: com.hzs.third.wechat.dto - */ -@Data -public class WeChatCodeDTO implements Serializable { - - /** - * 用户开放平台的唯一标记 - */ - private String unionid; - - /** - * 用户唯一标识 - */ - private String openid; - - /** - * 会话密钥 - */ - private String session_key; - - /** - * 错误码 - */ - private Integer errcode; - - /** - * 错误信息 - */ - private String errmsg; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/mapper/ShopMemberMapper.java b/hzs-shop/src/main/java/com/hzs/shop/member/mapper/ShopMemberMapper.java deleted file mode 100644 index d7c79345..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/mapper/ShopMemberMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.shop.member.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.common.domain.shop.member.ext.ShopMemberExt; -import com.hzs.shop.member.vo.CuMakerSpaceStoreVO; -import com.hzs.shop.member.vo.ShopMemberVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 店铺会员表 Mapper 接口 - * - * @author hzs - * @since 2024-08-13 - */ -public interface ShopMemberMapper extends BaseMapper { - - /** - * 查询店铺会员信息 - * - * @param pkShopMember 店铺会员ID - * @return - */ - ShopMemberExt getShopMemberInfo(@Param("pkShopMember") Long pkShopMember); - - /** - * @description: 店务会员列表 - * @author: zhang jing - * @date: 2024/8/28 14:07 - * @param: [shopMemberVO] - * @return: java.util.List - **/ - List spMemberList(ShopMemberVO shopMemberVO); - - List makerSpaceStoreList(CuMakerSpaceStoreVO cuMakerSpaceStoreVO); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/mapper/ShopMemberRoleMapper.java b/hzs-shop/src/main/java/com/hzs/shop/member/mapper/ShopMemberRoleMapper.java deleted file mode 100644 index 44f2a376..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/mapper/ShopMemberRoleMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.shop.member.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.member.ShopMemberRole; -import org.apache.ibatis.annotations.Param; - -/** - * 店铺会员角色表 Mapper 接口 - * - * @author hzs - * @since 2024-08-14 - */ -public interface ShopMemberRoleMapper extends BaseMapper { - - /** - * 绑定会员角色 - * - * @param shopMemberRole 会员角色 - * @return - */ - int bindShopMemberRole(@Param("shopMemberRole") ShopMemberRole shopMemberRole); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/param/BindMemberParam.java b/hzs-shop/src/main/java/com/hzs/shop/member/param/BindMemberParam.java deleted file mode 100644 index fbe365dc..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/param/BindMemberParam.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.shop.member.param; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 绑定会员入参 - * @Author: jiang chao - * @Time: 2024/8/14 14:51 - * @Classname: BindMemberParam - * @PackageName: com.hzs.shop.member.param - */ -@Data -public class BindMemberParam implements Serializable { - - /** - * 会员编号 - */ - private String memberCode; - - /*** - * 登录密码 - */ - private String passwordOne; - - /** - * 支付密码 - */ - private String passwordTwo; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/param/WeChatDataParam.java b/hzs-shop/src/main/java/com/hzs/shop/member/param/WeChatDataParam.java deleted file mode 100644 index 40c6eee1..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/param/WeChatDataParam.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.shop.member.param; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 微信数据入参 - * @Author: jiang chao - * @Time: 2023/8/8 15:05 - * @Classname: WeChatDataParam - * @PackageName: com.hzs.member.wechat.param - */ -@Data -public class WeChatDataParam implements Serializable { - - /** - * 昵称 - */ - private String nickName; - - /** - * 头像 - */ - private String headPath; - - /** - * 手机号获取code - */ - private String phoneCode; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/service/IShopMemberRoleService.java b/hzs-shop/src/main/java/com/hzs/shop/member/service/IShopMemberRoleService.java deleted file mode 100644 index b732bef2..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/service/IShopMemberRoleService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hzs.shop.member.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.member.ShopMemberRole; - -/** - * 店铺会员角色表 服务类 - * - * @author hzs - * @since 2024-08-14 - */ -public interface IShopMemberRoleService extends IService { - - /** - * 绑定会员角色 - * - * @param shopMemberRole 会员角色 - * @return - */ - int bindShopMemberRole(ShopMemberRole shopMemberRole); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/service/IShopMemberService.java b/hzs-shop/src/main/java/com/hzs/shop/member/service/IShopMemberService.java deleted file mode 100644 index 75946344..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/service/IShopMemberService.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzs.shop.member.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.common.domain.shop.member.ShopMemberRole; -import com.hzs.common.domain.shop.member.ext.ShopMemberExt; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.member.vo.CuMakerSpaceStoreVO; -import com.hzs.shop.member.vo.ShopMemberVO; - -import java.util.List; - -/** - * 店铺会员表 服务类 - * - * @author hzs - * @since 2024-08-13 - */ -public interface IShopMemberService extends IService { - - /** - * 根据 unionId 和 openId 查询店铺会员信息 - * - * @param unionId 微信unionId - * @param openId 微信openId - * @return - */ - ShopMember queryByUnionAndOpen(String unionId, String openId); - - /** - * 获取会员信息 - * - * @param pkShopMember 店铺会员ID - * @return - */ - ShopMemberExt getShopMemberInfo(Long pkShopMember); - - /** - * 绑定会员信息 - * - * @param shopMember 会员信息 - * @param shopInfo 店铺信息 - * @param shopMachine 店铺设备信息 - * @param shopMemberRole 会员店铺角色 - * @param shopMemberCardList 会员卡列表 - */ - void bindShopMember(ShopMember shopMember, ShopInfo shopInfo, ShopMachine shopMachine, ShopMemberRole shopMemberRole, List shopMemberCardList); - - /* - * @description: 根据会员编号查询该会员编号绑定的店铺会员 - * @author: sui q - * @date: 2024/8/19 14:19 - * @param: null null - **/ - ShopMember queryShopMemberByPkMember(String memberCode); - - /** - * 根据手机号查询会员信息 - * - * @param phone 手机号 - * @return ShopMember - */ - ShopMember getShopMemberInfoByPhone(String phone); - - /** - * 根据会员ID查询会员信息 - * - * @param pkMember 报单会员ID - * @return ShopMember - */ - ShopMember getShopMemberInfoByPkMember(Long pkMember); - - /** - * @description: 店务会员列表 - * @author: zhang jing - * @date: 2024/8/28 14:07 - * @param: [shopMemberVO] - * @return: java.util.List - **/ - List spMemberList(ShopMemberVO shopMemberVO); - - List makerSpaceStoreList(CuMakerSpaceStoreVO cuMakerSpaceStoreVO); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/service/impl/ShopMemberRoleServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/member/service/impl/ShopMemberRoleServiceImpl.java deleted file mode 100644 index c9c0e45a..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/service/impl/ShopMemberRoleServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.shop.member.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.shop.member.ShopMemberRole; -import com.hzs.shop.member.mapper.ShopMemberRoleMapper; -import com.hzs.shop.member.service.IShopMemberRoleService; -import org.springframework.stereotype.Service; - -/** - * 店铺会员角色表 服务实现类 - * - * @author hzs - * @since 2024-08-14 - */ -@Service -public class ShopMemberRoleServiceImpl extends ServiceImpl implements IShopMemberRoleService { - - @Override - public int bindShopMemberRole(ShopMemberRole shopMemberRole) { - return baseMapper.bindShopMemberRole(shopMemberRole); - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/service/impl/ShopMemberServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/member/service/impl/ShopMemberServiceImpl.java deleted file mode 100644 index 56208626..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/service/impl/ShopMemberServiceImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.hzs.shop.member.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.common.domain.shop.member.ShopMemberRole; -import com.hzs.common.domain.shop.member.ext.ShopMemberExt; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.member.base.IMemberServiceApi; -import com.hzs.shop.card.service.IShopMemberCardService; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.member.mapper.ShopMemberMapper; -import com.hzs.shop.member.service.IShopMemberRoleService; -import com.hzs.shop.member.service.IShopMemberService; -import com.hzs.shop.member.vo.CuMakerSpaceStoreVO; -import com.hzs.shop.member.vo.ShopMemberVO; -import com.hzs.shop.order.service.IShopMachineService; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 店铺会员表 服务实现类 - * - * @author hzs - * @since 2024-08-13 - */ -@Service -public class ShopMemberServiceImpl extends ServiceImpl implements IShopMemberService { - - @Autowired - private IShopInfoService iShopInfoService; - @Autowired - private IShopMemberRoleService iShopMemberRoleService; - @Autowired - private IShopMachineService iShopMachineService; - @Autowired - private IShopMemberCardService iShopMemberCardService; - - @DubboReference - IMemberServiceApi memberServiceApi; - - @Override - public ShopMember queryByUnionAndOpen(String unionId, String openId) { - return this.getOne(Wrappers.lambdaQuery() - .eq(ShopMember::getUnionId, unionId) - .eq(ShopMember::getOpenId, openId)); - } - - @Override - public ShopMemberExt getShopMemberInfo(Long pkShopMember) { - return baseMapper.getShopMemberInfo(pkShopMember); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void bindShopMember(ShopMember shopMember, ShopInfo shopInfo, ShopMachine shopMachine, ShopMemberRole shopMemberRole, List shopMemberCardList) { - // 绑定会员信息 - this.updateById(shopMember); - - if (null != shopInfo) { - // 处理店铺信息 - if (null == shopInfo.getModifiedTime()) { - // 新増店铺 - iShopInfoService.insertShopInfo(shopInfo); - } else { - // 修改店铺 - iShopInfoService.updateById(shopInfo); - } - - if (null != shopMachine) { - // 处理店铺设备 - iShopMachineService.save(shopMachine); - } - - if (null != shopMemberRole) { - // 处理会员店铺角色 - shopMemberRole.setPkShopInfo(shopInfo.getPkId()); - iShopMemberRoleService.bindShopMemberRole(shopMemberRole); - } - - if (CollectionUtil.isNotEmpty(shopMemberCardList)) { - // 保存卡以及流水 - for (ShopMemberCardVO shopMemberCardVO : shopMemberCardList) { - iShopMemberCardService.saveShopMemberCardAndTrade(shopMemberCardVO); - } - } - } - } - - @Override - public ShopMember queryShopMemberByPkMember(String memberCode) { - R member = memberServiceApi.getMember(memberCode); - if (member == null || member.getData() == null) { - return null; - } - CuMember cuMember = member.getData(); - // 根据会员主键查找店铺会员 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MemberFieldConstants.PK_MEMBER, cuMember.getPkId()); - List shopMemberList = baseMapper.selectList(queryWrapper); - if (shopMemberList == null || shopMemberList.size() == 0) { - return null; - } - return shopMemberList.get(0); - } - - @Override - public ShopMember getShopMemberInfoByPhone(String phone) { - return this.getOne(Wrappers.lambdaQuery() - .eq(ShopMember::getPhone, phone)); - } - - @Override - public ShopMember getShopMemberInfoByPkMember(Long pkMember) { - return this.getOne(Wrappers.lambdaQuery() - .eq(ShopMember::getPkMember, pkMember)); - } - - /** - * @description: 店务会员列表 - * @author: zhang jing - * @date: 2024/8/28 14:07 - * @param: [shopMemberVO] - * @return: java.util.List - **/ - @Override - public List spMemberList(ShopMemberVO shopMemberVO) { - return baseMapper.spMemberList(shopMemberVO); - } - - @Override - public List makerSpaceStoreList(CuMakerSpaceStoreVO cuMakerSpaceStoreVO) { - return baseMapper.makerSpaceStoreList(cuMakerSpaceStoreVO); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/vo/CuMakerSpaceStoreVO.java b/hzs-shop/src/main/java/com/hzs/shop/member/vo/CuMakerSpaceStoreVO.java deleted file mode 100644 index 84816060..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/vo/CuMakerSpaceStoreVO.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.hzs.shop.member.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -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.BaseEntity; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @description: 门店发起人数据 - * @author: zhang jing - * @date: 2024/9/9 14:08 - * @param: - * @return: - **/ -@Data -public class CuMakerSpaceStoreVO implements Serializable { - - /** - * 主键ID - */ - private Long pkId; - /** - * 会员主键 - */ - private Long pkMember; - /** - * 店铺编号 - */ - private String storeCode; - - /** - * 营业执照 - */ - private String licensePath; - - /** - * 门店名称 - */ - @Excel(name = "门店名称") - private String storeName; - - /** - * 门店类型（1=创客空间，2=超级工作室，3=经销商） EStoreType - */ - private Integer storeType; - /** - * 门店类型（1=创客空间，2=超级工作室，3=经销商） EStoreType - */ - @Excel(name = "门店类型") - private String storeTypeVal; - - /** - * 门店地址 - */ - @Excel(name = "门店地址") - private String storeAddress; - - - /** - * 发起人编号 - */ - @Excel(name = "发起人编号") - private String memberCode; - /** - * 发起人姓名 - */ - @Excel(name = "发起人姓名") - private String memberName; - /** - * 发起人手机号 - */ - @Excel(name = "发起人手机号") - private String phone; - - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - /** - * 真实奖衔显示 - */ - @Excel(name = "真实奖衔") - private String pkAwardsVal; - - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 隶属团队 - */ - @Excel(name = "隶属团队") - private String teamName; - - /** - * 所属总监编号 - */ - private String parentChief; - - /** - * 所属总监姓名 - */ - private String parentChiefName; - - /** - * 营业执照名称 - */ - @Excel(name = "营业执照名称") - private String licenseName; - /** - * 统一社会信用代码 - */ - @Excel(name = "统一社会信用代码") - private String creditCode; - - /** - * 店铺省 - */ - @Excel(name = "省") - private String province; - - /** - * 店铺市 - */ - @Excel(name = "市") - private String city; - /** - * 店铺县 - */ - @Excel(name = "县") - private String county; - - private Integer storeProvince; - private Integer storeCity; - private Integer storeCounty; - - - /** - * 法人姓名 - */ - @Excel(name = "法人姓名") - private String legalName; - - /** - * 营业执照地址 - */ - @Excel(name = "营业执照地址") - private String licenseAddress; - /** - * 是否有舱（0=是，1=否） EDealerYesNo - */ - @Excel(name = "是否有舱") - private String cabinStatusVal; - /** - * 是否新协议 EDealerYesNo - */ - @Excel(name = "是否新协议") - private String protocolStatusVal; - /** - * 关联编号 - */ - @Excel(name = "关联编号") - private String cabinPkMemberCode; - - /** - * 是否有舱（0=是，1=否） EDealerYesNo - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer cabinStatus; - - /** - * 是否新协议（0=是，1=否） - */ - private Integer protocolStatus; - /** - * 审核状态（2=待审核，3=审核中，4=已驳回，5=已审核） EApproveStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.APPROVE_STATUS) - private Integer approveStatus; - - private String approveStatusVal; - - /** - * 申请状态（1=未提交，3=审核中，4=已驳回，5=已审核） - */ - private Integer applyStatus; - - /** - * 申请时间 - */ - @Excel(name = "申请时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date applyTime; - - /** - * 审核时间 - */ - @Excel(name = "审核时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date approveTime; - - /** - * 证件状态（1=待提交，2=已齐全） ECertificateStatus - */ - private Integer certificateStatus; - /** - * 证件状态显示 - */ - @Excel(name = "证件状态") - private String certificateStatusVal; - - /** - * 是否推荐（0=是，1=否） - */ - private Integer recommendStatus; - - /** - * 真实奖衔 - */ - private Integer pkVertex; - /** - * 隶属团队 - */ - private Integer pkTeamCode; - /** - * 开始时间 - */ - private String startDate; - - /** - * 结束时间 - */ - private String endDate; - /** - * 省 - */ - private Integer licenseProvince; - /** - * 市 - */ - private Integer licenseCity; - /** - * 县 - */ - private Integer licenseCounty; - - private Integer pkCountry; - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/vo/ShopMemberInfoVO.java b/hzs-shop/src/main/java/com/hzs/shop/member/vo/ShopMemberInfoVO.java deleted file mode 100644 index dc34fbe4..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/vo/ShopMemberInfoVO.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.shop.member.vo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: 店铺会员信息VO - * @Author: jiang chao - * @Time: 2024/8/20 16:55 - * @Classname: ShopMemberInfoVO - * @PackageName: com.hzs.shop.member.vo - */ -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Data -public class ShopMemberInfoVO implements Serializable { - - /** - * 主键ID（暂时先不返回） - */ - @JsonIgnore - private Long pkId; - - /** - * 微信头像 - */ - private String headPath; - - /** - * 微信昵称 - */ - private String nickName; - - /** - * 微信手机号 - */ - private String phone; - - /** - * 店铺角色 - */ - private Integer shopRole; - - /** - * 店铺ID - */ - private Long pkShopInfo; - - /** - * 会员编号 - */ - private String memberCode; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/member/vo/ShopMemberVO.java b/hzs-shop/src/main/java/com/hzs/shop/member/vo/ShopMemberVO.java deleted file mode 100644 index 6884c953..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/member/vo/ShopMemberVO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hzs.shop.member.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * @description:电务会员VO - * @author: zhang jing - * @date: 2024/8/28 10:59 - * @param: - * @return: - **/ -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Data -public class ShopMemberVO implements Serializable { - - - /** - * 微信openId - */ - @Excel(name = "微信openId") - private String openId; - /** - * 昵称 - */ - @Excel(name = "昵称") - private String nickName; - /** - * 微信手机号 - */ - @Excel(name = "手机号") - private String phone; - /** - * 微信头像 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 微信头像 - */ - @Excel(name = "所属店铺名称") - private String shopName; - /** - * 所属店铺角色 - */ - private Integer shopRole; - /** - * 所属店铺角色 - */ - @Excel(name = "所属店铺角色") - private Integer shopRoleVal; - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/mqcall/listener/MemberCardListener.java b/hzs-shop/src/main/java/com/hzs/shop/mqcall/listener/MemberCardListener.java deleted file mode 100644 index 884cd609..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/mqcall/listener/MemberCardListener.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.hzs.shop.mqcall.listener; - -import cn.hutool.core.collection.CollUtil; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EOrderType; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.member.ShopMember; -import com.hzs.sale.order.ISaCabinCardDetailServiceApi; -import com.hzs.sale.order.dto.SaCabinCardDetailDTO; -import com.hzs.shop.card.service.IShopMemberCardService; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.member.service.IShopMemberService; -import com.rabbitmq.client.Channel; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.annotation.*; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.stereotype.Component; - -import java.util.Collections; -import java.util.List; - - -/** - * @Description: 会员卡监听处理 - * @Author: cjc - * @Time: 2024/8/23 15:28 - * @Classname: MemberCardListener - * @PackageName: com.hzs.shop.mqcall.listener - */ -@Slf4j -@Component -public class MemberCardListener { - - @DubboReference - private ISaCabinCardDetailServiceApi saCabinCardDetailServiceApi; - - @Autowired - private IShopInfoService shopInfoService; - - @Autowired - private IShopMemberService shopMemberService; - - @Autowired - private IShopMemberCardService shopMemberCardService; - - /** - * 注册、升级创客礼包标记权益赠送监听处理 - * - * @param message - * @param channel - * @throws Exception - */ - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.MEMBER_FIRST_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.MEMBER_FIRST_SHOP_MEMBER_CARD_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.MEMBER_FIRST_KEY)) - @RabbitHandler - public void onMessage(Message message, Channel channel) throws Exception { - // 手动应答 - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - - SaOrderExt saOrderExt = message.getPayload(); - log.info("注册、升级绑定会员卡：{}", saOrderExt); - // 拿到信息之后，延迟1秒再处理，防止出现MQ消费处理速度比正常业务处理速度快 - Thread.sleep(1000); - - if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { - Long pkOrder = saOrderExt.getPkId(); - //查询生态能量仓（会员升级） - R> cabinCardDetailResult = saCabinCardDetailServiceApi.getCabinCardDetailByCondition(pkOrder, null, Collections.singletonList(EOrderType.UPGRADE_ORDER.getValue())); - if (cabinCardDetailResult.isSuccess() && CollUtil.isNotEmpty(cabinCardDetailResult.getData())) { - SaCabinCardDetailDTO saCabinCardDetail = cabinCardDetailResult.getData().get(0); - //发起人ID - Long pkMakerMember = saCabinCardDetail.getPkMakerMember(); - if (null != pkMakerMember) { - //查询店铺信息 - ShopInfo shopInfo = shopInfoService.queryShopInfoByPkMember(pkMakerMember); - if (null != shopInfo) { - //会员ID - Long pkMember = saOrderExt.getPkMember(); - //查询店铺会员信息 - ShopMember shopMember = shopMemberService.getShopMemberInfoByPkMember(pkMember); - if (null != shopMember) { - Long pkShopMember = shopMember.getPkId(); - //店铺ID - Long pkShop = shopInfo.getPkId(); - ShopMemberCardVO shopMemberCardVO = shopMemberCardService.getShopMemberCard(pkShopMember, saCabinCardDetail, pkShop); - shopMemberCardService.saveShopMemberCardAndTrade(shopMemberCardVO); - } - } - } - - } - - } - } - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ApiShopCalendarTradeController.java b/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ApiShopCalendarTradeController.java deleted file mode 100644 index 6991660d..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ApiShopCalendarTradeController.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.hzs.shop.order.controller.api; - - -import cn.hutool.core.collection.CollUtil; - -import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.utils.StringUtils; -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.shop.member.ShopMember; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.common.domain.shop.order.ext.ShopCalendarTradeExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.shop.card.service.IShopMemberCardService; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.member.service.IShopMemberService; -import com.hzs.shop.order.service.IShopCalendarTradeService; -import com.hzs.shop.order.vo.ShopCalendarTradeVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - *

- * 店铺预约消费明细 前端控制器 - *

- * - * @author hzs - * @since 2024-08-13 - */ -@RestController -@RequestMapping("/api/card-trade") -public class ApiShopCalendarTradeController extends BaseController { - - @Autowired - private IShopMemberService shopMemberService; - - - @Autowired - private IShopMemberCardService shopMemberCardService; - - - @Autowired - private IShopCalendarTradeService shopCalendarTradeService; - - - /** - * 增加会员卡的消费明细 - * - * @param shopCalendarTradeVO 入参 - * @return AjaxResult - */ - @PostMapping("/add") - @RepeatSubmitSimple - public AjaxResult addCardTrade(@RequestBody ShopCalendarTradeVO shopCalendarTradeVO) { - Long pkCreator = SecurityUtils.getUserId(); - shopCalendarTradeVO.setPkCreator(pkCreator); - Long pkShop = shopCalendarTradeVO.getPkShop(); - if (null == pkShop) { - return AjaxResult.error("请选择店铺"); - } - Long pkShopMember = shopCalendarTradeVO.getPkShopMember(); - String mobile = shopCalendarTradeVO.getMobile(); - //店铺会员ID与手机号至少传一项 - if (null == pkShopMember && StringUtils.isEmpty(mobile)) { - return AjaxResult.error("请选择会员"); - } - // 根据手机号查询会员 - if (null == pkShopMember && StringUtils.isNotEmpty(mobile)) { - ShopMember shopMember = shopMemberService.getShopMemberInfoByPhone(mobile); - if (null != shopMember) { - pkShopMember = shopMember.getPkId(); - shopCalendarTradeVO.setPkShopMember(pkShopMember); - } else { - return AjaxResult.error("手机号会员不存在！"); - } - } - //查询会员卡信息 - List shopMemberCardVOList = shopMemberCardService.selectMyMemberCard(pkShopMember); - if (CollUtil.isEmpty(shopMemberCardVOList)) { - return AjaxResult.error("会员卡不存在"); - } - ShopMemberCardVO shopMemberCardNum = getShopMemberCardNum(shopMemberCardVOList); - if (null == shopMemberCardNum) { - return AjaxResult.error("会员卡有效次数已用完"); - } - //初始化交易次数 - getShopCalendarTradeNum(shopMemberCardNum, shopCalendarTradeVO); - //查询店铺的预约记录 - ShopCalendarTradeExt shopCalendarRecord = shopCalendarTradeService.selectShopCalendarRecord(pkShop, pkShopMember); - if (null == shopCalendarRecord) { - //如果预约记录不存在，则查询店铺的机器码 - List shopMachines = shopCalendarTradeService.selectShopMachine(pkShop); - if (CollUtil.isNotEmpty(shopMachines)) { - shopCalendarTradeVO.setPkMachine(shopMachines.get(0).getPkId()); - } - } else { - shopCalendarTradeVO.setPkMachine(shopCalendarRecord.getPkMachine()); - shopCalendarTradeVO.setPkDetailId(shopCalendarRecord.getPkDetailId()); - } - - return toAjax(shopCalendarTradeService.addCardTrade(shopCalendarTradeVO)); - } - - @GetMapping("/detail") - public TableDataInfo selectMemberTradeDetail() { - ShopCalendarTradeVO shopCalendarTradeVOParam = ShopCalendarTradeVO.builder().pkShopMember(SecurityUtils.getUserId()).build(); - startPage(); - List shopCalendarTradeList = shopCalendarTradeService.selectShopCalendarDetailByCondition(shopCalendarTradeVOParam); - return getDataTable(shopCalendarTradeList); - } - - /** - * 查询店铺 - * - * @param pkShop 店铺ID - * @return TableDataInfo - */ - @GetMapping("/shop-detail") - public TableDataInfo selectMemberShopTradeDetail(Long pkShop) { - ShopCalendarTradeVO shopCalendarTradeVOParam = ShopCalendarTradeVO.builder().pkShop(pkShop).build(); - startPage(); - List shopCalendarTradeList = shopCalendarTradeService.selectShopCalendarDetailByCondition(shopCalendarTradeVOParam); - return getDataTable(shopCalendarTradeList); - } - - /** - * 获取会员卡的有效次数 - * - * @param shopMemberCardVOList 会员卡信息 - * @return ShopMemberCardVO - */ - private ShopMemberCardVO getShopMemberCardNum(List shopMemberCardVOList) { - //总次数 - Integer totalNum = 0; - //已使用次数 - Integer usedNum = 0; - ShopMemberCardVO shopMemberCard = null; - //根据先门店使用，再全网通用;有效期先进先出规则扣次数 - for (ShopMemberCardVO shopMemberCardVO : shopMemberCardVOList) { - totalNum = shopMemberCardVO.getTotalNum(); - usedNum = shopMemberCardVO.getUsedNum(); - if (totalNum - usedNum > 0) { - shopMemberCard = shopMemberCardVO; - } - } - return shopMemberCard; - } - - /** - * 获取会员卡的消费次数 - * - * @param shopMemberCardNum 会员卡信息 - * @param shopCalendarTradeVO 会员卡消费明细 - * @return ShopCalendarTradeVO - */ - private ShopCalendarTradeVO getShopCalendarTradeNum(ShopMemberCardVO shopMemberCardNum, ShopCalendarTradeVO shopCalendarTradeVO) { - //交易前剩余次数 - Integer tradeBeforeBalance = shopMemberCardNum.getTotalNum() - shopMemberCardNum.getUsedNum(); - //交易次数 - Integer tradeNumber = 1; - shopCalendarTradeVO.setTradeBeforeBalance(tradeBeforeBalance); - shopCalendarTradeVO.setTradeNumber(tradeNumber); - shopCalendarTradeVO.setTradeBalance(tradeBeforeBalance - tradeNumber); - shopCalendarTradeVO.setPkCard(shopMemberCardNum.getPkId()); - return shopCalendarTradeVO; - } - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ShopCalendarController.java b/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ShopCalendarController.java deleted file mode 100644 index 914fde5c..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ShopCalendarController.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.hzs.shop.order.controller.api; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ShopMsgConstants; -import com.hzs.common.core.enums.ESubStatus; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -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.shop.order.ext.ShopCalendarDetailExt; -import com.hzs.common.domain.shop.order.ext.ShopCalendarExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.shop.order.param.ShopCalendarParam; -import com.hzs.shop.order.service.IShopCalendarService; -import com.hzs.shop.order.vo.ShopCalendarDetailVO; -import com.hzs.shop.order.vo.ShopCalendarVO; -import com.hzs.shop.order.vo.ShopMemberCalendarVO; -import com.hzs.shop.order.vo.ShopOwnerCalendarVO; -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; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * 店铺预约台历 前端控制器 - * - * @author hzs - * @since 2024-08-13 - */ -@RestController -@RequestMapping("/api/calendar") -public class ShopCalendarController extends BaseController { - - @Autowired - private IShopCalendarService shopCalendarService; - - /** - * 预约日期初始化 - * - * @param shopCalendarParam 入参 - */ - @PostMapping("/init") - public AjaxResult initShopCalendar(@RequestBody ShopCalendarParam shopCalendarParam) { - shopCalendarParam.setPkCreator(SecurityUtils.getUserId()); - shopCalendarParam.setPkCountry(SecurityUtils.getPkCountry()); - shopCalendarService.autoGenerateCalendarEveryDay(shopCalendarParam); - return AjaxResult.success(); - } - - /** - * 店铺预约情况 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - public TableDataInfo listShopCalendar(@RequestBody ShopCalendarParam shopCalendarParam) { - shopCalendarParam.setPkCountry(SecurityUtils.getPkCountry()); - shopCalendarParam.setOrderDate(DateUtils.currentDate()); - List shopCalendarExtList = shopCalendarService.queryShopCalendarByCondition(shopCalendarParam); - List shopCalendarVoList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(shopCalendarExtList)) { - for (ShopCalendarExt shopCalendarExt : shopCalendarExtList) { - ShopCalendarVO shopCalendarVO = BeanUtil.copyProperties(shopCalendarExt, ShopCalendarVO.class); - List calendarDetailVoList = new ArrayList<>(); - // 当天的预约，只能预约当前时间往后的 - boolean flag = DateUtils.compareDateEqual(shopCalendarExt.getOrderDate(), DateUtils.currentDate()); - for (ShopCalendarDetailExt shopCalendarDetailExt : shopCalendarExt.getShopCalendarDetailExtList()) { - ShopCalendarDetailVO shopCalendarDetailVO = ShopCalendarDetailVO.builder() - .pkId(shopCalendarDetailExt.getPkId()) - .machineCode(shopCalendarDetailExt.getMachineCode()) - .machineName(shopCalendarDetailExt.getMachineName()) - .orderTime(shopCalendarDetailExt.getOrderTime()) - .subStatus(shopCalendarDetailExt.getSubStatus()) - .build(); - if (flag) { - // 当天的只能预约当前时间之后的 - int position = shopCalendarDetailExt.getOrderTime().indexOf(":"); - int startHour = Integer.parseInt(shopCalendarDetailExt.getOrderTime().substring(0, position)); - int startMinute = Integer.parseInt(shopCalendarDetailExt.getOrderTime().substring(position + 1, shopCalendarDetailExt.getOrderTime().indexOf("-"))); - int currentHour = DateUtils.getCurrentHour(); - int currentMinute = DateUtils.getCurrentMinute(); - if (startHour < currentHour || (startHour == currentHour && startMinute < currentMinute)) { - continue; - } - } - calendarDetailVoList.add(shopCalendarDetailVO); - } - shopCalendarVO.setCalendarDetailVoList(calendarDetailVoList); - shopCalendarVoList.add(shopCalendarVO); - } - } - return getDataTable(shopCalendarVoList); - } - - /** - * 会员预约 - * - * @param shopCalendarParam 入参 - */ - @PostMapping("/order") - public AjaxResult orderShopCalendar(@RequestBody ShopCalendarParam shopCalendarParam) { - if (shopCalendarParam.getPkId() == null || StringUtils.isEmpty(shopCalendarParam.getOrderPhone())) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - shopCalendarParam.setPkShopMember(SecurityUtils.getUserId()); - // 验证该会员该时间段内是否有其他的预约，有预约的不能再次预约 - String msg = shopCalendarService.validateOrderRepeat(shopCalendarParam); - if (StringUtils.isNotEmpty(msg)) { - return AjaxResult.error(msg); - } - shopCalendarParam.setPkCountry(SecurityUtils.getPkCountry()); - shopCalendarService.orderShopCalendar(shopCalendarParam); - return AjaxResult.success(); - } - - /** - * 会员取消预约 - * - * @param shopCalendarParam 入参 - */ - @PostMapping("/cancel-order") - public AjaxResult cancelOrderShopCalendar(@RequestBody ShopCalendarParam shopCalendarParam) { - if (shopCalendarParam.getPkId() == null) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - shopCalendarParam.setPkShopMember(SecurityUtils.getUserId()); - // 验证该会员该时间段内是否有其他的预约，有预约的不能再次预约 - if (!shopCalendarService.validateShopMemberOrder(shopCalendarParam)) { - return AjaxResult.error(ShopMsgConstants.ORDER_TIME_NOT_EXISTS); - } - shopCalendarParam.setPkCountry(SecurityUtils.getPkCountry()); - shopCalendarService.cancelOrderShopCalendar(shopCalendarParam); - return AjaxResult.success(); - } - - - /** - * 会员查询预约列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/member-order") - public TableDataInfo memberOrder(@RequestBody ShopCalendarParam shopCalendarParam) { - shopCalendarParam.setPkOrderShopMember(SecurityUtils.getUserId()); - - // 返回结果 - List resultList = new ArrayList<>(); - - startPage(); - List shopCalendarDetailList = shopCalendarService.listCalendarDetail(shopCalendarParam); - if (CollectionUtil.isNotEmpty(shopCalendarDetailList)) { - resultList = BeanUtil.copyToList(shopCalendarDetailList, ShopMemberCalendarVO.class); - } - - TableDataInfo tableDataInfo = getDataTable(shopCalendarDetailList); - tableDataInfo.setRows(resultList); - return tableDataInfo; - } - - /** - * 店铺查询预约情况 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/shop-order") - public TableDataInfo shopOrder(@RequestBody ShopCalendarParam shopCalendarParam) { - shopCalendarParam.setPkCountry(SecurityUtils.getPkCountry()); - shopCalendarParam.setPkShopMember(SecurityUtils.getUserId()); - shopCalendarParam.setSubStatusList(Arrays.asList(ESubStatus.UN_USED.getValue(), ESubStatus.USED.getValue(), ESubStatus.CANCEL.getValue())); - - // 返回结果 - List resultList = new ArrayList<>(); - - startPage(); - List shopCalendarDetailList = shopCalendarService.listCalendarDetail(shopCalendarParam); - if (CollectionUtil.isNotEmpty(shopCalendarDetailList)) { - resultList = BeanUtil.copyToList(shopCalendarDetailList, ShopOwnerCalendarVO.class); - } - - TableDataInfo tableDataInfo = getDataTable(shopCalendarDetailList); - tableDataInfo.setRows(resultList); - return tableDataInfo; - } - - private List queryShopCalendarVoList(ShopCalendarParam shopCalendarParam) { - List shopCalendarExtList = shopCalendarService.queryShopCalendarByCondition(shopCalendarParam); - List shopCalendarVoList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(shopCalendarExtList)) { - for (ShopCalendarExt shopCalendarExt : shopCalendarExtList) { - ShopCalendarVO shopCalendarVO = BeanUtil.copyProperties(shopCalendarExt, ShopCalendarVO.class); - List calendarDetailVoList = new ArrayList<>(); - // 当天的预约，只能预约当前时间往后的 - for (ShopCalendarDetailExt shopCalendarDetailExt : shopCalendarExt.getShopCalendarDetailExtList()) { - ShopCalendarDetailVO shopCalendarDetailVO = ShopCalendarDetailVO.builder() - .pkId(shopCalendarDetailExt.getPkId()) - .machineCode(shopCalendarDetailExt.getMachineCode()) - .machineName(shopCalendarDetailExt.getMachineName()) - .orderTime(shopCalendarDetailExt.getOrderTime()) - .subStatus(shopCalendarDetailExt.getSubStatus()) - .build(); - calendarDetailVoList.add(shopCalendarDetailVO); - } - shopCalendarVO.setCalendarDetailVoList(calendarDetailVoList); - shopCalendarVoList.add(shopCalendarVO); - } - } - return shopCalendarVoList; - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ShopMachineController.java b/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ShopMachineController.java deleted file mode 100644 index 0251b12a..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/controller/api/ShopMachineController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hzs.shop.order.controller.api; - -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.utils.StringUtils; -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.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.shop.order.param.MachineParam; -import com.hzs.shop.order.service.IShopMachineService; -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; - -/** - * 前端控制器 - * - * @author hzs - * @since 2024-08-14 - */ -@RestController -@RequestMapping("/api/machine") -public class ShopMachineController extends BaseController { - - @Autowired - private IShopMachineService shopMachineService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - public TableDataInfo listShopMachine(@RequestBody MachineParam machineParam) { - machineParam.setPkShopMember(SecurityUtils.getUserId()); - machineParam.setPkCountry(SecurityUtils.getPkCountry()); - return getDataTable(shopMachineService.queryShopMachineByCondition(machineParam)); - } - - /** - * @param machineParam 入参 - */ - @PostMapping("/insert") - public AjaxResult insertShopMachine(@RequestBody MachineParam machineParam) { - if (StringUtils.isEmpty(machineParam.getMachineCode()) || StringUtils.isEmpty(machineParam.getMachineName()) || - StringUtils.isEmpty(machineParam.getProjectName())) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - machineParam.setPkShopMember(SecurityUtils.getUserId()); - machineParam.setPkCountry(SecurityUtils.getPkCountry()); - shopMachineService.insertOrUpdateShopMachine(machineParam); - return AjaxResult.success(); - } - - /** - * 修改采购入库 - * - * @param machineParam 入参 - */ - @PostMapping("/update") - public AjaxResult updateShopMachine(@RequestBody MachineParam machineParam) { - if (machineParam.getPkId() == null || StringUtils.isEmpty(machineParam.getMachineCode()) || - StringUtils.isEmpty(machineParam.getMachineName()) || StringUtils.isEmpty(machineParam.getProjectName())) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - machineParam.setPkShopMember(SecurityUtils.getUserId()); - shopMachineService.insertOrUpdateShopMachine(machineParam); - return AjaxResult.success(); - } - - /** - * 修改采购入库 - * - * @param machineParam 入参 - */ - @PostMapping("/delete") - public AjaxResult deleteShopMachine(@RequestBody MachineParam machineParam) { - if (machineParam.getPkId() == null) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - machineParam.setPkShopMember(SecurityUtils.getUserId()); - shopMachineService.deleteShopMachine(machineParam); - return AjaxResult.success(); - } - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/controller/manage/ShopCalendarManageController.java b/hzs-shop/src/main/java/com/hzs/shop/order/controller/manage/ShopCalendarManageController.java deleted file mode 100644 index d0c61fbd..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/controller/manage/ShopCalendarManageController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.shop.order.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.shop.order.ext.ShopCalendarDetailExt; -import com.hzs.common.domain.shop.order.ext.ShopCalendarExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.shop.order.param.ShopCalendarParam; -import com.hzs.shop.order.service.IShopCalendarService; -import com.hzs.shop.order.vo.ShopCalendarDetailVO; -import com.hzs.shop.order.vo.ShopCalendarVO; -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; - -import java.util.ArrayList; -import java.util.List; - -/** - * @description: 店铺日历后台 - * @author: sui q - * @time: 2024/8/16 16:01 - * @classname: ShopCalendarManageController - * @package_name: com.hzs.shop.order.controller.manage - * version 1.0.0 - */ -@RestController -@RequestMapping("/manage/calendar") -public class ShopCalendarManageController extends BaseController { - - @Autowired - private IShopCalendarService shopCalendarService; - - /** - * 查询列表 - * - * @return cubasdocParam 入参 - */ - @PostMapping("/list") - public TableDataInfo listShopCalendar(@RequestBody ShopCalendarParam shopCalendarParam) { - shopCalendarParam.setPkCountry(SecurityUtils.getPkCountry()); - List shopCalendarExtList = shopCalendarService.queryShopCalendarByCondition(shopCalendarParam); - List shopCalendarVoList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(shopCalendarExtList)) { - for (ShopCalendarExt shopCalendarExt : shopCalendarExtList) { - ShopCalendarVO shopCalendarVO = BeanUtil.copyProperties(shopCalendarExt, ShopCalendarVO.class); - List calendarDetailVoList = new ArrayList<>(); - for (ShopCalendarDetailExt shopCalendarDetailExt : shopCalendarExt.getShopCalendarDetailExtList()) { - ShopCalendarDetailVO shopCalendarDetailVO = ShopCalendarDetailVO.builder() - .pkId(shopCalendarDetailExt.getPkId()) - .machineCode(shopCalendarDetailExt.getMachineCode()) - .machineName(shopCalendarDetailExt.getMachineName()) - .orderTime(shopCalendarDetailExt.getOrderTime()) - .subStatus(shopCalendarDetailExt.getSubStatus()) - .build(); - calendarDetailVoList.add(shopCalendarDetailVO); - } - shopCalendarVO.setCalendarDetailVoList(calendarDetailVoList); - shopCalendarVoList.add(shopCalendarVO); - } - } - return getDataTable(shopCalendarVoList); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarDetailMapper.java b/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarDetailMapper.java deleted file mode 100644 index ec86b782..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.shop.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.order.ShopCalendarDetail; - -/** - *

- * 店铺预约台历明细 Mapper 接口 - *

- * - * @author hzs - * @since 2024-08-13 - */ -public interface ShopCalendarDetailMapper extends BaseMapper { - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarMapper.java b/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarMapper.java deleted file mode 100644 index c4d5c1d1..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hzs.shop.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.order.ShopCalendar; -import com.hzs.common.domain.shop.order.ext.ShopCalendarDetailExt; -import com.hzs.common.domain.shop.order.ext.ShopCalendarExt; -import com.hzs.shop.order.param.ShopCalendarParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 店铺预约台历 Mapper 接口 - *

- * - * @author hzs - * @since 2024-08-13 - */ -public interface ShopCalendarMapper extends BaseMapper { - - /* - * @description: 保存店铺日期 - * @author: sui q - * @date: 2024/8/15 11:15 - * @param: null null - **/ - void insertAllShopCalendar(@Param("shopCalendarList") List shopCalendarList); - - /** - * 批量获取cuMemberBonus主键 - * - * @param rowNum 数量 - * @return: List - * @Author: sui q - * @Date: 2022/12/13 13:47 - */ - List queryShopCalendarSeq(Integer rowNum); - - /* - * @description: 根据查询条件查询店铺日历 - * @author: sui q - * @date: 2024/8/15 13:20 - * @param: null null - **/ - List queryShopCalendarByCondition(ShopCalendarParam shopCalendarParam); - - /* - * @description: 查询店铺预约情况 - * @author: sui q - * @date: 2024/8/15 16:17 - * @param: null null - **/ - List queryShopCalendarByPk(ShopCalendarParam shopCalendarParam); - - /** - * 查询预约列表 - * - * @param param 查询参数 - * @return - */ - List listCalendarDetail(@Param("param") ShopCalendarParam param); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarTradeMapper.java b/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarTradeMapper.java deleted file mode 100644 index 8823d869..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopCalendarTradeMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.shop.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.order.ShopCalendarTrade; -import com.hzs.common.domain.shop.order.ext.ShopCalendarTradeExt; -import com.hzs.shop.order.vo.ShopCalendarTradeVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 店铺预约消费明细 Mapper 接口 - *

- * - * @author hzs - * @since 2024-08-13 - */ -public interface ShopCalendarTradeMapper extends BaseMapper { - - /** - * 根据店铺ID和会员ID查询店铺预约消费记录 - * - * @param pkShop 店铺ID - * @param pkShopMember 会员ID - * @return ShopCalendarTradeExt - */ - ShopCalendarTradeExt selectShopCalendarRecord(@Param("pkShop") Long pkShop, @Param("pkShopMember") Long pkShopMember); - - /** - * 根据会员ID查询会员卡的消费明细 - * - * @param shopCalendarTradeVO 入参 - * @return - */ - List selectShopCalendarDetail(ShopCalendarTradeVO shopCalendarTradeVO); - - /** - * 查询会员卡的交易余额 - * - * @param pkShopMember 店铺会员ID - * @param pkCard 会员卡ID - * @return ShopCalendarTrade - */ - ShopCalendarTrade selectMemberCadeTradeBalance(@Param("pkShopMember") Long pkShopMember, @Param("pkCard") Long pkCard); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopMachineMapper.java b/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopMachineMapper.java deleted file mode 100644 index f89b7402..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/mapper/ShopMachineMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.shop.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.common.domain.shop.order.ext.ShopMachineExt; -import com.hzs.shop.order.param.MachineParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author hzs - * @since 2024-08-14 - */ -public interface ShopMachineMapper extends BaseMapper { - - /* - * @description: 根据查询条件查询机器信息 - * @author: sui q - * @date: 2024/8/14 13:36 - * @param: null null - **/ - List queryShopMachineByCondition(@Param("machineParam") MachineParam machineParam); -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/param/MachineParam.java b/hzs-shop/src/main/java/com/hzs/shop/order/param/MachineParam.java deleted file mode 100644 index 450a8d58..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/param/MachineParam.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.shop.order.param; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @description: 机器参数 - * @author: sui q - * @time: 2024/8/14 11:13 - * @classname: MacineParam - * @package_name: com.hzs.shop.order.param - * version 1.0.0 - */ -@Data -public class MachineParam implements Serializable { - - private Long pkId; - - /** - * 店铺 - */ - private Long pkShop; - - /** - * 店铺状态（营运中，已闭店） - */ - private Integer shopStatus; - - /** - * 店铺名称 - */ - private String shopName; - - /** - * 机器编码 - */ - private String machineCode; - - /** - * 登录会员 - */ - private Long pkShopMember; - - /** - * 机器名称 - */ - private String machineName; - - /** - * 项目名称 - */ - private String projectName; - - private Integer pkCountry; - - private List shopIdList; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/param/ShopCalendarParam.java b/hzs-shop/src/main/java/com/hzs/shop/order/param/ShopCalendarParam.java deleted file mode 100644 index ff4b8d94..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/param/ShopCalendarParam.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.hzs.shop.order.param; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * @description: 店铺预约日历 - * @author: sui q - * @time: 2024/8/15 10:40 - * @classname: ShopCalendarParam - * @package_name: com.hzs.shop.order.param - * version 1.0.0 - */ -@Data -public class ShopCalendarParam implements Serializable { - - private Long pkId; - - /** - * 预约日期 - */ - private Date orderDate; - - /** - * 预约开始日期 - */ - private Date startOrderDate; - - /** - * 预约结束日期 - */ - private Date endOrderDate; - - /** - * 创建人 - */ - private Long pkCreator; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 店铺会员主键 shop_member - */ - private Long pkShopMember; - - /** - * 预约会员主键 - */ - private Long pkOrderShopMember; - - /** - * 店铺主键 - */ - private Long pkShop; - - - /** - * 店铺状态（营运中，已闭店） - */ - private Integer shopStatus; - - /** - * 预约手机号 - */ - private String orderPhone; - - /** - * 预约时间 yyyy-mm-dd hh:mi - */ - private String orderTime; - - /** - * 店铺名称 - */ - private String shopName; - - /** - * 店铺联系人 - */ - private String shopContacts; - - /** - * 预约状态(1=待预约，2=已预约，3=已核销) - */ - private Integer subStatus; - - /** - * 预约状态列表 - */ - private List subStatusList; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarDetailService.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarDetailService.java deleted file mode 100644 index 2c9234bd..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarDetailService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.shop.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.order.ShopCalendarDetail; -import com.hzs.shop.order.param.ShopCalendarParam; - -/** - *

- * 店铺预约台历明细 服务类 - *

- * - * @author hzs - * @since 2024-08-13 - */ -public interface IShopCalendarDetailService extends IService { - - /* - * @description: 会员预约功能 - * @author: sui q - * @date: 2024/8/15 15:20 - * @param: null null - **/ - void orderShopCalendar(ShopCalendarParam shopCalendarParam); - - /* - * @description: 会员预约功能 - * @author: sui q - * @date: 2024/8/15 15:20 - * @param: null null - **/ - void cancelOrderShopCalendar(ShopCalendarParam shopCalendarParam); -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarService.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarService.java deleted file mode 100644 index d2fb4bb4..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hzs.shop.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.order.ShopCalendar; -import com.hzs.common.domain.shop.order.ext.ShopCalendarDetailExt; -import com.hzs.common.domain.shop.order.ext.ShopCalendarExt; -import com.hzs.shop.order.param.ShopCalendarParam; - -import java.util.List; - -/** - *

- * 店铺预约台历 服务类 - *

- * - * @author hzs - * @since 2024-08-13 - */ -public interface IShopCalendarService extends IService { - - /* - * @description: 每天自动生成各店铺预约日历 - * @author: sui q - * @date: 2024/8/13 14:50 - * @param: null null - **/ - void autoGenerateCalendarEveryDay(ShopCalendarParam shopCalendarParam); - - /* - * @description: 根据查询条件查询店铺日历 - * @author: sui q - * @date: 2024/8/15 13:20 - * @param: null null - **/ - List queryShopCalendarByCondition(ShopCalendarParam shopCalendarParam); - - /* - * @description: 会员预约功能 - * @author: sui q - * @date: 2024/8/15 15:20 - * @param: null null - **/ - void orderShopCalendar(ShopCalendarParam shopCalendarParam); - - /* - * @description: 会员预约功能 - * @author: sui q - * @date: 2024/8/15 15:20 - * @param: null null - **/ - void cancelOrderShopCalendar(ShopCalendarParam shopCalendarParam); - - /* - * @description: 验证是否重复预约 - * @author: sui q - * @date: 2024/8/15 16:16 - * @param: null null - **/ - String validateOrderRepeat(ShopCalendarParam shopCalendarParam); - - /* - * @description: 验证会员预约情况，存在预约可以取消预约 - * @author: sui q - * @date: 2024/8/16 9:31 - * @param: null null - **/ - Boolean validateShopMemberOrder(ShopCalendarParam shopCalendarParam); - - /** - * 查询预约列表 - * - * @param param 查询参数 - * @return - */ - List listCalendarDetail(ShopCalendarParam param); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarTradeService.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarTradeService.java deleted file mode 100644 index 7fee5d35..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopCalendarTradeService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hzs.shop.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.card.ShopMemberCard; -import com.hzs.common.domain.shop.order.ShopCalendarTrade; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.common.domain.shop.order.ext.ShopCalendarTradeExt; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.order.vo.ShopCalendarTradeVO; - - -import java.util.List; - - -/** - *

- * 店铺预约消费明细 服务类 - *

- * - * @author hzs - * @since 2024-08-13 - */ -public interface IShopCalendarTradeService extends IService { - - /** - * 可在会员卡消费记录 - * - * @param shopCalendarTradeVO 入参 - * @return - */ - Boolean addCardTrade(ShopCalendarTradeVO shopCalendarTradeVO); - - /** - * 会员卡充值流水 - * - * @param shopMemberCardVO 会员卡 - * @return Boolean - */ - Boolean fillInShopCalendarTrade(ShopMemberCardVO shopMemberCardVO); - - - /** - * 根据店铺ID和会员ID查询店铺预约消费记录 - * - * @param pkShop 店铺ID - * @param pkShopMember 会员ID - * @return ShopCalendarTradeExt - */ - ShopCalendarTradeExt selectShopCalendarRecord(Long pkShop, Long pkShopMember); - - /** - * 根据店铺ID查询店铺机器信息 - * - * @param pkShop 店铺ID - * @return ShopMachine - */ - List selectShopMachine(Long pkShop); - - /** - * 根据会员ID查询会员卡的消费明细 - * - * @param shopCalendarTradeVO 入参 - * @return - */ - List selectShopCalendarDetailByCondition(ShopCalendarTradeVO shopCalendarTradeVO); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopMachineService.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopMachineService.java deleted file mode 100644 index 0b92a9be..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/IShopMachineService.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hzs.shop.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.common.domain.shop.order.ext.ShopMachineExt; -import com.hzs.shop.order.param.MachineParam; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author hzs - * @since 2024-08-14 - */ -public interface IShopMachineService extends IService { - - /* - * @description: 插入店铺的机器 - * @author: sui q - * @date: 2024/8/14 11:19 - * @param: null null - **/ - void insertOrUpdateShopMachine(MachineParam machineParam); - - /* - * @description: 删除店铺机器信息 - * @author: sui q - * @date: 2024/8/14 15:02 - * @param: null null - **/ - void deleteShopMachine(MachineParam machineParam); - - /* - * @description: 根据查询条件查询机器信息 - * @author: sui q - * @date: 2024/8/14 13:36 - * @param: null null - **/ - List queryShopMachineByCondition(MachineParam machineParam); -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarDetailServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarDetailServiceImpl.java deleted file mode 100644 index ec480486..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarDetailServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.shop.order.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.ESubStatus; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.shop.order.ShopCalendar; -import com.hzs.common.domain.shop.order.ShopCalendarDetail; -import com.hzs.shop.order.mapper.ShopCalendarDetailMapper; -import com.hzs.shop.order.param.ShopCalendarParam; -import com.hzs.shop.order.service.IShopCalendarDetailService; -import org.springframework.stereotype.Service; - -/** - *

- * 店铺预约台历明细 服务实现类 - *

- * - * @author hzs - * @since 2024-08-13 - */ -@Service -public class ShopCalendarDetailServiceImpl extends ServiceImpl implements IShopCalendarDetailService { - - @Override - public void orderShopCalendar(ShopCalendarParam shopCalendarParam) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("PK_SHOP_MEMBER", shopCalendarParam.getPkShopMember()); - updateWrapper.set("ORDER_PHONE", shopCalendarParam.getOrderPhone()); - updateWrapper.set("SUB_STATUS", ESubStatus.UN_USED.getValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, shopCalendarParam.getPkShopMember()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, shopCalendarParam.getPkId()); - updateWrapper.eq("SUB_STATUS", ESubStatus.UN_ORDER.getValue()); - update(updateWrapper); - } - - @Override - public void cancelOrderShopCalendar(ShopCalendarParam shopCalendarParam) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("PK_SHOP_MEMBER", ""); - updateWrapper.set("ORDER_PHONE", ""); - updateWrapper.set("SUB_STATUS", ESubStatus.UN_ORDER.getValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, shopCalendarParam.getPkShopMember()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, shopCalendarParam.getPkId()); - updateWrapper.eq("SUB_STATUS", ESubStatus.UN_USED.getValue()); - update(updateWrapper); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarServiceImpl.java deleted file mode 100644 index 0a87321a..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarServiceImpl.java +++ /dev/null @@ -1,251 +0,0 @@ -package com.hzs.shop.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.MagicNumberConstants; -import com.hzs.common.core.constant.msg.ShopMsgConstants; -import com.hzs.common.core.enums.EShopStatus; -import com.hzs.common.core.enums.ESubStatus; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.order.ShopCalendar; -import com.hzs.common.domain.shop.order.ShopCalendarDetail; -import com.hzs.common.domain.shop.order.ext.ShopCalendarDetailExt; -import com.hzs.common.domain.shop.order.ext.ShopCalendarExt; -import com.hzs.common.domain.shop.order.ext.ShopMachineExt; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.order.mapper.ShopCalendarMapper; -import com.hzs.shop.order.param.MachineParam; -import com.hzs.shop.order.param.ShopCalendarParam; -import com.hzs.shop.order.service.IShopCalendarDetailService; -import com.hzs.shop.order.service.IShopCalendarService; -import com.hzs.shop.order.service.IShopMachineService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 店铺预约台历 服务实现类 - *

- * - * @author hzs - * @since 2024-08-13 - */ -@Service -public class ShopCalendarServiceImpl extends ServiceImpl implements IShopCalendarService { - - @Autowired - private IShopInfoService shopInfoService; - - @Autowired - private IShopCalendarDetailService shopCalendarDetailService; - - @Autowired - private IShopMachineService shopMachineService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void autoGenerateCalendarEveryDay(ShopCalendarParam shopCalendarParam) { - Date orderDate = shopCalendarParam.getOrderDate(); - if (shopCalendarParam.getPkCreator() == null) { - shopCalendarParam.setPkCreator(MagicNumberConstants.PK_ADMIN); - } - if (shopCalendarParam.getPkCountry() == null) { - shopCalendarParam.setPkCountry(CountryConstants.CHINA_COUNTRY); - } - if (orderDate == null) { - orderDate = DateUtils.afterDate(7, ChronoUnit.DAYS); - } - // 查询所有店铺 shop_info中 - List shopInfoList = shopInfoService.queryShopInfoByCondition(new ShopParam()); - // 主表 - List shopCalendarList = new ArrayList<>(); - List shopCalendarDetailList = new ArrayList<>(); - if (shopInfoList != null && shopInfoList.size() > 0) { - // 根据店铺查询店铺的机器信息 - List shopIdList = shopInfoList.stream().map(ShopInfo::getPkId).collect(Collectors.toList()); - MachineParam machineParam = new MachineParam(); - machineParam.setShopIdList(shopIdList); - List shopMachineExtList = shopMachineService.queryShopMachineByCondition(machineParam); - Map> shopMachineMap = new HashMap<>(); - for (ShopMachineExt shopMachineExt : shopMachineExtList) { - if (shopMachineMap.containsKey(shopMachineExt.getPkShop())) { - shopMachineMap.get(shopMachineExt.getPkShop()).add(shopMachineExt); - } else { - List machineList = new ArrayList<>(); - machineList.add(shopMachineExt); - shopMachineMap.put(shopMachineExt.getPkShop(), machineList); - } - } - // 查询seq - List longs = baseMapper.queryShopCalendarSeq(shopInfoList.size()); - for (int i = 0; i < shopInfoList.size(); i++) { - ShopInfo shopInfo = shopInfoList.get(i); - long pkId = longs.get(i); - ShopCalendar shopCalendar = ShopCalendar.builder() - .pkId(pkId) - .pkMember(shopInfo.getPkMember()) - .pkShopMember(shopInfo.getPkShopMember()) - .orderDate(orderDate) - .pkShop(shopInfo.getPkId()) - .maxOrderNumber(0) - .shopStatus(shopInfo.getShopStatus()) - .build(); - shopCalendar.setPkCreator(shopCalendarParam.getPkCreator()); - shopCalendar.setPkCountry(shopCalendarParam.getPkCountry()); - shopCalendarList.add(shopCalendar); - if (StringUtils.isEmpty(shopInfo.getOpeningTimeStart()) || StringUtils.isEmpty(shopInfo.getOpeningTimeEnd()) || - !shopMachineMap.containsKey(shopInfo.getPkId()) || EShopStatus.OPERATIONS.getIntValue() != shopInfo.getShopStatus()) { - continue; - } - List machineList = shopMachineMap.get(shopInfo.getPkId()); - int startPosition = shopInfo.getOpeningTimeStart().indexOf(":"); - int startHour = Integer.parseInt(shopInfo.getOpeningTimeStart().substring(0, startPosition)); - int startMinute = Integer.parseInt(shopInfo.getOpeningTimeStart().substring(startPosition + 1)); - int endPosition = shopInfo.getOpeningTimeEnd().indexOf(":"); - int endHour = Integer.parseInt(shopInfo.getOpeningTimeEnd().substring(0, endPosition)); - int endMinute = Integer.parseInt(shopInfo.getOpeningTimeEnd().substring(endPosition + 1)); - int orderHour = startHour; - int orderMinute = startMinute; - int maxOrderNumber = 0; - while (startHour <= endHour) { - startMinute += 30; - if (startMinute >= 60) { - startMinute -= 60; - startHour += 1; - } - if (startHour <= endHour) { - if (startHour == endHour && startMinute > endMinute) { - break; - } - for (ShopMachineExt shopMachineExt : machineList) { - ShopCalendarDetail shopCalendarDetail = ShopCalendarDetail.builder() - .pkCalendar(pkId) - .orderTime(completeTime(orderHour) + ":" + completeTime(orderMinute) + "-" + completeTime(startHour) + ":" + completeTime(startMinute)) - .pkMachine(shopMachineExt.getPkId()) - .build(); - shopCalendarDetail.setPkCreator(shopCalendarParam.getPkCreator()); - shopCalendar.setPkCountry(shopCalendarParam.getPkCountry()); - shopCalendarDetailList.add(shopCalendarDetail); - maxOrderNumber += 1; - } - orderHour = startHour; - orderMinute = startMinute; - } - } - shopCalendar.setMaxOrderNumber(maxOrderNumber); - } - } - baseMapper.insertAllShopCalendar(shopCalendarList); - if (shopCalendarDetailList.size() > 0) { - shopCalendarDetailService.saveBatch(shopCalendarDetailList); - } - } - - /** - * 补全时间（例：1点，转为01点） - * - * @param time - * @return - */ - private String completeTime(int time) { - if (time < 10) { - return "0" + time; - } - return String.valueOf(time); - } - - @Override - public List queryShopCalendarByCondition(ShopCalendarParam shopCalendarParam) { - if (shopCalendarParam.getEndOrderDate() != null) { - shopCalendarParam.setEndOrderDate(DateUtils.afterDate(1, ChronoUnit.DAYS, shopCalendarParam.getEndOrderDate())); - } - return baseMapper.queryShopCalendarByCondition(shopCalendarParam); - } - - @Override - public void orderShopCalendar(ShopCalendarParam shopCalendarParam) { - shopCalendarDetailService.orderShopCalendar(shopCalendarParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void cancelOrderShopCalendar(ShopCalendarParam shopCalendarParam) { - shopCalendarDetailService.cancelOrderShopCalendar(shopCalendarParam); - } - - @Override - public String validateOrderRepeat(ShopCalendarParam shopCalendarParam) { - ShopCalendarParam calendarParam = new ShopCalendarParam(); - calendarParam.setPkId(shopCalendarParam.getPkId()); - // 先验证该主键是否已经有预定 - ShopCalendarExt shopCalendarExt = queryShopCalendarByPk(calendarParam); - if (shopCalendarExt == null || shopCalendarExt.getShopCalendarDetailExtList() == null || shopCalendarExt.getShopCalendarDetailExtList().size() == 0) { - return ShopMsgConstants.ORDER_TIME_EXISTS; - } - ShopCalendarDetailExt shopCalendarDetailExt = shopCalendarExt.getShopCalendarDetailExtList().get(0); - if (shopCalendarDetailExt.getPkShopMember() != null || StringUtils.isNotEmpty(shopCalendarDetailExt.getOrderPhone())) { - return ShopMsgConstants.ORDER_TIME_EXISTS; - } - shopCalendarParam.setPkId(null); - // 在验证该会员是否在其他店铺该时间段内已预定,一个人一天只能预约2次 -// shopCalendarParam.setOrderTime(shopCalendarDetailExt.getOrderTime()); - shopCalendarParam.setSubStatus(ESubStatus.UN_USED.getValue()); - List shopCalendarExtList = baseMapper.queryShopCalendarByPk(shopCalendarParam); - if (shopCalendarExtList.size() > 0) { - if (shopCalendarExtList.size() >= 2) { - return ShopMsgConstants.ORDER_TIME_MAX_NUMBER; - } - // 验证是否在其他店铺预约过，验证的时间必须间隔30分钟 - ShopCalendarDetailExt oldShopDetail = shopCalendarExtList.get(0).getShopCalendarDetailExtList().get(0); - int startPosition = oldShopDetail.getOrderTime().indexOf(":"); - int startHour = Integer.parseInt(oldShopDetail.getOrderTime().substring(0, startPosition)); - int startMinute = Integer.parseInt(oldShopDetail.getOrderTime().substring(startPosition + 1, startPosition + 3)); - int endPosition = shopCalendarDetailExt.getOrderTime().indexOf(":"); - int endHour = Integer.parseInt(shopCalendarDetailExt.getOrderTime().substring(0, endPosition)); - int endMinute = Integer.parseInt(shopCalendarDetailExt.getOrderTime().substring(endPosition + 1, startPosition + 3)); - int subMinute = Math.abs(startHour - endHour) * 60 + Math.abs(startMinute - endMinute); - // 2次预约时间必须大于30分钟 - if (subMinute <= 30) { - return ShopMsgConstants.ORDER_TIME_MEMBER_SAME_TIME; - } - } - shopCalendarParam.setPkId(calendarParam.getPkId()); - return null; - } - - @Override - public Boolean validateShopMemberOrder(ShopCalendarParam shopCalendarParam) { - ShopCalendarExt shopCalendarExt = queryShopCalendarByPk(shopCalendarParam); - if (shopCalendarExt == null || shopCalendarExt.getShopCalendarDetailExtList() == null || shopCalendarExt.getShopCalendarDetailExtList().size() == 0) { - return Boolean.FALSE; - } - return Boolean.TRUE; - } - - /* - * @description: 查询店铺预约情况 - * @author: sui q - * @date: 2024/8/15 16:17 - * @param: null null - **/ - private ShopCalendarExt queryShopCalendarByPk(ShopCalendarParam shopCalendarParam) { - List shopCalendarExtList = baseMapper.queryShopCalendarByPk(shopCalendarParam); - if (shopCalendarExtList != null && shopCalendarExtList.size() > 0) { - return shopCalendarExtList.get(0); - } - return null; - } - - @Override - public List listCalendarDetail(ShopCalendarParam param) { - return baseMapper.listCalendarDetail(param); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarTradeServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarTradeServiceImpl.java deleted file mode 100644 index bbd8531c..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopCalendarTradeServiceImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.hzs.shop.order.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EOrderPrefix; -import com.hzs.common.core.enums.ESubStatus; -import com.hzs.common.core.enums.ETradeClassify; -import com.hzs.common.core.utils.CommonUtil; -import com.hzs.common.domain.shop.card.ShopMemberCard; -import com.hzs.common.domain.shop.order.ShopCalendarDetail; -import com.hzs.common.domain.shop.order.ShopCalendarTrade; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.common.domain.shop.order.ext.ShopCalendarTradeExt; -import com.hzs.shop.card.service.IShopMemberCardService; -import com.hzs.shop.card.vo.ShopMemberCardVO; -import com.hzs.shop.order.mapper.ShopCalendarTradeMapper; -import com.hzs.shop.order.service.IShopCalendarDetailService; -import com.hzs.shop.order.service.IShopCalendarTradeService; -import com.hzs.shop.order.service.IShopMachineService; -import com.hzs.shop.order.vo.ShopCalendarTradeVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - *

- * 店铺预约消费明细 服务实现类 - *

- * - * @author hzs - * @since 2024-08-13 - */ -@Service -public class ShopCalendarTradeServiceImpl extends ServiceImpl implements IShopCalendarTradeService { - - @Autowired - private IShopMachineService shopMachineService; - - @Autowired - private IShopMemberCardService shopMemberCardService; - - @Autowired - private IShopCalendarDetailService shopCalendarDetailService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean addCardTrade(ShopCalendarTradeVO shopCalendarTradeVO) { - String tradeCode = CommonUtil.createSerialNumber(EOrderPrefix.SHOP_TRADE_CODE.getValue()); - ShopCalendarTrade shopCalendarTrade = BeanUtil.copyProperties(shopCalendarTradeVO, ShopCalendarTrade.class); - shopCalendarTrade.setTradeCode(tradeCode); - this.save(shopCalendarTrade); - //更新预约状态 - Long pkDetailId = shopCalendarTradeVO.getPkDetailId(); - if (null != pkDetailId) { - ShopCalendarDetail shopCalendarDetail = ShopCalendarDetail.builder().pkId(pkDetailId).subStatus(ESubStatus.USED.getValue()).build(); - shopCalendarDetail.setPkModified(shopCalendarTradeVO.getPkCreator()); - shopCalendarDetail.setModifiedTime(new Date()); - shopCalendarDetailService.updateById(shopCalendarDetail); - } - //更新会员卡次数 - return updateShopMemberCard(shopCalendarTradeVO); - } - - - @Override - public Boolean fillInShopCalendarTrade(ShopMemberCardVO shopMemberCardVO) { - //查询会员卡信息 - ShopMemberCard shopMemberCard = shopMemberCardService.getById(shopMemberCardVO.getPkId()); - ShopCalendarTrade shopCalendarTrade = ShopCalendarTrade.builder() - .pkShop(shopMemberCard.getPkShopId()) - .pkShopMember(shopMemberCard.getPkShopMember()) - .tradeCode(CommonUtil.createSerialNumber(EOrderPrefix.SHOP_TRADE_CODE.getValue())) - .tradeClassify(ETradeClassify.RECHARGE.getValue()) - .tradeNumber(shopMemberCardVO.getFillNum()) - .tradeBalance(shopMemberCard.getTotalNum() - shopMemberCard.getUsedNum()) - .tradeBeforeBalance(shopMemberCard.getTotalNum() - shopMemberCard.getUsedNum() - shopMemberCardVO.getFillNum()) - .pkCard(shopMemberCardVO.getPkId()) - .pkOrder(shopMemberCardVO.getPkOrder()).build(); - shopCalendarTrade.setPkCreator(shopMemberCardVO.getPkMember()); - return this.save(shopCalendarTrade); - } - - public @Override - List selectShopCalendarDetailByCondition(ShopCalendarTradeVO shopCalendarTradeVOParam) { - ShopCalendarTradeVO shopCalendarTradeVO; - Page shopCalendarTradeVOList = new Page<>(); - Page shopCalendarTradeList = (Page) baseMapper.selectShopCalendarDetail(shopCalendarTradeVOParam); - if (CollUtil.isNotEmpty(shopCalendarTradeList)) { - for (ShopCalendarTradeExt shopCalendarTradeExt : shopCalendarTradeList) { - shopCalendarTradeVO = BeanUtil.copyProperties(shopCalendarTradeExt, ShopCalendarTradeVO.class); - shopCalendarTradeVO.setTradeClassifyVal(ETradeClassify.getByValue(shopCalendarTradeExt.getTradeClassify())); - shopCalendarTradeVOList.add(shopCalendarTradeVO); - } - } - shopCalendarTradeVOList.setTotal(shopCalendarTradeList.getTotal()); - return shopCalendarTradeVOList; - } - - /** - * 更新会员卡次数 - * - * @param shopCalendarTradeVO 交易流水 - * @return - */ - private Boolean updateShopMemberCard(ShopCalendarTradeVO shopCalendarTradeVO) { - Long pkCard = shopCalendarTradeVO.getPkCard(); - ShopMemberCard shopMemberCard = shopMemberCardService.getById(pkCard); - //更新会员卡的次数 - ShopMemberCard shopMemberCardUpdate = ShopMemberCard.builder().pkId(pkCard) - .usedNum(shopMemberCard.getUsedNum() + 1) - .build(); - shopMemberCardUpdate.setPkModified(shopCalendarTradeVO.getPkCreator()); - shopMemberCardUpdate.setModifiedTime(new Date()); - return shopMemberCardService.updateById(shopMemberCardUpdate); - } - - - @Override - public ShopCalendarTradeExt selectShopCalendarRecord(Long pkShop, Long pkShopMember) { - return this.baseMapper.selectShopCalendarRecord(pkShop, pkShopMember); - } - - public List selectShopMachine(Long pkShop) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_ID", pkShop); - queryWrapper.orderByDesc("CREATION_TIME"); - return shopMachineService.list(queryWrapper); - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopMachineServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopMachineServiceImpl.java deleted file mode 100644 index be269625..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/service/impl/ShopMachineServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hzs.shop.order.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.scm.po.PoOrder; -import com.hzs.common.domain.shop.info.ShopInfo; -import com.hzs.common.domain.shop.order.ShopMachine; -import com.hzs.common.domain.shop.order.ext.ShopMachineExt; -import com.hzs.shop.info.param.ShopParam; -import com.hzs.shop.info.service.IShopInfoService; -import com.hzs.shop.order.mapper.ShopMachineMapper; -import com.hzs.shop.order.param.MachineParam; -import com.hzs.shop.order.service.IShopMachineService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 服务实现类 - *

- * - * @author hzs - * @since 2024-08-14 - */ -@Service -public class ShopMachineServiceImpl extends ServiceImpl implements IShopMachineService { - - @Autowired - private IShopInfoService shopInfoService; - - @Override - public void insertOrUpdateShopMachine(MachineParam machineParam) { - // 修改 - if(machineParam.getPkId() != null){ - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("MACHINE_CODE", machineParam.getMachineCode()); - updateWrapper.set("MACHINE_NAME", machineParam.getMachineName()); - updateWrapper.set("PROJECT_NAME", machineParam.getProjectName()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, machineParam.getPkShopMember()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, machineParam.getPkId()); - update(updateWrapper); - }else { - // 根据会员查询店铺 - ShopInfo shopInfo = queryOneShoInfo(machineParam.getPkShopMember()); - if (shopInfo != null) { - ShopMachine shopMachine = ShopMachine.builder() - .pkShop(shopInfo.getPkId()) - .machineName(machineParam.getMachineName()) - .machineCode(machineParam.getMachineCode()) - .projectName(machineParam.getProjectName()) - .build(); - shopMachine.setPkCountry(machineParam.getPkCountry()); - shopMachine.setPkCreator(machineParam.getPkShopMember()); - save(shopMachine); - } - } - } - - @Override - public void deleteShopMachine(MachineParam machineParam) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, machineParam.getPkShopMember()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, machineParam.getPkId()); - update(updateWrapper); - } - - @Override - public List queryShopMachineByCondition(MachineParam machineParam) { - return baseMapper.queryShopMachineByCondition(machineParam); - } - - private ShopInfo queryOneShoInfo(Long pkShopMember){ - ShopParam shopParam = new ShopParam(); - shopParam.setPkShopMember(pkShopMember); - List shopInfoList = shopInfoService.queryShopInfoByCondition(shopParam); - if(shopInfoList != null && shopInfoList.size() > 0){ - return shopInfoList.get(0); - }else{ - return null; - } - } -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarDetailVO.java b/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarDetailVO.java deleted file mode 100644 index 78e37ee1..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarDetailVO.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.shop.order.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @description: 店铺日历子表 - * @author: sui q - * @time: 2024/8/15 13:48 - * @classname: ShopCalendarDetailVO - * @package_name: com.hzs.shop.order.vo - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ShopCalendarDetailVO implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 机器编码 - */ - private String machineCode; - - /** - * 机器名称 - */ - private String machineName; - - /** - * 项目名称 - */ - private String projectName; - - /** - * 预约状态(1=未预约，2=已预约，3=已核销) - */ - @Transaction(transactionKey = EnumsPrefixConstants.SUB_STATUS) - private Integer subStatus; - - private String subStatusVal; - - /** - * 预约时间 yyyy-mm-dd hh:mi - */ - private String orderTime; - - /** - * 预约手机号 - */ - private String orderPhone; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarTradeVO.java b/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarTradeVO.java deleted file mode 100644 index 02381639..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarTradeVO.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.hzs.shop.order.vo; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 会员卡消费记录VO - * - * @Description: - * @Author: ljc - * @Time: 2024/8/16 16:50 - * @Classname: ShopCalendarTradeVO - * @Package_name: com.hzs.shop.order.vo - */ - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ShopCalendarTradeVO implements Serializable { - private static final long serialVersionUID = 7855305592968602143L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 店铺名称 - */ - private String shopName; - - /** - * 店铺主键 - */ - private Long pkShop; - - /** - * 店铺会员主键 - */ - private Long pkShopMember; - - /** - * 机器主键 - */ - private Long pkMachine; - /** - * 交易编号 - */ - private String tradeCode; - - /** - * 交易分类:(1=消费 4=充值) - */ - private Integer tradeClassify; - - private String tradeClassifyVal; - - /** - * 交易次数 - */ - private Integer tradeNumber; - - /** - * 交易剩余次数 - */ - private Integer tradeBalance; - - /** - * 交易前剩余次数 - */ - private Integer tradeBeforeBalance; - /** - * 手机号 - */ - private String mobile; - /** - * 会员卡主键 - */ - private Long pkCard; - - - /** - * 预约详情ID - */ - private Long pkDetailId; - - /** - * 创建人 - */ - private Long pkCreator; - - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 二维码加密码 - */ - private String qrCode; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarVO.java b/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarVO.java deleted file mode 100644 index 5801f877..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopCalendarVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.shop.order.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * @description: 店铺日历主表 - * @author: sui q - * @time: 2024/8/15 13:46 - * @classname: ShopCalendarVO - * @package_name: com.hzs.shop.order.vo - * version 1.0.0 - */ -@Data -public class ShopCalendarVO implements Serializable { - /** - * 店铺名称 - */ - private String shopName; - /** - * 店铺联系人 - */ - private String shopContacts; - - /** - * 店铺联系电话 - */ - private String shopPhone; - - /** - * 预约日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 店铺状态（营运中，已闭店） - */ - private Integer shopStatus; - - @Transaction - private List calendarDetailVoList; -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopMemberCalendarVO.java b/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopMemberCalendarVO.java deleted file mode 100644 index 6a87b93d..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopMemberCalendarVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.shop.order.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 会员预约记录VO - * @Author: jiang chao - * @Time: 2024/9/3 11:19 - * @Classname: ShopMemberCalendarVO - * @PackageName: com.hzs.shop.order.vo - */ -@Data -public class ShopMemberCalendarVO implements Serializable { - - /** - * 预约ID - */ - private Long pkId; - - /** - * 预约状态(1=未预约，2=已预约，3=已核销) - */ - @Transaction(transactionKey = EnumsPrefixConstants.SUB_STATUS) - private Integer subStatus; - - private String subStatusVal; - - /** - * 预约日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 预约时间 - */ - private String orderTime; - - /** - * 店铺名称 - */ - private String shopName; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopOwnerCalendarVO.java b/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopOwnerCalendarVO.java deleted file mode 100644 index 6def8b75..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/order/vo/ShopOwnerCalendarVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.shop.order.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 店长预约记录VO - * @Author: jiang chao - * @Time: 2024/9/4 11:11 - * @Classname: ShpOwnerCalendarVO - * @PackageName: com.hzs.shop.order.vo - */ -@Data -public class ShopOwnerCalendarVO implements Serializable { - - /** - * 预约ID - */ - private Long pkId; - - /** - * 预约状态(1=未预约，2=已预约，3=已核销) - */ - @Transaction(transactionKey = EnumsPrefixConstants.SUB_STATUS) - private Integer subStatus; - - private String subStatusVal; - - /** - * 预约日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date orderDate; - - /** - * 预约时间 - */ - private String orderTime; - - /** - * 预约人 - */ - private String nickName; - - /** - * 预约电话 - */ - private String orderPhone; - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/util/WeChatUtil.java b/hzs-shop/src/main/java/com/hzs/shop/util/WeChatUtil.java deleted file mode 100644 index 4c4fb112..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/util/WeChatUtil.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hzs.shop.util; - -import com.ijpay.core.kit.WxPayKit; -import lombok.extern.slf4j.Slf4j; - -import java.util.Map; - -/** - * 微信操作工具 - */ -@Slf4j -public class WeChatUtil { - - /** - * 微信返回errorCode处理 - * - * @param errorCode 错误编号 - * @return - */ - public static String handErrorCode(Integer errorCode) { - // 调用失败处理（https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/login/auth.code2Session.html） - if (null == errorCode || 0 == errorCode) { - // 请求成功 - return null; - } else if (-1 == errorCode) { - // 系统繁忙，此时请开发者稍候再试 - log.error("WeChat 请求异常 errorCode: {} ! msg: {}", errorCode, "系统繁忙，此时请开发者稍候再试"); - return "调用微信超时，请重试"; - } else if (40029 == errorCode) { - // code 无效 - log.error("WeChat 请求异常 errorCode: {} ! msg: {}", errorCode, "code 无效"); - return "微信授权已失效，请重试"; - } else if (45011 == errorCode) { - // 频率限制，每个用户每分钟100次 - log.error("WeChat 请求异常 errorCode: {} ! msg: {}", errorCode, "频率限制，每个用户每分钟100次"); - return "调用微信超时，请重试"; - } else if (40226 == errorCode) { - // 高风险等级用户，小程序登录拦截 - log.error("WeChat 请求异常 errorCode: {} ! msg: {}", errorCode, "高风险等级用户，小程序登录拦截"); - return "用户账号存在风险，暂时无法访问"; - } else if (40163 == errorCode) { - // 临时登录凭证重复使用 - log.error("WeChat 请求异常 errorCode: {} ! msg: {}", errorCode, "临时登录凭证重复使用"); - return "登录凭证重复使用"; - } - log.error("WeChat 请求异常 errorCode: {} !", errorCode); - return "调用微信超时，请重试"; - } - - - /** - * 微信返回结果error处理 - * - * @param result 微信返回结果 - * @return - */ - public static String handResultError(Map result) { - // 请求结果处理 - String returnCode = result.get("return_code"); - String returnMsg = result.get("return_msg"); - if (!WxPayKit.codeIsOk(returnCode)) { - return returnMsg; - } - - // 请求成功，业务结果处理 - String resultCode = result.get("result_code"); - String errCodeDes = result.get("err_code_des"); - if (!WxPayKit.codeIsOk(resultCode)) { - return errCodeDes; - } - return null; - } - - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/wechat/service/IWeChatAppletService.java b/hzs-shop/src/main/java/com/hzs/shop/wechat/service/IWeChatAppletService.java deleted file mode 100644 index a0091002..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/wechat/service/IWeChatAppletService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.shop.wechat.service; - -/** - * @Description: 小程序操作服务 - * @Author: jiang chao - * @Time: 2022/11/24 17:23 - * @Classname: IWeChatAppletService - * @PackageName: com.hz.weChat.service - */ -public interface IWeChatAppletService { - - /** - * 获取微信accessToken - * - * @return - */ - String getAccAccessToken(); - - /** - * 创建微信accessToken - * - * @return - */ - String createAccessToken(); - -} diff --git a/hzs-shop/src/main/java/com/hzs/shop/wechat/service/impl/WeChatAppletServiceImpl.java b/hzs-shop/src/main/java/com/hzs/shop/wechat/service/impl/WeChatAppletServiceImpl.java deleted file mode 100644 index 6e873ca1..00000000 --- a/hzs-shop/src/main/java/com/hzs/shop/wechat/service/impl/WeChatAppletServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.shop.wechat.service.impl; - -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.shop.core.config.WeChatConfig; -import com.hzs.shop.core.constants.WeChatConstants; -import com.hzs.shop.wechat.service.IWeChatAppletService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.concurrent.TimeUnit; - -/** - * @Description: 小程序操作服务 - * @Author: jiang chao - * @Time: 2022/11/24 17:23 - * @Classname: WeChatAppletServiceImpl - * @PackageName: com.hz.weChat.service.impl - */ -@Slf4j -@Service -public class WeChatAppletServiceImpl implements IWeChatAppletService { - - @Autowired - private WeChatConfig weChatConfig; - @Autowired - private RedisService redisService; - - @Override - public String getAccAccessToken() { - // 从缓存中获取accessToken（定时任务 WeChatJob 生成写入缓存） - String accessToken = redisService.getCacheObject(WeChatConstants.ACCESS_TOKEN_KEY); - if (StringUtils.isEmpty(accessToken)) { - return this.createAccessToken(); - } - return accessToken; - } - - @Override - public String createAccessToken() { - log.info("微信更新 AccessToken 执行开始!"); - - String result = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + weChatConfig.getShopAppletAppId() + "&secret=" + weChatConfig.getShopAppletAppSecret()); - - JSONObject resultObj = JSONUtil.parseObj(result); - Object errCodeObj = resultObj.get("errcode"); - if (null == errCodeObj || 0 == (int) errCodeObj) { - // errCode 为 空 或 0，表示请求成功 - - // accessToken - String accessToken = resultObj.get("access_token").toString(); - // accessToken有效期（7200秒之内） -- 2小时有效 - long expires = (int) resultObj.get("expires_in"); - - redisService.setCacheObject(WeChatConstants.ACCESS_TOKEN_KEY, accessToken, expires, TimeUnit.SECONDS); - - return accessToken; - } else { - log.error("微信 createAccessToken 更新小程序 AccessToken 失败! result: {}", resultObj); - } - log.info("微信更新 AccessToken 执行结束！"); - return null; - } - -} diff --git a/hzs-shop/src/main/resources/banner.txt b/hzs-shop/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee9..00000000 --- a/hzs-shop/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/hzs-shop/src/main/resources/bootstrap.yml b/hzs-shop/src/main/resources/bootstrap.yml deleted file mode 100644 index eacfea66..00000000 --- a/hzs-shop/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,96 +0,0 @@ -# 项目配置 -hzs: - # 当前环境（测试=test，生产=online） - env: test - -# Tomcat -server: - port: 8084 - -# Spring -spring: - application: - # 应用名称 - name: hzs-shop - jackson: - # 返回数据序列化时，如果为 null 则不进行返回 - default-property-inclusion: NON_NULL - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${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 - ## 启动时不检查服务提供者是否存在 - check: false - # 重试次数（默认：2） - retries: 0 - ## 负载策略（最少活跃调用） - loadbalance: "leastactive" - protocol: - ## 设置协议为dubbo - name: dubbo - ## dubbo 协议端口 （-1 表示自增端口，从20880开始） - port: -1 - cloud: - ## 订阅服务 - subscribed-services: hzs-shop, hzs-system, hzs-member, hzs-third, hzs-sale - scan: - # dubbo 服务扫描包（开启之后才会对外提供服务） - base-packages: com.hzs.shop - -# 日志配置 -logging: - level: - com.hzs: debug - org.springframework: warn - - - -# 会员卡密钥 -memberCard: - ## 会员卡密钥 - key: Z+SxUNDWgSY6/WFpuG1ORA== - -## 微信配置 -wechat: - #################### 基础支付相关 #################### - ## 商户号 - mchId: - ## v2密钥 - v2Key: - ## 微信支付回调地址 - notifyUrl: - #################### 店务小程序 #################### - ## 小程序appId - shopAppletAppId: wx01aace8385b307c4 - ## 小程序appSecret - shopAppletAppSecret: d13f36d067665227d0773c688ad1770d - #################### 店务公众号 #################### - ## 公众号appId - shopPublicAppId: wxc2d4abdae78ade52 - ## 公众号appSecret - shopPublicAppSecret: 896bf6b984b44b192e3f71e96002b800 diff --git a/hzs-shop/src/main/resources/mapper/shop/banner/ShopBannerMapper.xml b/hzs-shop/src/main/resources/mapper/shop/banner/ShopBannerMapper.xml deleted file mode 100644 index 3147a5d4..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/banner/ShopBannerMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - CREATION_TIME, - PK_CREATOR, - MODIFIED_TIME, - PK_MODIFIED, - PK_COUNTRY, - PK_ID, SORT, IMAGE, EFFECTIVE_DATE - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardConfigMapper.xml b/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardConfigMapper.xml deleted file mode 100644 index 3bfd280b..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardConfigMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG - , - PK_CREATOR, - CREATION_TIME, - PK_MODIFIED, - MODIFIED_TIME, - PK_COUNTRY, - PK_ID, CAR_NAME, EFFECTIVE_DATE, ENABLE_STATE, CAR_IMAGE, VALID_TIME, CAR_TYPE - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardMapper.xml b/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardMapper.xml deleted file mode 100644 index de6d6b6c..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardMapper.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardShareMapper.xml b/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardShareMapper.xml deleted file mode 100644 index b2efc237..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/card/ShopMemberCardShareMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/config/ShopNoticeMapper.xml b/hzs-shop/src/main/resources/mapper/shop/config/ShopNoticeMapper.xml deleted file mode 100644 index e5ffbd95..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/config/ShopNoticeMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_CREATOR, - CREATION_TIME, - PK_MODIFIED, - MODIFIED_TIME, - PK_COUNTRY, - PK_ID, TITLE, SHOW_BEGIN, SHOW_END, RECOMMEND_FLAG, CONTENT - - - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/config/ShopSysConfigMapper.xml b/hzs-shop/src/main/resources/mapper/shop/config/ShopSysConfigMapper.xml deleted file mode 100644 index 86623228..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/config/ShopSysConfigMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/info/ShopInfoMapper.xml b/hzs-shop/src/main/resources/mapper/shop/info/ShopInfoMapper.xml deleted file mode 100644 index a391b69c..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/info/ShopInfoMapper.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - insert into SHOP_INFO( - PK_ID, - PK_MEMBER, - PK_SHOP_MEMBER, - SHOP_STATUS, - SHOP_NAME, - SHOP_CONTACTS, - SHOP_PHONE, - SHOP_PROVINCE, - SHOP_CITY, - SHOP_COUNTY, - SHOP_ADDRESS, - OPENING_TIME_START, - OPENING_TIME_END, - RECOMMEND_FLAG, - PK_MAKER_SPACE, - PK_CREATOR, - CREATION_TIME - )values( - #{pkId}, - #{pkMember}, - #{pkShopMember}, - #{shopStatus}, - #{shopName}, - #{shopContacts}, - #{shopPhone}, - #{shopProvince}, - #{shopCity}, - #{shopCounty}, - #{shopAddress}, - #{openingTimeStart}, - #{openingTimeEnd}, - #{recommendFlag}, - #{pkMakerSpace}, - #{pkCreator}, - sysdate - ) - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/member/ShopMemberMapper.xml b/hzs-shop/src/main/resources/mapper/shop/member/ShopMemberMapper.xml deleted file mode 100644 index f2f3bcec..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/member/ShopMemberMapper.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/member/ShopMemberRoleMapper.xml b/hzs-shop/src/main/resources/mapper/shop/member/ShopMemberRoleMapper.xml deleted file mode 100644 index 965c4224..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/member/ShopMemberRoleMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - merge into SHOP_MEMBER_ROLE smr - using (select #{shopMemberRole.pkShopInfo} PK_SHOP_INFO, - #{shopMemberRole.pkShopMember} PK_SHOP_MEMBER, - #{shopMemberRole.shopRole} SHOP_ROLE - from dual) tmp - on (tmp.pk_shop_info = smr.pk_shop_info and tmp.pk_shop_member = smr.pk_shop_member) - WHEN MATCHED THEN - update set smr.shop_role = tmp.shop_role - WHEN NOT MATCHED THEN - insert - (pk_id, PK_SHOP_INFO, PK_SHOP_MEMBER, SHOP_ROLE, PK_CREATOR) - values (SHOP_MEMBER_ROLE_SEQ.Nextval, - tmp.pk_shop_info, - tmp.pk_shop_member, - tmp.shop_role, - #{shopMemberRole.pkCreator}) - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarDetailMapper.xml b/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarDetailMapper.xml deleted file mode 100644 index bcdd3d23..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarDetailMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarMapper.xml b/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarMapper.xml deleted file mode 100644 index 9b6ab5f8..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarMapper.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT ALL - - INTO SHOP_CALENDAR (PK_ID, PK_MEMBER, PK_SHOP_MEMBER, PK_SHOP, ORDER_DATE, MAX_ORDER_NUMBER, SHOP_STATUS, PK_CREATOR, PK_COUNTRY ) - VALUES (#{item.pkId},#{item.pkMember, jdbcType=BIGINT},#{item.pkShopMember, jdbcType=BIGINT}, #{item.pkShop}, - #{item.orderDate, jdbcType=DATE}, #{item.maxOrderNumber}, - #{item.shopStatus}, #{item.pkCreator}, #{item.pkCountry}) - - SELECT 1 FROM dual - - - - - - - - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarTradeMapper.xml b/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarTradeMapper.xml deleted file mode 100644 index 10bac938..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/order/ShopCalendarTradeMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-shop/src/main/resources/mapper/shop/order/ShopMachineMapper.xml b/hzs-shop/src/main/resources/mapper/shop/order/ShopMachineMapper.xml deleted file mode 100644 index 02c739be..00000000 --- a/hzs-shop/src/main/resources/mapper/shop/order/ShopMachineMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-third/src/main/resources/banner.txt b/hzs-third/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee9..00000000 --- a/hzs-third/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/pom.xml b/pom.xml index 8a877c80..e05264e2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,16 +5,16 @@ 4.0.0 com.bd - hzs + bd 1.0.0-SNAPSHOT - hzs + bd 微服务系统 pom - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT UTF-8 UTF-8 1.8 @@ -180,85 +180,85 @@ com.bd - hzs-common-core - ${hzs.version} + bd-common-core + ${bd.version} com.bd - hzs-common-security - ${hzs.version} + bd-common-security + ${bd.version} com.bd - hzs-common-domain - ${hzs.version} + bd-common-domain + ${bd.version} com.bd - hzs-api-member - ${hzs.version} + bd-api-member + ${bd.version} com.bd - hzs-api-report - ${hzs.version} + bd-api-report + ${bd.version} com.bd - hzs-api-sale - ${hzs.version} + bd-api-sale + ${bd.version} com.bd - hzs-api-system - ${hzs.version} + bd-api-system + ${bd.version} com.bd - hzs-api-third - ${hzs.version} + bd-api-third + ${bd.version} com.bd - hzs-api-bonus - ${hzs.version} + bd-api-bonus + ${bd.version} com.bd - hzs-api-scm - ${hzs.version} + bd-api-scm + ${bd.version} com.bd - hzs-common-aop - ${hzs.version} + bd-common-aop + ${bd.version} com.bd - hzs-business-common - ${hzs.version} + bd-business-common + ${bd.version} @@ -401,11 +401,11 @@ code-util - hzs-api - hzs-business - hzs-common - hzs-gateway - hzs-third + bd-api + bd-business + bd-common + bd-gateway + bd-third diff --git a/sql/hzs-config.sql b/sql/hzs-config.sql deleted file mode 100644 index 3ce20c71..00000000 --- a/sql/hzs-config.sql +++ /dev/null @@ -1,335 +0,0 @@ -/* - Navicat Premium Data Transfer - - Source Server : 127.0.0.1 - Source Server Type : MySQL - Source Server Version : 50736 - Source Host : 127.0.0.1:3306 - Source Schema : hzs-config - - Target Server Type : MySQL - Target Server Version : 50736 - File Encoding : 65001 - - Date: 02/08/2022 13:45:21 -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for config_info --- ---------------------------- -DROP TABLE IF EXISTS `config_info`; -CREATE TABLE `config_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'content', - `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间', - `gmt_modified` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间', - `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user', - `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `c_use` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `effect` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `type` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `c_schema` text CHARACTER SET utf8 COLLATE utf8_bin NULL, - `encrypted_data_key` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT '秘钥', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_configinfo_datagrouptenant`(`data_id`, `group_id`, `tenant_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 38 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of config_info --- ---------------------------- -INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'', 'b7366671d0e029cd7415036bce778c9f', '2020-05-20 12:00:00', '2022-07-16 08:16:26', 'nacos', '0:0:0:0:0:0:0:1', '', '', '通用配置', 'null', 'null', 'yaml', '', ''); -INSERT INTO `config_info` VALUES (2, 'hzs-gateway-dev.yml', 'DEFAULT_GROUP', '#spring:\n# redis:\n# host: localhost\n# port: 6379\n# password: ', 'db20e5548669d09e4da04359be9f856f', '2020-05-14 14:17:55', '2022-07-18 08:21:58', 'nacos', '0:0:0:0:0:0:0:1', '', '', '网关模块', 'null', 'null', 'yaml', '', ''); -INSERT INTO `config_info` VALUES (9, 'sentinel-hzs-gateway', 'DEFAULT_GROUP', '[\r\n {\r\n \"resource\": \"hzs-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"hzs-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n]', '9f3a3069261598f74220bc47958ec252', '2020-11-20 00:00:00', '2020-11-20 00:00:00', NULL, '0:0:0:0:0:0:0:1', '', '', '限流策略', 'null', 'null', 'json', NULL, ''); -INSERT INTO `config_info` VALUES (19, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: oracle.jdbc.driver.OracleDriver\n url: jdbc:oracle:thin:@39.107.153.159:1521:orcl\n username: hzs_cloud\n password: 123456\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input', '306ada06dbaa16f4be3d0b01daf88c12', '2022-07-15 09:42:34', '2022-07-22 03:15:00', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', NULL); -INSERT INTO `config_info` VALUES (37, 'hzs-third-dev.yml', 'DEFAULT_GROUP', '# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: oracle.jdbc.driver.OracleDriver\r\n url: jdbc:oracle:thin:@39.107.153.159:1521:orcl\r\n username: hzs_cloud\r\n password: 123456\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n hzs-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis-plus配置\r\nmybatis-plus:\r\n type-aliases-package: com.hzs.**\r\n mapper-locations: classpath*:mapper/**/*Mapper.xml\r\n configuration:\r\n # 全局映射器启用缓存\r\n cache-enabled: true\r\n # 将下划线映射成驼峰\r\n map-underscore-to-camel-case: true\r\n # 自动映射\r\n auto-mapping-behavior: full\r\n # 未指定jdbc类型时，空值的默认内容\r\n jdbc-type-for-null: null\r\n # 所用日志实现\r\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\r\n global-config:\r\n # 逻辑删除配置\r\n db-config:\r\n # 删除前\r\n logic-not-delete-value: 0\r\n # 删除后\r\n logic-delete-value: 1\r\n # 主键生成策略使用自输入\r\n id-type: input', '71a2bf9e6f1d91d37778adc353afd6c7', '2022-07-22 07:58:49', '2022-07-22 07:58:49', NULL, '0:0:0:0:0:0:0:1', '', '', NULL, NULL, NULL, 'yaml', NULL, NULL); - --- ---------------------------- --- Table structure for config_info_aggr --- ---------------------------- -DROP TABLE IF EXISTS `config_info_aggr`; -CREATE TABLE `config_info_aggr` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'datum_id', - `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '内容', - `gmt_modified` datetime(0) NOT NULL COMMENT '修改时间', - `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_configinfoaggr_datagrouptenantdatum`(`data_id`, `group_id`, `tenant_id`, `datum_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '增加租户字段' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of config_info_aggr --- ---------------------------- - --- ---------------------------- --- Table structure for config_info_beta --- ---------------------------- -DROP TABLE IF EXISTS `config_info_beta`; -CREATE TABLE `config_info_beta` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'app_name', - `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间', - `gmt_modified` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间', - `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user', - `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT '秘钥', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_configinfobeta_datagrouptenant`(`data_id`, `group_id`, `tenant_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info_beta' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of config_info_beta --- ---------------------------- - --- ---------------------------- --- Table structure for config_info_tag --- ---------------------------- -DROP TABLE IF EXISTS `config_info_tag`; -CREATE TABLE `config_info_tag` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'app_name', - `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'content', - `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间', - `gmt_modified` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间', - `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user', - `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_configinfotag_datagrouptenanttag`(`data_id`, `group_id`, `tenant_id`, `tag_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info_tag' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of config_info_tag --- ---------------------------- - --- ---------------------------- --- Table structure for config_tags_relation --- ---------------------------- -DROP TABLE IF EXISTS `config_tags_relation`; -CREATE TABLE `config_tags_relation` ( - `id` bigint(20) NOT NULL COMMENT 'id', - `tag_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'tag_name', - `tag_type` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'tag_type', - `data_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT 'tenant_id', - `nid` bigint(20) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`nid`) USING BTREE, - UNIQUE INDEX `uk_configtagrelation_configidtag`(`id`, `tag_name`, `tag_type`) USING BTREE, - INDEX `idx_tenant_id`(`tenant_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_tag_relation' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of config_tags_relation --- ---------------------------- - --- ---------------------------- --- Table structure for group_capacity --- ---------------------------- -DROP TABLE IF EXISTS `group_capacity`; -CREATE TABLE `group_capacity` ( - `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `group_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', - `quota` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '配额，0表示使用默认值', - `usage` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '使用量', - `max_size` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', - `max_aggr_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '聚合子配置最大个数，，0表示使用默认值', - `max_aggr_size` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', - `max_history_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最大变更历史数量', - `gmt_create` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间', - `gmt_modified` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_group_id`(`group_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '集群、各Group容量信息表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of group_capacity --- ---------------------------- - --- ---------------------------- --- Table structure for his_config_info --- ---------------------------- -DROP TABLE IF EXISTS `his_config_info`; -CREATE TABLE `his_config_info` ( - `id` bigint(64) UNSIGNED NOT NULL, - `nid` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, - `data_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, - `group_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, - `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'app_name', - `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, - `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `gmt_create` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0), - `gmt_modified` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0), - `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL, - `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `op_type` char(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT '秘钥', - PRIMARY KEY (`nid`) USING BTREE, - INDEX `idx_gmt_create`(`gmt_create`) USING BTREE, - INDEX `idx_gmt_modified`(`gmt_modified`) USING BTREE, - INDEX `idx_did`(`data_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 36 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '多租户改造' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of his_config_info --- ---------------------------- -INSERT INTO `his_config_info` VALUES (5, 1, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n hzs-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.hzs.system\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml', '70818d751228be742c5daf51a2418fc1', '2022-07-14 17:34:15', '2022-07-14 09:34:16', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (1, 2, 'application-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n', 'aaa73b809cfd4d0058893aa13da57806', '2022-07-15 09:47:18', '2022-07-15 01:47:18', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (1, 3, 'application-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n', '84dd3bdab5adcc74392263c245e85bca', '2022-07-15 10:22:34', '2022-07-15 02:22:35', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 4, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml', '36f690a2ce45899966a10b1b0d32bcde', '2022-07-15 16:46:47', '2022-07-15 08:46:47', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 5, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\n#mybatis:\n # 搜索指定包别名\n #typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n #mapperLocations: classpath:mapper/**/*.xml\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n db-type: oracle', '7ba4d66c88afb9c2a180e16ec9b2611d', '2022-07-15 16:47:53', '2022-07-15 08:47:54', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 6, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\n#mybatis:\n # 搜索指定包别名\n #typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n #mapperLocations: classpath:mapper/**/*.xml\n', 'a07f30ea64e58323954b14136856d037', '2022-07-15 16:52:50', '2022-07-15 08:52:50', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 7, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\n#mybatis:\n # 搜索指定包别名\n #typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n #mapperLocations: classpath:mapper/**/*.xml\n', 'a07f30ea64e58323954b14136856d037', '2022-07-15 16:53:24', '2022-07-15 08:53:24', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 8, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n', '172dc419457446e45bc57d4c4e267257', '2022-07-15 16:54:35', '2022-07-15 08:54:35', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 9, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\n#mybatis:\n # 搜索指定包别名\n #typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n #mapperLocations: classpath:mapper/**/*.xml\n', 'a07f30ea64e58323954b14136856d037', '2022-07-15 17:33:37', '2022-07-15 09:33:38', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (0, 10, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: root\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n hzs-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis配置\r\n#mybatis:\r\n # 搜索指定包别名\r\n #typeAliasesPackage: com.hzs.system\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n #mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# mybatis-plus配置\r\nmybatis-plus:\r\n type-aliases-package: com.hzs.**\r\n mapper-locations: classpath*:mapper/**/*Mapper.xml\r\n configuration:\r\n # 全局映射器启用缓存\r\n cache-enabled: true\r\n # 将下划线映射成驼峰\r\n map-underscore-to-camel-case: true\r\n # 自动映射\r\n auto-mapping-behavior: full\r\n # 未指定jdbc类型时，空值的默认内容\r\n jdbc-type-for-null: null\r\n # 所用日志实现\r\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\r\n global-config:\r\n # 逻辑删除配置\r\n db-config:\r\n # 删除前\r\n logic-not-delete-value: 0\r\n # 删除后\r\n logic-delete-value: 1\r\n # 主键生成策略使用自输入\r\n id-type: input\r\n', '34e8c216652d17d8d811fde929a1400b', '2022-07-15 17:42:34', '2022-07-15 09:42:34', NULL, '0:0:0:0:0:0:0:1', 'I', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 11, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: root\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n hzs-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis配置\r\n#mybatis:\r\n # 搜索指定包别名\r\n #typeAliasesPackage: com.hzs.system\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n #mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# mybatis-plus配置\r\nmybatis-plus:\r\n type-aliases-package: com.hzs.**\r\n mapper-locations: classpath*:mapper/**/*Mapper.xml\r\n configuration:\r\n # 全局映射器启用缓存\r\n cache-enabled: true\r\n # 将下划线映射成驼峰\r\n map-underscore-to-camel-case: true\r\n # 自动映射\r\n auto-mapping-behavior: full\r\n # 未指定jdbc类型时，空值的默认内容\r\n jdbc-type-for-null: null\r\n # 所用日志实现\r\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\r\n global-config:\r\n # 逻辑删除配置\r\n db-config:\r\n # 删除前\r\n logic-not-delete-value: 0\r\n # 删除后\r\n logic-delete-value: 1\r\n # 主键生成策略使用自输入\r\n id-type: input\r\n', '34e8c216652d17d8d811fde929a1400b', '2022-07-15 17:48:56', '2022-07-15 09:48:57', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 12, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\n#mybatis:\n # 搜索指定包别名\n #typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n #mapperLocations: classpath:mapper/**/*.xml\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n', 'd36ddd5b2d450b958dfc3bedfb428bc9', '2022-07-15 17:49:32', '2022-07-15 09:49:32', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (5, 13, 'hzs-system-dev.yml', 'DEFAULT_GROUP', '', '# mybatis配置\n#mybatis:\n # 搜索指定包别名\n #typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n #mapperLocations: classpath:mapper/**/*.xml', '8d9ce6a78f0e8bb69a0422de537ec5db', '2022-07-16 10:39:54', '2022-07-16 02:39:55', NULL, '0:0:0:0:0:0:0:1', 'D', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 14, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis配置\n#mybatis:\n # 搜索指定包别名\n #typeAliasesPackage: com.hzs.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n #mapperLocations: classpath:mapper/**/*.xml\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n\n\ndubbo:\n registry:\n address: spring-cloud://localhost\n protocol:\n # 设置协议为dubbo\n name: dubbo\n # dubbo 协议端口 （-1 表示自增端口，从20880开始）\n port: -1\n consumer:\n ## 启动时不检查dubbo服务是否启动\n check: false\n ## 负载策略（最少活跃调用）\n loadbalance: \"leastactive\"\n', 'f896d0ea4ba3feafd825b8ad6c618af2', '2022-07-16 10:43:30', '2022-07-16 02:43:30', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 15, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n\ndubbo:\n registry:\n ## 使用spring-cloud注册配置\n address: spring-cloud://localhost\n protocol:\n ## 设置协议为dubbo\n name: dubbo\n ## dubbo 协议端口 （-1 表示自增端口，从20880开始）\n port: -1\n consumer:\n ## 启动时不检查dubbo服务是否启动\n check: false\n ## 负载策略（最少活跃调用）\n loadbalance: \"leastactive\"', '404d098a94dc54e87beab628996b2d4a', '2022-07-16 10:45:04', '2022-07-16 02:45:05', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 16, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n\ndubbo:\n registry:\n ## 使用spring-cloud注册配置\n address: spring-cloud://localhost\n consumer:\n ## 启动时不检查dubbo服务是否启动\n check: false\n ## 负载策略（最少活跃调用）\n loadbalance: \"leastactive\"', '7225dd891a24c5020d260300335ac4f5', '2022-07-16 11:09:33', '2022-07-16 03:09:33', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (2, 17, 'hzs-gateway-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n redis:\n host: localhost\n port: 6379\n password: \n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: hzs-auth\n uri: lb://hzs-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 系统模块\n - id: hzs-system\n uri: lb://hzs-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: hzs-file\n uri: lb://hzs-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n', '6490fb72a1440d1095c18158175bba75', '2022-07-16 11:24:24', '2022-07-16 03:24:24', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (1, 18, 'application-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n', '84dd3bdab5adcc74392263c245e85bca', '2022-07-16 16:12:10', '2022-07-16 08:12:10', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (1, 19, 'application-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'', 'b7366671d0e029cd7415036bce778c9f', '2022-07-16 16:15:32', '2022-07-16 08:15:32', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (1, 20, 'application-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'', 'af985a659cb4a0c0b98e30b613f8143a', '2022-07-16 16:16:25', '2022-07-16 08:16:26', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 21, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n', 'a25034d0a2e13d4bc0ee0c4476720bcd', '2022-07-18 09:34:59', '2022-07-18 01:35:00', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 22, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: oracle.jdbc.driver.OracleDriver\n url: jdbc:mysql://localhost:3306/hzs-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: hzs_cloud\n password: 123456\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n', '45ed5119a871ae157b5517e759ffae50', '2022-07-18 09:40:17', '2022-07-18 01:40:18', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 23, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: oracle.jdbc.driver.OracleDriver\n url: jdbc:oracle:thin:@39.107.153.159:1521:orcl\n username: hzs_cloud\n password: 123456\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n', 'd54a1b16f821dfbb7fdb774d86b0d0be', '2022-07-18 09:42:06', '2022-07-18 01:42:07', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (19, 24, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: oracle.jdbc.driver.OracleDriver\n url: jdbc:oracle:thin:@39.107.153.159:1521:orcl\n username: hzs_cloud\n password: 123456\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input\n db-type: oracle\n', '2021555fd4b2c75c53cc23bb41687a28', '2022-07-18 09:54:26', '2022-07-18 01:54:26', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (2, 25, 'hzs-gateway-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n redis:\n host: localhost\n port: 6379\n password: ', '7f70af2b7b2d667641013e807af42127', '2022-07-18 16:21:57', '2022-07-18 08:21:58', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (3, 26, 'hzs-auth-dev.yml', 'DEFAULT_GROUP', '', 'spring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n', 'b7354e1eb62c2d846d44a796d9ec6930', '2022-07-18 16:24:23', '2022-07-18 08:24:23', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (8, 27, 'hzs-file-dev.yml', 'DEFAULT_GROUP', '', '# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/hzs/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test', '1892968599b88634e9e7539e3032e269', '2022-07-18 17:39:52', '2022-07-18 09:39:52', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (8, 28, 'hzs-file-dev.yml', 'DEFAULT_GROUP', '', '# 本地文件上传 \nfile:\n domain: http://127.0.0.1:9300\n path: D:/hzs/uploadPath\n prefix: /statics\n', '23be797dc8a9eb7b641723765f1b9544', '2022-07-21 10:04:24', '2022-07-21 02:04:24', NULL, '0:0:0:0:0:0:0:1', 'D', '', NULL); -INSERT INTO `his_config_info` VALUES (8, 29, 'hzs-file-dev.yml', 'DEFAULT_GROUP', '', '# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/hzs/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test', '1892968599b88634e9e7539e3032e269', '2022-07-21 11:15:24', '2022-07-21 03:15:25', NULL, '0:0:0:0:0:0:0:1', 'D', '', NULL); -INSERT INTO `his_config_info` VALUES (0, 30, '123123', 'DEFAULT_GROUP', '', '123123', '4297f44b13955235245b2497399d7a93', '2022-07-21 16:14:36', '2022-07-21 08:14:37', 'dev', '0:0:0:0:0:0:0:1', 'I', 'hzs-dev', NULL); -INSERT INTO `his_config_info` VALUES (34, 31, '123123', 'DEFAULT_GROUP', '', '123123', '4297f44b13955235245b2497399d7a93', '2022-07-21 16:15:13', '2022-07-21 08:15:14', 'dev', '0:0:0:0:0:0:0:1', 'D', 'hzs-dev', NULL); -INSERT INTO `his_config_info` VALUES (0, 32, '123', 'DEFAULT_GROUP', '', '123', '202cb962ac59075b964b07152d234b70', '2022-07-21 16:19:34', '2022-07-21 08:19:35', 'dev', '0:0:0:0:0:0:0:1', 'I', 'hzs-dev', NULL); -INSERT INTO `his_config_info` VALUES (35, 33, '123', 'DEFAULT_GROUP', '', '123', '202cb962ac59075b964b07152d234b70', '2022-07-22 09:49:09', '2022-07-22 01:49:10', NULL, '0:0:0:0:0:0:0:1', 'D', 'hzs-dev', NULL); -INSERT INTO `his_config_info` VALUES (19, 34, 'hzs-business-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring: \n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: oracle.jdbc.driver.OracleDriver\n url: jdbc:oracle:thin:@39.107.153.159:1521:orcl\n username: hzs_cloud\n password: 123456\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\n\n# seata配置\nseata:\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\n enabled: false\n # Seata 应用编号，默认为 ${spring.application.name}\n application-id: ${spring.application.name}\n # Seata 事务组编号，用于 TC 集群名\n tx-service-group: ${spring.application.name}-group\n # 关闭自动代理\n enable-auto-data-source-proxy: false\n # 服务配置项\n service:\n # 虚拟组和分组的映射\n vgroup-mapping:\n hzs-system-group: default\n config:\n type: nacos\n nacos:\n serverAddr: 127.0.0.1:8848\n group: SEATA_GROUP\n namespace:\n registry:\n type: nacos\n nacos:\n application: seata-server\n server-addr: 127.0.0.1:8848\n namespace:\n\n# mybatis-plus配置\nmybatis-plus:\n type-aliases-package: com.hzs.**\n mapper-locations: classpath*:mapper/**/*Mapper.xml\n configuration:\n # 全局映射器启用缓存\n cache-enabled: true\n # 将下划线映射成驼峰\n map-underscore-to-camel-case: true\n # 自动映射\n auto-mapping-behavior: full\n # 未指定jdbc类型时，空值的默认内容\n jdbc-type-for-null: null\n # 所用日志实现\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\n global-config:\n # 逻辑删除配置\n db-config:\n # 删除前\n logic-not-delete-value: 0\n # 删除后\n logic-delete-value: 1\n # 主键生成策略使用自输入\n id-type: input', 'b286960090370c00039df022916d93f0', '2022-07-22 11:14:59', '2022-07-22 03:15:00', 'nacos', '0:0:0:0:0:0:0:1', 'U', '', NULL); -INSERT INTO `his_config_info` VALUES (0, 35, 'hzs-third-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: oracle.jdbc.driver.OracleDriver\r\n url: jdbc:oracle:thin:@39.107.153.159:1521:orcl\r\n username: hzs_cloud\r\n password: 123456\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n hzs-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis-plus配置\r\nmybatis-plus:\r\n type-aliases-package: com.hzs.**\r\n mapper-locations: classpath*:mapper/**/*Mapper.xml\r\n configuration:\r\n # 全局映射器启用缓存\r\n cache-enabled: true\r\n # 将下划线映射成驼峰\r\n map-underscore-to-camel-case: true\r\n # 自动映射\r\n auto-mapping-behavior: full\r\n # 未指定jdbc类型时，空值的默认内容\r\n jdbc-type-for-null: null\r\n # 所用日志实现\r\n logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl\r\n global-config:\r\n # 逻辑删除配置\r\n db-config:\r\n # 删除前\r\n logic-not-delete-value: 0\r\n # 删除后\r\n logic-delete-value: 1\r\n # 主键生成策略使用自输入\r\n id-type: input', '71a2bf9e6f1d91d37778adc353afd6c7', '2022-07-22 15:58:49', '2022-07-22 07:58:49', NULL, '0:0:0:0:0:0:0:1', 'I', '', NULL); - --- ---------------------------- --- Table structure for permissions --- ---------------------------- -DROP TABLE IF EXISTS `permissions`; -CREATE TABLE `permissions` ( - `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `resource` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `action` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - UNIQUE INDEX `uk_role_permission`(`role`, `resource`, `action`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of permissions --- ---------------------------- -INSERT INTO `permissions` VALUES ('dev', 'hzs-dev:*:*', 'r'); -INSERT INTO `permissions` VALUES ('ROLE_ADMIN', ':*:*', 'rw'); -INSERT INTO `permissions` VALUES ('test', 'hzs-test:*:*', 'r'); - --- ---------------------------- --- Table structure for roles --- ---------------------------- -DROP TABLE IF EXISTS `roles`; -CREATE TABLE `roles` ( - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - UNIQUE INDEX `idx_user_role`(`username`, `role`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of roles --- ---------------------------- -INSERT INTO `roles` VALUES ('dev', 'dev'); -INSERT INTO `roles` VALUES ('nacos', 'ROLE_ADMIN'); -INSERT INTO `roles` VALUES ('test', 'test'); - --- ---------------------------- --- Table structure for tenant_capacity --- ---------------------------- -DROP TABLE IF EXISTS `tenant_capacity`; -CREATE TABLE `tenant_capacity` ( - `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Tenant ID', - `quota` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '配额，0表示使用默认值', - `usage` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '使用量', - `max_size` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', - `max_aggr_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '聚合子配置最大个数', - `max_aggr_size` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', - `max_history_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最大变更历史数量', - `gmt_create` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间', - `gmt_modified` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_tenant_id`(`tenant_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '租户容量信息表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of tenant_capacity --- ---------------------------- - --- ---------------------------- --- Table structure for tenant_info --- ---------------------------- -DROP TABLE IF EXISTS `tenant_info`; -CREATE TABLE `tenant_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `kp` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'kp', - `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT 'tenant_id', - `tenant_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT 'tenant_name', - `tenant_desc` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'tenant_desc', - `create_source` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'create_source', - `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', - `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_tenant_info_kptenantid`(`kp`, `tenant_id`) USING BTREE, - INDEX `idx_tenant_id`(`tenant_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'tenant_info' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of tenant_info --- ---------------------------- -INSERT INTO `tenant_info` VALUES (1, '1', 'hzs-dev', 'hzs-dev', '研发环境', 'nacos', 1658391100430, 1658391100430); -INSERT INTO `tenant_info` VALUES (2, '1', 'hzs-test', 'hzs-test', '测试环境', 'nacos', 1658391228220, 1658391228220); - --- ---------------------------- --- Table structure for users --- ---------------------------- -DROP TABLE IF EXISTS `users`; -CREATE TABLE `users` ( - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `password` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `enabled` tinyint(1) NOT NULL, - PRIMARY KEY (`username`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of users --- ---------------------------- -INSERT INTO `users` VALUES ('dev', '$2a$10$apFyzjeVUAS5oTg8ynASfuCv21A6J3D18d/T7jexg5qTaTqQWG1tK', 1); -INSERT INTO `users` VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); -INSERT INTO `users` VALUES ('test', '$2a$10$Hph4CX3LgK0qImJDsB3/k./E2iM5Hm2UqHcL1yaKKtp8y0U0XTbPC', 1); - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/sql/hzs_cloud_20220613.sql b/sql/hzs_cloud_20220613.sql deleted file mode 100644 index bdf6d549..00000000 --- a/sql/hzs_cloud_20220613.sql +++ /dev/null @@ -1,269 +0,0 @@ -SET NAMES utf8mb4; - --- ---------------------------- --- 1、部门表 --- ---------------------------- -drop table if exists sys_dept; -create table sys_dept ( - dept_id bigint(20) not null auto_increment comment '部门id', - parent_id bigint(20) default 0 comment '父部门id', - ancestors varchar(50) default '' comment '祖级列表', - dept_name varchar(30) default '' comment '部门名称', - order_num int(4) default 0 comment '显示顺序', - status char(1) default '0' comment '部门状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 1代表删除）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - PK_MODIFIED varchar(64) default '' comment '更新者', - MODIFIED_TIME datetime comment '更新时间', - primary key (dept_id) -) engine=innodb auto_increment=200 comment = '部门表'; - --- ---------------------------- --- 初始化-部门表数据 --- ---------------------------- -insert into sys_dept values(100, 0, '0', '海之圣科技', 0, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '0', '0', 'admin', sysdate(), '', null); - - --- ---------------------------- --- 2、用户信息表 --- ---------------------------- -drop table if exists sys_user; -create table sys_user ( - user_id bigint(20) not null auto_increment comment '用户ID', - dept_id bigint(20) default null comment '部门ID', - user_name varchar(30) not null comment '用户账号', - nick_name varchar(30) not null comment '用户昵称', - email varchar(50) default '' comment '用户邮箱', - phonenumber varchar(11) default '' comment '手机号码', - avatar varchar(100) default '' comment '头像地址', - password varchar(100) default '' comment '密码', - status char(1) default '0' comment '帐号状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 1代表删除）', - login_ip varchar(128) default '' comment '最后登录IP', - login_date datetime comment '最后登录时间', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - PK_MODIFIED varchar(64) default '' comment '更新者', - MODIFIED_TIME datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (user_id) -) engine=innodb auto_increment=100 comment = '用户信息表'; - --- ---------------------------- --- 初始化-用户信息表数据 --- ---------------------------- -insert into sys_user values(1, 103, 'admin', '海之圣', '0', 'hzs@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); -insert into sys_user values(2, 105, 'hzs', '海之圣', '0', 'hzs@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); - - --- ---------------------------- --- 4、角色信息表 --- ---------------------------- -drop table if exists sys_role; -create table sys_role ( - role_id bigint(20) not null auto_increment comment '角色ID', - role_name varchar(30) not null comment '角色名称', - role_key varchar(100) not null comment '角色权限字符串', - role_sort int(4) not null comment '显示顺序', - data_scope char(1) default '1' comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - dept_check_strictly tinyint(1) default 1 comment '部门树选择项是否关联显示', - status char(1) not null comment '角色状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 1代表删除）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - PK_MODIFIED varchar(64) default '' comment '更新者', - MODIFIED_TIME datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (role_id) -) engine=innodb auto_increment=100 comment = '角色信息表'; - --- ---------------------------- --- 初始化-角色信息表数据 --- ---------------------------- -insert into sys_role values('1', '超级管理员', 'admin', 1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '超级管理员'); -insert into sys_role values('2', '普通角色', 'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '普通角色'); - - --- ---------------------------- --- 5、菜单权限表 --- ---------------------------- -drop table if exists sys_menu; -create table sys_menu ( - menu_id bigint(20) not null auto_increment comment '菜单ID', - menu_name varchar(50) not null comment '菜单名称', - parent_id bigint(20) default 0 comment '父菜单ID', - order_num int(4) default 0 comment '显示顺序', - path varchar(200) default '' comment '路由地址', - component varchar(255) default null comment '组件路径', - query varchar(255) default null comment '路由参数', - is_frame int(1) default 1 comment '是否为外链（0是 1否）', - is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', - menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', - visible char(1) default 0 comment '菜单状态（0显示 1隐藏）', - status char(1) default 0 comment '菜单状态（0正常 1停用）', - perms varchar(100) default null comment '权限标识', - icon varchar(100) default '#' comment '菜单图标', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - PK_MODIFIED varchar(64) default '' comment '更新者', - MODIFIED_TIME datetime comment '更新时间', - remark varchar(500) default '' comment '备注', - primary key (menu_id) -) engine=innodb auto_increment=2000 comment = '菜单权限表'; - --- ---------------------------- --- 初始化-菜单信息表数据 --- ---------------------------- --- 一级菜单 -insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); -insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); --- 二级菜单 -insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); -insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); -insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', sysdate(), '', null, '菜单管理菜单'); -insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 'admin', sysdate(), '', null, '部门管理菜单'); -insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '字典管理菜单'); -insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '参数设置菜单'); -insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '日志管理菜单'); -insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '在线用户菜单'); -insert into sys_menu values('111', 'Sentinel控制台', '2', '3', 'http://localhost:8718', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 'admin', sysdate(), '', null, '流量控制菜单'); -insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8848/nacos', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 'admin', sysdate(), '', null, '服务治理菜单'); -insert into sys_menu values('113', 'Admin控制台', '2', '5', 'http://localhost:9100/login', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '服务监控菜单'); --- 三级菜单 -insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'system/logininfor/index', '', 1, 0, 'C', '0', '0', 'system:logininfor:list', 'logininfor', 'admin', sysdate(), '', null, '登录日志菜单'); --- 用户管理按钮 -insert into sys_menu values('1000', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1001', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1002', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1003', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1004', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1005', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1006', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', sysdate(), '', null, ''); --- 角色管理按钮 -insert into sys_menu values('1007', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1008', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1009', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1010', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1011', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', sysdate(), '', null, ''); --- 菜单管理按钮 -insert into sys_menu values('1012', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1013', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1014', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1015', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', sysdate(), '', null, ''); --- 部门管理按钮 -insert into sys_menu values('1016', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1017', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1018', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1019', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', sysdate(), '', null, ''); --- 字典管理按钮 -insert into sys_menu values('1025', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1026', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1027', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1028', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1029', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', sysdate(), '', null, ''); --- 参数设置按钮 -insert into sys_menu values('1030', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1031', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1032', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1033', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1034', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', sysdate(), '', null, ''); --- 登录日志按钮 -insert into sys_menu values('1042', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1043', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1044', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export', '#', 'admin', sysdate(), '', null, ''); --- 在线用户按钮 -insert into sys_menu values('1045', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1046', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1047', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 6、用户和角色关联表 用户N-1角色 --- ---------------------------- -drop table if exists sys_user_role; -create table sys_user_role ( - user_id bigint(20) not null comment '用户ID', - role_id bigint(20) not null comment '角色ID', - primary key(user_id, role_id) -) engine=innodb comment = '用户和角色关联表'; - --- ---------------------------- --- 初始化-用户和角色关联表数据 --- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('2', '2'); - --- ---------------------------- --- 13、参数配置表 --- ---------------------------- -drop table if exists sys_config; -create table sys_config ( - config_id int(5) not null auto_increment comment '参数主键', - config_name varchar(100) default '' comment '参数名称', - config_key varchar(100) default '' comment '参数键名', - config_value varchar(500) default '' comment '参数键值', - config_type char(1) default 'N' comment '系统内置（Y是 N否）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - PK_MODIFIED varchar(64) default '' comment '更新者', - MODIFIED_TIME datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (config_id) -) engine=innodb auto_increment=100 comment = '参数配置表'; - -insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '初始化密码 123456' ); -insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(4, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）'); - - --- ---------------------------- --- 14、系统访问记录 --- ---------------------------- -drop table if exists sys_logininfor; -create table sys_logininfor ( - info_id bigint(20) not null auto_increment comment '访问ID', - user_name varchar(50) default '' comment '用户账号', - ipaddr varchar(128) default '' comment '登录IP地址', - status char(1) default '0' comment '登录状态（0成功 1失败）', - msg varchar(255) default '' comment '提示信息', - access_time datetime comment '访问时间', - primary key (info_id) -) engine=innodb auto_increment=100 comment = '系统访问记录'; - - --- ---------------------------- --- 17、通知公告表 --- ---------------------------- -drop table if exists sys_notice; -create table sys_notice ( - notice_id int(4) not null auto_increment comment '公告ID', - notice_title varchar(50) not null comment '公告标题', - notice_type char(1) not null comment '公告类型（1通知 2公告）', - notice_content longblob default null comment '公告内容', - status char(1) default '0' comment '公告状态（0正常 1关闭）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - PK_MODIFIED varchar(64) default '' comment '更新者', - MODIFIED_TIME datetime comment '更新时间', - remark varchar(255) default null comment '备注', - primary key (notice_id) -) engine=innodb auto_increment=10 comment = '通知公告表'; - --- ---------------------------- --- 初始化-公告信息表数据 --- ---------------------------- -insert into sys_notice values('1', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); -insert into sys_notice values('2', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); - diff --git a/sql/hzs_seata_20210128.sql b/sql/hzs_seata_20210128.sql deleted file mode 100644 index 189a391f..00000000 --- a/sql/hzs_seata_20210128.sql +++ /dev/null @@ -1,80 +0,0 @@ -DROP DATABASE IF EXISTS `hzs-seata`; - -CREATE DATABASE `hzs-seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -USE `hzs-seata`; - --- -------------------------------- The script used when storeMode is 'db' -------------------------------- --- the table to store GlobalSession data -CREATE TABLE IF NOT EXISTS `global_table` -( - `xid` VARCHAR(128) NOT NULL, - `transaction_id` BIGINT, - `status` TINYINT NOT NULL, - `application_id` VARCHAR(32), - `transaction_service_group` VARCHAR(32), - `transaction_name` VARCHAR(128), - `timeout` INT, - `begin_time` BIGINT, - `application_data` VARCHAR(2000), - `gmt_create` DATETIME, - `gmt_modified` DATETIME, - PRIMARY KEY (`xid`), - KEY `idx_gmt_modified_status` (`gmt_modified`, `status`), - KEY `idx_transaction_id` (`transaction_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- the table to store BranchSession data -CREATE TABLE IF NOT EXISTS `branch_table` -( - `branch_id` BIGINT NOT NULL, - `xid` VARCHAR(128) NOT NULL, - `transaction_id` BIGINT, - `resource_group_id` VARCHAR(32), - `resource_id` VARCHAR(256), - `branch_type` VARCHAR(8), - `status` TINYINT, - `client_id` VARCHAR(64), - `application_data` VARCHAR(2000), - `gmt_create` DATETIME(6), - `gmt_modified` DATETIME(6), - PRIMARY KEY (`branch_id`), - KEY `idx_xid` (`xid`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- the table to store lock data -CREATE TABLE IF NOT EXISTS `lock_table` -( - `row_key` VARCHAR(128) NOT NULL, - `xid` VARCHAR(96), - `transaction_id` BIGINT, - `branch_id` BIGINT NOT NULL, - `resource_id` VARCHAR(256), - `table_name` VARCHAR(32), - `pk` VARCHAR(36), - `gmt_create` DATETIME, - `gmt_modified` DATETIME, - PRIMARY KEY (`row_key`), - KEY `idx_branch_id` (`branch_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- for AT mode you must to init this sql for you business database. the seata server not need it. -CREATE TABLE IF NOT EXISTS `undo_log` -( - `branch_id` BIGINT(20) NOT NULL COMMENT 'branch transaction id', - `xid` VARCHAR(100) NOT NULL COMMENT 'global transaction id', - `context` VARCHAR(128) NOT NULL COMMENT 'undo_log context,such as serialization', - `rollback_info` LONGBLOB NOT NULL COMMENT 'rollback info', - `log_status` INT(11) NOT NULL COMMENT '0:normal status,1:defense status', - `log_created` DATETIME(6) NOT NULL COMMENT 'create datetime', - `log_modified` DATETIME(6) NOT NULL COMMENT 'modify datetime', - UNIQUE KEY `ux_undo_log` (`xid`, `branch_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 1 - DEFAULT CHARSET = utf8mb4 COMMENT ='AT transaction mode undo table'; diff --git a/文档/翻译说明/翻译拦截器.txt b/文档/翻译说明/翻译拦截器.txt index 533cf421..64ba5d0a 100644 --- a/文档/翻译说明/翻译拦截器.txt +++ b/文档/翻译说明/翻译拦截器.txt @@ -1,4 +1,4 @@ -翻译拦截模块（hzs-common-aop -- TransactionAspectAdvice.java） +翻译拦截模块（bd-common-aop -- TransactionAspectAdvice.java） 如果业务操作时，返回内容需要统一翻译，则在pom文件中引入该模块。 翻译拦截器会统一拦截 com.hzs 包下 controller 下的以 Controller 结尾类。