diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java index 19d2a90..ff9d393 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/ICuMemberTradeRecoilServiceApi.java @@ -7,11 +7,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 会员活动发放复消币明细dubbo接口 - * @Author: jiang chao - * @Time: 2024/7/19 14:59 - * @Classname: ICuMemberTradeRecoil - * @PackageName: com.hzs.member.account + * 会员活动发放复消币明细dubbo接口 */ public interface ICuMemberTradeRecoilServiceApi { @@ -42,10 +38,7 @@ public interface ICuMemberTradeRecoilServiceApi { R deleteUpdateBatch(Long pkMember, Integer pkGrade); /* - * @description: 查询带发放的复销积分 - * @author: sui q - * @date: 2024/7/24 16:13 - * @param: null null + * 查询带发放的复销积分 **/ R> queryCuMemberTradeRecoil(Date settleDate); diff --git a/bd-api/bd-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 index 6280bf3..842d9a8 100644 --- a/bd-api/bd-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 @@ -1,31 +1,20 @@ package com.hzs.member.account; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApproveStatus; import com.hzs.member.account.dto.BusinessCommissionDTO; /** - * @description: 会员交易明细API - * @author: zhang jing - * @date: 2023/7/28 14:37 - * @param: - * @return: + * 会员交易明细API **/ public interface ICuMemberTradeServiceApi { + /** - * @description: 业务办理扣费提交 - * @author: zhang jing - * @date: 2023/7/28 14:38 - * @param: [businessCommissionDTO, eApproveStatus] - * @return: com.hzs.common.core.domain.R + * 业务办理扣费提交 **/ R businessCommissionSubmit(BusinessCommissionDTO businessCommissionDTO); + /** - * @description: 业务办理扣费驳回 - * @author: zhang jing - * @date: 2023/7/29 11:55 - * @param: [businessCommissionDTO] - * @return: com.hzs.common.core.domain.R + * 业务办理扣费驳回 **/ R businessCommissionReject(BusinessCommissionDTO businessCommissionDTO); } diff --git a/bd-api/bd-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 index fc0dc4d..a5014e9 100644 --- a/bd-api/bd-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 @@ -3,13 +3,8 @@ package com.hzs.member.account; import com.hzs.common.core.domain.R; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - /** - * @Description: 会员钱包审核接口 - * @Author: ljc - * @Time: 2022/9/24 13:48 - * @Classname: IMemberAccountAuditServiceApi - * @Package_name: com.hzs.member.account + * 会员钱包审核接口 */ public interface IMemberAccountAuditServiceApi { diff --git a/bd-api/bd-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 index 8c1869f..ae397fb 100644 --- a/bd-api/bd-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 @@ -11,11 +11,7 @@ import java.math.BigDecimal; import java.util.List; /** - * @Description: 会员账户提供api操作实体 - * @Author: sui q - * @Time: 2022/9/5 14:27 - * @Classname: IMemberAccountServiceApi - * @PackageName: com.hzs.member.account + * 会员账户提供api操作实体 */ public interface IMemberAccountServiceApi { @@ -23,9 +19,6 @@ public interface IMemberAccountServiceApi { * 查询会员账户状态，账户信息 * * @param cuMemberAccount 会员账户条件信息 - * @return: List - * @Author: sui q - * @Date: 2022/9/5 11:57 */ R> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount); @@ -33,9 +26,6 @@ public interface IMemberAccountServiceApi { * 根据会员id 列表查询账户信息 * * @param pkMemberList 列表 - * @return: List - * @Author: sui q - * @Date: 2023/3/25 16:28 */ R> queryCuMemberAccountByPkMembers(List pkMemberList); diff --git a/bd-api/bd-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 index 8490773..69a3e06 100644 --- a/bd-api/bd-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 @@ -4,13 +4,10 @@ import com.hzs.common.core.domain.R; import com.hzs.member.account.dto.CuMemberBankParam; /** - * @Description: 银行卡操作API - * @Author: ljc - * @Time: 2022/11/11 17:07 - * @Classname: IMemberBankServiceApi - * @Package_name: com.hzs.member.account + * 银行卡操作API */ public interface IMemberBankServiceApi { + /** * 添加银行卡信息 * @@ -18,4 +15,5 @@ public interface IMemberBankServiceApi { * @return R */ R addBankInfo(CuMemberBankParam cuMemberBankParam); + } diff --git a/bd-api/bd-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 index 89a506b..dfb897c 100644 --- a/bd-api/bd-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 @@ -9,6 +9,7 @@ import java.util.Date; * 会员模块定时任务 */ public interface IMemberJobServiceApi { + /** * 定时插入账户详情数据 * diff --git a/bd-api/bd-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 index 0646d0d..6d5af05 100644 --- a/bd-api/bd-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 @@ -9,12 +9,6 @@ import java.util.List; /** * 会员端在线支付 回调插入交易流水、更新余额 - * - * @Description: - * @Author: ljc - * @Time: 2023/3/8 18:23 - * @Classname: IMemberTradeServiceApi - * @Package_name: com.hzs.member.account */ public interface IMemberTradeServiceApi { diff --git a/bd-api/bd-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 deleted file mode 100644 index 67b3bec..0000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/OrderReturnPaymentDTO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.member.account.dto; - -import com.hzs.common.domain.sale.order.SaOrder; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 订单退单扣款DTO - * @Author: jiang chao - * @Time: 2023/4/4 11:40 - * @Classname: ReturnOrderDTO - * @PackageName: com.hzs.member.account.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class OrderReturnPaymentDTO implements Serializable { - - private static final long serialVersionUID = -8842651861054394386L; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 退还金额 - */ - private BigDecimal returnAmount; - - /** - * 退单备注 - */ - private String returnRemark; - - /** - * 订单信息 - */ - private SaOrder saOrder; - -} diff --git a/bd-api/bd-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 index 1d784de..4c62854 100644 --- a/bd-api/bd-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 @@ -4,20 +4,12 @@ import com.hzs.common.core.domain.R; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; /** - * @Description: 会员结算期间api接口 - * @Author: zhangjing - * @Time: 2022/10/26 15:12 - * @Classname: IMemberAchieveServiceAPI - * @PackageName: com.hzs.member.achieve + * 会员结算期间api接口 */ public interface ICuMemberSettlePeriodServiceApi { /** - * @description: 根据日期获得日期对应的期间 - * @author: zhang jing - * @date: 2023/8/26 10:25 - * @param: [date] - * @return: com.hzs.common.core.domain.R + * 根据日期获得日期对应的期间 **/ R getCuMemberSettlePeriodByDate(String date); diff --git a/bd-api/bd-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 index 11b242c..954bf67 100644 --- a/bd-api/bd-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 @@ -1,26 +1,19 @@ package com.hzs.member.achieve; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.achieve.CuMemberAchieve; import com.hzs.common.domain.member.base.CuMember; /** - * @Description: 提供查询实时会员业绩的api接口 - * @Author: sui q - * @Time: 2022/10/26 15:12 - * @Classname: IMemberAchieveServiceAPI - * @PackageName: com.hzs.member.achieve + * 提供查询实时会员业绩的api接口 */ public interface IMemberAchieveServiceApi { /** * 查询会员的安置部门 - * @param cuMember 推荐会员主键 公司 会员名称 手机号 - * @param isFirst 是否首单 + * + * @param cuMember 推荐会员主键 公司 会员名称 手机号 + * @param isFirst 是否首单 * @param isFirstAchieve 是否首购业绩 - * @return: CuMemberAchieve - * @Author: sui q - * @Date: 2022/10/26 15:04 */ R queryCuMemberAchieveByPkMember(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve); diff --git a/bd-api/bd-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 deleted file mode 100644 index c3cbe3d..0000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/address/ICuMemberGiftServiceApi.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.member.address; - -import com.hzs.common.core.domain.R; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - - -/** - * @description: 会员礼包收货地址修改回调接口 - * @author: zhang jing - * @date: 2022/10/22 15:04 - * @param: - * @return: - **/ -public interface ICuMemberGiftServiceApi { - - /** - * 审核流程(审批流调用业务模块) - * - * @param approvalBusinessResultDTO 业务审批操作DTO - * @return Integer - */ - R auditProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); - -} diff --git a/bd-api/bd-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 index 12adf52..8cf04d2 100644 --- a/bd-api/bd-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 @@ -8,15 +8,10 @@ import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; import java.util.List; /** - * @description: 特殊业务-注水业绩 - * @author: zhang jing - * @date: 2023/3/28 16:41 - * @param: - * @return: + * 特殊业务-注水业绩 **/ public interface ICuMemberAchieveLogServiceApi { - /** * 解析注水业绩诉求信息 * diff --git a/bd-api/bd-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 index 28bb443..ce3b601 100644 --- a/bd-api/bd-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 @@ -95,20 +95,6 @@ public interface IMemberServiceApi { */ R queryPlaceSponsorLastLeft(Long memberId, Integer placeDept); - /** - * 查找血缘伞上，推荐人 - * - * @param memberId 推荐人编号 - */ - R> queryBloodKinshipOnUmbrella(Long memberId); - - /** - * 查找血缘伞下，推荐人 - * - * @param memberId 推荐人编号 - */ - R> queryBloodKinshipUnderUmbrella(Long memberId); - /** * 获取会员缓存 * @@ -258,16 +244,6 @@ public interface IMemberServiceApi { **/ R queryCuMemberUpgradeByCondition(Integer pkCountry, Long pkMember); - /** - * 更新用户等级 - * - * @param cuMember 用户信息 - * @param saOrder 订单信息 - * @param pkOldLevel 原等级 - * @return R - */ - R updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel); - /** * 更新用户等级 * diff --git a/bd-api/bd-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 index 6ecb1ff..af4365c 100644 --- a/bd-api/bd-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 @@ -8,20 +8,12 @@ import java.util.List; import java.util.Map; /** - * @description: 根据国家查询隶属团队配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询隶属团队配置列表api **/ public interface IMemberTeamServiceApi { /** - * @description: 根据国家查询隶属团队配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询隶属团队配置列表 **/ R> queryCuMemberTeam(Integer pkCountry); @@ -34,10 +26,7 @@ public interface IMemberTeamServiceApi { R checkVertex(Integer pkVertex); /* - * @description: 根据主键获得所属团队 - * @author: sui q - * @date: 2023/4/25 9:17 - * @param: null null + * 根据主键获得所属团队 **/ R getCuMemberTeamById(Long pkMember); diff --git a/bd-api/bd-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 index b705455..3b0cf55 100644 --- a/bd-api/bd-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 @@ -1,7 +1,6 @@ package com.hzs.member.base; import com.hzs.common.core.domain.R; -import com.hzs.member.base.dto.CuAwardsControlDTO; import com.hzs.member.base.dto.UpPolicyCurrencyDTO; import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; diff --git a/bd-api/bd-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 index 02f136d..3d90185 100644 --- a/bd-api/bd-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 @@ -13,12 +13,7 @@ import java.math.BigDecimal; import java.util.Date; /** - *

* 真实奖衔控制表DTO - *

- * - * @author hzs - * @since 2022-08-22 */ @Data public class CuAwardsControlDTO implements Serializable { @@ -130,7 +125,7 @@ public class CuAwardsControlDTO implements Serializable { /** * 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; @@ -190,5 +185,4 @@ public class CuAwardsControlDTO implements Serializable { private String pkAccountKeyVal; - } diff --git a/bd-api/bd-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 index 30cd465..7941ecf 100644 --- a/bd-api/bd-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 @@ -1,10 +1,4 @@ -package com.hzs.member.base.dto;/** - * @Description: - * @Author: yuhui - * @Time: 2023/6/29 15:16 - * @Classname: ShowWaresDTO - * @PackageName: com.hzs.member.base.dto - */ +package com.hzs.member.base.dto; import com.hzs.common.domain.sale.wares.BdWaresAuthority; import lombok.Data; @@ -12,14 +6,6 @@ import lombok.Data; import java.io.Serializable; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.dto - *@Author: yh - *@CreateTime: 2023-06-29 15:16 - *@Description: TODO - *@Version: 1.0 - */ @Data public class ShowWaresDTO implements Serializable { diff --git a/bd-api/bd-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 index 71f9591..abc2c3e 100644 --- a/bd-api/bd-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 @@ -1,20 +1,13 @@ package com.hzs.member.base.dto; 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; import java.math.BigDecimal; /** - *

* 修改政策币表DTO - *

- * - * @author hzs - * @since 2022-08-22 */ @Data public class UpPolicyCurrencyDTO implements Serializable { diff --git a/bd-api/bd-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 index 244428c..99ea179 100644 --- a/bd-api/bd-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 @@ -5,11 +5,7 @@ import com.hzs.common.domain.member.detail.CuMemberLevel; import com.hzs.common.domain.member.detail.ext.CuMemberAwardsExt; /** - * @Description: 会员升级记录dubbo服务 - * @Author: jiang chao - * @Time: 2024/1/30 17:24 - * @Classname: ICuMemberLevelServiceApi - * @PackageName: com.hzs.member.detail + * 会员升级记录dubbo服务 */ public interface ICuMemberDetailServiceApi { diff --git a/bd-api/bd-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 index dd73e16..6185500 100644 --- a/bd-api/bd-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 @@ -5,26 +5,16 @@ import com.hzs.common.domain.member.detail.CuMemberServiceLog; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/13 19:02 - * @Classname: ICuMemberServiceLogServiceApi - * @PackageName: com.hzs.member.detail - */ public interface ICuMemberServiceLogServiceApi { /** * 查询pk_id最大的业务办理 - * @param pkMember 会员编号 + * + * @param pkMember 会员编号 * @param editTypeList 查询类型 - * @return: List - * @Author: sui q - * @Date: 2023/3/13 18:51 */ List queryMaxCuMemberServiceLog(Long pkMember, List editTypeList); - /** * 查询最大审核次数 * @@ -33,13 +23,6 @@ public interface ICuMemberServiceLogServiceApi { * @return */ Integer selectByMaxApproveNumber(Long pkMember, int editType, int approveStatus); - /** - * 查询最大审核次数 (无用户) - * - * @param editType - * @return - */ - Integer selectNotByMaxApproveNumber( int editType, int approveStatus); /** * 新增 @@ -51,23 +34,17 @@ public interface ICuMemberServiceLogServiceApi { /** * 根据业务单号查询 + * * @return */ R selectByBusinessNo(String businessNo); /** * 根据业务单号修改信息 + * * @param memberLog * @return */ R updateByBusinessNo(CuMemberServiceLog memberLog); - /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:15 - * @param: [businessNo] - * @return: com.hzs.common.core.domain.R> - **/ - R> selectCuMemberServiceLog(String businessNo); } diff --git a/bd-api/bd-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 index c2f6ed7..309c51d 100644 --- a/bd-api/bd-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 @@ -4,13 +4,6 @@ import com.hzs.common.core.domain.R; import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/30 14:23 - * @Classname: CuHandleBusinessServiceApi - * @PackageName: com.hzs.member.handleBusiness - */ public interface ICuHandleBusinessServiceApi { /** @@ -30,11 +23,7 @@ public interface ICuHandleBusinessServiceApi { R signForApproval(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 特殊业务审批处理 - * @author: zhang jing - * @date: 2023/5/16 20:07 - * @param: [approvalBusinessResultDTO] - * @return: com.hzs.common.core.domain.R + * 特殊业务审批处理 **/ String auditProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); diff --git a/bd-api/bd-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 deleted file mode 100644 index 3050018..0000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AttestationDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.member.handlebusiness.dto; - -import lombok.Builder; -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 认证DTO - * @Author: jiang chao - * @Time: 2023/4/18 17:38 - * @Classname: AttestationDTO - * @PackageName: com.hzs.member.handlebusiness.dto - */ -@Builder -@Data -public class AttestationDTO implements Serializable { - - private static final long serialVersionUID = -1486998523005023755L; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 真实奖衔 - */ - private String awardVal; - - /** - * 店铺类型 - */ - private Integer storeType; - - /** - * 店铺编号 - */ - private String storeCode; - -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 98f71f1..0000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/PetitionApprovalParam.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.member.handlebusiness.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 签呈审批 - * @Author: yuhui - * @Time: 2023/2/1 11:47 - * @Classname: PetitionApproval - * @PackageName: com.hzs.member.handleBusiness.dto - */ -@Data -public class PetitionApprovalParam implements Serializable { - - private static final long serialVersionUID = 5671790367636231121L; - - /** - * 通过 驳回 对应枚举: EApproveOperation - */ - private Integer approveOperationValue; - - /** - * 业务编号 - */ - private String businessNo; - - /** - * 主旨（类型） 对应枚举： EApprovalBusiness - */ - private Integer approvalBusinessValue; -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 6b55eb9..0000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.member.self; - -import com.hzs.common.core.domain.R; -import com.hzs.member.self.dto.SelfServiceDataDTO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - -/** - * 自助服务 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/19 16:09 - * @Classname: ICuSelfServiceServiceApi - * @Package_name: com.hzs.member.self - */ -public interface ICuSelfServiceServiceApi { - - - /** - * 解析自助服务数据 - * - * @param selfServiceDataDTO - * @return R - */ - R analysisSelfServiceData(SelfServiceDataDTO selfServiceDataDTO); - - - /** - * 在线签呈 （审批状态） 同意/驳回 - */ - R onlineApproval(ApprovalBusinessResultDTO approvalBusinessResultDTO); -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 4c46d42..0000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.hzs.member.self.dto; - -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.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - *

- * 自助服务日志表VO - *

- * - * @author hzs - * @since 2023-04-17 - */ -@Data -public class SelfModifyAddressDTO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 审批业务类型来源于 枚举： EApprovalBusiness - */ - private Integer editType; - - /** - * 原值 - */ - private String oldValue; - - /** - * 新值 - */ - private String newValue; - - /** - * 业务单号 - */ - private String businessNo; - - /** - * 审核状态 0 待审核 1 审核通过 2 审核驳回 枚举 ： EModifyRecordStatus - */ - private Integer approveStatus; - - /** - * 审核次数 - */ - private Integer approveNumber; - - /** - * 支付业务类型来源于枚举 - */ - private Integer editTypePay; - - /** - * 扣费金额 - */ - private BigDecimal singleAmount; - - - /** - * 订单编号 - */ - private String orderCode; - /** - * 订单id - */ - private Long pkOrder; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - /** - * 收货地址ID - */ - private Long pkReceiving; - /** - * 收货人 - */ - private String recName; - /** - * 手机 - */ - private String recPhone; - - /** - * 收货省 - */ - private Integer recProvince; - /** - * 收货市 - */ - private Integer recCity; - /** - * 收货县 - */ - private Integer recCounty; - /** - * 详细地址 - */ - private String recAddress; - - /** - * 会员手续费 - */ - List memberAmountDTOList; - /** - * 错误信息 - */ - private String errorMsg; - /** - * 业务涉及会员ID列表 -- 提交审核必传 - */ - private Set pkMemberList; - /** - * 旧邮费 - */ - private BigDecimal oldPostage; - /** - * 新邮费 - */ - private BigDecimal newPostage; - /** - * 邮费 - */ - private BigDecimal postage; - /** - * 备注 - */ - private String selfRemark; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种翻译key - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种翻译 - */ - private String pkAccountKeyVal; - - - -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 2fc5506..0000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.member.self.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 自助服务解析DTO - * - * @Description: - * @Author: ljc - * @Time: 2023/4/19 16:20 - * @Classname: selfServiceDataDTO - * @Package_name: com.hzs.member.self.dto - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class SelfServiceDataDTO implements Serializable { - private static final long serialVersionUID = -7391351591016186401L; - - - /** - * 业务单号 - */ - - private String businessNo; - - /** - * 业务类型 - */ - private Integer editType; - - /** - * 国家 - */ - private Integer pkCountry; -} diff --git a/bd-api/bd-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 index 160e1e9..cd4fd16 100644 --- a/bd-api/bd-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 @@ -1,58 +1,20 @@ package com.hzs.member.statis; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.achieve.CuMemberAchieve; -import com.hzs.common.domain.member.bonus.CuMemberBonus; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.member.self.dto.SelfServiceDataDTO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - -import java.util.Date; /** - * @description: 奖金拨比统计 - * @author: zhang jing - * @date: 2023/6/1 17:24 - * @param: - * @return: + * 奖金拨比统计 **/ public interface ICuBonusStatisServiceApi { - /** - * @description: 统计新增订单 - * @author: zhang jing - * @date: 2023/6/1 17:27 - * @param: [saOrder] - * @return: com.hzs.common.core.domain.R - **/ - R statisAddOrder(); - - /** - * @description: 统计历史奖金拨比 - * @author: zhang jing - * @date: 2023/10/19 9:29 - * @param: [startDate, endDate] - * @return: com.hzs.common.core.domain.R + * 统计历史奖金拨比 **/ R statisHistoryBonus(String startDate, String endDate); /** - * @description: 删除奖金拨比统计数据 - * @author: zhang jing - * @date: 2023/12/11 10:56 - * @param: [startDate, endDate] - * @return: com.hzs.common.core.domain.R + * 删除奖金拨比统计数据 **/ - R delStatis(String startDate,String endDate); - - /** - * @description: 统计撤销订单 - * @author: zhang jing - * @date: 2023/6/13 15:06 - * @param: [saOrder] - * @return: com.hzs.common.core.domain.R - **/ - R statisRevokeOrder(); + R delStatis(String startDate, String endDate); } diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java index 64fc07f..0e21094 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/store/ICuStoreServiceApi.java @@ -6,13 +6,6 @@ import com.hzs.member.store.dto.StoreDto; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/10/20 16:29 - * @Classname: ICuStoreServiceApi - * @PackageName: com.hzs.member.store - */ public interface ICuStoreServiceApi { /** @@ -33,19 +26,12 @@ public interface ICuStoreServiceApi { R getMemberStore(Long pkMember, Integer pkCountry); /** - * @description: 根据业务编号查询会员店铺信息 - * @author: zhang jing - * @date: 2024/4/3 15:09 - * @param: [analysisBusinessAppealParam] - * @return: com.hzs.common.core.domain.R + * 根据业务编号查询会员店铺信息 **/ R getCuStoreByBusinessNo(AnalysisBusinessAppealParam analysisBusinessAppealParam); /* - * @description: 查询所有国家的店铺 - * @author: sui q - * @date: 2024/4/3 10:16 - * @param: null null + * 查询所有国家的店铺 **/ R> queryAllMemberStore(); diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java index d7c7e01..29ecc06 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/storeconfig/IBdStoreMonthCheckConfigApi.java @@ -2,21 +2,12 @@ package com.hzs.member.storeconfig; import com.hzs.common.core.domain.R; import com.hzs.member.storeconfig.dto.StoreMonthCheckConfigDto; -import lombok.Data; - -/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/7 11:32 - * @Classname: IBdStoreMonthCheckConfigApi - * @PackageName: com.hzs.member.storeconfig - */ public interface IBdStoreMonthCheckConfigApi { - /** * 查询配置 + * * @param pkStoreMonthCheckConfig * @return */ diff --git a/bd-api/bd-api-report/src/main/java/com/hzs/report/dto/package-info.java b/bd-api/bd-api-report/src/main/java/com/hzs/report/dto/package-info.java deleted file mode 100644 index b54cc76..0000000 --- a/bd-api/bd-api-report/src/main/java/com/hzs/report/dto/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.hzs.report.dto; diff --git a/bd-api/bd-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 deleted file mode 100644 index b3dd209..0000000 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/activity/dto/AcRecommendUpgradeDTO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.activity.dto; - -import com.hzs.common.core.enums.EOrderOperateStatus; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 直推-升级DTO - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class AcRecommendUpgradeDTO implements Serializable { - private static final long serialVersionUID = 9005728656479475728L; - - /** - * 订单信息 - */ - private SaOrderExt saOrderExt; - - /** - * 订单操作状态 - */ - private EOrderOperateStatus orderOperateStatus; - -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 60cea5e..0000000 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.sale.deliver; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.ext.SaDeliverExt; - -import java.util.List; - -/** - * @Description: 发货单相关dubbo接口 - * @Author: jiang chao - * @Time: 2023/12/19 14:27 - * @Classname: ISaDeliverServiceApi - * @PackageName: com.hzs.sale.deliver - */ -public interface ISaDeliverServiceApi { - - /** - * 查询发货单+明细列表 - * - * @param idList 发货单ID列表 - * @param pkCountry 所属国家 -- 非必传 - * @return - */ - R> queryDeliverList(List idList, Integer pkCountry); - -} diff --git a/bd-api/bd-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 index d7707c5..656dcf0 100644 --- a/bd-api/bd-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 @@ -5,11 +5,7 @@ import com.hzs.common.core.domain.R; import java.util.List; /** - * @Description: 销售订单-明细表 - * @Author: zhangjing - * @Time: 2023/11/16 20:06 - * @Classname: ISaOrderItemsServiceApi - * @PackageName: com.hzs.sale.order.dto + * 销售订单-明细表 */ public interface ISaOrderItemsServiceApi { diff --git a/bd-api/bd-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 index 80b79d0..1fdd386 100644 --- a/bd-api/bd-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 @@ -4,16 +4,13 @@ import com.hzs.common.core.domain.R; import com.hzs.common.domain.member.ext.CuMemberAccountExt; import com.hzs.common.domain.sale.ext.SaDeliverItemsExt; 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.sale.order.dto.SaOrderRangeDto; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import java.util.Map; /** * 订单服务对外提供接口 @@ -49,32 +46,6 @@ public interface ISaOrderServiceApi { */ R> queryDeliverySaOrderByDay(Date startDate, Date endDate); - /* - * 查询订单编号 - **/ - R querySaOrderByDay(Date startDate, Date endDate, String orderCode); - - /* - * 计算店铺奖金，查询订单 - **/ - R> querySaOrderByTimeForStore(Date startDate, Date endDate); - - /** - * 查询出所有有极差的，海外的计算方式 - * - * @param saOrderList 订单列表 - */ - R>> queryOrderRangeVO(List saOrderList); - - /** - * 根据订单ID查询订单详细列表 - * - * @param pkOrderList 订单ID列表 -- 必传 - * @param pkCountry 国家ID -- 非必传 - * @return - */ - R> queryOrderItemsListByOrderId(List pkOrderList, Integer pkCountry); - /** * 空单注册审核通过 * @@ -132,11 +103,6 @@ public interface ISaOrderServiceApi { */ R saveOrderBatch(List orderList, List orderItemsList); - /* 保存销售订单 - * - **/ - R saveOrder(SaOrderExt saOrderExt); - /** * 批量插入虚拟订单数据 **/ diff --git a/bd-api/bd-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 index 314c43d..8a2bea9 100644 --- a/bd-api/bd-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 @@ -5,13 +5,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -/** - * @Description: - * @Author: sui q - * @Time: 2022/12/30 17:14 - * @Classname: SaOrderRangeDto - * @PackageName: com.hzs.sale.order.dto - */ @Data public class SaOrderRangeDto implements Serializable { diff --git a/bd-api/bd-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 index 114eaa5..d68497a 100644 --- a/bd-api/bd-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 @@ -7,11 +7,7 @@ import java.math.BigDecimal; import java.util.List; /** - * @Description: 邮费服务API - * @Author: jiang chao - * @Time: 2023/4/25 14:40 - * @Classname: IPostageServiceApi - * @PackageName: com.hzs.sale.postage + * 邮费服务API */ public interface IPostageServiceApi { diff --git a/bd-api/bd-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 index b1c5911..af6861a 100644 --- a/bd-api/bd-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 @@ -3,22 +3,11 @@ package com.hzs.sale.product; import com.hzs.common.core.domain.R; import com.hzs.common.domain.sale.classify.BdSpecs; import com.hzs.common.domain.sale.ext.BdProductExt; -import com.hzs.common.domain.sale.product.BdProduct; import com.hzs.common.domain.sale.product.BdProductSpecs; import com.hzs.sale.product.dto.ProductDTO; -import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.Set; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/15 17:52 - * @Classname: IProductServiceApi - * @PackageName: com.hzs.sale.product - */ public interface IProductServiceApi { /** @@ -30,18 +19,7 @@ public interface IProductServiceApi { R getProduct(Integer productId); /* - * @description: 根据产品id查询产品 - * @author: sui q - * @date: 2023/5/29 16:07 - * @param: null null - **/ - R> queryProductDtoById(Set productIdSet, Integer pkCountry, Integer repurchaseType); - - /* - * @description: 根据规格、主键查询产品 - * @author: sui q - * @date: 2023/11/27 15:52 - * @param: null null + * 根据规格、主键查询产品 **/ R> queryProductDtoById(List productSpecsList, Integer pkCountry); @@ -53,28 +31,9 @@ public interface IProductServiceApi { */ R getProduct(String productCode); - /** - * 批量查询产品数据 - * - * @param productIdList 产品ID列表 - * @param pkCountry 所属国家（可为空） - * @return - */ - R> getProductMap(Collection productIdList, Integer pkCountry); - - /* - * @description: 根据主键List查询规格 - * @author: sui q - * @date: 2023/11/30 15:18 - * @param: null null + * 根据主键List查询规格 **/ R> queryBdSpecsByIdList(List idList); - /** - * 根据产品主键修改所关联商品是下架/预售 - * @param productDTOList - * @return - */ - R updateWaresPreSaleStatus(List productDTOList); } diff --git a/bd-api/bd-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 index 14f4452..f71c471 100644 --- a/bd-api/bd-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 @@ -5,13 +5,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/15 17:53 - * @Classname: ProductDTO - * @PackageName: com.hzs.sale.product.dto - */ @Data public class ProductDTO implements Serializable { diff --git a/bd-api/bd-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 index 5135f74..ea1e5a8 100644 --- a/bd-api/bd-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 @@ -5,11 +5,7 @@ import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; /** - * @Description: 统一的销售服务回调审批成功入口 - * @Author: sui q - * @Time: 2022/10/25 13:45 - * @Classname: ISaleApprovalServiceApi - * @PackageName: com.hzs.sale.pub + * 统一的销售服务回调审批成功入口 */ public interface ISaleApprovalServiceApi { @@ -17,9 +13,6 @@ public interface ISaleApprovalServiceApi { * 提供销售模块统一的审核回调方法 * * @param approvalBusinessResultDTO - * @return: void - * @Author: sui q - * @Date: 2022/10/22 14:48 */ R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO); diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/wares/dto/WaresChangeDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/wares/dto/WaresChangeDTO.java deleted file mode 100644 index 0f3945b..0000000 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/wares/dto/WaresChangeDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.sale.wares.dto; - -import lombok.Builder; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 三方商品修改DTO - * @Author: jiang chao - * @Time: 2023/6/2 17:49 - * @Classname: WaresChangeDTO - * @PackageName: com.hzs.sale.wares.dto - */ -@Builder -@Data -public class WaresChangeDTO implements Serializable { - - private static final long serialVersionUID = -6260337345852608256L; - - /** - * 平台渠道 - */ - private Integer source; - - /** - * 三方商品ID - */ - private Long waresId; - - /** - * 三方商品状态（0=下架，1=上架） - */ - private Integer status; - - /** - * 三方sku列表 - */ - private List skuList; - -} diff --git a/bd-api/bd-api-scm/pom.xml b/bd-api/bd-api-scm/pom.xml deleted file mode 100644 index 1b74b3b..0000000 --- a/bd-api/bd-api-scm/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - com.bd.africa - bd-api - 1.0.0-SNAPSHOT - - - bd-api-scm - - - bd-api-scm进销存服务 - - - - - - com.bd.africa - bd-api-system - - - com.bd.africa - bd-common-domain - - - - - diff --git a/bd-api/bd-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 deleted file mode 100644 index fea2497..0000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IBdProductBasSpecsServiceApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.scm.product;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:28 - * @Classname: IBdProductBasSpecsServiceApi - * @PackageName: com.hzs.scm.product - */ - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product - *@Author: yh - *@CreateTime: 2023-11-23 18:28 - *@Description: TODO - *@Version: 1.0 - */ -public interface IBdProductBasSpecsServiceApi { - - - /** - * 新增 - * @param productBasSpecsList - * @return - */ - R saveAll(List productBasSpecsList); - - /** - * 删除 （根据pkProductBas删除） - * @param pkProductBasList - * @return - */ - R removeByPkProductBasList(List pkProductBasList); - - -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 1bf46f5..0000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/IProductBasServiceApi.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.scm.product; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.scm.product.dto.ProductBasDTO; - -import java.util.List; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 17:59 - * @Classname: IProductBasServiceApi - * @PackageName: com.hzs.scm.product - */ -public interface IProductBasServiceApi { - - - /** - * 批量新增 - * @param productBas - * @return - */ - R save(BdProductBas productBas); - - /** - * 根据id 修改 - */ - R updateById(BdProductBas productBas); - - /** - * 根据id 查询 - * @return - */ - R getProductBasById(Integer pkId); - - /** - * 根据产品编号 查询 - * @return - */ - R getProductBasByProductCode(String productCode); - - -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 1252ad9..0000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/product/dto/ProductBasDTO.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hzs.scm.product.dto;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:04 - * @Classname: ProductDTO - * @PackageName: com.hzs.scm.product.provider.dto - */ - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.provider.dto - *@Author: yh - *@CreateTime: 2023-11-23 18:04 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ProductBasDTO implements Serializable { - /** - * 主键 - */ - - private Integer pkId; - - /** - * 产品编号 - */ - - private String productCode; - - /** - * 产品名称 - */ - - private String productName; - - /** - * 规格分类 - */ - - private Integer pkClassify; - - /** - * 单位 来源于枚举：单位 - */ - - private Integer unit; - - /** - * 重量 以千克作为单位 - */ - - private BigDecimal weight; - - /** - * 长 以厘米作为单位 - */ - - private BigDecimal length; - - /** - * 宽 以厘米作为单位 - */ - - private BigDecimal width; - - /** - * 高 以厘米作为单位 - */ - - private BigDecimal height; - - /** - * 封面图 - */ - - private String cover; - - /** - * 保质期 - */ - - private Integer shelfLife; - -} diff --git a/bd-api/bd-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 deleted file mode 100644 index b44ad9f..0000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.scm.pub; - -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.scm.pub.dto.BillDTO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - -import java.util.List; - -/** - * 供应链单据对外接口发布 - */ -public interface IScmBillServiceApi { - - /** - * 活动服务信息处理回调 - * - * @param approvalBusinessResultDTO 参数 - * @return - */ - R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * 查询单据信息 - **/ - R> queryBillDtoByCondition(EApprovalBusiness eApprovalBusiness, String businessCode); - - /* - * 下单时验证可用量 - **/ - R> queryAvailableNumByProduct(List availableNumList); - - /* - * 更新可用量 - **/ - R updateDeductIcAvailableNumByList(List availableNumList); - - /* - * 查询可用量 - **/ - R queryAvailableNumByCondition(Integer pkCountry, Integer pkProduct, List speceIdList); - - /* - * 更新单据号规则 - **/ - R updateScmBillNoNextValue(); - - /* - * 撤单、退单回退可用量 - **/ - R backSaOrderAvailable(SaOrderExt saOrderExt); -} diff --git a/bd-api/bd-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 deleted file mode 100644 index cecc8a7..0000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillDTO.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hzs.scm.pub.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 单据主表表头 - * @author: sui q - * @time: 2023/11/25 09:23 - * @classname: BillDTO - * @package_name: com.hzs.scm.ic.dto - * version 1.0.0 - */ -@Data -public class BillDTO implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 采购部门 - */ - private Integer pkDept; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 仓库管理员 - */ - private Long pkWhsmanager; - - /** - * 管理员名称 - */ - private String managerName; - - /** - * 供应商 取bd_cubasdoc 类型为1 2的 - */ - private Integer pkCubasdoc; - - /** - * 供应商名称 - */ - private String cubasdocName; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 订单日期 2023-10 - */ - private String orderDate; - - /** - * 订单状态 EPoOrderStatus 1=已保存 2=已提交 3=已审核 4=已收货 5=已关闭 - */ - private Integer orderStatus; - - /** - * 退货状态 0=是 1=否 - */ - private Integer returnStatus; - - /** - * 采购组织 - */ - private Integer pkCorp; - - /** - * 采购组织名称 - */ - private String corpName; - - /** - * 总数量 - */ - private BigDecimal totalNum; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 退货理由 - */ - private String returnReason; - - private List billDtoList; -} diff --git a/bd-api/bd-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 deleted file mode 100644 index d3cf296..0000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/BillItemDTO.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.hzs.scm.pub.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 单据明细表 - * @author: sui q - * @time: 2023/11/25 09:23 - * @classname: BillItemDTO - * @package_name: com.hzs.scm.ic.dto - * version 1.0.0 - */ -@Data -public class BillItemDTO implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 单位 - */ - private Integer pkUnit; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 采购订单主键 - */ - private Long pkPoOrder; - - /** - * 采购订单明细主键 - */ - private Long pkPoOrderItems; - - /** - * 主表主键 - */ - private Long pkPurchase; - - /** - * 货位 - */ - private Integer pkClocation; - - /** - * 货位名称 - */ - private String clocationName; - - /** - * 产品基础信息主键 - */ - private Integer pkProductBas; - - /** - * 产品信息主键 - */ - private Integer pkProduct; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 规格名称 - */ - private String specsName; - - /** - * 入库日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date bizDate; - - /** - * 出入口类型 1=入库 2=出库 - */ - private Integer transType; - - /** - * 仓库 - */ - private Integer pkStorehouse; - - /** - * 仓库名称 - */ - private String storehouseName; - - /** - * 汇率 - */ - private Integer pkRate; - - /** - * 数量 - */ - private BigDecimal nnum; - - /** - * 无税单价 - */ - private BigDecimal norigprice; - - /** - * 税率 - */ - private BigDecimal ntaxrate; - - /** - * 含税单价 = 无税单价*（1+税率） - */ - private BigDecimal norigtaxprice; - - /** - * 无税金额 = 无税单价*数量 - */ - private BigDecimal norigmny; - - /** - * 税额 =无税单价*数量 - */ - private BigDecimal ntax; - - /** - * 价税合计 含税单价*数量 - */ - private BigDecimal norigtaxmny; - - /** - * 批次主键 - */ - private Long pkBatchCode; - - private String batchCode; - - /** - * 是否赠品 - */ - private Integer isGift; -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 028bdea..0000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.scm.pub.dto; - -import com.hzs.system.sys.dto.LoginUser; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 发货推送MQ数据 - * @Author: jiang chao - * @Time: 2023/12/19 14:16 - * @Classname: DeliverDTO - * @PackageName: com.hzs.scm.pub.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class DeliverDTO implements Serializable { - - /** - * 发货单ID列表 - */ - private List deliverIdList; - - /** - * 登录用户 - */ - private LoginUser loginUser; - -} diff --git a/bd-api/bd-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 index 7591468..c5fa8c9 100644 --- a/bd-api/bd-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 @@ -5,14 +5,8 @@ import com.hzs.system.base.dto.ApprovalPushInfoDTO; import java.util.List; -/** - * @Description: - * @Author: ljc - * @Time: 2023/4/5 21:29 - * @Classname: IApprovalPushInfo - * @Package_name: com.hzs.system.base - */ public interface IApprovalPushInfo { + /** * 审批推送站内信信息 * @@ -20,4 +14,5 @@ public interface IApprovalPushInfo { * @return R */ R approvalPushInfo(List approvalPushInfoDTOList); + } diff --git a/bd-api/bd-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 index 05395a2..4b2e880 100644 --- a/bd-api/bd-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 @@ -7,11 +7,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 行政区划接口 - * @Author: jiang chao - * @Time: 2022/10/21 11:30 - * @Classname: IAreaServiceApi - * @PackageName: com.hzs.system.base + * 行政区划接口 */ public interface IAreaServiceApi { diff --git a/bd-api/bd-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 index 10bffde..335f82a 100644 --- a/bd-api/bd-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 @@ -7,11 +7,7 @@ import com.hzs.system.base.dto.BarCodeUseDTO; import java.util.List; /** - * @Description: 条码服务接口 - * @Author: jiang chao - * @Time: 2022/11/2 11:46 - * @Classname: IBarCodeServiceApi - * @PackageName: com.hzs.system.base + * 条码服务接口 */ public interface IBarCodeServiceApi { diff --git a/bd-api/bd-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 index b3ab59c..396fbef 100644 --- a/bd-api/bd-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 @@ -8,11 +8,7 @@ import com.hzs.system.base.dto.CountryDTO; import java.util.Map; /** - * Description: 国家服务接口 - * Author: jiang chao - * Time: 2022/8/31 16:53 - * Classname: ICountryServiceApi - * PackageName: com.hzs.system.base + * 国家服务接口 */ public interface ICountryServiceApi { @@ -26,25 +22,21 @@ public interface ICountryServiceApi { /** * 查询所有国家 + * * @return */ R> getAllCountryMap(); /** * 根据业务类型更新 + * * @param businessType 业务类型 - * @param pkId 主键 - * @return: R - * @Author: sui q - * @Date: 2023/3/10 15:14 - */ + * @param pkId 主键 + */ R updateConfigEffectById(Integer businessType, Integer pkId); /* - * @description: 根据国家查询对应的仓库 - * @author: sui q - * @date: 2024/1/18 10:47 - * @param: null null + * 根据国家查询对应的仓库 **/ R queryBdStorehouseByCountry(Integer pkCountry); } diff --git a/bd-api/bd-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 index ca23c22..8902d6e 100644 --- a/bd-api/bd-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 @@ -8,25 +8,14 @@ import com.hzs.system.base.dto.CurrencyDTO; import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.Set; -/** - * @Description: - * @Author: sui q - * @Time: 2022/9/8 15:11 - * @Classname: ICurrencyServiceApi - * @PackageName: com.hzs.system.base - */ public interface ICurrencyServiceApi { /** * 根据国家获得币种 * * @param pkCountry 国家 - * @return: BdCurrency - * @Author: sui q - * @Date: 2022/9/8 15:05 */ R getCurrency(Integer pkCountry); @@ -39,10 +28,7 @@ public interface ICurrencyServiceApi { R> getCurrencyByPkCountryList(Set pkCountryList); /* - * @description: 查询需要的所有汇率 - * @author: sui q - * @date: 2023/5/11 14:58 - * @param: null null + * 查询需要的所有汇率 **/ R> getCurrencyById(Set currencyIdSet); @@ -55,10 +41,7 @@ public interface ICurrencyServiceApi { R getCurrencyByPkId(Integer currencyId); /* - * @description: 根据省查询对应的发货仓库 - * @author: sui q - * @date: 2023/5/8 14:22 - * @param: null null + * 根据省查询对应的发货仓库 **/ R queryBdStorehouseByProvince(Integer province, Integer... type); @@ -83,42 +66,23 @@ public interface ICurrencyServiceApi { R> findAll(); /* - * @description: 提供查询供应商的dubbo调用 - * @author: sui q - * @date: 2023/11/20 16:45 - * @param: null null + * 提供查询供应商的dubbo调用 **/ R queryBdCubasdocById(Integer pkId, Integer pkCountry); /* - * @description: 提供查询供应商的dubbo调用 - * @author: sui q - * @date: 2023/11/20 16:45 - * @param: null null + * 提供查询供应商的dubbo调用 **/ R queryBdCustomerById(Integer pkId, Integer pkCountry); /* - * @description: 提供查询采购组织的dubbo调用 - * @author: sui q - * @date: 2023/11/20 17:47 - * @param: null null + * 提供查询采购组织的dubbo调用 **/ R querySysCorp(Integer pkId, Integer pkCountry); /* - * @description: 根据仓库主键查询仓库 - * @author: sui q - * @date: 2023/11/20 17:54 - * @param: null null + * 根据仓库主键查询仓库 **/ R> queryStorehouseByIds(Set storehouseIdSet, Integer pkCountry, Integer pkCorp); - /* - * @description: 根据省查询对应的发货仓库 - * @author: sui q - * @date: 2023/5/8 14:22 - * @param: null null - **/ - R queryBdStorehouseById(Integer pkId); } diff --git a/bd-api/bd-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 index 969c209..149abd9 100644 --- a/bd-api/bd-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 @@ -3,13 +3,8 @@ package com.hzs.system.base; import com.hzs.common.core.domain.R; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - /** - * @Description: 公告、站内信审批 - * @Author: ljc - * @Time: 2022/9/24 13:48 - * @Classname: IMemberAccountAuditServiceApi - * @Package_name: com.hzs.member.account + * 公告、站内信审批 */ public interface INoticeAuditServiceApi { diff --git a/bd-api/bd-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 index fa9f47a..c1d00cd 100644 --- a/bd-api/bd-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 @@ -3,15 +3,10 @@ package com.hzs.system.base; import com.hzs.common.core.domain.R; import java.util.Collection; -import java.util.List; import java.util.Map; /** - * @Description: 查询系统参数 - * @Author: sui q - * @Time: 2022/11/10 11:27 - * @Classname: ISystemConfigServiceApi - * @PackageName: com.hzs.system.base + * 查询系统参数 */ public interface ISystemConfigServiceApi { @@ -20,9 +15,6 @@ public interface ISystemConfigServiceApi { * * @param pkCountry 国家 * @param key 键 - * @return: BdSystemConfig - * @Author: sui q - * @Date: 2022/11/10 11:28 */ R getBonusSystemConfig(Integer pkCountry, String key); @@ -39,27 +31,17 @@ public interface ISystemConfigServiceApi { * 批量查询系统参数 * * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/11/10 14:03 */ R> getBonusSystemConfig(Integer pkCountry); /** * 批量查询所有国家的系统参数 - * - * @return: R> - * @Author: sui q - * @Date: 2022/11/10 14:04 */ R> getBonusSystemConfig(); /** * 批量查询所有国家的订单参数 - * - * @return: R> - * @Author: yh - * @Date: 2022/11/10 14:04 */ R> getSystemConfig(); + } diff --git a/bd-api/bd-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 index 0999f2a..15a34e1 100644 --- a/bd-api/bd-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 @@ -14,12 +14,6 @@ import java.util.List; /** * 审批推送站内信信息 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/5 21:20 - * @Classname: approvalPushInfoDTO - * @Package_name: com.hzs.system.base.dto */ @Data @Builder diff --git a/bd-api/bd-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 index 5717313..33f3603 100644 --- a/bd-api/bd-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 @@ -8,11 +8,7 @@ import lombok.Data; import java.io.Serializable; /** - * @Description: 条码DTO - * @Author: jiang chao - * @Time: 2022/11/2 14:29 - * @Classname: BarCodeDTO - * @PackageName: com.hzs.system.base.dto + * 条码DTO */ @Data public class BarCodeDTO implements Serializable { diff --git a/bd-api/bd-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 index ef1fcec..077cd93 100644 --- a/bd-api/bd-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 @@ -8,11 +8,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; /** - * @Description: 条码使用DTO - * @Author: jiang chao - * @Time: 2023/8/10 14:20 - * @Classname: BarCodeUseDTO - * @PackageName: com.hzs.system.base.dto + * 条码使用DTO */ @AllArgsConstructor @NoArgsConstructor diff --git a/bd-api/bd-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 index 6cd545d..3fc2531 100644 --- a/bd-api/bd-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 @@ -5,11 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * Description: 国家数据传输DTO - * Author: jiang chao - * Time: 2022/8/31 16:56 - * Classname: CountryDTO - * PackageName: com.hzs.system.base.dto + * 国家数据传输DTO */ @Data public class CountryDTO implements Serializable { diff --git a/bd-api/bd-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 index 5237184..a1dac26 100644 --- a/bd-api/bd-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 @@ -5,13 +5,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -/** - * @Description: - * @Author: sui q - * @Time: 2022/9/8 15:22 - * @Classname: CurrencyDTO - * @PackageName: com.hzs.system.base.dto - */ @Data public class CurrencyDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/bd-api/bd-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 index 0af35a0..2ae3802 100644 --- a/bd-api/bd-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 @@ -9,11 +9,7 @@ import java.io.Serializable; import java.util.Date; /** - * Description: 翻译操作DTO - * Author: jiang chao - * Time: 2022/9/13 9:33 - * Classname: TransactionDTO - * PackageName: com.hzs.system.base.dto + * 翻译操作DTO */ @AllArgsConstructor @NoArgsConstructor diff --git a/bd-api/bd-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 index e41b68b..4cf22a6 100644 --- a/bd-api/bd-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 @@ -4,11 +4,7 @@ import com.hzs.common.core.domain.R; import com.hzs.system.common.dto.MemberDataDTO; /** - * @Description: 公用dubbo接口 - * @Author: jiang chao - * @Time: 2023/1/10 16:09 - * @Classname: ICommonServiceApi - * @PackageName: com.hzs.system.common + * 公用dubbo接口 */ public interface ICommonServiceApi { diff --git a/bd-api/bd-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 index 7e4dab7..0a65d9d 100644 --- a/bd-api/bd-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 @@ -9,11 +9,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * @Description: 会员信息DTO - * @Author: jiang chao - * @Time: 2023/1/10 16:40 - * @Classname: MemberDataDTO - * @PackageName: com.hzs.system.common.dto + * 会员信息DTO */ @AllArgsConstructor @NoArgsConstructor diff --git a/bd-api/bd-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 index 6924e3c..8a1c1a8 100644 --- a/bd-api/bd-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 @@ -8,20 +8,12 @@ import java.util.List; import java.util.Map; /** - * @Description: 币种公共的api - * @Author: sui q - * @Time: 2022/9/9 14:07 - * @Classname: IGradeServiceApi - * @PackageName: com.hzs.system.config + * 币种公共的api */ public interface IAccountServiceApi { /** - * @description: 根据币种属性查询币种类型（账户类型） - * @author: zhang jing - * @date: 2022/9/22 10:03 - * @param: [accountProperty, pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据币种属性查询币种类型（账户类型） **/ R> queryAccountByType(Integer accountProperty, Integer pkCountry); @@ -35,20 +27,12 @@ public interface IAccountServiceApi { R> queryAccountByType(Integer accountType, Collection pkCountryList); /** - * @description: 根据pkid查询币种信息 - * @author: zhang jing - * @date: 2022/10/11 17:44 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R + * 根据pkid查询币种信息 **/ R getAccount(Integer pkId); /** - * @description: 根据币种值查询币种 - * @author: zhang jing - * @date: 2023/3/17 11:11 - * @param: [fieldValue] - * @return: com.hzs.common.core.domain.R + * 根据币种值查询币种 **/ R getBdAccountByFieldValue(Integer pkCountry, Integer fieldValue); @@ -80,38 +64,17 @@ public interface IAccountServiceApi { * 查出国家默认在线充值入的币种 * * @param pkCountry 国家 - * @return: R - * @Author: sui q - * @Date: 2023/3/15 19:02 */ R queryAccountByCondition(Integer pkCountry); /** - * @description: 查询币种转换 - * @author: zhang jing - * @date: 2023/3/16 11:53 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R + * 查询币种转换 **/ R getPkAccount(Integer pkId); /** - * 查询邮费扣除币种 - * - * @param pkCountry 所属国家 - * @return - */ - R queryPostageAccount(Integer pkCountry); - - - /** - * @description: 会员端账户查询 - * @author: zhang jing - * @date: 2023/4/7 15:33 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 会员端账户查询 **/ R> memberAccountByType(Integer pkCountry); - } diff --git a/bd-api/bd-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 index 0d42837..897b3fa 100644 --- a/bd-api/bd-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 @@ -6,38 +6,27 @@ import com.hzs.system.config.dto.AreaCurrencyDTO; import java.util.List; /** - * @Description: 专区币种配置提供的公共api - * @Author: sui q - * @Time: 2022/9/6 10:13 - * @Classname: IAreaCurrency - * @PackageName: com.hzs.system.config + * 专区币种配置提供的公共api */ public interface IAreaCurrencyServiceApi { /** * 根据条件查询国家的所有币种 + * * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 */ R> queryAreaCurrencyByPkCountry(Integer pkCountry); /** * 根据条件查找对应的币种配置 + * * @param specialArea 所属专区 - * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 + * @param pkCountry 国家 */ R> queryAreaCurrencyByCondition(Integer specialArea, Integer pkCountry); /* - * @description: 根据条件查找对应的币种配置 - * @author: sui q - * @date: 2023/7/19 14:18 - * @param: null null + * 根据条件查找对应的币种配置 **/ R> queryAreaCurrencyByCondition(Integer pkSpecialAccount); } diff --git a/bd-api/bd-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 index 4255182..6e6d52e 100644 --- a/bd-api/bd-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 @@ -2,66 +2,43 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdAwards; -import com.hzs.common.domain.system.config.ext.BdAwardsExt; import java.util.List; import java.util.Map; -import java.util.Set; /** - * @description: 根据国家查询奖衔配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询奖衔配置列表api **/ public interface IAwardsServiceApi { - /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> queryAwards(Integer pkCountry); - /** - * @description: 根据PKID查询奖衔信息 - * @author: zhang jing - * @date: 2022/10/10 11:49 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R - **/ - R getAwardsOne(Integer pkId); + /** + * 根据国家查询奖衔配置列表 + **/ + R> queryAwards(Integer pkCountry); - /** - * 根据国家获取该国家的奖衔 - * @return: R> - * @throws - * @Author: sui q - * @Date: 2022/11/4 16:38 + /** + * 根据PKID查询奖衔信息 + **/ + R getAwardsOne(Integer pkId); + + /** + * 根据国家获取该国家的奖衔 */ - R> getAwards(); + R> getAwards(); - /** - * @description: 根据国家查询辅导分红 - * @author: zhang jing - * @date: 2022/11/11 14:14 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> coachBonusList(Integer pkCountry); + /** + * 根据所属国家查询奖衔 + * + * @param pkCountry + * @return + */ + R> queryByPkCountryAwards(Integer pkCountry); - /** - * 根据所属国家查询奖衔 - * @param pkCountry - * @return - */ - R> queryByPkCountryAwards(Integer pkCountry); - /** - * 根据所属国家查询奖衔 - * @param countryList - * @return - */ + /** + * 根据所属国家查询奖衔 + * + * @param countryList + * @return + */ R> queryAwardsByIdList(List countryList); } diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdAreaCurrencyServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdAreaCurrencyServiceApi.java deleted file mode 100644 index 7907dc2..0000000 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdAreaCurrencyServiceApi.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.system.config; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdAccount; -import com.hzs.common.domain.system.config.ext.BdAreaCurrencyExt; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * @description: 消费配置公共的api - * @author: zhang jing - * @date: 2023/10/11 17:29 - * @param: - * @return: - **/ -public interface IBdAreaCurrencyServiceApi { - - - /** - * @description: 查询兑换复消扣款配置 - * @author: zhang jing - * @date: 2022/10/11 17:44 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R - **/ - R queryAreaCurrency(); - - - - -} diff --git a/bd-api/bd-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 index 1aaf69c..943e786 100644 --- a/bd-api/bd-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 @@ -1,57 +1,32 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdBonusItems; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; import com.hzs.system.config.dto.BonusConfigDTO; import java.util.List; -import java.util.Map; -import java.util.Set; /** - * @description: 根据国家查询奖项配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询奖项配置列表api **/ public interface IBonusItemsServiceApi { - /** - * @description: 根据国家查询奖项配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> queryBonusItems(Integer pkCountry); + /** + * 根据国家查询奖项配置列表 + **/ + R> queryBonusItems(Integer pkCountry); - /** - * 查询存在车奖、全球积分的国家 - * @param bonusValueList 奖金值 - * @return: R> - * @Author: sui q - * @Date: 2023/3/14 10:06 + /** + * 查询奖金项 + * + * @param pkCountry 国家 + * @param pkBonusItems 奖金项 */ - R> queryExistsBonusItems(List bonusValueList); + R queryBonusItems(Integer pkCountry, Integer pkBonusItems); - /** - * 查询奖金项 - * @param pkCountry 国家 - * @param pkBonusItems 奖金项 - * @return: R - * @Author: sui q - * @Date: 2023/3/7 18:05 + /** + * 查询国家的推荐奖金参数 */ - R queryBonusItems(Integer pkCountry, Integer pkBonusItems); - - /** - * 查询国家的推荐奖金参数 - * @return: R - * @Author: sui q - * @Date: 2022/11/14 16:35 - */ - R queryBonusConfigDTO(); + R queryBonusConfigDTO(); } diff --git a/bd-api/bd-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 index 05f8913..bd528c7 100644 --- a/bd-api/bd-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 @@ -2,7 +2,6 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdGrade; -import com.hzs.common.domain.system.config.ext.BdStoreLevelExt; import com.hzs.system.config.dto.GradeDTO; import java.util.List; @@ -68,11 +67,6 @@ public interface IGradeServiceApi { */ R> selectGradeAll(Integer dataCountry); - /* - * 查询店铺等级 - **/ - R> queryStoreLevel(); - /** * 根据国家查询等级配置列表 * diff --git a/bd-api/bd-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 index 8908038..2e20d70 100644 --- a/bd-api/bd-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 @@ -7,14 +7,9 @@ import java.util.List; /** * 标签配置接口 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/1 19:02 - * @Classname: ILabelServiceApi - * @Package_name: com.hzs.system.config */ public interface ILabelServiceApi { + /** * 根据ID查询标签信息 * diff --git a/bd-api/bd-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 index 1bbf27e..fec2906 100644 --- a/bd-api/bd-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 @@ -9,39 +9,26 @@ import java.util.List; import java.util.Map; /** - * @description: 根据国家查询极差配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询极差配置列表api **/ public interface IRangeServiceApi { - /** - * @description: 根据国家查询极差配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> queryRange(Integer pkCountry); + /** + * 根据国家查询极差配置列表 + **/ + R> queryRange(Integer pkCountry); - /** - * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 - * @return: Map - * @Author: sui q - * @Date: 2023/1/3 14:00 - */ - R> queryRangeDto(); + /** + * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 + */ + R> queryRangeDto(); - /** - * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 - * @param pkCountry 国家 - * @param rangeType 极差类型 - * @param pkLevel 等级 - * @return: Map - * @Author: sui q - * @Date: 2023/1/3 14:00 - */ - R queryRangeDtoByCondition(Integer pkCountry, Integer rangeType, Integer pkLevel); + /** + * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 + * + * @param pkCountry 国家 + * @param rangeType 极差类型 + * @param pkLevel 等级 + */ + R queryRangeDtoByCondition(Integer pkCountry, Integer rangeType, Integer pkLevel); } diff --git a/bd-api/bd-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 index 805319c..dc08e82 100644 --- a/bd-api/bd-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 @@ -6,20 +6,12 @@ import com.hzs.system.config.dto.ServiceChargeDTO; import java.util.List; /** - * @Description: 办理业务手续费api - * @Author: zhangjing - * @Time: 2022/9/9 14:07 - * @Classname: IGradeServiceApi - * @PackageName: com.hzs.system.config + * 办理业务手续费api */ public interface IServiceChargeServiceApi { /** - * @description: 根据业务类型查询扣款 - * @author: zhang jing - * @date: 2023/1/7 15:01 - * @param: [type, quantity] - * @return: com.hzs.common.core.domain.R + * 根据业务类型查询扣款 **/ R getServiceChargeByType(ServiceChargeDTO serviceChargeDTO); diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IShopServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IShopServiceApi.java index 4ad977e..4038855 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IShopServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IShopServiceApi.java @@ -7,21 +7,13 @@ import com.hzs.common.domain.system.config.ext.BdShopExt; import java.util.List; /** - * @description: 根据国家查询奖项配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询奖项配置列表api **/ public interface IShopServiceApi { - /** - * @description: 根据国家查询奖项配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> queryShop(Integer pkCountry); + /** + * 根据国家查询奖项配置列表 + **/ + R> queryShop(Integer pkCountry); } diff --git a/bd-api/bd-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 index 50de087..fb94f14 100644 --- a/bd-api/bd-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 @@ -4,13 +4,6 @@ import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdTradeWhiteConfig; import com.hzs.system.config.dto.TradeConfigDTO; -/** - * @Description: - * @Author: ljc - * @Time: 2023/8/21 15:05 - * @Classname: ITradeConfigApi - * @Package_name: com.hzs.system.config - */ public interface ITradeConfigServiceApi { /** diff --git a/bd-api/bd-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 index 3c6d6ce..806821e 100644 --- a/bd-api/bd-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 @@ -7,20 +7,12 @@ import com.hzs.common.domain.system.config.BdWithdrawal; import java.util.List; /** - * @description: 根据国家查询提现配置明细列表api - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: - * @return: + * 根据国家查询提现配置明细列表api **/ public interface ITransferServiceApi { /** - * @description: 根据国家查询转账配置列表 - * @author: zhang jing - * @date: 2022/9/28 10:32 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询转账配置列表 **/ R queryTransfer(Integer pkCountry); } diff --git a/bd-api/bd-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 index 1ff7a4c..5f878c2 100644 --- a/bd-api/bd-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 @@ -6,23 +6,18 @@ import com.hzs.system.config.dto.VertexDTO; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/16 15:55 - * @Classname: IVertexServiceApi - * @PackageName: com.hzs.sale.vertex - */ public interface IVertexServiceApi { /** * 查询所有体系配置 + * * @return */ R> findAll(); /** * 查询所有体系配置(根据国家) + * * @return */ R> findAllByPkCountry(Integer pkCountry); diff --git a/bd-api/bd-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 index 5f37d4d..8760337 100644 --- a/bd-api/bd-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 @@ -6,20 +6,12 @@ import com.hzs.common.domain.system.config.BdWithdrawalAuto; import java.util.List; /** - * @description: 根据国家查询自动提现明细api - * @author: zhang jing - * @date: 2022/9/27 15:15 - * @param: - * @return: + * 根据国家查询自动提现明细api **/ public interface IWithdrawalAutoServiceApi { /** - * @description:根据国家查询自动提现明细列表 - * @author: zhang jing - * @date: 2022/9/27 15:20 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询自动提现明细列表 **/ - R> queryWithdrawalAuto(Integer pkCountry); + R> queryWithdrawalAuto(Integer pkCountry); } diff --git a/bd-api/bd-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 index 8dacd14..b2e545c 100644 --- a/bd-api/bd-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 @@ -3,23 +3,13 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdWithdrawalProcess; - - /** - * @description: 根据国家查询提现手续费配置列表api - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: - * @return: + * 根据国家查询提现手续费配置列表api **/ public interface IWithdrawalProcessServiceApi { /** - * @description: 根据国家查询提现手续费配置列表 - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询提现手续费配置列表 **/ R queryBdWithdrawalProcess(Integer pkCountry); diff --git a/bd-api/bd-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 index 6ec0d39..906e6c6 100644 --- a/bd-api/bd-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 @@ -6,29 +6,17 @@ import com.hzs.common.domain.system.config.BdWithdrawal; import java.util.List; /** - * @description: 根据国家查询提现配置明细列表api - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: - * @return: + * 根据国家查询提现配置明细列表api **/ public interface IWithdrawalServiceApi { /** - * @description: 根据国家查询提现配置明细列表 - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询提现配置明细列表 **/ R queryWithdrawal(Integer pkCountry); /** - * @description: 查询所有自动提现的配置 - * @author: zhang jing - * @date: 2022/11/1 19:44 - * @param: [] - * @return: com.hzs.common.core.domain.R> + * 查询所有自动提现的配置 **/ R> queryWithdrawalByIsAuto(); } diff --git a/bd-api/bd-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 deleted file mode 100644 index e0efe58..0000000 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalSpecialServiceApi.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzs.system.config; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdWithdrawalSpecial; - -import java.util.List; - -/** - * @description: 提现设置特殊配置api - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: - * @return: - **/ -public interface IWithdrawalSpecialServiceApi { - - /** - * @description: 根据国家查询提现设置特殊配置列表 - * @author: zhang jing - * @date: 2022/9/27 16:24 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> queryWithdrawalSpecial(Integer pkCountry); - /** - * @description: 根据国家会员编号查询提现设置特殊配置 - * @author: zhang jing - * @date: 2022/9/27 16:27 - * @param: [pkCountry, memberCode] - * @return: com.hzs.common.core.domain.R - **/ - R getWithdrawalSpecial(Integer pkCountry,String memberCode); - -} diff --git a/bd-api/bd-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 index 3ac8992..11349ab 100644 --- a/bd-api/bd-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 @@ -1,27 +1,16 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdWithdrawalTax; import com.hzs.common.domain.system.config.ext.BdWithdrawalTaxExt; -import java.util.List; - /** - * @description: 个税明细api - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: - * @return: + * 个税明细api **/ public interface IWithdrawalTaxServiceApi { + /** + * 根据国家查询个税明细 + **/ + R queryWithdrawalTax(Integer pkCountry); - /** - * @description: 根据国家查询个税明细 - * @author: zhang jing - * @date: 2022/9/27 16:13 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R queryWithdrawalTax(Integer pkCountry); } diff --git a/bd-api/bd-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 index 4084dba..e91a0ee 100644 --- a/bd-api/bd-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 @@ -7,11 +7,7 @@ import java.util.List; import java.util.Map; /** - * Description: 审批服务接口 - * Author: jiang chao - * Time: 2022/10/9 11:24 - * Classname: IApprovalServiceApi - * PackageName: com.hzs.system.sys + * 审批服务接口 */ public interface IApprovalServiceApi { diff --git a/bd-api/bd-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 index 4cda55d..e934233 100644 --- a/bd-api/bd-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 @@ -6,11 +6,7 @@ import com.hzs.system.sys.dto.BusinessLogDTO; import java.util.List; /** - * @Description: 业务操作明细接口 - * @Author: jiang chao - * @Time: 2023/8/3 18:14 - * @Classname: IBusinessLogApi - * @PackageName: com.hzs.system.sys + * 业务操作明细接口 */ public interface IBusinessLogApi { diff --git a/bd-api/bd-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 index 7e90d13..d4d19b8 100644 --- a/bd-api/bd-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 @@ -5,11 +5,7 @@ import com.hzs.common.core.domain.R; import java.util.Map; /** - * @Description: 菜单列服务 - * @Author: jiang chao - * @Time: 2023/6/8 11:21 - * @Classname: IMenuColumnServiceApi - * @PackageName: com.hzs.system.sys + * 菜单列服务 */ public interface IMenuColumnServiceApi { diff --git a/bd-api/bd-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 index d1f1c24..57d0267 100644 --- a/bd-api/bd-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 @@ -4,11 +4,7 @@ import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.sys.SysOperationLog; /** - * Description: 后台操作日志服务接口 - * Author: jiang chao - * Time: 2022/9/14 15:48 - * Classname: IOperationLogService - * PackageName: com.hzs.system.sys + * 后台操作日志服务接口 */ public interface IOperationLogServiceApi { diff --git a/bd-api/bd-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 deleted file mode 100644 index 75c8f24..0000000 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IThaliConfigServiceApi.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hzs.system.sys; - -import com.hzs.common.core.domain.R; -import com.hzs.system.sys.dto.ThaliConfigDTO; - -/** - * @Description: 能量仓套餐dubbo服务 - * @Author: jiang chao - * @Time: 2023/8/10 17:48 - * @Classname: IThaliConfigServiceApi - * @PackageName: com.hzs.system.sys - */ -public interface IThaliConfigServiceApi { - - /** - * 获取最新的能量仓套餐 - * - * @return - */ - R getLastThaliConfig(); - -} diff --git a/bd-api/bd-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 deleted file mode 100644 index 086d99a..0000000 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ThaliConfigDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.system.sys.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: 能量仓套餐DTO - * @Author: jiang chao - * @Time: 2023/8/10 17:53 - * @Classname: ThaliConfigDTO - * @PackageName: com.hzs.system.sys.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class ThaliConfigDTO implements Serializable { - - private static final long serialVersionUID = 3316294777261662729L; - - /** - * 套餐ID - */ - private Integer pkId; - - /** - * 三方套餐ID - */ - private Long packageId; - - /** - * 套餐时长 - */ - private Integer time; - - /** - * 套餐价格 - */ - private BigDecimal price; - -} diff --git a/bd-api/bd-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 index e9a4100..583fcb5 100644 --- a/bd-api/bd-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 @@ -3,21 +3,10 @@ package com.hzs.third.mq; import com.hzs.common.core.domain.R; import com.hzs.third.mq.dto.DelayedMessageDTO; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/9 15:21 - * @Classname: IDelayedMessage - * @PackageName: com.hzs.third.mq - */ public interface IDelayedMessageApi { /** * 发送延时队列消息 - * @param delayedMessageDTO 内容 - * @return: void - * @Author: sui q - * @Date: 2023/3/9 15:18 */ R sendDelayedMessage(DelayedMessageDTO delayedMessageDTO); } diff --git a/bd-api/bd-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 index ac90e9c..7bb6c52 100644 --- a/bd-api/bd-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 @@ -10,11 +10,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 用于延时队列，删除redis缓存 - * @Author: sui q - * @Time: 2023/3/9 15:49 - * @Classname: DelayedMessageDTO - * @PackageName: com.hzs.third.mq.dto + * 用于延时队列，删除redis缓存 */ @Data @Builder diff --git a/bd-api/bd-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 deleted file mode 100644 index 69cef26..0000000 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/mq/dto/RefundOrderDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.third.mq.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: 在线支付订单退款DTO - * @Author: jiang chao - * @Time: 2023/9/12 14:15 - * @Classname: RefundDTO - * @PackageName: com.hzs.third.mq.dto - */ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class RefundOrderDTO implements Serializable { - - private static final long serialVersionUID = -6096443193538958478L; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 会员ID - */ - private Long pkMember; - - /** - * 退款重试次数（写死判断，如果3次发起退款都失败，则不继续进行处理） - */ - private Integer retryNum; - - /** - * 业务重试次数 - */ - private Integer businessRetryNum; - -} diff --git a/bd-api/pom.xml b/bd-api/pom.xml index 2a51293..035f9ca 100644 --- a/bd-api/pom.xml +++ b/bd-api/pom.xml @@ -34,7 +34,6 @@ bd-api-sale bd-api-system bd-api-third - bd-api-scm diff --git a/bd-business/bd-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 index d9317e0..09f11ac 100644 --- a/bd-business/bd-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 @@ -2,12 +2,10 @@ package com.hzs.bonus.achieve.controller.manage; import cn.hutool.core.bean.BeanUtil; import com.hzs.bonus.achieve.param.MemberPeriodParam; -import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberMonthAchieveService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; import com.hzs.bonus.achieve.service.ICuMemberTreeService; import com.hzs.bonus.bonus.service.IBonusGrantService; -import com.hzs.bonus.bonus.service.IBonusSettleService; import com.hzs.bonus.bonus.service.ICuMemberBonusService; import com.hzs.bonus.bonus.vo.MemberSettlePeriodVO; import com.hzs.common.core.annotation.Log; @@ -16,7 +14,6 @@ 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.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; @@ -31,21 +28,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2022/11/2 16:21 - * @Classname: CuMemberSettleController - * @PackageName: com.hzs.member.achieve.controller - */ @RestController @RequestMapping("/manage/settle") public class CuMemberSettleController extends BaseController { private ICuMemberBonusService cuMemberBonusService; - private IBonusSettleService bonusSettleService; - private ICuMemberTreeService cuMemberTreeService; private ICuMemberSettlePeriodService cuMemberSettlePeriodService; @@ -54,8 +42,6 @@ public class CuMemberSettleController extends BaseController { private ICuMemberMonthAchieveService cuMemberMonthAchieveService; - @Autowired - private ICuMemberAchieveService cuMemberAchieveService; @Autowired public void setCuMemberBonusService(ICuMemberBonusService cuMemberBonusService) { @@ -82,11 +68,6 @@ public class CuMemberSettleController extends BaseController { this.cuMemberTreeService = cuMemberTreeService; } - @Autowired - public void setBonusSettleService(IBonusSettleService bonusSettleService) { - this.bonusSettleService = bonusSettleService; - } - /** * 初始化奖金结算表 * @@ -165,7 +146,7 @@ public class CuMemberSettleController extends BaseController { @GetMapping("/grant-bonus") @Log(module = EOperationModule.BONUS_SETTLE, business = EOperationBusiness.BONUS_SETTLE, method = EOperationMethod.GRANT) public AjaxResult grantBonus(String settleDate) { - if(!bonusGrantService.grantBonusByPeriod(SecurityUtils.getPkCountry(), settleDate)){ + if (!bonusGrantService.grantBonusByPeriod(SecurityUtils.getPkCountry(), settleDate)) { return AjaxResult.error(TransactionUtils.getContent(BonusMsgConstants.GRANT_VALIDATE_DATE)); } bonusGrantService.withdrawalBonusByPeriod(SecurityUtils.getPkCountry(), settleDate); @@ -210,24 +191,8 @@ public class CuMemberSettleController extends BaseController { return AjaxResult.success(); } - /** - * 秒接结算业绩，仅用于测试 - * w - * - * @return AjaxResult - */ - @GetMapping("/settle-second-bonus") - public AjaxResult settleSecondBonus(String orderCode) { - if(StringUtils.isEmpty(orderCode)){ - return AjaxResult.error(); - } -// bonusSettleService.calculateCumberBonusBySecond(orderCode); - return AjaxResult.success(); - } - /** * 发放直推达人、抗衰达人 - * w * * @return AjaxResult */ @@ -239,10 +204,7 @@ public class CuMemberSettleController extends BaseController { } /* - * @description: 查询奖金计算期数列表 - * @author: sui q - * @date: 2023/4/26 17:10 - * @param: null null + * 查询奖金计算期数列表 **/ @Log(module = EOperationModule.BONUS_SETTLE, business = EOperationBusiness.BONUS_SETTLE, method = EOperationMethod.SELECT) @PostMapping("/list-period") diff --git a/bd-business/bd-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 index a49ae2a..7dc93e0 100644 --- a/bd-business/bd-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 @@ -8,30 +8,19 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员月数据 Mapper 接口 - *

- * - * @author hzs - * @since 2023-06-06 */ public interface CuMemberMonthAchieveMapper extends BaseMapper { /* - * @description: 根据时间查询月业绩 - * @author: sui q - * @date: 2023/6/7 14:37 - * @param: null null + * 根据时间查询月业绩 **/ List queryCuMemberMonthAchieveByDate(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("recommend") Integer recommend); /* - * @description: 每天插入会员月表，计算推荐业绩，复购业绩，1-6号计算前7天 - * @author: sui q - * @date: 2023/6/6 14:15 - * @param: null null + * 每天插入会员月表，计算推荐业绩，复购业绩，1-6号计算前7天 **/ void insertCuMemberMonthAchieve(@Param("tableName") String tableName, @Param("period") Integer period, @Param("month") String month); } diff --git a/bd-business/bd-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 index 3a12736..0192f53 100644 --- a/bd-business/bd-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 @@ -6,36 +6,22 @@ import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve; import java.util.Date; /** - *

* 会员月数据 服务类 - *

- * - * @author hzs - * @since 2023-06-06 */ public interface ICuMemberMonthAchieveService extends IService { /* - * @description: 每日生成业绩、月表统计数据 - * @author: sui q - * @date: 2023/9/1 9:50 - * @param: null null + * 每日生成业绩、月表统计数据 **/ void insertCuMemberAchieveByEveryDay(Date settleDate); /* - * @description: 每天插入会员月表，计算推荐业绩，复购业绩，1-6号计算前7天 - * @author: sui q - * @date: 2023/6/6 14:15 - * @param: null null + * 每天插入会员月表，计算推荐业绩，复购业绩，1-6号计算前7天 **/ void insertCuMemberMonthAchieve(Date settleDate); /* - * @description: 每天统计月表数据 - * @author: sui q - * @date: 2023/8/29 10:31 - * @param: null null + * 每天统计月表数据 **/ void insertCuMemberCuMemberMonthYearAchieve(Date settleDate); } diff --git a/bd-business/bd-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 index 4a8b4dc..03e91aa 100644 --- a/bd-business/bd-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 @@ -1,23 +1,15 @@ package com.hzs.bonus.achieve.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberMonthAchieveService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.bonus.base.service.ICuMemberHonorWallService; -import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.enums.HonorWallType; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt; -import com.hzs.common.domain.member.honor.CuHonorWall; -import com.hzs.common.domain.member.honor.CuMemberHonorWall; import com.hzs.bonus.achieve.mapper.CuMemberMonthAchieveMapper; import com.hzs.bonus.achieve.service.ICuMemberTreeService; -import com.hzs.bonus.base.service.ICuHonorWallService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,12 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; /** - *

* 会员月数据 服务实现类 - *

- * - * @author hzs - * @since 2023-06-06 */ @Service public class CuMemberMonthAchieveServiceImpl extends ServiceImpl implements ICuMemberMonthAchieveService { @@ -38,10 +25,6 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl cuHonorWallList = cuHonorWallService.queryCuHonorWall(); - Map honorWallMap = new HashMap<>(); - cuHonorWallList.forEach(cuHonorWall -> { - String key = cuHonorWall.getPkCountry().toString() + cuHonorWall.getType() + cuHonorWall.getValue(); - honorWallMap.put(key, cuHonorWall); - }); - List cuMemberHonorWallList = new ArrayList<>(); - // 上月期间，作为结束期间 - String beforeFirstMonthDate = DateUtils.beforeMonthFirstDateStr(settleDate); - CuMemberSettlePeriod beforePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeFirstMonthDate); - // 月徽章 - grantHonorWall(beforePeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, - HonorWallType.RECOMMEND_MONTH.getValue(), honorWallMap, cuMemberHonorWallList); - // 再发季度徽章 - if (month == 1 || month == 4 || month == 7 || month == 10) { - // 3个月期间，作为开始期间 - String quarterFirstMonthDate = DateUtils.beforeMonthFirstDateStr(3, settleDate); - CuMemberSettlePeriod quarterPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(quarterFirstMonthDate); - grantHonorWall(quarterPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, - HonorWallType.RECOMMEND_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList); - if (month == 1) { - // 再发年度徽章 - // 3个月期间，作为开始期间 - String yearFirstMonthDate = DateUtils.beforeMonthFirstDateStr(12, settleDate); - CuMemberSettlePeriod yearPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yearFirstMonthDate); - if (yearPeriod != null) { - grantHonorWall(yearPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, - HonorWallType.RECOMMEND_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList); - } - } - } - if (cuMemberHonorWallList.size() > 0) { - cuMemberHonorWallService.saveBatch(cuMemberHonorWallList); - } - } } @Override @@ -138,37 +83,4 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl honorWallMap, List cuMemberHonorWallList) { - // 先发月徽章 查询值，查询前3名 - List cuMemberMonthAchieveList = baseMapper.queryCuMemberMonthAchieveByDate(startPeriod, endPeriod, recommend); - if (CollectionUtil.isNotEmpty(cuMemberMonthAchieveList)) { - Map> monthAchieveMap = new HashMap<>(); - cuMemberMonthAchieveList.forEach(cuMemberMonthAchieve -> { - if (monthAchieveMap.containsKey(cuMemberMonthAchieve.getWallType())) { - monthAchieveMap.get(cuMemberMonthAchieve.getWallType()).add(cuMemberMonthAchieve); - } else { - List cuMemberMonthAchieveExtList = new ArrayList<>(); - cuMemberMonthAchieveExtList.add(cuMemberMonthAchieve); - monthAchieveMap.put(cuMemberMonthAchieve.getWallType(), cuMemberMonthAchieveExtList); - } - }); - monthAchieveMap.forEach((wallType, cuMemberMonthAchieveExtList) -> { - for (int i = 1; i <= cuMemberMonthAchieveExtList.size(); i++) { - CuMemberMonthAchieveExt cuMemberMonthAchieveExt = cuMemberMonthAchieveExtList.get(i - 1); - String key = cuMemberMonthAchieveExt.getPkCountry().toString() + cuMemberMonthAchieveExt.getWallType() + i; - if (honorWallMap.containsKey(key)) { - CuMemberHonorWall cuMemberHonorWall = CuMemberHonorWall.builder() - .pkMember(cuMemberMonthAchieveExt.getPkMember()) - .pkHonorWall(honorWallMap.get(key).getPkId()) - .settleMonth(settleMonth) - .build(); - cuMemberHonorWall.setPkCountry(cuMemberMonthAchieveExt.getPkCountry()); - cuMemberHonorWall.setPkCreator(MagicNumberConstants.PK_ADMIN); - cuMemberHonorWallList.add(cuMemberHonorWall); - } - } - }); - } - } } diff --git a/bd-business/bd-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 index aa5844b..39ea6a6 100644 --- a/bd-business/bd-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 @@ -1,25 +1,12 @@ package com.hzs.bonus.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.ext.CuHonorWallExt; import com.hzs.common.domain.member.honor.CuHonorWall; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** - *

* 荣誉墙 Mapper 接口 - *

- * - * @author hzs - * @since 2023-04-26 */ public interface CuHonorWallMapper extends BaseMapper { - /** - * 查询荣誉墙全量信息 - * @param pkCountry - * @return - */ - List queryAll(@Param("pkCountry") Integer pkCountry, @Param("pkMember") Long pkMember); + + } diff --git a/bd-business/bd-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 index 1ec9145..80c5a30 100644 --- a/bd-business/bd-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 @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.honor.CuMemberHonorWall; /** - *

* 会员荣誉墙关联表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-04-26 */ public interface CuMemberHonorWallMapper extends BaseMapper { diff --git a/bd-business/bd-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 index 491e6ae..acead2a 100644 --- a/bd-business/bd-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 @@ -1,27 +1,11 @@ package com.hzs.bonus.base.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.ext.CuHonorWallExt; import com.hzs.common.domain.member.honor.CuHonorWall; -import java.util.List; - /** - *

* 荣誉墙 服务类 - *

- * - * @author hzs - * @since 2023-04-26 */ public interface ICuHonorWallService extends IService { - /* - * @description: 查询所有的徽章 - * @author: sui q - * @date: 2023/6/7 14:30 - * @param: null null - **/ - List queryCuHonorWall(); - } diff --git a/bd-business/bd-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 index b48a299..191ba06 100644 --- a/bd-business/bd-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 @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.honor.CuMemberHonorWall; /** - *

* 会员荣誉墙关联表 服务类 - *

- * - * @author hzs - * @since 2023-04-26 */ public interface ICuMemberHonorWallService extends IService { diff --git a/bd-business/bd-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 index b31fb58..113cb9b 100644 --- a/bd-business/bd-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 @@ -1,30 +1,15 @@ package com.hzs.bonus.base.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.base.mapper.CuHonorWallMapper; import com.hzs.bonus.base.service.ICuHonorWallService; import com.hzs.common.domain.member.honor.CuHonorWall; import org.springframework.stereotype.Service; -import java.util.List; - /** - *

* 荣誉墙 服务实现类 - *

- * - * @author hzs - * @since 2023-04-26 */ @Service public class CuHonorWallServiceImpl extends ServiceImpl implements ICuHonorWallService { - @Override - public List queryCuHonorWall() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("pk_id,PK_COUNTRY,TYPE,VALUE,IMG"); - return baseMapper.selectList(queryWrapper); - } - } diff --git a/bd-business/bd-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 index 051d32a..c9e976b 100644 --- a/bd-business/bd-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 @@ -7,12 +7,7 @@ import com.hzs.common.domain.member.honor.CuMemberHonorWall; import org.springframework.stereotype.Service; /** - *

* 会员荣誉墙关联表 服务实现类 - *

- * - * @author hzs - * @since 2023-04-26 */ @Service public class CuMemberHonorWallServiceImpl extends ServiceImpl implements ICuMemberHonorWallService { diff --git a/bd-business/bd-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 index bc6168b..ef78262 100644 --- a/bd-business/bd-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 @@ -29,17 +29,13 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 计算复购的奖金处理类 - * @Author: sui q - * @Time: 2023/1/4 10:23 - * @Classname: BonusSettlePurchaseHandle - * @PackageName: com.hzs.member.bonus.service.impl + * 计算复购的奖金处理类 */ @Component public class BonusSettlePurchaseHandle extends BonusSettleHandle { @DubboReference - private ISystemConfigServiceApi systemConfigServiceApi; + ISystemConfigServiceApi systemConfigServiceApi; /** * @param period 期间 @@ -409,8 +405,8 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (targetSettleExt == null) { break; } - if(ECategory.NORMAL.getValue() != targetSettleExt.getCategory() || - EAccountStatus.STOP_INCOME.getValue() == targetSettleExt.getAccountStatus()){ + if (ECategory.NORMAL.getValue() != targetSettleExt.getCategory() || + EAccountStatus.STOP_INCOME.getValue() == targetSettleExt.getAccountStatus()) { pkParent = targetSettleExt.getPkParent(); continue; } diff --git a/bd-business/bd-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 deleted file mode 100644 index 5a8dd47..0000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.bonus.listener; - -import com.hzs.bonus.bonus.service.IBonusSettleService; -import com.hzs.bonus.settle.IMemberSettleBonusApi; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.domain.sale.ext.SaOrderExt; -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.rabbit.core.RabbitTemplate; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.stereotype.Component; - -/** - * @Description: 订单秒接 - * @Author: sui q - * @Time: 2023/3/1 16:30 - * @Classname: SaOrderSecondListener - * @PackageName: com.hzs.third.mqcall.listener - */ -@Slf4j -@Component -public class SaOrderSecondListener { - - @Autowired - private IBonusSettleService bonusSettleService; - @Autowired - private RabbitTemplate rabbitTemplate; - - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.ORDER_SECOND_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.ORDER_SECOND_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.ORDER_SECOND_KEY)) - @RabbitHandler - public void onMessage(Message message, Channel channel) throws Exception { - SaOrderExt saOrderExt = message.getPayload(); - log.info("秒结开始消费，接收到的参数：{}", saOrderExt.getOrderCode()); - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - try { - Thread.sleep(500); -// bonusSettleService.calculateCumberBonusBySecond(saOrderExt.getOrderCode()); -// if (!flag) { - // 处理日志，同一个订单执行3次，3次后还失败手动ack，记录信息 -// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); -// } - }catch (Exception e){ - e.printStackTrace(); - } - // todo 失败的时候记录日志 - } -} diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberMonthAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberMonthAchieveMapper.xml index e12880d..0272983 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberMonthAchieveMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberMonthAchieveMapper.xml @@ -4,55 +4,70 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + merge into CU_MEMBER_MONTH_ACHIEVE a - using( - select pk_member,#{period} period,RECOMMEND_MONEY,RECOMMEND_ACHIEVE,REPURCHASE_MONEY,REPURCHASE_ACHIEVE,pk_country from( - select pk_member,pk_country,sum(REGISTER_NEW_AMOUNT+UPGRADE_NEW_AMOUNT) RECOMMEND_MONEY,sum(REGISTER_NEW_PV) RECOMMEND_ACHIEVE, - sum(REPURCHASE_NEW_AMOUNT+HI_FUN_NEW_AMOUNT+MALL_NEW_AMOUNT) REPURCHASE_MONEY,sum(REPURCHASE_PV) REPURCHASE_ACHIEVE from ${tableName} - where REGISTER_NEW_AMOUNT+UPGRADE_NEW_AMOUNT>0 or REPURCHASE_NEW_AMOUNT>0 - group by pk_member,pk_country) + using ( + select pk_member, #{period} period, RECOMMEND_MONEY, RECOMMEND_ACHIEVE, REPURCHASE_MONEY, REPURCHASE_ACHIEVE, pk_country + from ( + select pk_member, + pk_country, + sum(REGISTER_NEW_AMOUNT + UPGRADE_NEW_AMOUNT) RECOMMEND_MONEY, + sum(REGISTER_NEW_PV) RECOMMEND_ACHIEVE, + sum(REPURCHASE_NEW_AMOUNT + HI_FUN_NEW_AMOUNT + MALL_NEW_AMOUNT) REPURCHASE_MONEY, + sum(REPURCHASE_PV) REPURCHASE_ACHIEVE + from ${tableName} + where REGISTER_NEW_AMOUNT + UPGRADE_NEW_AMOUNT > 0 + or REPURCHASE_NEW_AMOUNT > 0 + group by pk_member, pk_country) ) b - on (a.pk_member=b.pk_member and a.period=b.period) + on (a.pk_member = b.pk_member and a.period = b.period) when matched then - update set a.RECOMMEND_MONEY = b.RECOMMEND_MONEY, a.RECOMMEND_ACHIEVE=b.RECOMMEND_ACHIEVE, - a.REPURCHASE_MONEY=b.REPURCHASE_MONEY,a.REPURCHASE_ACHIEVE=b.REPURCHASE_ACHIEVE + update set a.RECOMMEND_MONEY = b.RECOMMEND_MONEY, a.RECOMMEND_ACHIEVE = b.RECOMMEND_ACHIEVE, + a.REPURCHASE_MONEY = b.REPURCHASE_MONEY,a.REPURCHASE_ACHIEVE = b.REPURCHASE_ACHIEVE WHEN NOT MATCHED THEN - insert(PK_ID, PK_MEMBER, PERIOD, SETTLE_MONTH, RECOMMEND_MONEY,RECOMMEND_ACHIEVE,REPURCHASE_MONEY, - REPURCHASE_ACHIEVE,PK_COUNTRY,PK_CREATOR) + insert (PK_ID, PK_MEMBER, PERIOD, SETTLE_MONTH, RECOMMEND_MONEY, RECOMMEND_ACHIEVE, REPURCHASE_MONEY, + REPURCHASE_ACHIEVE, PK_COUNTRY, PK_CREATOR) values (CU_MEMBER_MONTH_ACHIEVE_SEQ.NEXTVAL, - b.pk_member,b.period,#{month},b.RECOMMEND_MONEY,b.RECOMMEND_ACHIEVE,b.REPURCHASE_MONEY, - b.REPURCHASE_ACHIEVE,b.PK_COUNTRY,1) + b.pk_member, b.period, #{month}, b.RECOMMEND_MONEY, b.RECOMMEND_ACHIEVE, b.REPURCHASE_MONEY, + b.REPURCHASE_ACHIEVE, b.PK_COUNTRY, 1) + diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuHonorWallMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuHonorWallMapper.xml index 3426a4f..c26d852 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuHonorWallMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuHonorWallMapper.xml @@ -2,58 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PK_CREATOR, - CREATION_TIME, - PK_MODIFIED, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_ID, TYPE, VALUE, IMG,NAME - - - - diff --git a/bd-business/bd-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 index 4f21f13..bb03b65 100644 --- a/bd-business/bd-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 @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.json.JSONUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.MemberFieldConstants; import com.hzs.common.core.constant.msg.FinanceMsgConstants; import com.hzs.common.core.enums.*; @@ -41,15 +40,11 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; -import java.util.Arrays; +import java.util.Collections; import java.util.List; - /** * 会员提现表 前端控制器 - * - * @author hzs - * @since 2022-09-06 */ @RestController @RequestMapping("/api/transfer") @@ -57,29 +52,20 @@ public class ApiCuMemberTransferController extends BaseController { @Autowired ICuMemberService cuMemberService; - @Autowired ICuMemberTransferService cuMemberTransferService; - @Autowired ICuMemberBaseService cuMemberBaseService; - @Autowired ICuMemberAccountService cuMemberAccountService; - @Autowired ICuMemberBaseService memberBaseService; - @Autowired ICuMemberServiceLogService memberServiceLogService; @DubboReference IAccountServiceApi accountServiceApi; - @DubboReference - IGradeServiceApi gradeServiceApi; - - /** * 根据用户编号查询中文脱敏 * @@ -129,15 +115,13 @@ public class ApiCuMemberTransferController extends BaseController { * @param pkMember 会员ID * @return List */ - private List getServiceLogValue(Integer pkCountry, Long pkMember) { - List editTypeList = Arrays.asList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); + List editTypeList = Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); CuMemberServiceLogExt log = new CuMemberServiceLogExt(); log.setPkMember(pkMember); log.setPkCountry(pkCountry); log.setEditTypeList(editTypeList); - List CuMemberServiceLogs = memberServiceLogService.selectServiceValue(log); - return CuMemberServiceLogs; + return memberServiceLogService.selectServiceValue(log); } @@ -216,16 +200,10 @@ public class ApiCuMemberTransferController extends BaseController { if (toMember.getAccountStatus().equals(EAccountStatus.SHUT_DOWN.getValue())) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.TRANSFER_IN_USER_NOT_ALLOWED)); } - //非洲、欧洲奖金账户可以自己转自己 + //非洲、欧洲奖金账户可以自己转自己 BdAccount bdAccount = accountServiceApi.getAccount(pkAccount).getData(); - if (!ESystem.ASIA.getValue().equals(BdConfig.getSystem())) { - if (EAccount.BONUS.getValue() != bdAccount.getFieldValue() && pkMember.equals(toPkMember)) { - return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.NOT_TRANSFER_MONEY_TO_YOURSELF)); - } - } else { - if (pkMember.equals(toPkMember)) { - return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.NOT_TRANSFER_MONEY_TO_YOURSELF)); - } + if (EAccount.BONUS.getValue() != bdAccount.getFieldValue() && pkMember.equals(toPkMember)) { + return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.NOT_TRANSFER_MONEY_TO_YOURSELF)); } if (!member.getPkSettleCountry().equals(toMember.getPkSettleCountry())) { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/CuMemberTradeRecoilServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/CuMemberTradeRecoilServiceProvider.java index ca85d3a..bae2f78 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/CuMemberTradeRecoilServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/CuMemberTradeRecoilServiceProvider.java @@ -17,11 +17,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 会员活动发放复消币明细dubbo服务 - * @Author: jiang chao - * @Time: 2024/7/19 15:01 - * @Classname: CuMemberTradeRecoilServiceProvider - * @PackageName: com.hzs.member.account.provider + * 会员活动发放复消币明细dubbo服务 */ @Slf4j @DubboService diff --git a/bd-business/bd-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 index d2477f4..55f9d62 100644 --- a/bd-business/bd-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 @@ -47,11 +47,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 会员业务处理 - * @Author: yuhui - * @Time: 2023/1/30 14:33 - * @Classname: CuHandleBusinessServiceProvider - * @PackageName: com.hzs.member.account.provider + * 会员业务处理 */ @Slf4j @DubboService @@ -75,33 +71,23 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic private ICuMemberAchieveLogService iCuMemberAchieveLogService; @DubboReference - private IGradeServiceApi gradeServiceApi; + IGradeServiceApi gradeServiceApi; @DubboReference - private IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi awardsServiceApi; @DubboReference - private ICountryServiceApi countryServiceApi; + ICountryServiceApi countryServiceApi; @DubboReference - private ISaOrderServiceApi orderServiceApi; + ISaOrderServiceApi orderServiceApi; @Autowired ICuMemberRechargeService cuMemberRechargeService; - @Autowired ICuMemberWithdrawService cuMemberWithdrawService; - @Autowired ICuMemberAchieveLogService cuMemberAchieveLogService; @Autowired ICuStoreService iCuStoreService; - - - /** - * 解析业务诉求信息 - * - * @param analysisBusinessAppealParam 业务信息 - * @return R - */ @Override public R analysisBusinessAppeal(AnalysisBusinessAppealParam analysisBusinessAppealParam) { // 国家 @@ -154,7 +140,7 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic memberServiceLog.getEditType() == EApprovalBusiness.CHANGE_PHONE.getValue() || memberServiceLog.getEditType() == EApprovalBusiness.CU_MEMBER_PARENT.getValue() || memberServiceLog.getEditType() == EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue() || - memberServiceLog.getEditType() == EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()|| + memberServiceLog.getEditType() == EApprovalBusiness.CHANGE_MEMBER_CODE.getValue() || memberServiceLog.getEditType() == EApprovalBusiness.RESET_EMAIL.getValue() ) { // 修改姓名 手机 直推 安置 登录密码 支付密码 修改会员编号 @@ -343,14 +329,6 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic } } - - /** - * @description: 特殊业务处理 - * @author: zhang jing - * @date: 2023/5/16 20:06 - * @param: [approvalBusinessResultDTO] - * @return: com.hzs.common.core.domain.R - **/ @Override @Transactional(rollbackFor = Exception.class) public String auditProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) { @@ -397,7 +375,7 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic //修改政策币 cuMemberService.upPolicyCurrencyProcess(approvalBusinessResultDTO); return null; - }else if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.NOT_ACTIVE_POINT.getValue()) { + } else if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.NOT_ACTIVE_POINT.getValue()) { //未激活点位 cuMemberService.notActiveByBusinessNo(approvalBusinessResultDTO); return null; @@ -427,7 +405,7 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic //真实奖衔控制审批 cuMemberService.awardsControlPetition(approvalBusinessResultDTO); return null; - }else if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.CU_STORE_SAVE.getValue() || + } else if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.CU_STORE_SAVE.getValue() || approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.CU_STORE_MODIFY.getValue() || approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.CU_STORE_DELETE.getValue() ) { diff --git a/bd-business/bd-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 index e7bbdc4..39cf1c0 100644 --- a/bd-business/bd-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 @@ -1,7 +1,6 @@ package com.hzs.member.account.provider; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApproveStatus; import com.hzs.member.account.ICuMemberTradeServiceApi; import com.hzs.member.account.dto.BusinessCommissionDTO; import com.hzs.member.account.service.ICuMemberTradeService; @@ -10,11 +9,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @description: 会员交易明细 Doubbo服务 - * @author: zhang jing - * @date: 2023/7/28 11:53 - * @param: - * @return: + * 会员交易明细 Doubbo服务 **/ @Slf4j @DubboService @@ -23,29 +18,14 @@ public class ICuMemberTradeServiceProvider implements ICuMemberTradeServiceApi { @Autowired private ICuMemberTradeService iCuMemberTradeService; - /** - * @description: 业务办理扣费提交 - * @author: zhang jing - * @date: 2023/7/28 14:38 - * @param: [businessCommissionDTO, eApproveStatus] - * @return: com.hzs.common.core.domain.R - **/ @Override public R businessCommissionSubmit(BusinessCommissionDTO businessCommissionDTO) { return R.ok(iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO)); } - /** - * @description: 业务办理扣费驳回 - * @author: zhang jing - * @date: 2023/7/28 14:38 - * @param: [businessCommissionDTO, eApproveStatus] - * @return: com.hzs.common.core.domain.R - **/ @Override public R businessCommissionReject(BusinessCommissionDTO businessCommissionDTO) { return R.ok(iCuMemberTradeService.businessCommissionReject(businessCommissionDTO)); } - } diff --git a/bd-business/bd-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 index 7c3afac..03da00a 100644 --- a/bd-business/bd-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 @@ -19,32 +19,22 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 会员钱包审核Doubbo服务 - * @Author: ljc - * @Time: 2022/9/24 13:53 - * @Classname: IMemberAccountAuditServiceProvider - * @Package_name: com.hzs.member.account.provider + * 会员钱包审核Doubbo服务 */ @Slf4j @DubboService public class IMemberAccountAuditServiceProvider implements IMemberAccountAuditServiceApi { - @Autowired ICuMemberRechargeService cuMemberRechargeService; - @Autowired ICuMemberWithdrawService cuMemberWithdrawService; - @Autowired ICuMemberTradeService cuMemberTradeService; - @Autowired ICuMemberBaseService cuMemberBaseService; - @Autowired ICuMemberAccountLogService cuMemberAccountLogService; - @Autowired ICuMemberAccountService cuMemberAccountService; diff --git a/bd-business/bd-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 index 3f3f3e8..880663f 100644 --- a/bd-business/bd-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 @@ -13,13 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -/** - * @Description: - * @Author: ljc - * @Time: 2023/3/8 18:28 - * @Classname: IMemberTradeServiceProvider - * @Package_name: com.hzs.member.account.provider - */ @Slf4j @DubboService public class IMemberTradeServiceProvider implements IMemberTradeServiceApi { @@ -30,23 +23,11 @@ public class IMemberTradeServiceProvider implements IMemberTradeServiceApi { @Autowired ICuMemberRechargeService memberRechargeService; - /** - * 查询余额不足的用户信息 - * - * @param businessCommissionDTO 业务参数 - * @return List - */ @Override public List selectBalanceNotEnoughMember(BusinessCommissionDTO businessCommissionDTO) { return memberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); } - /** - * 业务办理扣费提交 - * - * @param businessCommissionDTO 业务办理入参 - * @return Integer - */ @Override public R businessCommissionSubmit(BusinessCommissionDTO businessCommissionDTO) { return R.ok(memberTradeService.businessCommissionSubmit(businessCommissionDTO)); diff --git a/bd-business/bd-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 index dc59403..40b5d98 100644 --- a/bd-business/bd-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 @@ -16,13 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2022/9/5 14:32 - * @Classname: MemberAccountServiceProvider - * @PackageName: com.hzs.member.account.provider - */ @Slf4j @DubboService public class MemberAccountServiceProvider implements IMemberAccountServiceApi { @@ -32,14 +25,6 @@ public class MemberAccountServiceProvider implements IMemberAccountServiceApi { @Autowired private ICuMemberBusinessService iCuMemberBusinessService; - /** - * 查询会员账户状态，账户信息 - * - * @param cuMemberAccount 会员账户条件信息 - * @return: List - * @Author: sui q - * @Date: 2022/9/5 11:57 - */ @Override public R> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount) { return R.ok(cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount)); diff --git a/bd-business/bd-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 index 76a1428..6836149 100644 --- a/bd-business/bd-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 @@ -9,11 +9,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @Description: 银行卡 Doubbo服务 - * @Author: ljc - * @Time: 2022/11/11 16:31 - * @Classname: MemberBankServiceProvider - * @Package_name: com.hzs.member.account.provider + * 银行卡 Doubbo服务 */ @Slf4j @DubboService diff --git a/bd-business/bd-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 index 8848789..4a99007 100644 --- a/bd-business/bd-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 @@ -8,11 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @Description: 会员结算期间 - * @Author: zhangjing - * @Time: 2022/10/26 15:14 - * @Classname: MemberAchieveServiceProvider - * @PackageName: com.hzs.member.achieve.provider + * 会员结算期间 */ @DubboService public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePeriodServiceApi { @@ -20,13 +16,6 @@ public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePerio @Autowired private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; - /** - * @description: 根据日期获得日期对应的期间 - * @author: zhang jing - * @date: 2023/8/26 10:25 - * @param: [date] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getCuMemberSettlePeriodByDate(String date) { return R.ok(iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date)); diff --git a/bd-business/bd-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 index 09daf1b..f56d5d7 100644 --- a/bd-business/bd-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 @@ -7,13 +7,6 @@ import com.hzs.member.base.service.ICuMemberBusinessService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -/** - * @Description: - * @Author: sui q - * @Time: 2022/10/26 15:14 - * @Classname: MemberAchieveServiceProvider - * @PackageName: com.hzs.member.achieve.provider - */ @DubboService public class MemberAchieveServiceProvider implements IMemberAchieveServiceApi { diff --git a/bd-business/bd-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 index 53b6f71..6e29d3e 100644 --- a/bd-business/bd-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 @@ -3,19 +3,13 @@ package com.hzs.member.achieve.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.achieve.ext.CuMemberSettlePeriodExt; -import com.hzs.member.achieve.param.MemberParentCountParam; import com.hzs.member.achieve.param.MemberPeriodParam; import java.util.Date; import java.util.List; /** - *

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

- * - * @author hzs - * @since 2022-10-26 */ public interface ICuMemberSettlePeriodService extends IService { @@ -23,45 +17,35 @@ public interface ICuMemberSettlePeriodService extends IService - * @Author: sui q - * @Date: 2023/1/30 17:27 */ List queryCuMemberSettlePeriod(); /** * 根据国家查询奖金期数返回到前台 + * * @param periodParam 查询参数 - * @return: List - * @Author: sui q - * @Date: 2023/1/30 17:27 - */ + */ List queryCuMemberSettlePeriod(MemberPeriodParam periodParam); /** * 根据时间更新会员结算期间状态 + * * @param cuMemberSettlePeriodByDate 修改的期间 - * @Author: sui q - * @Date: 2023/3/20 18:37 - */ + */ void updateCuMemberSettlePeriodByDate(CuMemberSettlePeriodExt cuMemberSettlePeriodByDate); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/address/provider/ICuMemberGiftServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/address/provider/ICuMemberGiftServiceProvider.java deleted file mode 100644 index 223eb57..0000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/address/provider/ICuMemberGiftServiceProvider.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.hzs.member.address.provider; - -import com.alibaba.fastjson2.JSONObject; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.enums.EApproveStatus; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.member.address.CuMemberGift; -import com.hzs.common.domain.member.address.CuMemberGiftRecord; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.member.account.dto.MemberAccountAudit; -import com.hzs.member.address.ICuMemberGiftServiceApi; -import com.hzs.member.address.service.ICuMemberGiftRecordService; -import com.hzs.member.address.service.ICuMemberGiftService; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; - -/** - * @Description: 会员礼包修改收货地址审批回调 - * @Author: ljc - * @Time: 2022/9/24 13:53 - * @Classname: IMemberAccountAuditServiceProvider - * @Package_name: com.hzs.member.account.provider - */ -@Slf4j -@DubboService -public class ICuMemberGiftServiceProvider implements ICuMemberGiftServiceApi { - - @Autowired - ICuMemberGiftRecordService cuMemberGiftRecordService; - @Autowired - ICuMemberGiftService cuMemberGiftService; - - @Override - public R auditProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - //审核状态(1=待提交,2=已提交,3=审核中,4=已驳回,5=已完成,6=已归档) - EApproveStatus eApproveStatus = approvalBusinessResultDTO.getEApproveStatus(); - EApprovalBusiness eApprovalBusiness = approvalBusinessResultDTO.getEApprovalBusiness(); - String businessCode = approvalBusinessResultDTO.getBusinessCode(); - - if (StringUtils.isEmpty(businessCode) || null == eApproveStatus || null == eApprovalBusiness) { - return R.fail("提交审核缺少参数！"); - } - int approveState = eApproveStatus.getValue(); - try { - //会员礼包收货地址修改审批 - if (approveState == (EApproveStatus.FINISH.getValue())) { - CuMemberGiftRecord cuMemberGiftRecord = cuMemberGiftRecordService.getById(Integer.parseInt(businessCode)); - String newValue=cuMemberGiftRecord.getNewValue(); - if(StringUtils.isNotEmpty(newValue)){ - JSONObject root = new JSONObject().parseObject(newValue); - Long pkId =root.getLong("pkId"); - String giftAddress =root.getString("giftAddress"); - String giftName =root.getString("giftName"); - String giftPhone =root.getString("giftPhone"); - Long giftProvince =root.getLong("giftProvince"); - Long giftCity =root.getLong("giftCity"); - Long giftCounty =root.getLong("giftCounty"); - CuMemberGift cuMemberGift= new CuMemberGift(); - cuMemberGift.setPkId(pkId); - cuMemberGift.setGiftAddress(giftAddress); - cuMemberGift.setGiftName(giftName); - cuMemberGift.setGiftPhone(giftPhone); - cuMemberGift.setGiftProvince(giftProvince); - cuMemberGift.setGiftCity(giftCity); - cuMemberGift.setGiftCounty(giftCounty); - cuMemberGift.setPkCountry(SecurityUtils.getPkCountry()); - cuMemberGift.setPkModified(SecurityUtils.getUserId()); - cuMemberGift.setModifiedTime(new Date()); - cuMemberGiftService.updateById(cuMemberGift); - }else{ - return R.fail("提交审核缺少参数！"); - } - } - return R.ok(); - } catch (Exception e) { - //会员礼包修改收货地址业务发生异常时，提醒审批流程事务回滚 - log.error("审核状态为： {} 的审核出错", approveState, e); - return R.fail("会员礼包修改收货地址业务流程出错！"); - } - } - - - /** - * TDO转业务参数 - * - * @param approvalBusinessResultDTO 业务审批操作DTO - * @param approveState 审核状态 - * @param module 模块 - * @param businessCode 业务代码 - * @return MemberAccountAudit - */ - private MemberAccountAudit dtoToParam(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer approveState, Integer module, String businessCode) { - return MemberAccountAudit.builder() - .approver(approvalBusinessResultDTO.getLoginUser().getUserId()) - .pkModified(approvalBusinessResultDTO.getLoginUser().getUserId()) - .approveState(approveState) - .approveTime(approvalBusinessResultDTO.getOperationTime()) - .businessCode(businessCode).module(module) - .pkRole(approvalBusinessResultDTO.getSysUser().getUserId()) - .roleName(approvalBusinessResultDTO.getSysUser().getUserName()) - .build(); - } - - -} diff --git a/bd-business/bd-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 index 66ee02d..144db7c 100644 --- a/bd-business/bd-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 @@ -54,11 +54,7 @@ import java.math.BigDecimal; import java.util.*; /** - * @Description: 会员控制器 - * @Author: jiang chao - * @Time: 2023/1/10 15:18 - * @Classname: ApiMemberController - * @PackageName: com.hzs.member.base.controller.api + * 会员控制器 */ @Slf4j @RequestMapping("/api/member") @@ -341,7 +337,7 @@ public class ApiMemberController extends BaseController { /** * @param memberParam 订单参数 - * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 + * 确认注册订单，生成待支付订单,只有注册订单有待支付订单 * @return: AjaxResult * @Author: sui q * @Date: 2022/8/27 16:47 @@ -396,9 +392,6 @@ public class ApiMemberController extends BaseController { .loginPassword(newCuMember.getLoginPassword()) .payPassword(newCuMember.getPayPassword()) .urlAddress(BdConfig.getPc()) - .gzh(BdConfig.getGzh()) - .ios(BdConfig.getIos()) - .android(BdConfig.getAndroid()) .build(); return AjaxResult.success(memberShare); } else { @@ -419,10 +412,7 @@ public class ApiMemberController extends BaseController { } /** - * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 + * 确认注册订单，生成待支付订单,只有注册订单有待支付订单 */ @GetMapping("/validate-share-member/{memberCode}") public AjaxResult validateShareMemberCode(@PathVariable("memberCode") String memberCode) { @@ -439,10 +429,7 @@ public class ApiMemberController extends BaseController { } /* - * @description: 验证是否连续数字 - * @author: sui q - * @date: 2023/7/4 16:48 - * @param: null null + * 验证是否连续数字 **/ private Boolean compareConDigits(String memberCode) { String[] codeList = memberCode.split(""); @@ -510,11 +497,9 @@ public class ApiMemberController extends BaseController { } /** + * 验证字段是否必输 + * * @param fieldList 需要验证的字段 - * @Description: 验证字段是否必输 - * @return: boolean - * @Author: sui q - * @Date: 2022/8/29 11:13 */ private boolean validateFieldNotNull(MemberParam memberParam, List fieldList) { return fieldList.stream().anyMatch(field -> { @@ -777,8 +762,6 @@ public class ApiMemberController extends BaseController { BigDecimal achieve = memberOrderAchieve.getData(); // 等级名称 String gradeName = ""; - // 等级值 - BigDecimal startValue = BigDecimal.ZERO; BdGradeExt bdGrade = new BdGradeExt(); R> gradeDto = gradeServiceApi.queryNextGrade(pkCountry); List gradeList = gradeDto.getData(); @@ -790,7 +773,7 @@ public class ApiMemberController extends BaseController { bdGrade.setIsMaxGrade(EYesNo.YES.getIntValue()); } else { gradeName = gradeList.get(i + 1).getGradeName(); - startValue = gradeList.get(i + 1).getStartValue(); + BigDecimal startValue = gradeList.get(i + 1).getStartValue(); BigDecimal value = startValue.subtract(achieve); bdGrade.setGradeName(gradeName); bdGrade.setGradeValue(value.intValue()); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manager/CuHonorWallController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manager/CuHonorWallController.java index aa575c8..b244335 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manager/CuHonorWallController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manager/CuHonorWallController.java @@ -25,24 +25,17 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.member.base.controller.manager - * @Author: yh - * @CreateTime: 2023-04-26 19:41 - * @Description: TODO - * @Version: 1.0 - */ @RequestMapping("/manage/member") @RestController public class CuHonorWallController extends BaseController { @Autowired private ICuHonorWallService honorWallService; + @DubboReference - private IGradeServiceApi gradeServiceApi; + IGradeServiceApi gradeServiceApi; @DubboReference - private IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi awardsServiceApi; /** * 查询荣誉墙列表 diff --git a/bd-business/bd-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 index 9c6a83f..9ff3131 100644 --- a/bd-business/bd-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 @@ -1,6 +1,5 @@ package com.hzs.member.base.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.ext.CuHonorWallExt; import com.hzs.common.domain.member.honor.CuHonorWall; @@ -9,18 +8,16 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 荣誉墙 Mapper 接口 - *

- * - * @author hzs - * @since 2023-04-26 */ public interface CuHonorWallMapper extends BaseMapper { + /** * 查询荣誉墙全量信息 + * * @param pkCountry * @return */ List queryAll(@Param("pkCountry") Integer pkCountry, @Param("pkMember") Long pkMember); + } diff --git a/bd-business/bd-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 index 13b3ff1..e3a5370 100644 --- a/bd-business/bd-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 @@ -129,28 +129,6 @@ public interface CuMemberMapper extends BaseMapper { **/ List realCuMemberByCondition(CuMemberVO memberParam); - /** - * 根据会员姓名跟手机号获得安置人 - * 验证在哪个区 - * - * @param pkPlaceParent 推荐人主键 - * @param memberName 新会员姓名 - * @param phone 手机 - */ - List queryLastPlaceMemberByPkParent(@Param("pkPlaceParent") Long pkPlaceParent, - @Param("memberName") String memberName, - @Param("phone") String phone); - - /** - * 更新会员奖衔根据临时表 - */ - Integer updateCuMemberByTemp(); - - /* - * 回退会员奖衔 - **/ - void updateBackCuMemberAward(Integer period); - /** * 根据国家、会员编号查询会员信息 * diff --git a/bd-business/bd-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 index 60dae5e..eab32ce 100644 --- a/bd-business/bd-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 @@ -5,55 +5,39 @@ import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; import com.hzs.member.base.param.MemberTeamInfoParam; import com.hzs.member.base.vo.MemberTeamVo; -import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员交易明细 Mapper 接口 - *

- * - * @author hzs - * @since 2022-09-01 */ public interface CuMemberTeamMapper extends BaseMapper { List queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt); /* - * @description: 查询会员伞下团队 - * @author: sui q - * @date: 2023/4/24 20:04 - * @param: null null + * 查询会员伞下团队 **/ List queryCuMemberUmbrella(Long pkMember); /* - * @description: 更新体系下所有的团队为空 - * @author: sui q - * @date: 2023/4/24 19:26 - * @param: null null + * 更新体系下所有的团队为空 **/ void updateSelfCuMemberTeam(Long pkMember); /* - * @description: 更新伞下会员 - * @author: sui q - * @date: 2023/4/24 19:34 - * @param: null null + * 更新伞下会员 **/ void updateCuMemberUnderUmbrella(CuMemberTeam cuMemberTeam); /* - * @description: 更新伞下会员 - * @author: sui q - * @date: 2023/4/24 19:34 - * @param: null null + * 更新伞下会员 **/ void updateCuMemberUnderUmbrellaNull(Long pkMember); + /** * 查询会员团队信息 + * * @param memberTeamInfoParam * @return */ diff --git a/bd-business/bd-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 index ce92ff9..831fa5c 100644 --- a/bd-business/bd-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 @@ -27,8 +27,6 @@ import java.util.Map; /** * 真实奖衔控制涉及dubbo服务 - * - * @author zhangjing */ @DubboService public class CuAwardsControlServiceProvider implements ICuAwardsControlServiceApi { @@ -44,13 +42,6 @@ public class CuAwardsControlServiceProvider implements ICuAwardsControlServiceAp @Autowired private ITransactionCommonService iTransactionCommonService; - /** - * @description: 查询真实奖衔控制审核列表 - * @author: zhang jing - * @date: 2023/4/10 15:17 - * @param: [analysisBusinessAppealParam] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> awardsControlList(AnalysisBusinessAppealParam analysisBusinessAppealParam) { CuMemberServiceLog memberServiceLog = new CuMemberServiceLog(); diff --git a/bd-business/bd-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 index 26f4a62..414f309 100644 --- a/bd-business/bd-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 @@ -14,9 +14,6 @@ import com.hzs.member.base.dto.CuMemberAchieveLogDTO; import com.hzs.member.base.service.ICuMemberAchieveLogService; import com.hzs.member.base.vo.CuMemberAchieveLogVO; import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; -import com.hzs.system.base.ICountryServiceApi; -import com.hzs.system.config.IAwardsServiceApi; -import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.config.IServiceChargeServiceApi; import com.hzs.system.config.dto.ServiceChargeDTO; import lombok.extern.slf4j.Slf4j; @@ -28,40 +25,22 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * @description: - * @author: zhang jing - * @date: 2023/3/28 16:57 - * @param: - * @return: - **/ @Slf4j @DubboService public class ICuMemberAchieveLogServiceProvider implements ICuMemberAchieveLogServiceApi { @DubboReference - private IGradeServiceApi gradeServiceApi; - @DubboReference - private IAwardsServiceApi awardsServiceApi; - @DubboReference - private ICountryServiceApi countryServiceApi; + IServiceChargeServiceApi serviceChargeServiceApi; + @Autowired private ICuMemberAchieveLogService achieveLogService; @Autowired private ICuMemberAchieveLogService cuMemberAchieveLogService; - @DubboReference - private IServiceChargeServiceApi serviceChargeServiceApi; @Autowired private ICuMemberBaseService cuMemberBaseService; @Autowired private ITransactionCommonService iTransactionCommonService; - /** - * 解析注水业绩诉求信息 - * - * @param analysisBusinessAppealParam 业务信息 - * @return R - */ @Override public R> memberAchieveLog(AnalysisBusinessAppealParam analysisBusinessAppealParam) { CuMemberAchieveLogVO cuMemberAchieveLogVO = new CuMemberAchieveLogVO(); @@ -94,5 +73,4 @@ public class ICuMemberAchieveLogServiceProvider implements ICuMemberAchieveLogSe return R.ok(list); } - } diff --git a/bd-business/bd-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 index 2715816..5ae6394 100644 --- a/bd-business/bd-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 @@ -117,16 +117,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.queryPlaceSponsorLastLeft(memberId, placeDept)); } - @Override - public R> queryBloodKinshipOnUmbrella(Long memberId) { - return R.ok(iCuMemberService.queryBloodKinshipOnUmbrella(memberId)); - } - - @Override - public R> queryBloodKinshipUnderUmbrella(Long memberId) { - return R.ok(iCuMemberService.queryBloodKinshipUnderUmbrella(memberId)); - } - @Override public R getMember(String memberCode) { return R.ok(iCuMemberService.getMemberByCode(memberCode)); @@ -260,12 +250,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberUpgradeService.queryCuMemberUpgradeByCondition(pkCountry, pkMember)); } - - @Override - public R updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel) { - return R.ok(iCuMemberBusinessService.updateMemberLevel(cuMember, saOrder, pkOldLevel)); - } - @Override public R updateMemberLevel(CuMember cuMember, Integer pkOldLevel, EUpgradeType eUpgradeType, String remark) { return R.ok(iCuMemberBusinessService.updateMemberLevel(cuMember, pkOldLevel, eUpgradeType, remark)); diff --git a/bd-business/bd-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 index 417a783..2f17b94 100644 --- a/bd-business/bd-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 @@ -16,11 +16,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @description: 隶属团队配置 - * @author: zhang jing - * @date: 2022/11/10 17:02 - * @param: - * @return: + * 隶属团队配置 **/ @DubboService public class MemberTeamServiceProvider implements IMemberTeamServiceApi { @@ -28,23 +24,11 @@ public class MemberTeamServiceProvider implements IMemberTeamServiceApi { @Autowired private ICuMemberTeamService memberTeamService; - /** - * @description: 根据国家查询隶属团队配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:17 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryCuMemberTeam(Integer pkCountry) { return R.ok(memberTeamService.queryCuMemberTeam(pkCountry)); } - /** - * 根据体系id 查询是否有团队占用该体系 - * @param pkVertex - * @return - */ @Override public R checkVertex(Integer pkVertex) { return R.ok(memberTeamService.checkVertex(pkVertex)); diff --git a/bd-business/bd-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 index de68f57..edcd7d2 100644 --- a/bd-business/bd-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 @@ -1,24 +1,18 @@ package com.hzs.member.base.provider; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.common.core.enums.EPopupType; import com.hzs.common.core.enums.EnableStatus; import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.service.ITransactionCommonService; -import com.hzs.member.account.service.ICuMemberBaseService; import com.hzs.member.base.IUpPolicyCurrencyServiceApi; import com.hzs.member.base.dto.UpPolicyCurrencyDTO; -import com.hzs.member.base.service.ICuMemberAchieveLogService; import com.hzs.member.detail.service.ICuMemberServiceLogService; import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; -import com.hzs.system.config.IServiceChargeServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,8 +22,6 @@ import java.util.Map; /** * 修改政策币涉及dubbo服务 - * - * @author zhangjing */ @DubboService public class UpPolicyCurrencyServiceProvider implements IUpPolicyCurrencyServiceApi { @@ -39,14 +31,6 @@ public class UpPolicyCurrencyServiceProvider implements IUpPolicyCurrencyService @Autowired private ITransactionCommonService iTransactionCommonService; - - /** - * @description: 查询修改政策币审核列表 - * @author: zhang jing - * @date: 2023/5/10 17:42 - * @param: [analysisBusinessAppealParam] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> policyCurrencyList(AnalysisBusinessAppealParam analysisBusinessAppealParam) { List list = new ArrayList<>(); @@ -59,8 +43,8 @@ public class UpPolicyCurrencyServiceProvider implements IUpPolicyCurrencyService if (CollectionUtil.isNotEmpty(msList)) { msList.forEach(item -> { UpPolicyCurrencyDTO upc = JSONObject.parseObject(item.getNewValue(), UpPolicyCurrencyDTO.class); - upc.setEnableStatusVal(transactionMap.get(EnumsPrefixConstants.ENABLE_STATUS+upc.getEnableStatus())); - upc.setTransferVal(transactionMap.get(EnumsPrefixConstants.POPUP_TYPE+upc.getTransfer())); + upc.setEnableStatusVal(transactionMap.get(EnumsPrefixConstants.ENABLE_STATUS + upc.getEnableStatus())); + upc.setTransferVal(transactionMap.get(EnumsPrefixConstants.POPUP_TYPE + upc.getTransfer())); list.add(upc); }); } diff --git a/bd-business/bd-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 index c132499..cd0d152 100644 --- a/bd-business/bd-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 @@ -7,28 +7,16 @@ import com.hzs.common.domain.member.honor.CuHonorWall; import java.util.List; /** - *

* 荣誉墙 服务类 - *

- * - * @author hzs - * @since 2023-04-26 */ public interface ICuHonorWallService extends IService { - /* - * @description: 查询所有的徽章 - * @author: sui q - * @date: 2023/6/7 14:30 - * @param: null null - **/ - List queryCuHonorWall(); - /** * 查询荣誉墙全量信息 + * * @param pkCountry * @param pkMember * @return */ - List queryAll(Integer pkCountry,Long pkMember); + List queryAll(Integer pkCountry, Long pkMember); } diff --git a/bd-business/bd-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 index 86136ec..580bfd7 100644 --- a/bd-business/bd-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 @@ -140,15 +140,6 @@ public interface ICuMemberBusinessService { **/ Boolean updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney); - /** - * 更新用户等级 - * - * @param cuMember 用户信息 - * @param saOrder 订单信息 - * @param pkOldLevel 原等级 - */ - Boolean updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel); - /** * 更新用户等级 * diff --git a/bd-business/bd-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 index 0b3f1b4..30f5b40 100644 --- a/bd-business/bd-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 @@ -4,7 +4,6 @@ import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.account.CuMemberAccount; import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.detail.CuMemberAwards; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.member.ext.MemberSettleTreeExt; @@ -204,28 +203,6 @@ public interface ICuMemberService extends IService { **/ List realCuMemberByCondition(CuMemberVO memberParam); - /** - * 根据会员姓名跟手机号获得安置人 - * 验证在哪个区 - * - * @param pkParent 推荐人主键 - * @param memberName 新会员姓名 - * @param phone 手机 - */ - List queryLastPlaceMemberByPkParent(Long pkParent, String memberName, String phone); - - /** - * 更新会员奖衔根据临时表 - * - * @param enoughAwardsMember 修改奖衔的会员 - */ - void updateCuMemberByTemp(List enoughAwardsMember); - - /** - * 更新会员奖衔根据临时表 - */ - void updateBackCuMemberAward(List cuMemberAwards, Integer period); - /** * 生成会员编号 * diff --git a/bd-business/bd-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 index d18fe12..c88747e 100644 --- a/bd-business/bd-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 @@ -9,57 +9,41 @@ import com.hzs.member.base.vo.MemberTeamVo; import java.util.List; /** - *

* 隶属团队 服务类 - *

- * - * @author hzs - * @since 2022-09-01 */ public interface ICuMemberTeamService extends IService { /** - * @description: 隶属团队列表 - * @author: zhang jing - * @date: 2022/11/9 14:13 - * @param: [cuMemberTeamExt] - * @return: java.util.List + * 隶属团队列表 **/ List queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt); /* - * @description: 根据会员主键获得所属团队 - * @author: sui q - * @date: 2023/4/25 9:17 - * @param: pkMember 会员主键 + * 根据会员主键获得所属团队 **/ CuMemberTeamExt getCuMemberTeamById(Long pkMember); /** - * @description: 根据国家查询隶属团队 - * @author: zhang jing - * @date: 2022/11/10 19:26 - * @param: [pkCountry] - * @return: java.util.List + * 根据国家查询隶属团队 **/ List queryCuMemberTeam(Integer pkCountry); + /** * 根据体系id 查询是否有团队占用该体系 + * * @param pkVertex * @return */ Boolean checkVertex(Integer pkVertex); /* - * @description: 更新体系下的团队 - * @author: sui q - * @date: 2023/4/24 19:18 - * @param: null null + * 更新体系下的团队 **/ Boolean updateCuMemberTeamByVertex(Long pkTeamCode); /** * 查询会员团队信息 + * * @param memberTeamInfoParam * @return */ diff --git a/bd-business/bd-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 index d12fe8c..7cd6586 100644 --- a/bd-business/bd-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 @@ -1,7 +1,5 @@ package com.hzs.member.base.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.ext.CuHonorWallExt; import com.hzs.common.domain.member.honor.CuHonorWall; @@ -12,31 +10,20 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 荣誉墙 服务实现类 - *

- * - * @author hzs - * @since 2023-04-26 */ @Service public class CuHonorWallServiceImpl extends ServiceImpl implements ICuHonorWallService { - @Override - public List queryCuHonorWall() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("pk_id,PK_COUNTRY,TYPE,VALUE,IMG"); - return baseMapper.selectList(queryWrapper); - } - /** * 查询荣誉墙全量信息 + * * @param pkCountry * @param pkMember * @return */ @Override - public List queryAll(Integer pkCountry,Long pkMember) { - return baseMapper.queryAll(pkCountry,pkMember); + public List queryAll(Integer pkCountry, Long pkMember) { + return baseMapper.queryAll(pkCountry, pkMember); } } diff --git a/bd-business/bd-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 index bb31563..238ff63 100644 --- a/bd-business/bd-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 @@ -1109,13 +1109,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { cuMemberChangeLogService.saveBatch(cuMemberChangeLogList); } - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel) { - updateCuMember(cuMember); - return saveLevelUpgrade(cuMember, EUpgradeType.ACTIVITY_UPGRADE.getValue(), saOrder, pkOldLevel); - } - @Transactional(rollbackFor = Exception.class) @Override public Boolean updateMemberLevel(CuMember cuMember, Integer pkOldLevel, EUpgradeType eUpgradeType, String remark) { @@ -1172,9 +1165,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { * @param isFirst 是否收单 * @param isFirstAchieve 受否判断首购业绩 * @param cuMemberAchieve 业绩 - * @return: Integer - * @Author: sui q - * @Date: 2023/3/15 9:35 */ private Integer getPlaceDept(Boolean isFirst, Boolean isFirstAchieve, CuMemberAchieve cuMemberAchieve, Long pkParent) { int placeDept = EPlaceDept.LEFT_DEPT.getValue(); diff --git a/bd-business/bd-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 index 7ac7849..6c50bba 100644 --- a/bd-business/bd-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 @@ -344,26 +344,9 @@ public class CuMemberServiceImpl extends ServiceImpl i if (memberParam.getEndAttestationTime() != null) { memberParam.setEndAttestationTime(DateUtils.afterDate(1, ChronoUnit.DAYS, memberParam.getEndAttestationTime())); } - - return baseMapper.realCuMemberByCondition(memberParam); } - @Override - public List queryLastPlaceMemberByPkParent(Long pkParent, String memberName, String phone) { - return baseMapper.queryLastPlaceMemberByPkParent(pkParent, memberName, phone); - } - - @Override - public void updateCuMemberByTemp(List enoughAwardsMember) { - baseMapper.updateCuMemberByTemp(); - } - - @Override - public void updateBackCuMemberAward(List cuMemberAwards, Integer period) { - baseMapper.updateBackCuMemberAward(period); - } - @Override public CuMember createEmptyOrderMember(CuMemberExt member) { try { diff --git a/bd-business/bd-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 index a489369..59f5111 100644 --- a/bd-business/bd-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 @@ -4,14 +4,11 @@ import cn.hutool.core.collection.CollectionUtil; 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.SystemFieldConstants; import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; import com.hzs.member.base.mapper.CuMemberTeamMapper; import com.hzs.member.base.param.MemberTeamInfoParam; -import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.base.service.ICuMemberTeamService; import com.hzs.member.base.vo.MemberTeamVo; import org.springframework.beans.factory.annotation.Autowired; @@ -22,38 +19,22 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - *

* 隶属团队列表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-01 */ @Service public class CuMemberTeamServiceImpl extends ServiceImpl implements ICuMemberTeamService { + @Autowired private RedisService redisService; - private ICuMemberService cuMemberService; - - @Autowired - public void setCuMemberService(ICuMemberService cuMemberService) { - this.cuMemberService = cuMemberService; - } - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - @Override public CuMemberTeamExt getCuMemberTeamById(Long pkMember) { - CuMemberTeamExt cuMemberTeamExt = redisService.getCacheObject(CacheConstants.CU_MEMBER_TEAM_ID + pkMember); - if(cuMemberTeamExt == null){ - CuMemberTeamExt cuMemberTeamExtParam=new CuMemberTeamExt(); + CuMemberTeamExt cuMemberTeamExt = redisService.getCacheObject(CacheConstants.CU_MEMBER_TEAM_ID + pkMember); + if (cuMemberTeamExt == null) { + CuMemberTeamExt cuMemberTeamExtParam = new CuMemberTeamExt(); cuMemberTeamExtParam.setPkMember(pkMember); - List cmtExtList=baseMapper.queryCuMemberTeam(cuMemberTeamExtParam); - if(null != cmtExtList && cmtExtList.size() > 0){ + List cmtExtList = baseMapper.queryCuMemberTeam(cuMemberTeamExtParam); + if (null != cmtExtList && cmtExtList.size() > 0) { cuMemberTeamExt = cmtExtList.get(0); redisService.setCacheObject(CacheConstants.CU_MEMBER_TEAM_ID + pkMember, cuMemberTeamExt, CacheConstants.MEMBER_REFRESH_TIME, TimeUnit.DAYS); } @@ -61,48 +42,29 @@ public class CuMemberTeamServiceImpl extends ServiceImpl - **/ @Override public List queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt) { return baseMapper.queryCuMemberTeam(cuMemberTeamExt); } - /** - * @description: 根据国家查询隶属团队配置列表 - * @author: zhang jing - * @date: 2022/11/10 19:31 - * @param: [pkCountry] - * @return: java.util.List - **/ @Override public List queryCuMemberTeam(Integer pkCountry) { - List cmtExtList = redisService.getCacheList(CacheConstants.CU_MEMBER_TEAM + pkCountry); - if(cmtExtList == null || cmtExtList.size() == 0){ - CuMemberTeamExt cuMemberTeamExt=new CuMemberTeamExt(); + if (cmtExtList == null || cmtExtList.size() == 0) { + CuMemberTeamExt cuMemberTeamExt = new CuMemberTeamExt(); cuMemberTeamExt.setPkCountry(pkCountry); - cmtExtList=baseMapper.queryCuMemberTeam(cuMemberTeamExt); - if(null != cmtExtList && cmtExtList.size() != 0){ + cmtExtList = baseMapper.queryCuMemberTeam(cuMemberTeamExt); + if (null != cmtExtList && cmtExtList.size() != 0) { redisService.setCacheList(CacheConstants.CU_MEMBER_TEAM + pkCountry, cmtExtList); } } return cmtExtList; } - /** - * 根据体系id 查询是否有团队占用该体系 - * @param pkVertex - * @return - */ + @Override public Boolean checkVertex(Integer pkVertex) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_BD_VERTEX",pkVertex); + queryWrapper.eq("PK_BD_VERTEX", pkVertex); return this.count(queryWrapper) > 0; } @@ -111,7 +73,7 @@ public class CuMemberTeamServiceImpl extends ServiceImpl queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam) { - return baseMapper.queryMemberTeamInfoList(memberTeamInfoParam); } + } diff --git a/bd-business/bd-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 index 20b0a7a..9708c43 100644 --- a/bd-business/bd-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 @@ -3,12 +3,8 @@ package com.hzs.member.base.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.DesensitizedUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hzs.common.core.config.BdConfig; -import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.enums.ESystem; 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.utils.sign.Base64Util; import com.hzs.common.domain.member.base.CuMember; @@ -51,8 +47,6 @@ public class MemberInfoServiceImpl implements IMemberInfoService { private ITransactionCommonService iTransactionCommonService; @Autowired private ICuStoreService iCuStoreService; - @Autowired - private RedisService redisService; @DubboReference ICurrencyServiceApi iCurrencyServiceApi; @@ -90,13 +84,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService { // 结算国家 String pkSettleCountryVal = memberDataDTO.getPkSettleCountryVal(); // 是否显示购买协议（0=是，1=否） - int buyAgreementFlag = EYesNo.YES.getIntValue(); - // 当缓存中存在该key值，则标记不显示购买协议 - // 2024.04.18 非洲系统不显示购买协议 - if (ESystem.AFRICA.getValue().equals(BdConfig.getSystem()) - || redisService.hasKey(CacheConstants.NOT_BUY_AGREEMENT_FLAG + cuMember.getPkSettleCountry())) { - buyAgreementFlag = EYesNo.NO.getIntValue(); - } + int buyAgreementFlag = EYesNo.NO.getIntValue(); // 国家翻译 Map transactionMap = iTransactionCommonService.enumTransactionByDBFromPkId(Arrays.asList(memberDataDTO.getPkCountryTransaction(), memberDataDTO.getPkSettleCountryTransaction())); diff --git a/bd-business/bd-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 index 2c8648e..7cebc59 100644 --- a/bd-business/bd-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 @@ -7,13 +7,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/15 11:07 - * @Classname: MemberShare - * @PackageName: com.hzs.member.base.vo - */ @Data @Builder @AllArgsConstructor @@ -56,17 +49,5 @@ public class MemberShare implements Serializable { * 登录网址 */ private String urlAddress; - /** - * 公众号 - */ - private String gzh; - /** - * IOS - */ - private String ios; - /** - * 安卓 - */ - private String android; } diff --git a/bd-business/bd-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 index 2a03244..38407d8 100644 --- a/bd-business/bd-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 @@ -5,40 +5,19 @@ import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.detail.CuMemberServiceLogExt; import com.hzs.member.detail.vo.CuMemberServiceLogVO; import com.hzs.member.handlebusiness.vo.BusinessMemberVO; -import com.hzs.member.handlebusiness.vo.CuMemberOldValueVO; import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员更名、密码修改表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-08-22 */ public interface CuMemberServiceLogMapper extends BaseMapper { Integer selectByMaxApproveNumber(@Param("pkMember") Long pkMember, @Param("editType") int editType, @Param("approveStatus") Integer approveStatus); /** - * @description: 查询会员办理业务日志最新数据 - * @author: zhang jing - * @date: 2023/3/24 9:08 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ - CuMemberServiceLogVO selectTopData(@Param("pkMember") Long pkMember, - @Param("editType") int editType, - @Param("approveStatus") int approveStatus); - - /** - * @description: 查询用户是否已经存在未审核业务 - * @author: zhang jing - * @date: 2023/1/29 17:26 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List + * 查询用户是否已经存在未审核业务 **/ List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO); @@ -51,20 +30,7 @@ public interface CuMemberServiceLogMapper extends BaseMapper List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog); /** - * @description: 查询审核通过的最新数据 - * @author: zhang jing - * @date: 2023/1/30 10:02 - * @param: [cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ - CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO); - - /** - * @description: 查询会员原值 - * @author: zhang jing - * @date: 2023/1/30 14:20 - * @param: [cuMemberOldValueVO] - * @return: java.util.List + * 查询会员原值 **/ List selectOldValue(BusinessMemberVO businessMemberVO); @@ -75,7 +41,7 @@ public interface CuMemberServiceLogMapper extends BaseMapper * @param cuMemberServiceLog 业务信息 * @return List */ - List selectServiceValue(CuMemberServiceLogExt cuMemberServiceLog); + List selectServiceValue(CuMemberServiceLogExt cuMemberServiceLog); /** * 查询pk_id最大的业务办理 @@ -85,24 +51,20 @@ public interface CuMemberServiceLogMapper extends BaseMapper */ List queryMaxCuMemberServiceLog(@Param("pkMember") Long pkMember, @Param("editTypeList") List editTypeList); - /** - * 查询最大审核次数 (无用户) - * - * @param editType - * @return - */ - Integer selectNotByMaxApproveNumber(@Param("editType") int editType, @Param("approveStatus") int approveStatus); + /** * 查询列表信息 + * * @param editType * @param memberCode * @param memberName * @return */ - List queryList(@Param("editType") Integer editType,@Param("memberCode") String memberCode,@Param("memberName") String memberName,@Param("pkCountry") Integer pkCountry); + List queryList(@Param("editType") Integer editType, @Param("memberCode") String memberCode, @Param("memberName") String memberName, @Param("pkCountry") Integer pkCountry); /** * 查询展示列表 + * * @return */ List selectByList(CuMemberServiceLogExt memberServiceLogExt); diff --git a/bd-business/bd-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 index 4ac3fa3..9418632 100644 --- a/bd-business/bd-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 @@ -10,11 +10,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @Description: 会员升级记录dubbo服务 - * @Author: jiang chao - * @Time: 2024/1/30 17:25 - * @Classname: CuMemberLevelProvider - * @PackageName: com.hzs.member.detail.provider + * 会员升级记录dubbo服务 */ @DubboService public class CuMemberDetailProvider implements ICuMemberDetailServiceApi { @@ -29,7 +25,6 @@ public class CuMemberDetailProvider implements ICuMemberDetailServiceApi { return R.ok(iCuMemberLevelService.queryLastManualUpgrade(pkMember, pkCountry)); } - @Override public R queryLastManualAwards(Long pkMember, Integer pkCountry) { return R.ok(iCuMemberAwardsService.queryLastManualAwards(pkMember, pkCountry)); diff --git a/bd-business/bd-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 index 7af4179..1aa439b 100644 --- a/bd-business/bd-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 @@ -9,87 +9,35 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/13 19:04 - * @Classname: CuMemberServiceLogProvider - * @PackageName: com.hzs.member.detail.provider - */ @DubboService public class CuMemberServiceLogProvider implements ICuMemberServiceLogServiceApi { - private ICuMemberServiceLogService cuMemberServiceLogService; - @Autowired - public void setCuMemberServiceLogService(ICuMemberServiceLogService cuMemberServiceLogService) { - this.cuMemberServiceLogService = cuMemberServiceLogService; - } + private ICuMemberServiceLogService cuMemberServiceLogService; @Override public List queryMaxCuMemberServiceLog(Long pkMember, List editTypeList) { return cuMemberServiceLogService.queryMaxCuMemberServiceLog(pkMember, editTypeList); } - /** - * 查询最大审核次数 - * - * @param pkMember - * @param editType - * @return - */ + @Override public Integer selectByMaxApproveNumber(Long pkMember, int editType, int approveStatus) { - return cuMemberServiceLogService.selectByMaxApproveNumber( pkMember, editType, approveStatus); + return cuMemberServiceLogService.selectByMaxApproveNumber(pkMember, editType, approveStatus); } - /** - * 查询最大审核次数 (无用户) - * - * @param editType - * @return - */ - @Override - public Integer selectNotByMaxApproveNumber(int editType, int approveStatus) { - return cuMemberServiceLogService.selectNotByMaxApproveNumber(editType,approveStatus); - } - /** - * 新增 - * - * @param memberLog - * @return - */ @Override public R insert(CuMemberServiceLog memberLog) { return R.ok(cuMemberServiceLogService.save(memberLog)); } - /** - * 根据业务单号查询 - * @return - */ + @Override public R selectByBusinessNo(String businessNo) { return cuMemberServiceLogService.selectByBusinessNo(businessNo); } - /** - * 根据业务单号修改信息 - * @param memberLog - * @return - */ + @Override public R updateByBusinessNo(CuMemberServiceLog memberLog) { return cuMemberServiceLogService.updateByBusinessNo(memberLog); } - /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:16 - * @param: [businessNo] - * @return: com.hzs.common.core.domain.R> - **/ - @Override - public R> selectCuMemberServiceLog(String businessNo) { - return cuMemberServiceLogService.selectCuMemberServiceLog(businessNo); - } - } diff --git a/bd-business/bd-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 index 86c2620..d13ca5c 100644 --- a/bd-business/bd-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 @@ -6,17 +6,11 @@ import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.detail.CuMemberServiceLogExt; import com.hzs.member.detail.vo.CuMemberServiceLogVO; import com.hzs.member.handlebusiness.vo.BusinessMemberVO; -import com.hzs.member.handlebusiness.vo.CuMemberOldValueVO; import java.util.List; /** - *

* 会员更名、密码修改表 服务类 - *

- * - * @author hzs - * @since 2022-08-22 */ public interface ICuMemberServiceLogService extends IService { @@ -30,21 +24,7 @@ public interface ICuMemberServiceLogService extends IService Integer selectByMaxApproveNumber(Long pkMember, int editType, Integer approveStatus); /** - * @description: 查询会员办理业务日志最新数据 - * @author: zhang jing - * @date: 2023/3/24 9:07 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ - CuMemberServiceLogVO selectTopData(Long pkMember, int editType, int approveStatus); - - - /** - * @description: 查询用户是否已经存在未审核业务 - * @author: zhang jing - * @date: 2023/1/29 17:25 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List + * 查询用户是否已经存在未审核业务 **/ List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO); @@ -57,29 +37,12 @@ public interface ICuMemberServiceLogService extends IService List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog); /** - * @description: 查询审核通过的最新数据 - * @author: zhang jing - * @date: 2023/1/30 10:02 - * @param: [cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ - CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO); - - /** - * @description: 查询会员原值 - * @author: zhang jing - * @date: 2023/1/30 14:20 - * @param: [cuMemberOldValueVO] - * @return: java.util.List + * 查询会员原值 **/ List selectOldValue(BusinessMemberVO businessMemberVO); /** - * @description: 再次发起签呈 - * @author: zhang jing - * @date: 2023/2/2 11:15 - * @param: [cmslList, cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 再次发起签呈 **/ CuMemberServiceLogVO againBusiness(List cmslList, CuMemberServiceLogVO cuMemberServiceLogVO); @@ -98,20 +61,17 @@ public interface ICuMemberServiceLogService extends IService * @param editTypeList 业务办理类型 */ List queryMaxCuMemberServiceLog(Long pkMember, List editTypeList); - /** - * 查询最大审核次数 (无用户) - * - * @param editType - * @return - */ - Integer selectNotByMaxApproveNumber(int editType, int approveStatus); + /** * 根据业务单号查询 + * * @return */ R selectByBusinessNo(String businessNo); + /** * 根据业务单号修改信息 + * * @param memberLog * @return */ @@ -119,25 +79,18 @@ public interface ICuMemberServiceLogService extends IService /** * 查询列表信息 + * * @param editType * @param memberCode * @param memberName * @param pkCountry * @return */ - List queryList(Integer editType, String memberCode, String memberName,Integer pkCountry); - - /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:16 - * @param: [businessNo] - * @return: com.hzs.common.core.domain.R> - **/ - R> selectCuMemberServiceLog(String businessNo); + List queryList(Integer editType, String memberCode, String memberName, Integer pkCountry); /** * 查询展示列表 + * * @return */ List selectByList(CuMemberServiceLogExt memberServiceLogExt); diff --git a/bd-business/bd-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 index 8c09f2f..920cf6f 100644 --- a/bd-business/bd-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 @@ -18,7 +18,6 @@ import com.hzs.member.detail.mapper.CuMemberServiceLogMapper; import com.hzs.member.detail.service.ICuMemberServiceLogService; import com.hzs.member.detail.vo.CuMemberServiceLogVO; import com.hzs.member.handlebusiness.vo.BusinessMemberVO; -import com.hzs.member.handlebusiness.vo.CuMemberOldValueVO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,94 +26,31 @@ import java.util.Date; import java.util.List; /** - *

* 会员更名、密码修改表 服务实现类 - *

- * - * @author hzs - * @since 2022-08-22 */ @Service public class CuMemberServiceLogServiceImpl extends ServiceImpl implements ICuMemberServiceLogService { - /** - * 查询最大审核次数 - * - * @param pkMember - * @param editType - * @return - */ + @Override public Integer selectByMaxApproveNumber(Long pkMember, int editType, Integer approveStatus) { return baseMapper.selectByMaxApproveNumber(pkMember, editType, approveStatus); } - /** - * @description: 查询会员办理业务日志最新数据 - * @author: zhang jing - * @date: 2023/3/24 9:08 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ - @Override - public CuMemberServiceLogVO selectTopData(Long pkMember, int editType, int approveStatus) { - return baseMapper.selectTopData(pkMember, editType, approveStatus); - } - - - /** - * @description: 查询用户是否已经存在未审核业务 - * @author: zhang jing - * @date: 2023/1/29 17:26 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List - **/ @Override public List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO) { return baseMapper.selectServiceLogList(cuMemberServiceLogVO); } - /** - * 查询 - * - * @param cuMemberServiceLog - * @return - */ @Override public List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog) { return baseMapper.selectByServiceLogList(cuMemberServiceLog); } - /** - * @description: 查询审核通过的最新数据 - * @author: zhang jing - * @date: 2023/1/30 10:02 - * @param: [cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ - @Override - public CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO) { - return baseMapper.selectNewestServiceLog(cuMemberServiceLogVO); - } - - /** - * @description: 查询会员原值 - * @author: zhang jing - * @date: 2023/1/30 14:20 - * @param: [cuMemberOldValueVO] - * @return: java.util.List - **/ @Override public List selectOldValue(BusinessMemberVO businessMemberVO) { return baseMapper.selectOldValue(businessMemberVO); } - /** - * @description: 再次发起签呈 - * @author: zhang jing - * @date: 2023/2/2 9:09 - * @param: [cmslList] - * @return: boolean - **/ @Transactional(rollbackFor = Exception.class) @Override public CuMemberServiceLogVO againBusiness(List cmslList, CuMemberServiceLogVO cuMemberServiceLogVO) { @@ -150,22 +86,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl selectByBusinessNo(String businessNo) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -173,12 +93,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl updateByBusinessNo(CuMemberServiceLog memberLog) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -186,45 +100,16 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl queryList(Integer editType, String memberCode, String memberName, Integer pkCountry) { return baseMapper.queryList(editType, memberCode, memberName, pkCountry); } - /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:16 - * @param: [cuMemberServiceLog] - * @return: java.util.List - **/ - @Override - public R> selectCuMemberServiceLog(String businessNo) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("BUSINESS_NO", businessNo); - return R.ok(baseMapper.selectList(queryWrapper)); - } - - /** - * 查询展示列表 - * - * @return - */ @Override public List selectByList(CuMemberServiceLogExt memberServiceLogExt) { return baseMapper.selectByList(memberServiceLogExt); } - @Override public List selectServiceValue(CuMemberServiceLogExt cuMemberServiceLog) { return baseMapper.selectServiceValue(cuMemberServiceLog); diff --git a/bd-business/bd-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 deleted file mode 100644 index 7dbf59f..0000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/vo/CuMemberOldValueVO.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.hzs.member.handlebusiness.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; - - -/** - *

- * 会员信息原值 - *

- * - * @author hzs - * @since 2022-08-22 - */ -@Data -public class CuMemberOldValueVO { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - private Long pkId; - - /** - * 会员id - */ - private Long pkMember; - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - /** - * 注册等级 - */ - private Integer pkRegisterGrade; - /** - * 注册等级后 - */ - private Integer pkRegisterGradeAfter; - /** - * 注册等级名称 - */ - private String gradeName; - /** - * 结算等级 - */ - private Integer pkSettleGrade; - /** - * 结算等级后 - */ - private Integer pkSettleGradeAfter; - - /** - * 结算等级名称 - */ - private String settleGradeName; - /** - * 真实奖衔 - */ - private Integer pkAwards; - /** - * 真实奖衔后 - */ - private Integer pkAwardsAfter; - - /** - * 奖衔名称 - */ - private String awardsName; - /** - * 自然国 - */ - private Integer pkCountry; - /** - * 自然国后 - */ - private Integer pkCountryAfter; - /** - * 自然国家简称 - */ - private String shortName; - /** - * 结算国 - */ - private Integer pkSettleCountry; - /** - * 结算国简称 - */ - private String settleShortName; - /** - * 账号登录状态 （0=正常,1=限制登录(仅登录,无操作),2=禁止登录（不能登录）） - */ - @Transaction(transactionKey = EnumsPrefixConstants.ACCOUNT_STATUS) - private Integer accountStatus; - private String accountStatusVal; - /** - * 账号登录状态 后 （0=正常,1=限制登录(仅登录,无操作),2=禁止登录（不能登录）） - */ - private Integer accountStatusAfter; - /** - * 收益状态 (0=正常，1=烧伤) - */ - @Transaction(transactionKey = EnumsPrefixConstants.INCOME_STATUS) - private Integer incomeStatus; - private String incomeStatusVal; - - /** - * 复购免考（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer purchaseStatus; - private String purchaseStatusVal; - /** - * 复购免考后（0=是,1=否） - */ - private Integer purchasStatusAfter; - /** - * 分红免考（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer shareStatus; - private String shareStatusVal; - /** - * 分红免考后（0=是,1=否） - */ - private Integer shareStatusAfter; - /** - * 注册权限 - */ - @Transaction(transactionKey = EnumsPrefixConstants.REGISTRATION_AUTHORITY) - private Integer registerAuthority; - private String registerAuthorityVal; - /** - * 注册权限后 - */ - private Integer registerAuthorityAfter; - /** - * 是否认证创客空间（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer isMakerSpace; - private String isMakerSpaceVal; - /** - * 能否转账（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer isTransfer; - private String isTransferVal; - /** - * 能否提现（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer isWithdraw; - private String isWithdrawVal; - /** - * 收益状态（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer isConsume; - private String isConsumeVal; - - /** - * 收益状态后 (0=正常,1=停止收益) - */ - private Integer incomeStatusAfter; - /** - * 转账状态 (0=正常, 1=全网) - */ - @Transaction(transactionKey = EnumsPrefixConstants.TRANSFER_STATUS) - private Integer transferStatus; - private String transferStatusVal; - - /** - * 会员编号 - */ - private List pkMemberList; - - /** - * 重置密码前 - */ - private String resetPasswordFront; - /** - * 重置密码后 - */ - private String resetPasswordAfter; - - /** - * 重置支付密码前 - */ - private String paymentPasswordFront; - /** - * 重置支付密码后 - */ - private String paymentPasswordAfter; - - /** - * 重置银行密码前 - */ - private String bankFront; - /** - * 重置银行密码前 - */ - private String bankAfter; - /** - * 合计金额 - */ - private BigDecimal totalMoney; - - - - - - - - - - - - - - - - - - - -} diff --git a/bd-business/bd-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 index bdefc1a..a783e68 100644 --- a/bd-business/bd-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 @@ -1,9 +1,7 @@ package com.hzs.member.statis.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.statis.CuBonusStatis; -import com.hzs.member.statis.vo.CuBonusStatisChartVO; import com.hzs.member.statis.vo.CuBonusStatisColumnarVO; import com.hzs.member.statis.vo.CuBonusStatisRoundVO; import com.hzs.member.statis.vo.CuBonusStatisVO; @@ -12,161 +10,65 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 奖金拨比统计 Mapper 接口 - *

- * - * @author zhangjing - * @since 2023-05-31 */ public interface CuBonusStatisMapper extends BaseMapper { /** - * @description: 查询当天团队统计数据 - * @author: zhang jing - * @date: 2023/6/1 11:31 - * @param: [cuBonusStatis] - * @return: com.hzs.common.domain.member.statis.CuBonusStatis + * 查询当天团队统计数据 **/ List getCuBonusStatis(CuBonusStatis cuBonusStatis); /** - * @description: 查询国外奖金拨比 - * @author: zhang jing - * @date: 2023/9/28 16:43 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询国外奖金拨比 **/ List queryForeignCountryCuBonusStatis(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 查询国外奖金拨比合计 - * @author: zhang jing - * @date: 2023/10/7 16:01 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询国外奖金拨比合计 **/ CuBonusStatisVO queryForeignCountryCuBonusStatisSum(CuBonusStatisVO cuBonusStatisVO); - - /** - * @description: 查询订单业绩 - * @author: zhang jing - * @date: 2023/9/29 17:30 - * @param: [cuBonusStatisVO] - * @return: java.util.List - **/ - CuBonusStatisVO queryOrderAchieveList(CuBonusStatisVO cuBonusStatisVO); - - - - - - - /** - * @description: 奖金拨比图表 - * @author: zhang jing - * @date: 2023/9/5 13:42 - * @param: [chartVO] - * @return: java.util.List - **/ - List queryCuBonusStatisChart(CuBonusStatisChartVO chartVO); - - /** - * @description: 奖金拨比图表合计 - * @author: zhang jing - * @date: 2023/9/18 14:39 - * @param: [chartVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisChartVO - **/ - CuBonusStatisChartVO queryCuBonusSumStatisChart(CuBonusStatisChartVO chartVO); - - - /** - * @description: 查询一年注册、升级、复购、嗨粉合计 - * @author: zhang jing - * @date: 2023/6/5 9:45 - * @param: [cuBonusStatisVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO + * 查询一年注册、升级、复购、嗨粉合计 **/ CuBonusStatisColumnarVO queryYearData(CuBonusStatisColumnarVO columnarVO); /** - * @description: 查询奖金拨比(饼状图) - * @author: zhang jing - * @date: 2023/6/5 15:49 - * @param: [cuBonusStatisVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO + * 查询奖金拨比(饼状图) **/ CuBonusStatisRoundVO queryDiallingRatio(CuBonusStatisRoundVO roundVO); /** - * @description: 查询小于当天全部已支付或撤单订单信息 - * @author: zhang jing - * @date: 2023/8/16 17:14 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询小于当天全部已支付或撤单订单信息 **/ List querySaOrderByLessDay(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 删除奖金拨比统计表数据 - * @author: zhang jing - * @date: 2023/9/11 16:03 - * @param: [] - * @return: java.lang.Boolean + * 删除奖金拨比统计表数据 **/ - Boolean delStatis(@Param("startDate") String startDate,@Param("endDate") String endDate); + Boolean delStatis(@Param("startDate") String startDate, @Param("endDate") String endDate); /** - * @description: 查询奖金扣项配置参数 - * @author: zhang jing - * @date: 2023/9/15 14:00 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询奖金扣项配置参数 **/ List bonusDeductlist(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 查询分红比例配置 - * @author: zhang jing - * @date: 2023/9/28 17:04 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询分红比例配置 **/ List bonusDividendRatiolist(CuBonusStatisVO cuBonusStatisVO); - /** - * @description: 查询国外奖金 - * @author: zhang jing - * @date: 2023/9/28 14:12 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询国外奖金 **/ List queryForeignCountryBonus(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 查询生效国外国家列表 - * @author: zhang jing - * @date: 2023/9/21 16:09 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询生效国外国家列表 **/ List countrylist(CuBonusStatisVO cuBonusStatisVO); - /** - * @description: 查询有效体系 - * @author: zhang jing - * @date: 2023/9/22 9:37 - * @param: [] - * @return: java.util.List - **/ - List vertexList(); - - - } diff --git a/bd-business/bd-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 index 8b5213d..fe4d96d 100644 --- a/bd-business/bd-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 @@ -1,24 +1,14 @@ package com.hzs.member.statis.provider; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.achieve.CuMemberAchieve; -import com.hzs.common.domain.member.bonus.CuMemberBonus; -import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.member.statis.ICuBonusStatisServiceApi; import com.hzs.member.statis.service.ICuBonusStatisService; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Date; - - /** - * @description: 奖金拨比统计Dubbo 服务 - * @author: zhang jing - * @date: 2023/6/1 17:25 - * @param: - * @return: + * 奖金拨比统计Dubbo 服务 **/ @Slf4j @DubboService @@ -27,54 +17,14 @@ public class ICuBonusStatisServiceProvider implements ICuBonusStatisServiceApi { @Autowired ICuBonusStatisService iCuBonusStatisService; - - /** - * @description: 统计新增订单 - * @author: zhang jing - * @date: 2023/6/1 17:28 - * @param: [saOrder] - * @return: com.hzs.common.core.domain.R - **/ @Override - public R statisAddOrder() { - return R.ok(iCuBonusStatisService.statisAddOrder()); + public R statisHistoryBonus(String startDate, String endDate) { + return R.ok(iCuBonusStatisService.statisHistoryBonus(startDate, endDate)); } - /** - * @description: 统计历史奖金拨比 - * @author: zhang jing - * @date: 2023/10/19 9:29 - * @param: [startDate, endDate] - * @return: com.hzs.common.core.domain.R - **/ @Override - public R statisHistoryBonus(String startDate,String endDate) { - return R.ok(iCuBonusStatisService.statisHistoryBonus( startDate, endDate)); + public R delStatis(String startDate, String endDate) { + return R.ok(iCuBonusStatisService.delStatis(startDate, endDate)); } - /** - * @description: 统计撤销订单 - * @author: zhang jing - * @date: 2023/6/13 15:06 - * @param: [saOrder] - * @return: com.hzs.common.core.domain.R - **/ - @Override - public R statisRevokeOrder() { - return R.ok(iCuBonusStatisService.statisRevokeOrder()); - } - - /** - * @description: 删除奖金拨比统计数据 - * @author: zhang jing - * @date: 2023/12/11 10:56 - * @param: [startDate, endDate] - * @return: com.hzs.common.core.domain.R - **/ - @Override - public R delStatis(String startDate,String endDate) { - return R.ok(iCuBonusStatisService.delStatis( startDate, endDate)); - } - - } diff --git a/bd-business/bd-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 index 0f2d87e..cc4122a 100644 --- a/bd-business/bd-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 @@ -1,191 +1,77 @@ package com.hzs.member.statis.service; - import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.achieve.CuMemberAchieve; -import com.hzs.common.domain.member.bonus.CuMemberBonus; import com.hzs.common.domain.member.statis.CuBonusStatis; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.member.statis.vo.CuBonusStatisChartVO; import com.hzs.member.statis.vo.CuBonusStatisColumnarVO; import com.hzs.member.statis.vo.CuBonusStatisRoundVO; import com.hzs.member.statis.vo.CuBonusStatisVO; -import java.time.LocalDateTime; -import java.util.Date; import java.util.List; /** - *

* 奖金拨比统计 服务类 - *

- * - * @author zhangjing - * @since 2023-05-31 */ public interface ICuBonusStatisService extends IService { /** - * @description: 统计新增订单 - * @author: zhang jing - * @date: 2023/6/1 10:31 - * @param: [] - * @return: java.lang.Boolean - **/ - Boolean statisAddOrder(); - - /** - * @description: 统计撤销订单 - * @author: zhang jing - * @date: 2023/6/13 14:54 - * @param: [saOrder] - * @return: java.lang.Boolean - **/ - Boolean statisRevokeOrder(); - - - /** - * @description: 查询国外奖金拨比 - * @author: zhang jing - * @date: 2023/9/28 16:41 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询国外奖金拨比 **/ List queryForeignCountryCuBonusStatis(CuBonusStatisVO cuBonusStatisVO); + /** - * @description: 查询国外奖金拨比合计 - * @author: zhang jing - * @date: 2023/10/7 16:06 - * @param: [cuBonusStatisVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO + * 查询国外奖金拨比合计 **/ CuBonusStatisVO queryForeignCountryCuBonusStatisSum(CuBonusStatisVO cuBonusStatisVO); - /** - * @description: 查询订单业绩 - * @author: zhang jing - * @date: 2023/9/29 17:29 - * @param: [cuBonusStatisVO] - * @return: java.util.List - **/ - CuBonusStatisVO queryOrderAchieveList(CuBonusStatisVO cuBonusStatisVO); - /** - * @description: 奖金拨比图表 - * @author: zhang jing - * @date: 2023/9/5 13:41 - * @param: [chartVO] - * @return: java.util.List - **/ - List queryCuBonusStatisChart(CuBonusStatisChartVO chartVO); - - /** - * @description: 奖金拨比图表合计 - * @author: zhang jing - * @date: 2023/9/18 14:38 - * @param: [chartVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisChartVO - **/ - CuBonusStatisChartVO queryCuBonusSumStatisChart(CuBonusStatisChartVO chartVO); - - /** - * @description: 查询奖金拨比图形数据-柱形图 - * @author: zhang jing - * @date: 2023/6/5 9:19 - * @param: [cuBonusStatisVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO + * 查询奖金拨比图形数据-柱形图 **/ CuBonusStatisColumnarVO pillarRatio(CuBonusStatisColumnarVO columnarVO); /** - * @description: 查询一年注册、升级、复购、嗨粉合计 - * @author: zhang jing - * @date: 2023/6/5 10:25 - * @param: [cuBonusStatisVO, queryDate] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO + * 查询一年注册、升级、复购、嗨粉合计 **/ - CuBonusStatisColumnarVO queryYearData (CuBonusStatisColumnarVO columnarVO); + CuBonusStatisColumnarVO queryYearData(CuBonusStatisColumnarVO columnarVO); /** - * @description: 查询奖金拨比(饼状图) - * @author: zhang jing - * @date: 2023/6/5 15:49 - * @param: [cuBonusStatisVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO + * 查询奖金拨比(饼状图) **/ - CuBonusStatisRoundVO queryDiallingRatio (CuBonusStatisRoundVO roundVO); + CuBonusStatisRoundVO queryDiallingRatio(CuBonusStatisRoundVO roundVO); /** - * @description: 查询小于当天全部已支付或撤单订单信息 - * @author: zhang jing - * @date: 2023/8/16 17:14 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询小于当天全部已支付或撤单订单信息 **/ List querySaOrderByLessDay(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 统计历史奖金拨比数据 - * @author: zhang jing - * @date: 2023/8/16 11:35 - * @param: [] - * @return: java.lang.Boolean + * 统计历史奖金拨比数据 **/ - Boolean statisHistoryBonus(String startDate,String endDate); + Boolean statisHistoryBonus(String startDate, String endDate); /** - * @description: 删除奖金拨比统计表数据 - * @author: zhang jing - * @date: 2023/9/11 16:04 - * @param: [] - * @return: java.lang.Boolean + * 删除奖金拨比统计表数据 **/ - Boolean delStatis(String startDate,String endDate); + Boolean delStatis(String startDate, String endDate); /** - * @description: 查询奖金扣项配置参数 - * @author: zhang jing - * @date: 2023/9/15 14:02 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询奖金扣项配置参数 **/ List bonusDeductlist(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 查询分红比例配置 - * @author: zhang jing - * @date: 2023/9/28 17:03 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询分红比例配置 **/ List bonusDividendRatiolist(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 查询国外奖金 - * @author: zhang jing - * @date: 2023/9/28 14:12 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询国外奖金 **/ List queryForeignCountryBonus(CuBonusStatisVO cuBonusStatisVO); /** - * @description: 查询生效国外国家列表 - * @author: zhang jing - * @date: 2023/9/21 16:10 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询生效国外国家列表 **/ List countrylist(CuBonusStatisVO cuBonusStatisVO); - /** - * @description: 查询所有体系 - * @author: zhang jing - * @date: 2023/9/22 9:36 - * @param: [] - * @return: java.util.List - **/ - List vertexList(); - } diff --git a/bd-business/bd-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 index 1436c8a..2e07759 100644 --- a/bd-business/bd-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 @@ -2,145 +2,39 @@ package com.hzs.member.statis.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.enums.EBonusItems; import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.core.enums.EOrderStatus; import com.hzs.common.core.enums.EOrderType; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.bonus.CuMemberBonus; import com.hzs.common.domain.member.statis.CuBonusStatis; import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.member.base.service.ICuMemberService; -import com.hzs.member.base.service.ICuMemberTeamService; -import com.hzs.member.bonus.service.ICuMemberBonusService; import com.hzs.member.statis.mapper.CuBonusStatisMapper; import com.hzs.member.statis.service.ICuBonusStatisService; -import com.hzs.member.statis.vo.CuBonusStatisChartVO; import com.hzs.member.statis.vo.CuBonusStatisColumnarVO; import com.hzs.member.statis.vo.CuBonusStatisRoundVO; import com.hzs.member.statis.vo.CuBonusStatisVO; -import com.hzs.sale.order.ISaOrderServiceApi; 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.time.LocalDate; -import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; /** - *

* 奖金拨比统计 服务实现类 - *

- * - * @author zhangjing - * @since 2023-05-31 */ @Service @Slf4j public class CuBonusStatisServiceImpl extends ServiceImpl implements ICuBonusStatisService { - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private ICuMemberTeamService iCuMemberTeamService; - @DubboReference - private ISaOrderServiceApi orderServiceApi; @Autowired ICuMemberSettlePeriodService cuMemberSettlePeriodService; - @Autowired - private ICuMemberBonusService cuMemberBonusService; - /** - * @description: 统计新增订单--定时任务 - * @author: zhang jing - * @date: 2023/6/1 10:32 - * @param: saOrder - * @return: java.lang.Boolean - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean statisAddOrder() { - CuBonusStatisVO cbs = new CuBonusStatisVO(); - cbs.setDelFlag(EDelFlag.UN_DELETE.getValue()); - cbs.setOrderStatus(EOrderStatus.PAY.getValue()); - //查询前一天的订单 - Date date = DateUtils.currentDate(); - date = DateUtils.beforeDate(1, ChronoUnit.DAYS, date); - cbs.setPayTimeStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date)); - //查询国家列表 - List countrylist = countrylist(cbs); - if (CollectionUtil.isNotEmpty(countrylist)) { - for (CuBonusStatisVO con : countrylist) { - cbs.setPkCountry(con.getPkCountry()); - List orach = querySaOrderByLessDay(cbs); - if (CollectionUtil.isNotEmpty(orach)) { - for (CuBonusStatisVO so : orach) { - saveBonusStatis(so, 2); - } - } - } - } - - return true; - } - - /** - * @description: 统计撤销订单--定时任务 - * @author: zhang jing - * @date: 2023/6/13 14:54 - * @param: [saOrder] - * @return: java.lang.Boolean - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean statisRevokeOrder() { - CuBonusStatisVO cbs = new CuBonusStatisVO(); - cbs.setDelFlag(EDelFlag.DELETE.getValue()); - //查询前一天的订单 - Date date = DateUtils.currentDate(); - date = DateUtils.beforeDate(1, ChronoUnit.DAYS, date); - cbs.setModifiedTimeStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date)); - //查询国家列表 - List countrylist = countrylist(cbs); - if (CollectionUtil.isNotEmpty(countrylist)) { - for (CuBonusStatisVO con : countrylist) { - cbs.setPkCountry(con.getPkCountry()); - List orach = querySaOrderByLessDay(cbs); - if (CollectionUtil.isNotEmpty(orach)) { - for (CuBonusStatisVO so : orach) { - saveBonusStatis(so, 1); - } - } - } - } - - return true; - } - - /** - * @description: 奖金拨比保存订单统计数据--定时任务 - * @author: zhang jing - * @date: 2023/9/14 10:47 - * @param: [so, type] typ 1加2减 - * @return: void - **/ - private void saveBonusStatis(CuBonusStatisVO so, int type) { - - } - - /** - * @description: 保存奖金拨比订单数据 - * @author: zhang jing - * @date: 2023/9/14 14:44 - * @param: [so, type] - * @return: void + * 保存奖金拨比订单数据 **/ private void saveBonusStatis(List soList) { for (CuBonusStatisVO so : soList) { @@ -168,11 +62,7 @@ public class CuBonusStatisServiceImpl extends ServiceImpl orachList, int type) { for (CuBonusStatisVO newSo : orachList) { @@ -210,13 +100,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl cblist) { for (CuBonusStatisVO cb : cblist) { @@ -303,74 +183,16 @@ public class CuBonusStatisServiceImpl extends ServiceImpl - **/ @Override public List queryForeignCountryCuBonusStatis(CuBonusStatisVO cuBonusStatisVO) { return baseMapper.queryForeignCountryCuBonusStatis(cuBonusStatisVO); } - /** - * @description: 查询国外奖金拨比合计 - * @author: zhang jing - * @date: 2023/10/7 16:02 - * @param: [cuBonusStatisVO] - * @return: java.util.List - **/ @Override public CuBonusStatisVO queryForeignCountryCuBonusStatisSum(CuBonusStatisVO cuBonusStatisVO) { return baseMapper.queryForeignCountryCuBonusStatisSum(cuBonusStatisVO); } - /** - * @description: 查询订单业绩 - * @author: zhang jing - * @date: 2023/9/29 17:30 - * @param: [cuBonusStatisVO] - * @return: java.util.List - **/ - @Override - public CuBonusStatisVO queryOrderAchieveList(CuBonusStatisVO cuBonusStatisVO) { - return baseMapper.queryOrderAchieveList(cuBonusStatisVO); - } - - - /** - * @description: 奖金拨比图表 - * @author: zhang jing - * @date: 2023/9/5 13:42 - * @param: [chartVO] - * @return: java.util.List - **/ - @Override - public List queryCuBonusStatisChart(CuBonusStatisChartVO chartVO) { - return baseMapper.queryCuBonusStatisChart(chartVO); - } - - /** - * @description: 奖金拨比图表合计 - * @author: zhang jing - * @date: 2023/9/18 14:38 - * @param: [chartVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisChartVO - **/ - @Override - public CuBonusStatisChartVO queryCuBonusSumStatisChart(CuBonusStatisChartVO chartVO) { - return baseMapper.queryCuBonusSumStatisChart(chartVO); - } - - /** - * @description: 查询奖金拨比图形数据-柱形图 - * @author: zhang jing - * @date: 2023/6/3 15:14 - * @param: [cuBonusStatisVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO - **/ @Override public CuBonusStatisColumnarVO pillarRatio(CuBonusStatisColumnarVO columnarVO) { // 查询当年的数据 @@ -397,61 +219,31 @@ public class CuBonusStatisServiceImpl extends ServiceImpl opt = Optional.ofNullable(baseMapper.queryYearData(columnarVO)); return opt.orElse(null); } - /** - * @description: 查询奖金拨比(饼状图) - * @author: zhang jing - * @date: 2023/6/5 15:51 - * @param: [cuBonusStatisVO] - * @return: com.hzs.member.statis.vo.CuBonusStatisVO - **/ @Override public CuBonusStatisRoundVO queryDiallingRatio(CuBonusStatisRoundVO roundVO) { return baseMapper.queryDiallingRatio(roundVO); } /** - * @description: 查询小于当天全部已支付或撤单订单信息 - * @author: zhang jing - * @date: 2023/8/16 17:14 - * @param: [cuBonusStatisVO] - * @return: java.util.List + * 查询小于当天全部已支付或撤单订单信息 **/ public List querySaOrderByLessDay(CuBonusStatisVO cuBonusStatisVO) { return baseMapper.querySaOrderByLessDay(cuBonusStatisVO); } - /** - * @description:查询当天团队统计数据 - * @author: zhang jing - * @date: 2023/6/1 11:17 - * @param: [cuBonusStatis] - * @return: com.hzs.common.domain.member.statis.CuBonusStatis + * 查询当天团队统计数据 **/ public List getCuBonusStatis(CuBonusStatis cuBonusStatis) { return baseMapper.getCuBonusStatis(cuBonusStatis); } - /** - * @description: 统计历史奖金拨比数据 - * @author: zhang jing - * @date: 2023/8/16 10:51 - * @param: [] - * @return: java.lang.Boolean - **/ @Override @Transactional(rollbackFor = Exception.class) public Boolean statisHistoryBonus(String startDate, String endDate) { @@ -522,78 +314,29 @@ public class CuBonusStatisServiceImpl extends ServiceImpl - **/ @Override public List bonusDeductlist(CuBonusStatisVO cuBonusStatisVO) { return baseMapper.bonusDeductlist(cuBonusStatisVO); } - /** - * @description: 查询分红比例配置 - * @author: zhang jing - * @date: 2023/9/28 17:04 - * @param: [cuBonusStatisVO] - * @return: java.util.List - **/ @Override public List bonusDividendRatiolist(CuBonusStatisVO cuBonusStatisVO) { return baseMapper.bonusDividendRatiolist(cuBonusStatisVO); } - /** - * @description: 查询国外奖金 - * @author: zhang jing - * @date: 2023/9/28 14:12 - * @param: [cuBonusStatisVO] - * @return: java.util.List - **/ @Override public List queryForeignCountryBonus(CuBonusStatisVO cuBonusStatisVO) { return baseMapper.queryForeignCountryBonus(cuBonusStatisVO); } - - /** - * @description: 查询生效国外国家列表 - * @author: zhang jing - * @date: 2023/9/21 16:10 - * @param: [cuBonusStatisVO] - * @return: java.util.List - **/ @Override public List countrylist(CuBonusStatisVO cuBonusStatisVO) { return baseMapper.countrylist(cuBonusStatisVO); } - /** - * @description: 查询有效体系 - * @author: zhang jing - * @date: 2023/9/22 9:37 - * @param: [] - * @return: java.util.List - **/ - @Override - public List vertexList() { - return baseMapper.vertexList(); - } - - } diff --git a/bd-business/bd-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 index dd810b5..8db4716 100644 --- a/bd-business/bd-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 @@ -10,14 +10,9 @@ import java.util.Date; import java.util.List; /** - *

* 奖金拨比统计(波比图表) * 每个团队，每天一条数据 * 数据来自 订单表和 CU_MEMBER_BONUS 会员奖金-会员奖金汇总表 - *

- * - * @author zhangjing - * @since 2023-05-31 */ @Data public class CuBonusStatisChartVO { @@ -46,303 +41,303 @@ public class CuBonusStatisChartVO { /** * 业绩时间 */ - @Excel(name = "业绩时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "业绩时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; /** * 报单订单（$） */ - @Excel(name = "报单订单($)",scale = 2) + @Excel(name = "报单订单($)", scale = 2) @BigDecimalFormat - private BigDecimal mainRegAmount=BigDecimal.ZERO; + private BigDecimal mainRegAmount = BigDecimal.ZERO; /** * 消费订单（$） */ - @Excel(name = "消费订单($)",scale = 2) + @Excel(name = "消费订单($)", scale = 2) @BigDecimalFormat - private BigDecimal mainUpAmount=BigDecimal.ZERO; + private BigDecimal mainUpAmount = BigDecimal.ZERO; /** * 虚拟订单金额（$） */ - @Excel(name = "虚拟订单($)",scale = 2) + @Excel(name = "虚拟订单($)", scale = 2) @BigDecimalFormat - private BigDecimal fictitiousOrder=BigDecimal.ZERO; + private BigDecimal fictitiousOrder = BigDecimal.ZERO; /** * 首购总金额（$） 报单订单+消费订单 */ - @Excel(name = "首购金额($)",scale = 2) + @Excel(name = "首购金额($)", scale = 2) @BigDecimalFormat - private BigDecimal firstPurchaseAll=BigDecimal.ZERO; + private BigDecimal firstPurchaseAll = BigDecimal.ZERO; /** * 见点收益（$） */ - @Excel(name = "见点收益($)",scale = 2) + @Excel(name = "见点收益($)", scale = 2) @BigDecimalFormat - private BigDecimal seePointIncome=BigDecimal.ZERO; + private BigDecimal seePointIncome = BigDecimal.ZERO; /** * 直推收益（$） */ - @Excel(name = "直推收益($)",scale = 2) + @Excel(name = "直推收益($)", scale = 2) @BigDecimalFormat - private BigDecimal introduceBonus=BigDecimal.ZERO; + private BigDecimal introduceBonus = BigDecimal.ZERO; /** * 拓展收益（$） */ - @Excel(name = "拓展收益($)",scale = 2) + @Excel(name = "拓展收益($)", scale = 2) @BigDecimalFormat - private BigDecimal orgBonus=BigDecimal.ZERO; + private BigDecimal orgBonus = BigDecimal.ZERO; /** * 辅导收益（$） */ - @Excel(name = "辅导收益($)",scale = 2) + @Excel(name = "辅导收益($)", scale = 2) @BigDecimalFormat - private BigDecimal leaderBonus=BigDecimal.ZERO; + private BigDecimal leaderBonus = BigDecimal.ZERO; /** * 领袖收益（$） */ - @Excel(name = "领袖收益($)",scale = 2) + @Excel(name = "领袖收益($)", scale = 2) @BigDecimalFormat - private BigDecimal shareIncome=BigDecimal.ZERO; + private BigDecimal shareIncome = BigDecimal.ZERO; /** * 复销新增金额（$）(复销订单) */ - @Excel(name = "复销专区($)",scale = 2) + @Excel(name = "复销专区($)", scale = 2) @BigDecimalFormat private BigDecimal mainRepurAmount; /** * 复销级差收益 */ - @Excel(name = "复销级差收益($)",scale = 2) + @Excel(name = "复销级差收益($)", scale = 2) @BigDecimalFormat private BigDecimal repurRangeIncome; /** * 复销同级收益 */ - @Excel(name = "复销同级收益($)",scale = 2) + @Excel(name = "复销同级收益($)", scale = 2) @BigDecimalFormat private BigDecimal sameLevelIncome; /** * (直推收益+拓展收益+辅导收益++报单收益)*0.8+创客空间3000元的店补+1万里面的2000元直推奖=实际拨出之和。 */ - @Excel(name = "首购拨出金额($)",scale = 2) + @Excel(name = "首购拨出金额($)", scale = 2) @BigDecimalFormat - private BigDecimal mainBonus=BigDecimal.ZERO; + private BigDecimal mainBonus = BigDecimal.ZERO; /** * 首购相关奖金拨比（%）=首购总奖金（推荐奖净值+拓展奖净值+领导奖净值）/首购总金额 */ - @Excel(name = "首购拨出比例(%)",scale = 2) + @Excel(name = "首购拨出比例(%)", scale = 2) @BigDecimalFormat - private BigDecimal mainBonusRate=BigDecimal.ZERO; + private BigDecimal mainBonusRate = BigDecimal.ZERO; /** * （复购直推收益+复购级差收益+复购拓展收益）*80% * (复购级差+复购拓展 ) *0.8 */ - @Excel(name = "复销拨出金额($)",scale = 2) + @Excel(name = "复销拨出金额($)", scale = 2) @BigDecimalFormat - private BigDecimal repurBonus=BigDecimal.ZERO; + private BigDecimal repurBonus = BigDecimal.ZERO; - /** (复购级差+复购拓展 ) *0.8 + /** + * (复购级差+复购拓展 ) *0.8 * 复购拨出比例（%） = ((（复购直推收益+复购级差收益+复购拓展收益）*80%))/复购总奖金(复购订单) */ - @Excel(name = "复销拨出比例(%)",scale = 2) + @Excel(name = "复销拨出比例(%)", scale = 2) @BigDecimalFormat - private BigDecimal repurBonusRate=BigDecimal.ZERO; + private BigDecimal repurBonusRate = BigDecimal.ZERO; /** * 见点收益拨比（%） */ - @Excel(name = "见点收益拨比(%)",scale = 2) + @Excel(name = "见点收益拨比(%)", scale = 2) @BigDecimalFormat private BigDecimal seePointIncomeRate; /** * 领袖收益拨比（%） */ - @Excel(name = "领袖收益拨比(%)",scale = 2) + @Excel(name = "领袖收益拨比(%)", scale = 2) @BigDecimalFormat private BigDecimal shareIncomeRate; /** * 直推收益拨比（%） 直推收益/首购金额 */ - @Excel(name = "直推收益拨比(%)",scale = 2) + @Excel(name = "直推收益拨比(%)", scale = 2) @BigDecimalFormat private BigDecimal introduceBonusRate; /** * 拓展收益拨比（%） */ - @Excel(name = "拓展收益拨比(%)",scale = 2) + @Excel(name = "拓展收益拨比(%)", scale = 2) @BigDecimalFormat private BigDecimal orgBonusRate; /** * 辅导收益拨比（%） */ - @Excel(name = "辅导收益拨比(%)",scale = 2) + @Excel(name = "辅导收益拨比(%)", scale = 2) @BigDecimalFormat private BigDecimal leaderBonusRate; /** * (直推收益+拓展收益+辅导收益）+复购直推收益+复购级差收益+复购拓展收益)*0.8 * +创客空间3000元的店补+1万里面的2000元直推奖 */ - @Excel(name = "总拨出金额($)",scale = 2) + @Excel(name = "总拨出金额($)", scale = 2) @BigDecimalFormat - private BigDecimal totalBonus=BigDecimal.ZERO; + private BigDecimal totalBonus = BigDecimal.ZERO; /** * 综合（拨出）实发拨比（%）=(直推收益+拓展收益+辅导收益))*80% * =创客空间3000元的店补+1万里面的2000元直推奖+首购拨出之和+ * （复购直推收益+复购级差收益+复购拓展收益）*80%=X=实际大盘拨出金额/(总金额)(注册+升级+复购)订单 */ - @Excel(name = "总拨出比例(%)",scale = 2) + @Excel(name = "总拨出比例(%)", scale = 2) @BigDecimalFormat - private BigDecimal totalBonusRate=BigDecimal.ZERO; - + private BigDecimal totalBonusRate = BigDecimal.ZERO; /** * 报单订单（$）小计 */ @BigDecimalFormat - private BigDecimal mainRegAmountSum=BigDecimal.ZERO; + private BigDecimal mainRegAmountSum = BigDecimal.ZERO; /** * 消费订单（$）小计 */ @BigDecimalFormat - private BigDecimal mainUpAmountSum=BigDecimal.ZERO; + private BigDecimal mainUpAmountSum = BigDecimal.ZERO; /** * 虚拟订单（$）小计 */ @BigDecimalFormat - private BigDecimal fictitiousOrderSum=BigDecimal.ZERO; + private BigDecimal fictitiousOrderSum = BigDecimal.ZERO; /** * 首购总金额（$）小计 注册金额+升级金额 */ @BigDecimalFormat - private BigDecimal firstPurchaseAllSum=BigDecimal.ZERO; + private BigDecimal firstPurchaseAllSum = BigDecimal.ZERO; /** * 直推收益（$）小计 */ @BigDecimalFormat - private BigDecimal introduceBonusSum=BigDecimal.ZERO; + private BigDecimal introduceBonusSum = BigDecimal.ZERO; /** * 拓展收益（$）小计 */ @BigDecimalFormat - private BigDecimal orgBonusSum=BigDecimal.ZERO; + private BigDecimal orgBonusSum = BigDecimal.ZERO; /** * 辅导收益（$）小计 */ @BigDecimalFormat - private BigDecimal leaderBonusSum=BigDecimal.ZERO; + private BigDecimal leaderBonusSum = BigDecimal.ZERO; /** * 见点收益（$）小计 */ @BigDecimalFormat - private BigDecimal seePointIncomeSum=BigDecimal.ZERO; + private BigDecimal seePointIncomeSum = BigDecimal.ZERO; /** * 领袖收益（$）小计 */ @BigDecimalFormat - private BigDecimal shareIncomeSum=BigDecimal.ZERO; + private BigDecimal shareIncomeSum = BigDecimal.ZERO; /** * 复销级差收益（$）小计 */ @BigDecimalFormat - private BigDecimal repurRangeIncomeSum=BigDecimal.ZERO; + private BigDecimal repurRangeIncomeSum = BigDecimal.ZERO; /** * 复销同级收益（$）小计 */ @BigDecimalFormat - private BigDecimal sameLevelIncomeSum=BigDecimal.ZERO; + private BigDecimal sameLevelIncomeSum = BigDecimal.ZERO; /** * 见点收益拨比(%)小计 */ @BigDecimalFormat - private BigDecimal seePointIncomeRateSum=BigDecimal.ZERO; + private BigDecimal seePointIncomeRateSum = BigDecimal.ZERO; /** * 领袖收益拨比(%)小计 */ @BigDecimalFormat - private BigDecimal shareIncomeRateSum=BigDecimal.ZERO; + private BigDecimal shareIncomeRateSum = BigDecimal.ZERO; /** * 直推收益拨比(%)小计 */ @BigDecimalFormat - private BigDecimal introduceBonusRateSum=BigDecimal.ZERO; + private BigDecimal introduceBonusRateSum = BigDecimal.ZERO; /** * 拓展收益拨比(%)小计 */ @BigDecimalFormat - private BigDecimal orgBonusRateSum=BigDecimal.ZERO; + private BigDecimal orgBonusRateSum = BigDecimal.ZERO; /** * 辅导收益拨比(%)小计 */ @BigDecimalFormat - private BigDecimal leaderBonusRateSum=BigDecimal.ZERO; + private BigDecimal leaderBonusRateSum = BigDecimal.ZERO; /** * 复销专区小计（$）(复销专区) */ @BigDecimalFormat - private BigDecimal mainRepurAmountSum=BigDecimal.ZERO; + private BigDecimal mainRepurAmountSum = BigDecimal.ZERO; /** * 首购拨出金额 小计 */ @BigDecimalFormat - private BigDecimal mainBonusSum=BigDecimal.ZERO; + private BigDecimal mainBonusSum = BigDecimal.ZERO; /** * 首购拨出拨比 小计 */ @BigDecimalFormat - private BigDecimal mainBonusRateSum=BigDecimal.ZERO; + private BigDecimal mainBonusRateSum = BigDecimal.ZERO; /** * 复销拨出金额 小计 */ @BigDecimalFormat - private BigDecimal repurBonusSum=BigDecimal.ZERO; + private BigDecimal repurBonusSum = BigDecimal.ZERO; - /** (复购级差+复购拓展 ) *0.8 + /** + * (复购级差+复购拓展 ) *0.8 * 复销拨出比例（%） 小计 */ @BigDecimalFormat - private BigDecimal repurBonusRateSum=BigDecimal.ZERO; + private BigDecimal repurBonusRateSum = BigDecimal.ZERO; /** * 总拨出金额 小计 */ @BigDecimalFormat - private BigDecimal totalBonusSum=BigDecimal.ZERO; + private BigDecimal totalBonusSum = BigDecimal.ZERO; /** * 总拨出比例（%） 小计 */ @BigDecimalFormat - private BigDecimal totalBonusRateSum=BigDecimal.ZERO; - + private BigDecimal totalBonusRateSum = BigDecimal.ZERO; /** - *体系ID 统计体系，1原体系，2六合体系,3六合二，101非洲体系 + * 体系ID 统计体系，1原体系，2六合体系,3六合二，101非洲体系 */ private Integer pkVertex; /** @@ -351,7 +346,6 @@ public class CuBonusStatisChartVO { private Long pkTeamCode; - /** * 国家 */ @@ -388,8 +382,6 @@ public class CuBonusStatisChartVO { private String endDate; - - private String payTimeStr; private String modifiedTimeStr; private Date modifiedTime; @@ -398,17 +390,17 @@ public class CuBonusStatisChartVO { private Long pkMember; private Integer orderType; /** - *奖金类型 + * 奖金类型 */ private Integer bonusType; private BigDecimal orderAchieve; /** - *国外奖金 + * 国外奖金 */ private BigDecimal realIncome; /** - *按照体系（中国）和国家分组合并订单 + * 按照体系（中国）和国家分组合并订单 */ List mergeList; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/storeconfig/provider/IBdStoreMonthCheckConfigProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/storeconfig/provider/IBdStoreMonthCheckConfigProvider.java index 73d5b20..4f1e5df 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/storeconfig/provider/IBdStoreMonthCheckConfigProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/storeconfig/provider/IBdStoreMonthCheckConfigProvider.java @@ -1,10 +1,4 @@ -package com.hzs.member.storeconfig.provider;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/7 11:33 - * @Classname: IBdStoreMonthCheckConfigProvider - * @PackageName: com.hzs.member.storeconfig.provider - */ +package com.hzs.member.storeconfig.provider; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,29 +13,17 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -/** - *@BelongsProject: hzs_java_cloud_africa - *@BelongsPackage: com.hzs.member.storeconfig.provider - *@Author: yh - *@CreateTime: 2024-04-07 11:33 - *@Description: TODO - *@Version: 1.0 - */ @Slf4j @DubboService public class IBdStoreMonthCheckConfigProvider implements IBdStoreMonthCheckConfigApi { + @Autowired private IBdStoreMonthCheckConfigService storeMonthCheckConfigService; - /** - * 查询配置 - * @param pkStoreMonthCheckConfig - * @return - */ @Override public R getByStoreMonthCheckConfig(Integer pkStoreMonthCheckConfig) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_ID",pkStoreMonthCheckConfig); + queryWrapper.eq("PK_ID", pkStoreMonthCheckConfig); queryWrapper.ge("START_DATE", DateUtils.currentDate()); queryWrapper.le("END_DATE", DateUtils.currentDate()); BdStoreMonthCheckConfig storeMonthCheckConfig = storeMonthCheckConfigService.getOne(queryWrapper); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 9747fb9..3150304 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -225,18 +225,6 @@ SELECT 1 FROM dual - - merge into cu_member a - using (select pk_member, max(pk_awards) pk_awards - from tmp_cu_member_awards - group by pk_member) b - on (a.pk_id = b.pk_member) - when matched then - update set - a.pk_awards = b.pk_awards, - a.modified_time = sysdate - - update cu_member set resale_income_number= resale_income_number - #{reSaleNumber}, @@ -722,46 +710,6 @@ - - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml index 92e223d..67cf90d 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml @@ -88,16 +88,7 @@ and APPROVE_STATUS =#{approveStatus} - - + - - - - - select nvl(max(APPROVE_NUMBER),0) from CU_MEMBER_SERVICE_LOG - where EDIT_TYPE = #{editType} - and APPROVE_STATUS=#{approveStatus} - - - select - hw.*,a.CREATION_TIME haveTime,a.PK_MEMBER - from CU_HONOR_WALL hw + select hw.*, + a.CREATION_TIME haveTime, + a.PK_MEMBER + from CU_HONOR_WALL hw - left join ( - select mhw.CREATION_TIME,mhw.PK_MEMBER,mhw.PK_HONOR_WALL from CU_MEMBER_HONOR_WALL mhw where mhw.PK_MEMBER = #{pkMember} - ) a on a.PK_HONOR_WALL = hw.pk_id - where hw.PK_COUNTRY = #{pkCountry} - order by hw.type,hw.value + left join ( + select mhw.CREATION_TIME, mhw.PK_MEMBER, mhw.PK_HONOR_WALL from CU_MEMBER_HONOR_WALL mhw where mhw.PK_MEMBER = #{pkMember} + ) a on a.PK_HONOR_WALL = hw.pk_id + where hw.PK_COUNTRY = #{pkCountry} + order by hw.type, hw.value diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml index 3980b44..3db9b72 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml @@ -4,56 +4,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - PK_ID, STATIS_TYPE, PERIOD, START_DATE, END_DATE, MAIN_REG_AMOUNT, MAIN_UP_AMOUNT, MAIN_REPUR_AMOUNT, AGENT_REG_AMOUNT, AGENT_UP_AMOUNT, AGENT_REPUR_AMOUNT, HIFANS_REG_AMOUNT, TOTAL_AMOUNT, INTRODUCE_BONUS, INTRODUCE_BONUS_RATE, ORG_BONUS, ORG_BONUS_RATE, LEADER_BONUS, LEADER_BONUS_RATE, SHARE_BONUS, SHARE_BONUS_RATE, SERVICE_BONUS, SERVICE_BONUS_RATE, SEABEAN, REPUR_RANGE_BONUS, SEABEAN_REPUR_RANGE, REPUR_ORG_BONUS, AGENT_INTRODUCE_BONUS, AGENT_AREA_BONUS, MAIN_BONUS, MAIN_BONUS_RATE, REPUR_BONUS, REPUR_BONUS_RATE, TOTAL_BONUS, TOTAL_BONUS_RATE, TOTAL_BONUS_REAL, STATIS_SYS - - - - + - + - - - - - - - - - - - select - sum(MAIN_REG_AMOUNT + MAIN_UP_AMOUNT+SPECIAL_REGISTER_AMOUNT+ - SPECIAL_UPGRADE_AMOUNT+MAKER_GIFT_AMOUNT) firstPurchaseAll, - sum(MAIN_REPUR_AMOUNT + HIFANS_REG_AMOUNT+HAI_FUN_UPGRADE_AMOUNT+CLOUD_COLLEGE_AMOUNT + select + sum(MAIN_REG_AMOUNT + MAIN_UP_AMOUNT+SPECIAL_REGISTER_AMOUNT+ + SPECIAL_UPGRADE_AMOUNT+MAKER_GIFT_AMOUNT) firstPurchaseAll, + sum(MAIN_REPUR_AMOUNT + HIFANS_REG_AMOUNT+HAI_FUN_UPGRADE_AMOUNT+CLOUD_COLLEGE_AMOUNT +EMPOWERMENT_GIFT_AMOUNT+COOPERATE_AMOUNT+SPECIAL_REPURCHASE_AMOUNT) repurchaseAllAmount, - sum(REAL_INCOME_TOTAL) totalBonus, - sum(INTRODUCE_BONUS) introduceBonus, - sum(ORG_BONUS) orgBonus, - sum(LEADER_BONUS) leaderBonus, - sum(SHARE_BONUS) shareBonus, - sum(SERVICE_BONUS) serviceBonus, - sum(REPUR_RANGE_BONUS) repurRangeBonus, - sum(REPUR_ORG_BONUS) repurOrgBonus, - sum(AGENT_INTRODUCE_BONUS) agentIntroduceBonus, - sum(AGENT_REG_AMOUNT+AGENT_UP_AMOUNT) agentFirstAmount, - sum(AGENT_REPUR_AMOUNT) agentRepurAmount - from CU_BONUS_STATIS + sum(REAL_INCOME_TOTAL) totalBonus, + sum(INTRODUCE_BONUS) introduceBonus, + sum(ORG_BONUS) orgBonus, + sum(LEADER_BONUS) leaderBonus, + sum(SHARE_BONUS) shareBonus, + sum(SERVICE_BONUS) serviceBonus, + sum(REPUR_RANGE_BONUS) repurRangeBonus, + sum(REPUR_ORG_BONUS) repurOrgBonus, + sum(AGENT_INTRODUCE_BONUS) agentIntroduceBonus, + sum(AGENT_REG_AMOUNT+AGENT_UP_AMOUNT) agentFirstAmount, + sum(AGENT_REPUR_AMOUNT) agentRepurAmount + from CU_BONUS_STATIS WHERE PK_COUNTRY=#{pkCountry} @@ -522,7 +284,7 @@ - + delete from CU_BONUS_STATIS where 1=1 @@ -589,7 +351,7 @@ ORDER BY a.BACK_RATIO,a.PLATFORM_RATIO DESC - + - + - - - @@ -669,7 +422,7 @@ sum( real_income ) real_income, PK_BONUS_ITEMS FROM - ( SELECT pk_order, real_income,PK_BONUS_ITEMS FROM CU_MEMBER_BONUS_EXPAND WHERE del_flag = 0 AND income_status = 0 ) + ( SELECT pk_order, real_income,PK_BONUS_ITEMS FROM CU_MEMBER_BONUS_EXPAND WHERE del_flag = 0 AND income_status = 0 ) GROUP BY pk_order,PK_BONUS_ITEMS ) mbe @@ -698,7 +451,7 @@ sum( real_income ) real_income, PK_BONUS_ITEMS FROM - ( SELECT pk_order, real_income,PK_BONUS_ITEMS FROM CU_MEMBER_BONUS_COACH WHERE del_flag = 0 AND income_status = 0 ) + ( SELECT pk_order, real_income,PK_BONUS_ITEMS FROM CU_MEMBER_BONUS_COACH WHERE del_flag = 0 AND income_status = 0 ) GROUP BY pk_order,PK_BONUS_ITEMS ) mbc @@ -727,7 +480,7 @@ sum( real_income ) real_income, PK_BONUS_ITEMS FROM - ( SELECT pk_order, real_income,PK_BONUS_ITEMS FROM cu_member_bonus_range mbr WHERE del_flag = 0 AND income_status = 0 ) + ( SELECT pk_order, real_income,PK_BONUS_ITEMS FROM cu_member_bonus_range mbr WHERE del_flag = 0 AND income_status = 0 ) GROUP BY pk_order,PK_BONUS_ITEMS ) mbr @@ -746,6 +499,4 @@ - - diff --git a/bd-business/bd-business-sale/pom.xml b/bd-business/bd-business-sale/pom.xml index e29ab53..8f6c8c0 100644 --- a/bd-business/bd-business-sale/pom.xml +++ b/bd-business/bd-business-sale/pom.xml @@ -47,12 +47,6 @@ bd-api-bonus - - - com.bd.africa - bd-api-scm - - diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java index c36f9ee..b171904 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java @@ -12,21 +12,9 @@ import java.util.List; /** * 销售订单-发货单 Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface SaDeliverMapper extends BaseMapper { - /** - * 出货单打印校验 - * - * @param idList 发货单ID列表 - * @param pkCountry 国家ID - * @return - */ - List deliverPrintCheck(@Param("idList") List idList, @Param("pkCountry") Integer pkCountry); - /** * 出货单打印列表 * @@ -92,13 +80,4 @@ public interface SaDeliverMapper extends BaseMapper { */ List queryDeliverByOrder(@Param("pkOrder") Long pkOrder); - /** - * 查询发货单+明细列表 - * - * @param idList 发货单ID列表 - * @param pkCountry 所属国家 - * @return - */ - List queryDeliverAndItemsList(@Param("idList") List idList, @Param("pkCountry") Integer pkCountry); - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/provider/SaDeliverServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/provider/SaDeliverServiceProvider.java deleted file mode 100644 index 6c8759e..0000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/provider/SaDeliverServiceProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.sale.deliver.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.ext.SaDeliverExt; -import com.hzs.sale.deliver.ISaDeliverServiceApi; -import com.hzs.sale.deliver.service.ISaDeliverService; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * @Description: 发货单相关dubbo服务 - * @Author: jiang chao - * @Time: 2023/12/19 14:28 - * @Classname: SaDeliverServiceProvider - * @PackageName: com.hzs.sale.deliver.provider - */ -@Slf4j -@DubboService -public class SaDeliverServiceProvider implements ISaDeliverServiceApi { - - @Autowired - private ISaDeliverService iSaDeliverService; - - @Override - public R> queryDeliverList(List idList, Integer pkCountry) { - try { - return R.ok(iSaDeliverService.queryDeliverAndItemsList(idList, pkCountry)); - } catch (Exception e) { - log.error("查询发货单及明细数据异常：{}", e.getMessage(), e); - return R.fail(e.getMessage()); - } - } - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverBusinessService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverBusinessService.java index b413583..7052428 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverBusinessService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverBusinessService.java @@ -10,11 +10,7 @@ import com.hzs.system.sys.dto.LoginUser; import java.util.List; /** - * @Description: 发货单业务服务 - * @Author: jiang chao - * @Time: 2023/3/24 17:31 - * @Classname: ISaDeliverBusinessService - * @PackageName: com.hzs.sale.deliver.service + * 发货单业务服务 */ public interface ISaDeliverBusinessService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java index a0e4e91..8472b4c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java @@ -2,7 +2,6 @@ package com.hzs.sale.deliver.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.sale.deliver.SaDeliver; -import com.hzs.common.domain.sale.ext.SaDeliverExt; import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.sale.deliver.param.DeliverConfirmParam; import com.hzs.sale.deliver.param.DeliverHandledParam; @@ -17,9 +16,6 @@ import java.util.List; /** * 销售订单-发货单 服务类 - * - * @author hzs - * @since 2022-08-31 */ public interface ISaDeliverService extends IService { @@ -43,15 +39,6 @@ public interface ISaDeliverService extends IService { */ List queryDeliverHandledList(DeliverHandledParam param, Integer pkCountry); - /** - * 出货单打印校验 - * - * @param idList 发货单ID列表 - * @param pkCountry 国家ID - * @return - */ - List deliverPrintCheck(List idList, Integer pkCountry); - /** * 发货单打印 * @@ -152,12 +139,4 @@ public interface ISaDeliverService extends IService { */ int deleteDeliverByItemsCount(Long pkDeliver, Long userId, Integer pkCountry); - /** - * 查询发货单+明细列表 - * - * @param idList 发货单ID列表 - * @param pkCountry 所属国家 - * @return - */ - List queryDeliverAndItemsList(List idList, Integer pkCountry); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java index 27404df..ed99865 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.constant.RabbitMqConstants; import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants; @@ -47,7 +46,6 @@ import com.hzs.sale.order.service.*; import com.hzs.sale.pub.dto.SecondAccountDTO; import com.hzs.sale.pub.dto.SecondDTO; import com.hzs.sale.pub.dto.SecondProductDTO; -import com.hzs.scm.pub.dto.DeliverDTO; import com.hzs.system.base.IBarCodeServiceApi; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.BarCodeUseDTO; @@ -59,7 +57,6 @@ import com.hzs.system.sys.dto.ApprovalSubmitDTO; import com.hzs.system.sys.dto.LoginUser; 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; @@ -70,11 +67,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 发货单业务服务 - * @Author: jiang chao - * @Time: 2023/3/24 17:32 - * @Classname: SaDeliverBusinessServiceImpl - * @PackageName: com.hzs.sale.deliver.service.impl + * 发货单业务服务 */ @Slf4j @Service @@ -96,22 +89,19 @@ public class SaDeliverBusinessServiceImpl implements ISaDeliverBusinessService { private ISaDeliverItemsService iSaDeliverItemsService; @Autowired private ISaDeliverBarCodeService iSaDeliverBarCodeService; - - @DubboReference - private IApprovalServiceApi iApprovalServiceApi; - @DubboReference - private IBarCodeServiceApi iBarCodeServiceApi; - @DubboReference - private IMemberAccountServiceApi iMemberAccountServiceApi; - @DubboReference - private ICurrencyServiceApi iCurrencyServiceApi; - @DubboReference - private IAccountServiceApi iAccountServiceApi; @Autowired private ISaOrderSelfLogService saOrderSelfLogService; - @Autowired - private RabbitTemplate rabbitTemplate; + @DubboReference + IApprovalServiceApi iApprovalServiceApi; + @DubboReference + IBarCodeServiceApi iBarCodeServiceApi; + @DubboReference + IMemberAccountServiceApi iMemberAccountServiceApi; + @DubboReference + ICurrencyServiceApi iCurrencyServiceApi; + @DubboReference + IAccountServiceApi iAccountServiceApi; @Transactional(rollbackFor = Exception.class) @@ -290,7 +280,7 @@ public class SaDeliverBusinessServiceImpl implements ISaDeliverBusinessService { UpdateWrapper updateOrder = new UpdateWrapper<>(); updateOrder.set("DELIVERY_WAY", EDelivery.COMPANY_PICKED_UP.getValue()); // 更新仓库 - if(pkStorehouse != null){ + if (pkStorehouse != null) { updateOrder.set("PK_STOREHOUSE", pkStorehouse); } updateOrder.set(SystemFieldConstants.PK_MODIFIED, userId); @@ -354,28 +344,9 @@ public class SaDeliverBusinessServiceImpl implements ISaDeliverBusinessService { saDeliverBarCode.setModifiedTime(nowDate); deliverBarCodeList.add(saDeliverBarCode); } - if(deliverBarCodeList.size() > 0) { + if (deliverBarCodeList.size() > 0) { iSaDeliverBarCodeService.insertBatch(deliverBarCodeList); } - -// if (null != postage && postage.compareTo(BigDecimal.ZERO) != 0) { -// // 返还邮费不为0，则需要处理邮费 -// R resultR = iMemberAccountServiceApi.orderSelfDeliver(saOrder.getPkCreator(), saOrder.getPkRate(), saOrder.getPkCountry(), postage, userId); -// if (!resultR.isSuccess()) { -// log.error("订单自提同意返还邮费处理失败: {}", resultR.getMsg()); -// // 签呈处理失败 -// throw new ServiceException(TransactionUtils.getContent(CommonMsgConstants.APPROVAL_ERROR) + "：" + resultR.getMsg()); -// } -// } - if(saDeliver.getPkId() != null && deliverItemsList.size() >0) { - List deliverIdList = new ArrayList<>(); - deliverIdList.add(saDeliver.getPkId()); - // 推送进销存处理数据 - rabbitTemplate.convertAndSend(RabbitMqConstants.SCM_DELIVER_EXCHANGE, RabbitMqConstants.SCM_DELIVER_KEY, DeliverDTO.builder() - .deliverIdList(deliverIdList) - .loginUser(approvalBusinessResultDTO.getLoginUser()) - .build()); - } return null; } log.error("订单自提同意处理失败: 更新数据失败"); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java index 7a7cf5f..a60a2e5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java @@ -3,7 +3,6 @@ package com.hzs.sale.deliver.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.core.constant.RabbitMqConstants; import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.constant.msg.SaOrderMsgConstants; import com.hzs.common.core.enums.*; @@ -13,7 +12,6 @@ import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.sale.deliver.SaDeliver; import com.hzs.common.domain.sale.deliver.SaDeliverBarCode; import com.hzs.common.domain.sale.deliver.SaDeliverItems; -import com.hzs.common.domain.sale.ext.SaDeliverExt; import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrderItems; import com.hzs.common.core.utils.TransactionUtils; @@ -29,7 +27,6 @@ import com.hzs.sale.deliver.vo.DeliverHandledVO; import com.hzs.sale.deliver.vo.DeliverPrintVO; import com.hzs.sale.deliver.vo.DeliverVO; import com.hzs.sale.order.mapper.SaOrderItemsMapper; -import com.hzs.scm.pub.dto.DeliverDTO; import com.hzs.system.base.IBarCodeServiceApi; import com.hzs.system.sys.dto.LoginUser; import org.apache.dubbo.config.annotation.DubboReference; @@ -44,9 +41,6 @@ import java.util.stream.Collectors; /** * 销售订单-发货单 服务实现类 - * - * @author hzs - * @since 2022-08-31 */ @Service public class SaDeliverServiceImpl extends ServiceImpl implements ISaDeliverService { @@ -58,11 +52,8 @@ public class SaDeliverServiceImpl extends ServiceImpl deliverPrintCheck(List idList, Integer pkCountry) { - return baseMapper.deliverPrintCheck(idList, pkCountry); - } - @Transactional(rollbackFor = Exception.class) @Override public List deliverPrint(List idList, Integer pkCountry, Long userId) { @@ -207,13 +193,11 @@ public class SaDeliverServiceImpl extends ServiceImpl queryDeliverAndItemsList(List idList, Integer pkCountry) { - return baseMapper.queryDeliverAndItemsList(idList, pkCountry); - } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/mapper/BdModifyRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/mapper/BdModifyRecordMapper.java index 91fd9ad..26516c7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/mapper/BdModifyRecordMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/mapper/BdModifyRecordMapper.java @@ -1,19 +1,11 @@ package com.hzs.sale.modifyrecord.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.sale.modifyRecord.BdModifyRecord; -import org.apache.ibatis.annotations.Param; /** - *

* 修改记录 Mapper 接口 - *

- * - * @author hzs - * @since 2023-02-27 */ public interface BdModifyRecordMapper extends BaseMapper { - BdModifyRecord selectByLastWaresEditInfo(@Param("waresId") Integer waresId); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/IBdModifyRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/IBdModifyRecordService.java index 6f50485..782eb23 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/IBdModifyRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/IBdModifyRecordService.java @@ -1,29 +1,17 @@ package com.hzs.sale.modifyrecord.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.sale.modifyRecord.BdModifyRecord; import com.hzs.system.sys.dto.LoginUser; /** - *

* 修改记录 服务类 - *

- * - * @author hzs - * @since 2023-02-27 */ public interface IBdModifyRecordService extends IService { - /** - * 查询商品最近一条记录 - * @param waresId - * @return - */ - BdModifyRecord selectByLastWaresEditInfo(Integer waresId); - /** * 审核 + * * @param modifyRecord */ void examineAndVerify(BdModifyRecord modifyRecord, LoginUser loginUser); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/impl/BdModifyRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/impl/BdModifyRecordServiceImpl.java index 0591524..8233698 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/impl/BdModifyRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/modifyrecord/service/impl/BdModifyRecordServiceImpl.java @@ -1,6 +1,5 @@ package com.hzs.sale.modifyrecord.service.impl; - import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.domain.R; @@ -25,15 +24,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** - *

* 修改记录 服务实现类 - *

- * - * @author hzs - * @since 2023-02-27 */ @Service public class BdModifyRecordServiceImpl extends ServiceImpl implements IBdModifyRecordService { + @Autowired private IBdWaresService waresService; @Autowired @@ -41,43 +36,30 @@ public class BdModifyRecordServiceImpl extends ServiceImpl user = userServiceApi.selectUserById(SecurityUtils.getUserId()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java index f7639f3..2821575 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java @@ -1,13 +1,9 @@ package com.hzs.sale.order.controller; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.HttpStatus; import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.ComputeUtil; @@ -20,13 +16,7 @@ import com.hzs.common.domain.member.account.CuMemberAccount; 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.common.domain.sale.order.SaOrderItems; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.system.base.BdStorehouse; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.core.utils.TransactionUtils; import com.hzs.member.base.IMemberServiceApi; @@ -39,11 +29,7 @@ import com.hzs.sale.shopping.service.IShoppingCartService; import com.hzs.sale.shopping.vo.ProductGroup; import com.hzs.sale.shopping.vo.ShoppingCartRedis; import com.hzs.sale.shopping.vo.ShoppingCartVO; -import com.hzs.sale.util.WaresSpecialUtil; -import com.hzs.sale.wares.service.IBdWaresDetailService; -import com.hzs.scm.pub.IScmBillServiceApi; import com.hzs.system.base.IAreaServiceApi; -import com.hzs.system.base.ICountryServiceApi; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import lombok.extern.slf4j.Slf4j; @@ -53,13 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.*; -/** - * @Description: - * @Author: sui q - * @Time: 2022/8/30 8:42 - * @Classname: ParentOrderController - * @PackageName: com.hzs.sale.order.controller - */ @Slf4j public abstract class ParentOrderController extends BaseController { @@ -69,22 +48,11 @@ public abstract class ParentOrderController extends BaseController { ICurrencyServiceApi currencyServiceApi; @DubboReference IMemberServiceApi iMemberServiceApi; - @DubboReference - ICountryServiceApi iCountryServiceApi; - @DubboReference - IScmBillServiceApi scmBillServiceApi; private ISaOrderService orderService; protected RedisService redisService; - private IBdWaresDetailService bdWaresDetailService; - - @Autowired - public void setBdWaresDetailService(IBdWaresDetailService bdWaresDetailService) { - this.bdWaresDetailService = bdWaresDetailService; - } - @Autowired protected IShoppingCartService shoppingCartService; @@ -103,22 +71,18 @@ public abstract class ParentOrderController extends BaseController { } /** + * 根据code、编码从redis缓存中获取值 + * * @param code 查询的code - * @Description: 根据code、编码从redis缓存中获取值 - * @return: CuMember - * @Author: sui q - * @Date: 2022/8/30 8:48 */ protected CuMember getCuMemberByCode(String code) { return orderService.getCuMemberByCode(code); } /** + * 验证字段是否必输 + * * @param fieldList 需要验证的字段 - * @Description: 验证字段是否必输 - * @return: boolean - * @Author: sui q - * @Date: 2022/8/29 11:13 */ protected boolean validateFieldNotNull(OrderParam orderParam, List fieldList) { return fieldList.stream().anyMatch(field -> { @@ -128,27 +92,9 @@ public abstract class ParentOrderController extends BaseController { } /** - * 校验银行相关字段 + * 验证手机号+姓名 * - * @param orderParam - * @return true 存在空值 - */ - protected boolean validateBankNotNull(OrderParam orderParam) { -// if (redisService.hasKey(CacheConstants.REGISTER_BANK_FLAG + orderParam.getPkSettleCountry())) { - // 缓存中存在注册银行控制KEY，则不需要校验必填银行信息 - return false; -// } else { -// return null == orderParam.getPkBank() || -// StringUtils.isAnyEmpty(orderParam.getSubBankName(), orderParam.getCardNumber(), orderParam.getAccountName(), orderParam.getIdCard()); -// } - } - - /** * @param orderParam 手机号、姓名、安置人必输 - * @Description: 验证手机号+姓名 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:51 */ protected AjaxResult validatePhone(OrderParam orderParam) { if (StringUtils.isEmpty(orderParam.getPhone()) || StringUtils.isEmpty(orderParam.getMemberName())) { @@ -209,11 +155,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证推荐编号，成功后返回姓名，如果首单返回安置人、安置部门 + * * @param orderParam 必须推荐人 - * @Description: 验证推荐编号，成功后返回姓名，如果首单返回安置人、安置部门 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ protected AjaxResult validateReferenceRelation(OrderParam orderParam) { if (StringUtils.isEmpty(orderParam.getParent())) { @@ -284,11 +228,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证安置编号、安置部门，成功后返回姓名 + * * @param orderParam 必须安置人 - * @Description: 验证安置编号、安置部门，成功后返回姓名 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ protected AjaxResult validatePlaceParentMemberCode(OrderParam orderParam) { if (StringUtils.isEmpty(orderParam.getParent())) { @@ -354,11 +296,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证需要注册的信息, 订单保存时需要调用的验证 + * * @param orderParam 所有信息 - * @Description: 验证需要注册的信息, 订单保存时需要调用的验证 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/2 16:15 */ protected AjaxResult validateSaveMember(OrderParam orderParam) { // 安置编号 @@ -386,132 +326,6 @@ public abstract class ParentOrderController extends BaseController { return AjaxResult.success(orderParam); } - /* - * @description: 验证可用量，可用量不足，不能下单 - * @author: sui q - * @date: 2023/12/14 17:49 - * @param: null null - **/ - protected String validateAvailableNum(OrderParam orderParam, String orderCode) { - // 验证是否控制进销存 - R bdStorehouseR = iCountryServiceApi.queryBdStorehouseByCountry(orderParam.getPkSettleCountry()); - if (bdStorehouseR != null && bdStorehouseR.getData() != null) { - orderParam.setPkStorehouse(bdStorehouseR.getData().getPkId()); - } - if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) { - return null; - } - // 2024.01.18 需求确认，目前海外按国家维护总仓库存 -// if(CountryConstants.CHINA_COUNTRY == orderParam.getPkSettleCountry() || orderParam.getPkStorehouse() == null){ -// if(orderParam.getRecProvince() != null) { -// // 根据收货省获取仓库 -// bdStorehouse = currencyServiceApi.queryBdStorehouseByProvince(orderParam.getRecProvince()).getData(); -// }else{ -// return MemberMsgConstants.REQUIRED_NOT_EMPTY; -// } -// }else{ -// bdStorehouse = currencyServiceApi.queryBdStorehouseById(orderParam.getPkStorehouse()).getData(); -// } - if (bdStorehouseR == null || bdStorehouseR.getData() == null) { - return ScmMsgConstants.AVAILABLE_NUM_NOT_ENOUGH; - } - BdStorehouse bdStorehouse = bdStorehouseR.getData(); -// Integer specialArea = orderParam.getSpecialArea(); -// if (ESpecialArea.UPGRADE_FORM.getValue() == orderParam.getSpecialArea()) { -// specialArea = ESpecialArea.REGISTER_AREA_FORM.getValue(); -// } else if (ESpecialArea.UPGRADE_CONSUMPTION.getValue() == orderParam.getSpecialArea()) { -// specialArea = ESpecialArea.REGISTER_AREA_CONSUMPTION.getValue(); -// } - // 验证可用量，根据参数获得产品规格 - List availableNumList; - if (EOrderType.PICK_ORDER.getValue() == orderParam.getSpecialArea()) { - SaOrderExt saOrderExt = redisService.getCacheObject(CacheConstants.TEMP_ORDER + orderParam.getCenterCodeId() + orderCode); - if (saOrderExt == null) { - return ScmMsgConstants.AVAILABLE_NUM_NOT_ENOUGH; - } - availableNumList = new ArrayList<>(); - for (SaOrderItems orderItems : saOrderExt.getOrderItemsList()) { - IcAvailableNum availableNum = IcAvailableNum.builder() - .availableNum(BigDecimal.valueOf(orderItems.getQuantity())) - .pkProduct(orderItems.getPkProduct()) - .pkCorp(bdStorehouse.getPkCorp()) - .pkStorehouse(bdStorehouse.getPkId()) - .preSaleStatus(EPresaleStatus.ON_SALE.getValue()) - .build(); - String[] split = orderItems.getSpecsNameId().split(","); - List scmItemSpecsList = new ArrayList<>(); - for (String pkSpecsId : split) { - ScmItemSpecs scmItemSpecs = new ScmItemSpecs(); - scmItemSpecs.setPkSpecs(Integer.parseInt(pkSpecsId)); - scmItemSpecsList.add(scmItemSpecs); - } - availableNum.setScmItemSpecsList(scmItemSpecsList); - availableNumList.add(availableNum); - } - } else { - availableNumList = bdWaresDetailService.queryWaresDetailSpecsByCondition(WaresSpecialUtil.getWaresSpecial(orderParam.getSpecialArea()), bdStorehouse.getPkCorp(), - bdStorehouse.getPkId(), orderParam.getOrderItemsParams()); - } - List returnAvailableNumList = new ArrayList<>(); - List queryAvailableNumList = new ArrayList<>(); - if (availableNumList != null && availableNumList.size() > 0) { - for (IcAvailableNum icAvailableNum : availableNumList) { - if (null != icAvailableNum.getPreSaleStatus() && EPresaleStatus.PRESALE.getValue() == icAvailableNum.getPreSaleStatus()) { - returnAvailableNumList.add(BeanUtil.copyProperties(icAvailableNum, IcAvailableNumExt.class)); - } else { - queryAvailableNumList.add(icAvailableNum); - returnAvailableNumList.add(BeanUtil.copyProperties(icAvailableNum, IcAvailableNumExt.class)); - } - } - } - if (queryAvailableNumList.size() > 0) { - Map availableNumMap = new HashMap<>(); - for (IcAvailableNum icAvailableNum : queryAvailableNumList) { - StringBuilder key = new StringBuilder(icAvailableNum.getPkProduct()); - for (ScmItemSpecs scmItemSpecs : icAvailableNum.getScmItemSpecsList()) { - key.append(scmItemSpecs.getPkSpecs()); - } - if (availableNumMap.containsKey(key.toString())) { - availableNumMap.get(key.toString()).setAvailableNum(ComputeUtil.computeAdd(availableNumMap.get(key.toString()).getAvailableNum(), icAvailableNum.getAvailableNum())); - } else { - availableNumMap.put(key.toString(), icAvailableNum); - } - } - List recQueryAvailableNumList = new ArrayList<>(availableNumMap.values()); - List availableNumExtList = scmBillServiceApi.queryAvailableNumByProduct(recQueryAvailableNumList).getData(); - if (CollectionUtil.isEmpty(availableNumExtList) || availableNumExtList.size() < recQueryAvailableNumList.size()) { - return ScmMsgConstants.AVAILABLE_NUM_NOT_ENOUGH; - } - - boolean flag = Boolean.FALSE; - for (IcAvailableNumExt icAvailableNum : availableNumExtList) { - if (icAvailableNum.getPkUnit() != 0) { - flag = Boolean.TRUE; - break; - } - icAvailableNum.setOrderCode(orderCode); - icAvailableNum.setPkCountry(orderParam.getPkSettleCountry()); - } - if (flag) { - return ScmMsgConstants.AVAILABLE_NUM_NOT_ENOUGH; - } - Date currentDateTime = DateUtils.currentDateTime(); - for (IcAvailableNum icAvailableNum : availableNumExtList) { - icAvailableNum.setPkModified(orderParam.getCenterCodeId()); - icAvailableNum.setModifiedTime(currentDateTime); - } - } - Date currentDateTime = DateUtils.currentDateTime(); - for (IcAvailableNumExt icAvailableNum : returnAvailableNumList) { - icAvailableNum.setPkCountry(orderParam.getPkCountry()); - icAvailableNum.setPkModified(orderParam.getCenterCodeId()); - icAvailableNum.setModifiedTime(currentDateTime); - icAvailableNum.setOrderCode(orderCode); - } - orderParam.setAvailableNumList(returnAvailableNumList); - return null; - } - protected AjaxResult validateFun(OrderParam orderParam) { // 报单中心 Long centerCodeId = orderParam.getCenterCodeId(); @@ -534,12 +348,10 @@ public abstract class ParentOrderController extends BaseController { } /** + * 对安置位置进行加锁预防位置重复 + * * @param placeParentId 安置人 * @param placeDept 安置位置 - * @Description: 对安置位置进行加锁预防位置重复 - * @return: void - * @Author: sui q - * @Date: 2022/9/5 9:20 */ protected boolean validatePlacePosition(Long placeParentId, Integer placeDept) { // 验证通过对安置人，安置部门加锁，防止同时安置引起错误，最后解锁 @@ -549,10 +361,6 @@ public abstract class ParentOrderController extends BaseController { /** * @param placeParentId 安置位置 * @param placeDept 安置部门 - * @Description: - * @return: String - * @Author: sui q - * @Date: 2022/9/5 10:35 */ private String getLockKey(Long placeParentId, Integer placeDept) { return CacheConstants.POSITION + @@ -561,11 +369,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 空单注册 验证权限，验证编号是否有报单权限 + * * @param centerCodeId 验证的权限 - * @Description: 空单注册 验证权限，验证编号是否有报单权限 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ protected AjaxResult validateRegisterAuthority(Long centerCodeId) { // 前台登录验证登录会员，后台空点验证输入的报单人 @@ -643,10 +449,6 @@ public abstract class ParentOrderController extends BaseController { * 验证手机号注册次数 * * @param cuMemberExtList 会员数量 - * @Description: - * @return: Boolean - * @Author: sui q - * @Date: 2022/8/29 11:38 */ private Boolean validatePhoneCount(List cuMemberExtList) { // 判断次数，获取系统参数，从redis中获取系统参数 @@ -684,11 +486,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证升级关系，只能给自己或者自己安置伞下升级 + * * @param orderParam 前台传递的参数 - * @Description: 验证升级关系，只能给自己或者自己安置伞下升级 - * @return: boolean - * @Author: sui q - * @Date: 2023/1/10 14:05 */ protected AjaxResult validateUpgradeRelation(OrderParam orderParam) { CuMember upgradeMember = orderService.getCuMemberByCode(orderParam.getUpgradeMemberCode()); @@ -722,12 +522,10 @@ public abstract class ParentOrderController extends BaseController { } /** + * 查询订单返回值，用于支付 + * * @param saOrder 订单 * @param orderParam 参数 - * @Description: 查询订单返回值，用于支付 - * @return: OrderReturn - * @Author: sui q - * @Date: 2023/2/2 11:11 */ protected OrderReturn getOrderReturn(SaOrder saOrder, OrderParam orderParam) { // 封装订单信息 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiFanSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiFanSaOrderController.java index 3381545..0b25026 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiFanSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiFanSaOrderController.java @@ -1,20 +1,16 @@ package com.hzs.sale.order.controller.api; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; import com.hzs.common.core.annotation.RepeatSubmit; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.constant.msg.SaOrderMsgConstants; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.core.utils.TransactionUtils; -import com.hzs.member.base.IMemberServiceApi; import com.hzs.sale.order.controller.ParentOrderController; import com.hzs.sale.order.param.*; import com.hzs.sale.shopping.vo.ShoppingCartVO; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,26 +18,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Description: 嗨粉订单 - * @Author: sui q - * @Time: 2022/10/25 11:38 - * @Classname: ApiFanSaOrderController - * @PackageName: com.hzs.sale.order.controller.api + * 嗨粉订单 */ @RestController @RequestMapping("/api/order") @Slf4j public class ApiFanSaOrderController extends ParentOrderController { - @DubboReference - private IMemberServiceApi iMemberServiceApi; - /** + * 报单中心确认嗨粉订单，生成待支付订单,只有注册订单有待支付订单 + * * @param orderParam 订单参数 - * @Description: 报单中心确认嗨粉订单，生成待支付订单,只有注册订单有待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/confirm-fun-order") @RepeatSubmit @@ -61,11 +48,7 @@ public class ApiFanSaOrderController extends ParentOrderController { return result; } convertShoppingCarToSku(orderParam); - // 验证可用量 - String msg = validateAvailableNum(orderParam, null); - if(ObjectUtil.isNotEmpty(msg)){ - return AjaxResult.error(TransactionUtils.getContent(msg)); - } + if (getOrderService().confirmRegSaOrderByOrderParam(orderParam)) { //删除购物车下单的数据 if (CollectionUtil.isNotEmpty(orderParam.getDeleteList())) { @@ -80,11 +63,9 @@ public class ApiFanSaOrderController extends ParentOrderController { } /** + * 报单中心确认嗨粉订单，生成待支付订单,只有注册订单有待支付订单 + * * @param orderParam 订单参数 自注册 - * @Description: 报单中心确认嗨粉订单，生成待支付订单,只有注册订单有待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/confirm-self-fun-order") @RepeatSubmit @@ -102,43 +83,4 @@ public class ApiFanSaOrderController extends ParentOrderController { } } - /** - * @param orderParam 订单参数 - * @Description: 只用于api测试在线支付是否好用 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 - */ - @PostMapping("/pay-self-fun-order") - public AjaxResult paySelfFunOrder(@RequestBody OrderParam orderParam) throws Exception { - initSecurityOrderParam(orderParam); - // 验证必输项 - if (StringUtils.isEmpty(orderParam.getOrderCode())) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - orderParam.setIsHaiFun(true); - if (getOrderService().onlinePaymentCallBack(orderParam.getCenterCodeId(), orderParam.getOrderCode())) { - return AjaxResult.success(orderParam); - } else { - return AjaxResult.error(); - } - } - - /** - * @param orderParam 订单参数 - * @Description: 只用于api测试注册在线支付是否好用 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 - */ - @PostMapping("/pay-self-order") - public AjaxResult paySelfOrder(@RequestBody OrderParam orderParam) throws Exception { - initSecurityOrderParam(orderParam); - if (getOrderService().onlinePaymentCallBack(orderParam.getCenterCodeId(), orderParam.getOrderCode())) { - return AjaxResult.success(orderParam); - } else { - return AjaxResult.error(); - } - } - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java index 8535d84..8297978 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java @@ -10,12 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; /** - * @description: 新人礼包领取礼包 - * @author: sui q - * @time: 2023/5/10 13:46 - * @classname: ApiGiftSaOrderController - * @package_name: com.hzs.sale.order.controller.api - * version 1.0.0 + * 新人礼包领取礼包 */ @RestController @RequestMapping("/api/order") @@ -23,18 +18,16 @@ import org.springframework.web.bind.annotation.*; public class ApiGiftSaOrderController extends ParentOrderController { /** + * 确认注册订单，生成待支付订单,只有注册订单有待支付订单 + * * @param orderParam 订单参数 - * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/confirm-gift-order") @RepeatSubmit public AjaxResult confirmRegisterOrder(@RequestBody OrderParam orderParam) { initSecurityOrderParam(orderParam); // 查询新人礼包方案 - if(!checkPeopleRecMsgBoolean(orderParam)){ + if (!checkPeopleRecMsgBoolean(orderParam)) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } getOrderService().confirmNewPeopleGift(orderParam); @@ -42,8 +35,8 @@ public class ApiGiftSaOrderController extends ParentOrderController { } private Boolean checkPeopleRecMsgBoolean(OrderParam orderParam) { - return orderParam.getPkNewPeople() != null && orderParam.getRecPhone() != null && orderParam.getRecName() != null - &&orderParam.getRecName() != null && orderParam.getRecPhone() != null + return orderParam.getPkNewPeople() != null && orderParam.getRecPhone() != null && orderParam.getRecName() != null + && orderParam.getRecName() != null && orderParam.getRecPhone() != null && orderParam.getRecProvince() != null && orderParam.getRecCity() != null; } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java index 38c16d7..bf03fdd 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java @@ -1,7 +1,6 @@ package com.hzs.sale.order.controller.api; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; import com.hzs.common.core.annotation.RepeatSubmit; import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.HttpStatus; @@ -28,11 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Description: 其他订单（升级、复购）订单 - * @Author: sui q - * @Time: 2022/9/26 9:32 - * @Classname: ApiUpdSaOrderController - * @PackageName: com.hzs.sale.order.controller.api + * 其他订单（升级、复购）订单 */ @RestController @RequestMapping("/api/order") @@ -43,11 +38,9 @@ public class ApiOthSaOrderController extends ParentOrderController { private ISaOrderItemsService saOrderItemsService; /** + * 提供确认订单的方法 + * * @param orderParam 前台传递的参数 - * @Description: 提供确认订单的方法 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/10/24 21:03 */ @PostMapping("/confirm-oth-order") @RepeatSubmit @@ -64,11 +57,7 @@ public class ApiOthSaOrderController extends ParentOrderController { int tmpSpecialArea = ESpecialArea.getOrderTypeValue(orderParam.getSpecialArea()); if (tmpSpecialArea != EOrderType.REGISTER_ORDER.getValue()) { convertShoppingCarToSku(orderParam); - // 验证可用量 - String msg = validateAvailableNum(orderParam, null); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } + if (EOrderType.UPGRADE_ORDER.getValue() == tmpSpecialArea || EOrderType.REPURCHASE_ORDER.getValue() == tmpSpecialArea || EOrderType.RESALE_ORDER.getValue() == tmpSpecialArea @@ -97,10 +86,6 @@ public class ApiOthSaOrderController extends ParentOrderController { /** * @param orderParam 订单参数 - * @Description: - * @return: AjaxResult - * @Author: sui q - * @Date: 2023/2/4 14:48 */ @PostMapping("/validate-upg-rel") public AjaxResult validateUpgradeMemberCodeRelation(@RequestBody OrderParam orderParam) { @@ -110,10 +95,6 @@ public class ApiOthSaOrderController extends ParentOrderController { /** * @param orderParam 订单参数 - * @Description: - * @return: AjaxResult - * @Author: sui q - * @Date: 2023/2/4 14:48 */ @PostMapping("/query-special-deduct") public AjaxResult querySpecialDeduct(@RequestBody OrderParam orderParam) { @@ -126,11 +107,9 @@ public class ApiOthSaOrderController extends ParentOrderController { /** + * 支付升级订单，生成支付订单或者更新待支付订单 + * * @param orderParam 订单参数 - * @Description: 支付升级订单，生成支付订单或者更新待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/pay-oth-order") @RepeatSubmit @@ -173,11 +152,6 @@ public class ApiOthSaOrderController extends ParentOrderController { oldOrderParam = orderParam; oldOrderParam.setRecProvince(saOrderExt.getRecProvince()); } - // 验证可用量 - String msg = validateAvailableNum(oldOrderParam, saOrderExt.getOrderCode()); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } if (EOrderType.RENEWAL_ORDER.getValue() == tmpSpecialArea) { // 年包订单，订单价格需要大于等于会员等级年包价格，不然不能下单 @@ -195,7 +169,6 @@ public class ApiOthSaOrderController extends ParentOrderController { // 升级订单 if (EOrderType.UPGRADE_ORDER.getValue() == tmpSpecialArea) { if (getOrderService().payUpgradeSaOrder(saOrderExt, cuMemberAccountExt)) { - getOrderService().convertAvailableNumMsg(oldOrderParam.getAvailableNumList()); return AjaxResult.success(saOrderExt); } else { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.LEVEL_NOT_ENOUGH)); @@ -203,7 +176,6 @@ public class ApiOthSaOrderController extends ParentOrderController { } else { // 其它订单 if (getOrderService().payRepurchaseSaOrder(saOrderExt, cuMemberAccountExt)) { - getOrderService().convertAvailableNumMsg(oldOrderParam.getAvailableNumList()); return AjaxResult.success(saOrderExt); } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java index 0c43b6a..23253ff 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java @@ -2,7 +2,6 @@ package com.hzs.sale.order.controller.api; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; import com.hzs.common.core.annotation.RepeatSubmit; import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.CacheConstants; @@ -36,11 +35,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - * @author: sui q - * @time: 2022/8/27 16:20 - * @description: 订单控制类 - * @classname: OrderController - * @package_name: com.hzs.sale.order.controller + * 订单控制类 */ @RestController @RequestMapping("/api/order") @@ -51,11 +46,9 @@ public class ApiRegSaOrderController extends ParentOrderController { IGradeServiceApi gradeServiceApi; /** + * 确认注册订单，生成待支付订单,只有注册订单有待支付订单 + * * @param orderParam 订单参数 - * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/confirm-reg-order") @RepeatSubmit @@ -72,22 +65,13 @@ public class ApiRegSaOrderController extends ParentOrderController { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } - // 2024.08.19 添加银行信息等校验 - if (validateBankNotNull(orderParam)) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REGISTER_BANK_EMPTY)); - } - orderParam.setSource(source); AjaxResult result = validateSaveMember(orderParam); if ((Integer) result.get(AjaxResult.CODE_TAG) == HttpStatus.ERROR) { return result; } convertShoppingCarToSku(orderParam); - // 验证可用量 - String msg = validateAvailableNum(orderParam, null); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } + if (getOrderService().confirmRegSaOrderByOrderParam(orderParam)) { //删除购物车下单的数据 if (CollectionUtil.isNotEmpty(orderParam.getDeleteList())) { @@ -102,11 +86,9 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** + * 支付注册订单，生成支付订单或者更新待支付订单 + * * @param orderParam 订单参数 - * @Description: 支付注册订单，生成支付订单或者更新待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/pay-reg-order") @RepeatSubmit @@ -154,11 +136,6 @@ public class ApiRegSaOrderController extends ParentOrderController { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } - // 2024.08.19 添加银行信息等校验 - if (validateBankNotNull(orderParam)) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REGISTER_BANK_EMPTY)); - } - AjaxResult result = validateSaveMember(orderParam); if ((Integer) result.get(AjaxResult.CODE_TAG) == HttpStatus.ERROR) { return result; @@ -185,11 +162,7 @@ public class ApiRegSaOrderController extends ParentOrderController { oldOrderParam = new OrderParam(); oldOrderParam.setPkSettleCountry(SecurityUtils.getPkCountry()); } - // 验证可用量 - String msg = validateAvailableNum(oldOrderParam, saOrderExt.getOrderCode()); - if (ObjectUtil.isNotEmpty(msg)) { - return AjaxResult.error(TransactionUtils.getContent(msg)); - } + CuMemberAccountExt cuMemberAccountExt = (CuMemberAccountExt) result.get(AjaxResult.DATA_TAG); // 对安置位置加锁 if (validatePlacePosition(orderParam.getPlaceParentId(), orderParam.getPlaceDept())) { @@ -199,7 +172,6 @@ public class ApiRegSaOrderController extends ParentOrderController { if (cuMemberAccountExt.getIsPayment()) { // 开始支付 扣款 getOrderService().payRegSaOrder(saOrderExt, newCuMember, cuMemberAccountExt, isHaiFun); - getOrderService().convertAvailableNumMsg(oldOrderParam.getAvailableNumList()); } else { if (StringUtils.isEmpty(cuMemberAccountExt.getErrorMsg())) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_BALANCE_NOT_PAY)); @@ -219,19 +191,14 @@ public class ApiRegSaOrderController extends ParentOrderController { .loginPassword(newCuMember.getLoginPassword()) .payPassword(newCuMember.getPayPassword()) .urlAddress(BdConfig.getPc()) - .gzh(BdConfig.getGzh()) - .ios(BdConfig.getIos()) - .android(BdConfig.getAndroid()) .build(); return AjaxResult.success(orderReturn); } /** + * 查询订单 + * * @param orderParam 订单参数 - * @Description: 查询订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:56 */ @PostMapping("/query-order") public AjaxResult queryOrder(@RequestBody OrderParam orderParam) { @@ -308,11 +275,9 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** + * 查询订单邮费 + * * @param orderParam 订单参数 - * @Description: 查询订单邮费 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:56 */ @PostMapping("/query-order-postage") public AjaxResult queryOrderPostage(@RequestBody OrderParam orderParam) { @@ -329,11 +294,7 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** - * @description: 自助服务-修改收货地址邮费计算 - * @author: zhang jing - * @date: 2023/5/30 12:00 - * @param: [orderParam] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 自助服务-修改收货地址邮费计算 **/ @PostMapping("/self-order-postage") public AjaxResult selfOrderPostage(@RequestBody OrderParam orderParam) { @@ -347,11 +308,9 @@ public class ApiRegSaOrderController extends ParentOrderController { /** + * 查询订单消费明细 + * * @param orderParam 订单参数 - * @Description: 查询订单消费明细 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:56 */ @PostMapping("/query-spend-details") public AjaxResult queryOrderSpendDetails(@RequestBody OrderParam orderParam) { @@ -400,11 +359,9 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** + * 验证手机号+姓名 + * * @param orderParam 手机号、姓名 - * @Description: 验证手机号+姓名 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:51 */ @Override @PostMapping("/valid-phone") @@ -414,11 +371,9 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** + * 验证推荐编号、推荐关系，成功后返回姓名,只有注册订单调用 + * * @param orderParam 必须推荐人 - * @Description: 验证推荐编号、推荐关系，成功后返回姓名,只有注册订单调用 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ @Override @PostMapping("/valid-p-code") @@ -430,11 +385,9 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** + * 验证安置编号，成功后返回姓名 + * * @param orderParam 必须安置人 当传输的值中安置部门不为空时，校验安置位置 - * @Description: 验证安置编号，成功后返回姓名 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ @Override @PostMapping("/valid-p-p-code") @@ -445,10 +398,7 @@ public class ApiRegSaOrderController extends ParentOrderController { /** - * @Description: 空单注册 验证权限，验证编号是否有报单权限 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 + * 空单注册 验证权限，验证编号是否有报单权限 */ @PostMapping("/valid-authority") public AjaxResult validateRegisterAuthority() { @@ -457,11 +407,9 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** + * 校验会员等级, 计算会员等级 + * * @param orderParam 参数 - * @Description: 校验会员等级, 计算会员等级 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 */ @PostMapping("/valid-mem-level") public AjaxResult validateMemberLevel(@RequestBody OrderParam orderParam) { @@ -498,34 +446,17 @@ public class ApiRegSaOrderController extends ParentOrderController { } /* - * @description: 沙棘创客礼包仅为vip级会员开放 - * @author: sui q - * @date: 2023/8/22 9:35 - * @param: null null + * 沙棘创客礼包仅为vip级会员开放 **/ @PostMapping("/valid-enough-shop") public AjaxResult validateEnoughShop(@RequestBody OrderParam orderParam) { return AjaxResult.success(); -// if (orderParam.getSpecialArea() == null || orderParam.getDeleteList() == null || orderParam.getDeleteList().size() == 0) { -// return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.SPECIAL_AREA_NOT_EMPTY)); -// } -// orderParam.setCenterCodeId(SecurityUtils.getUserId()); -// initPkCountry(orderParam); -// convertShoppingCarToSku(orderParam); -// String msg = getOrderService().validateEnoughShopping(orderParam); -// if (msg == null) { -// return AjaxResult.success(); -// } else { -// return AjaxResult.error(msg); -// } } /** + * 快速注册 + * * @param orderParam 参数 - * @Description: 快速注册 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 */ @PostMapping("/quick-reg") public AjaxResult quickRegistration(@RequestBody OrderParam orderParam) { @@ -561,11 +492,9 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** + * 快速注册 + * * @param orderParam 参数 - * @Description: 快速注册 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 */ @PostMapping("/update-default") public AjaxResult setRegisterDefault(@RequestBody OrderParam orderParam) { @@ -577,10 +506,7 @@ public class ApiRegSaOrderController extends ParentOrderController { } /** - * @Description: 快速注册 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 + * 快速注册 */ @GetMapping("/query-default") public AjaxResult setRegisterDefault() { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java index c4404c4..9833716 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java @@ -16,16 +16,9 @@ import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrderRemarks; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.service.ITransactionCommonService; -import com.hzs.member.account.IMemberTradeServiceApi; -import com.hzs.member.base.IMemberServiceApi; -import com.hzs.member.detail.ICuMemberServiceLogServiceApi; -import com.hzs.member.store.ICuStoreServiceApi; -import com.hzs.member.storeconfig.IBdStoreMonthCheckConfigApi; import com.hzs.sale.order.controller.ParentOrderController; -import com.hzs.sale.order.controller.vo.OrderVo; import com.hzs.sale.order.controller.vo.StoreOrderTotalVo; import com.hzs.sale.order.dto.OrderBusinessTemplate; -import com.hzs.sale.order.param.MyOrderParam; import com.hzs.sale.order.param.OrderQueryParam; import com.hzs.sale.order.param.OrderSelectParam; import com.hzs.sale.order.param.WaresOrderParam; @@ -35,9 +28,6 @@ import com.hzs.sale.order.service.ISaOrderService; import com.hzs.sale.order.vo.*; import com.hzs.sale.util.OrderUtil; import com.hzs.system.base.IAreaServiceApi; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; -import com.hzs.system.config.IServiceChargeServiceApi; import com.hzs.system.sys.IUserServiceApi; import com.hzs.system.sys.dto.UserAuthorityDTO; import lombok.extern.slf4j.Slf4j; @@ -55,45 +45,27 @@ import java.util.stream.Collectors; /** * 订单控制类 - * - * @author: sui q - * @time: 2022/8/27 16:20 - * @description: - * @classname: OrderController - * @package_name: com.hzs.sale.order.controller */ @RestController @RequestMapping("/manage/order") @Slf4j public class SaOrderController extends ParentOrderController { - @DubboReference - private IAreaServiceApi iAreaServiceApi; - @DubboReference - private ICurrencyServiceApi iCurrencyServiceApi; - @DubboReference - private IBdStoreMonthCheckConfigApi storeMonthCheckConfigApi; - @DubboReference - private ICuStoreServiceApi storeServiceApi; + @Autowired private ITransactionCommonService iTransactionCommonService; - @DubboReference - private IServiceChargeServiceApi serviceChargeServiceApi; @Autowired private ISaOrderService orderService; @Autowired private ISaOrderRemarksService orderRemarksService; @Autowired private ISaOrderItemsService orderItemsService; + @DubboReference - private IMemberTradeServiceApi memberTradeServiceApi; + IAreaServiceApi areaServiceApi; @DubboReference - private IAreaServiceApi areaServiceApi; - @DubboReference - private IMemberServiceApi memberServiceApi; - @DubboReference - private ICuMemberServiceLogServiceApi memberServiceLogServiceApi; - @DubboReference - private IUserServiceApi iUserServiceApi; + IUserServiceApi iUserServiceApi; + + /** * 查询订单列表 * @@ -101,16 +73,16 @@ public class SaOrderController extends ParentOrderController { */ @GetMapping("query-order-list") public TableDataInfo getQueryList(WaresOrderParam waresOrderParam) { - if (waresOrderParam.getStartCreateDate() != null){ + if (waresOrderParam.getStartCreateDate() != null) { waresOrderParam.setStartCreateDate(DateUtils.getStartTime(waresOrderParam.getStartCreateDate())); } - if (waresOrderParam.getEndCreateDate() != null){ + if (waresOrderParam.getEndCreateDate() != null) { waresOrderParam.setEndCreateDate(DateUtils.getEndTime(waresOrderParam.getEndCreateDate())); } - if (waresOrderParam.getStartPayDate() != null){ + if (waresOrderParam.getStartPayDate() != null) { waresOrderParam.setStartPayDate(DateUtils.getStartTime(waresOrderParam.getStartPayDate())); } - if (waresOrderParam.getEndPayDate() != null){ + if (waresOrderParam.getEndPayDate() != null) { waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate())); } Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); @@ -122,7 +94,7 @@ public class SaOrderController extends ParentOrderController { waresOrderParam.setVertexIdList(userAuthorityDTO.getVertexIdList()); waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList()); startPage(); - if(waresOrderParam.getPkCountry()== CountryConstants.CHINA_COUNTRY){ + if (waresOrderParam.getPkCountry() == CountryConstants.CHINA_COUNTRY) { waresOrderParam.setPkCountry(null); } List resultList = orderService.selectByOrderInfoList(waresOrderParam); @@ -147,7 +119,7 @@ public class SaOrderController extends ParentOrderController { } } // 运输方式 - if(waresOrderVo.getTranType() != null) { + if (waresOrderVo.getTranType() != null) { waresOrderVo.setTranTypeStr(ETransportType.getETransportType(waresOrderVo.getTranType()).getLabel()); } // 预售状态 @@ -157,7 +129,7 @@ public class SaOrderController extends ParentOrderController { // 订单状态 if (waresOrderVo.getOrderStatus() != null) { EOrderStatus orderStatusEnum = EOrderStatus.getEOrderStatus(waresOrderVo.getOrderStatus()); - if (orderStatusEnum != null){ + if (orderStatusEnum != null) { waresOrderVo.setOrderStatusStr(orderStatusEnum.getLabel()); } } @@ -196,16 +168,16 @@ public class SaOrderController extends ParentOrderController { Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); // List resultList = orderService.selectByInvestmentList(waresOrderParam); waresOrderParam.setPkCountry(SecurityUtils.getPkCountry()); - if (waresOrderParam.getStartPayDate() != null){ + if (waresOrderParam.getStartPayDate() != null) { waresOrderParam.setStartPayDate(DateUtils.getStartTime(waresOrderParam.getStartPayDate())); } - if (waresOrderParam.getEndPayDate() != null){ + if (waresOrderParam.getEndPayDate() != null) { waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate())); } - if (waresOrderParam.getStartCreateDate() != null){ + if (waresOrderParam.getStartCreateDate() != null) { waresOrderParam.setStartCreateDate(DateUtils.getStartTime(waresOrderParam.getStartCreateDate())); } - if (waresOrderParam.getEndCreateDate() != null){ + if (waresOrderParam.getEndCreateDate() != null) { waresOrderParam.setEndCreateDate(DateUtils.getEndTime(waresOrderParam.getEndCreateDate())); } List resultList = orderItemsService.selectByInvestmentList(waresOrderParam); @@ -223,11 +195,11 @@ public class SaOrderController extends ParentOrderController { waresOrderVo.setRecCountryName(areaMap.get(waresOrderVo.getRecCountry())); } // 发货方式 - if(null!=waresOrderVo.getDeliveryWay()){ + if (null != waresOrderVo.getDeliveryWay()) { waresOrderVo.setDeliveryWayStr(EDelivery.getDelivery(waresOrderVo.getDeliveryWay()).getLabel()); } // 运输方式 - if (waresOrderVo.getTranType() != null){ + if (waresOrderVo.getTranType() != null) { waresOrderVo.setTranTypeStr(ETransportType.getETransportType(waresOrderVo.getTranType()).getLabel()); } @@ -256,7 +228,7 @@ public class SaOrderController extends ParentOrderController { // waresOrderVo.setOrderAchieve(waresOrderVo.getInExchangeRate().multiply(waresOrderVo.getOrderAchieve())); // } // 发货类型 - if (waresOrderVo.getShippingChannel() != null){ + if (waresOrderVo.getShippingChannel() != null) { waresOrderVo.setShippingChannelStr(EShippingChannel.getEnumByValue(waresOrderVo.getShippingChannel()).getLabel()); } // 计算产品总计 @@ -268,24 +240,25 @@ public class SaOrderController extends ParentOrderController { /** * 商品订单详情导出 + * * @param response * @param waresOrderParam */ @PostMapping("get-order-info-export") - public void getOrderList(WaresOrderParam waresOrderParam,HttpServletResponse response) { + public void getOrderList(WaresOrderParam waresOrderParam, HttpServletResponse response) { Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); // 导出缺少国家筛选 waresOrderParam.setPkCountry(SecurityUtils.getPkCountry()); - if (waresOrderParam.getStartPayDate() != null){ + if (waresOrderParam.getStartPayDate() != null) { waresOrderParam.setStartPayDate(DateUtils.getStartTime(waresOrderParam.getStartPayDate())); } - if (waresOrderParam.getEndPayDate() != null){ + if (waresOrderParam.getEndPayDate() != null) { waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate())); } - if (waresOrderParam.getStartCreateDate() != null){ + if (waresOrderParam.getStartCreateDate() != null) { waresOrderParam.setStartCreateDate(DateUtils.getStartTime(waresOrderParam.getStartCreateDate())); } - if (waresOrderParam.getEndCreateDate() != null){ + if (waresOrderParam.getEndCreateDate() != null) { waresOrderParam.setEndCreateDate(DateUtils.getEndTime(waresOrderParam.getEndCreateDate())); } List resultList = orderItemsService.selectByInvestmentList(waresOrderParam); @@ -305,7 +278,7 @@ public class SaOrderController extends ParentOrderController { // 发货方式 waresOrderVo.setDeliveryWayStr(EDelivery.getDelivery(waresOrderVo.getDeliveryWay()).getLabel()); // 运输方式 - if (waresOrderVo.getTranType() != null){ + if (waresOrderVo.getTranType() != null) { waresOrderVo.setTranTypeStr(ETransportType.getETransportType(waresOrderVo.getTranType()).getLabel()); } @@ -332,7 +305,7 @@ public class SaOrderController extends ParentOrderController { // 计算汇率 waresOrderVo.setOrderAchieve(waresOrderVo.getInExchangeRate().multiply(waresOrderVo.getOrderAchieve())); // 发货类型 - if (waresOrderVo.getShippingChannel() != null){ + if (waresOrderVo.getShippingChannel() != null) { waresOrderVo.setShippingChannelStr(EShippingChannel.getEnumByValue(waresOrderVo.getShippingChannel()).getLabel()); } } @@ -359,16 +332,16 @@ public class SaOrderController extends ParentOrderController { */ @PostMapping("get-order-list-export") public void getOrderListExport(HttpServletResponse response, WaresOrderParam waresOrderParam) { - if (waresOrderParam.getStartCreateDate() != null){ + if (waresOrderParam.getStartCreateDate() != null) { waresOrderParam.setStartCreateDate(DateUtils.getStartTime(waresOrderParam.getStartCreateDate())); } - if (waresOrderParam.getEndCreateDate() != null){ + if (waresOrderParam.getEndCreateDate() != null) { waresOrderParam.setEndCreateDate(DateUtils.getEndTime(waresOrderParam.getEndCreateDate())); } - if (waresOrderParam.getStartPayDate() != null){ + if (waresOrderParam.getStartPayDate() != null) { waresOrderParam.setStartPayDate(DateUtils.getStartTime(waresOrderParam.getStartPayDate())); } - if (waresOrderParam.getEndPayDate() != null){ + if (waresOrderParam.getEndPayDate() != null) { waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate())); } Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); @@ -379,8 +352,8 @@ public class SaOrderController extends ParentOrderController { waresOrderParam.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); waresOrderParam.setVertexIdList(userAuthorityDTO.getVertexIdList()); waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList()); - // startPage(); - if(waresOrderParam.getPkCountry()== CountryConstants.CHINA_COUNTRY){ + // startPage(); + if (waresOrderParam.getPkCountry() == CountryConstants.CHINA_COUNTRY) { waresOrderParam.setPkCountry(null); } List resultList = orderService.selectByOrderInfoList(waresOrderParam); @@ -402,7 +375,7 @@ public class SaOrderController extends ParentOrderController { // 发货方式 waresOrderVo.setDeliveryWayStr(EDelivery.getDelivery(waresOrderVo.getDeliveryWay()).getLabel()); // 运输方式 - if(waresOrderVo.getTranType() != null) { + if (waresOrderVo.getTranType() != null) { waresOrderVo.setTranTypeStr(ETransportType.getETransportType(waresOrderVo.getTranType()).getLabel()); } // 预售状态 @@ -412,7 +385,7 @@ public class SaOrderController extends ParentOrderController { // 订单状态 if (waresOrderVo.getOrderStatus() != null) { EOrderStatus orderStatusEnum = EOrderStatus.getEOrderStatus(waresOrderVo.getOrderStatus()); - if (orderStatusEnum != null){ + if (orderStatusEnum != null) { waresOrderVo.setOrderStatusStr(orderStatusEnum.getLabel()); } } @@ -515,19 +488,19 @@ public class SaOrderController extends ParentOrderController { * 添加订单备注 */ @PostMapping("update-order-remarks") - public AjaxResult updateOrderRemarks(@RequestBody SaOrderRemarks saOrderRemarks){ + public AjaxResult updateOrderRemarks(@RequestBody SaOrderRemarks saOrderRemarks) { SaOrderRemarks orderRemarks = orderRemarksService.getOne(new QueryWrapper().eq("PK_ORDER", saOrderRemarks.getPkOrder())); - if (orderRemarks == null){ + if (orderRemarks == null) { saOrderRemarks.setCreationTime(DateUtils.currentDateTime()); saOrderRemarks.setPkCountry(SecurityUtils.getPkCountry()); saOrderRemarks.setPkCreator(SecurityUtils.getUserId()); saOrderRemarks.setStatus(EYesNo.NO.getIntValue()); orderRemarksService.save(saOrderRemarks); - }else { + } else { orderRemarks.setModifiedTime(DateUtils.currentDateTime()); orderRemarks.setPkModified(SecurityUtils.getUserId()); orderRemarks.setRemarks(saOrderRemarks.getRemarks()); - orderRemarksService.update(orderRemarks,new QueryWrapper().eq("PK_ORDER", saOrderRemarks.getPkOrder())); + orderRemarksService.update(orderRemarks, new QueryWrapper().eq("PK_ORDER", saOrderRemarks.getPkOrder())); } return AjaxResult.success(); } @@ -561,11 +534,12 @@ public class SaOrderController extends ParentOrderController { /** * 会员店铺统计订单导出 + * * @param orderQueryParam * @return */ @PostMapping("member-store-summary-export") - public void memberStoreSummaryExport(OrderQueryParam orderQueryParam,HttpServletResponse response) { + public void memberStoreSummaryExport(OrderQueryParam orderQueryParam, HttpServletResponse response) { // List resultList = new ArrayList<>(); // // // 获取需要翻译的枚举翻译 @@ -714,14 +688,14 @@ public class SaOrderController extends ParentOrderController { storeOrderTotalVo.setProductName(saOrderItemsExt.getProductName()); storeOrderTotalVo.setSpecsName(saOrderItemsExt.getSpecsName()); storeOrderTotalVo.setQuantity(saOrderItemsExt.getQuantity()); - for(EOrderType orderType:EOrderType.values()){ - if(saOrderExt.getOrderType() == orderType.getValue()){ + for (EOrderType orderType : EOrderType.values()) { + if (saOrderExt.getOrderType() == orderType.getValue()) { storeOrderTotalVo.setOrderTypeVal(orderType.getLabel()); break; } } - for(EOrderStatus orderStatus : EOrderStatus.values()){ - if(saOrderExt.getOrderStatus() == orderStatus.getValue()){ + for (EOrderStatus orderStatus : EOrderStatus.values()) { + if (saOrderExt.getOrderStatus() == orderStatus.getValue()) { storeOrderTotalVo.setOrderStatusVal(orderStatus.getLabel()); break; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/vo/OrderVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/vo/OrderVo.java index 3f104c4..95cd46a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/vo/OrderVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/vo/OrderVo.java @@ -1,10 +1,4 @@ -package com.hzs.sale.order.controller.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/11 11:23 - * @Classname: SaOrderVo - * @PackageName: com.hzs.sale.order.controller.vo - */ +package com.hzs.sale.order.controller.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.core.annotation.Excel; @@ -17,14 +11,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - *@BelongsProject: hzs_java_cloud_africa - *@BelongsPackage: com.hzs.sale.order.controller.vo - *@Author: yh - *@CreateTime: 2024-04-11 11:23 - *@Description: TODO - *@Version: 1.0 - */ @Data public class OrderVo implements Serializable { @@ -48,7 +34,7 @@ public class OrderVo implements Serializable { */ @Excel(name = "订单类型") - private String orderTypeVal; + private String orderTypeVal; /** * 订单金额 @@ -63,7 +49,7 @@ public class OrderVo implements Serializable { /** * 支付时间 */ - @Excel(name = "支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; @@ -135,7 +121,7 @@ public class OrderVo implements Serializable { /** * 收货县 */ - // @Excel(name = "县") + // @Excel(name = "县") private String recCounty; /** * 地址 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java index acf5e4c..14779e1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java @@ -11,7 +11,6 @@ import com.hzs.sale.deliver.vo.DeliverUnhandledVO; import com.hzs.sale.deliver.vo.DeliverExcludeProductVO; import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.order.param.WaresOrderParam; -import com.hzs.sale.order.vo.OrderRangeVO; import com.hzs.sale.order.vo.WaresOrderVo; import org.apache.ibatis.annotations.Param; @@ -20,9 +19,6 @@ import java.util.List; /** * 销售订单-明细表 Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface SaOrderItemsMapper extends BaseMapper { @@ -118,18 +114,9 @@ public interface SaOrderItemsMapper extends BaseMapper { * 更新订单明细表，将订单明细更改为删除 * * @param saOrder 订单 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/24 20:48 */ Integer updateOrderItems(SaOrder saOrder); - /* - * @description: - * @author: sui q - * @date: 2023/7/27 16:16 - * @param: null null - **/ void updateOrderItemsByMemberList(@Param("memberList") List memberList, @Param("pkApprove") Long pkApprove, @Param("currentDateTime") Date currentDateTime); @@ -139,22 +126,9 @@ public interface SaOrderItemsMapper extends BaseMapper { * @param pkOrderItemsId 订单明细 * @param pkApprove 审核人 * @param currentDate 更新时间 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/28 11:25 */ Integer updateOrderItemsById(@Param("pkOrderItemsId") List pkOrderItemsId, @Param("pkApprove") Long pkApprove, @Param("currentDate") Date currentDate); - /** - * 查询出所有有极差的 - * - * @param saOrderList 订单列表 - * @return: List - * @Author: sui q - * @Date: 2022/12/9 14:09 - */ - List queryOrderRangeVO(@Param("saOrderList") List saOrderList); - /** * 根据订单ID查询订单明细列表（前台使用，尽量只查能用到的） * @@ -163,16 +137,6 @@ public interface SaOrderItemsMapper extends BaseMapper { */ List queryListByOrderId(@Param("orderIdList") List orderIdList); - /** - * @description: 根据订单ID查询订单商品明细列表 - * @author: zhang jing - * @date: 2023/5/29 15:38 - * @param: [orderIdList, tOrderIdList] - * @return: java.util.List - **/ - List waresListByOrderId(@Param("orderIdList") List orderIdList); - - /** * 根据订单明细ID查询订单明细列表 * @@ -207,11 +171,7 @@ public interface SaOrderItemsMapper extends BaseMapper { List selectByList(@Param("pkOrder") Long pkOrder); /** - * @description: 根据订单ID查询商品 - * @author: zhang jing - * @date: 2023/4/21 18:02 - * @param: [canApplyOrderVO] - * @return: java.util.List + * 根据订单ID查询商品 **/ List getOrderItemsParams(@Param("orderIdList") List orderIdList); @@ -231,14 +191,6 @@ public interface SaOrderItemsMapper extends BaseMapper { */ int checkOrderItemsPutOn(@Param("orderCode") String orderCode); - /** - * 根据订单明细查询订单购买人信息 - * - * @param pkId 订单明细ID - * @return - */ - Long queryPkMemberByOrderItemsId(@Param("pkId") Long pkId); - Integer sendDeliverBySaOrder(@Param("saOrderItemsExtList") List saOrderItemsExtList, @Param("pkMember") Long pkMember); /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java index 28360ac..6da337c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java @@ -19,9 +19,6 @@ import java.util.List; /** * Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface SaOrderMapper extends BaseMapper { @@ -29,9 +26,6 @@ public interface SaOrderMapper extends BaseMapper { * 查询会员注册、升级累计消费的业绩，用于计算海外升级 * * @param memberCode 会员编号 - * @return: SaOrder - * @Author: sui q - * @Date: 2022/9/24 17:32 */ SaOrderVO queryTotalOrderAchieve(String memberCode); @@ -39,9 +33,6 @@ public interface SaOrderMapper extends BaseMapper { * 根据查询条件查询销售订单 * * @param orderQueryParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2022/10/21 13:40 */ List querySaOrderByCondition(OrderQueryParam orderQueryParam); @@ -58,10 +49,7 @@ public interface SaOrderMapper extends BaseMapper { @Param("userId") Long userId); /* - * @description: 批量撤单 - * @author: sui q - * @date: 2023/7/27 16:04 - * @param: null null + * 批量撤单 **/ void updateSaOrderByMember(@Param("memberList") List memberList, @Param("pkApprove") Long pkApprove, @Param("currentDateTime") Date currentDateTime); @@ -70,9 +58,6 @@ public interface SaOrderMapper extends BaseMapper { * * @param startDate 开始时间 * @param endDate 结束时间 - * @return: List - * @Author: sui q - * @Date: 2022/11/4 9:05 */ List querySaOrderByTime(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("orderCode") String orderCode); @@ -82,9 +67,6 @@ public interface SaOrderMapper extends BaseMapper { * * @param startDate 开始时间 * @param endDate 结束时间 - * @return: List - * @Author: sui q - * @Date: 2022/11/4 9:05 */ List querySaOrderByEffectiveDay(@Param("startDate") Date startDate, @Param("endDate") Date endDate); @@ -93,9 +75,6 @@ public interface SaOrderMapper extends BaseMapper { * * @param startDate 开始时间 * @param endDate 结束时间 - * @return: List - * @Author: sui q - * @Date: 2022/11/4 9:05 */ List queryDeliverySaOrderByDay(@Param("startDate") Date startDate, @Param("endDate") Date endDate); @@ -268,14 +247,6 @@ public interface SaOrderMapper extends BaseMapper { */ List queryOrderType(@Param("memberId") Long memberId, @Param("pkCountry") Integer pkCountry); - /* - * @description: 计算店铺奖金，查询订单 - * @author: sui q - * @date: 2023/5/8 15:45 - * @param: null null - **/ - List querySaOrderByTimeForStore(@Param("startDate") Date startDate, @Param("endDate") Date endDate); - /** * 二次发货列表 * @@ -285,7 +256,6 @@ public interface SaOrderMapper extends BaseMapper { */ List secondList(@Param("param") DeliverSecondParam param, @Param("pkCountry") Integer pkCountry); - /** * 会员首页我的市场 * @@ -295,7 +265,6 @@ public interface SaOrderMapper extends BaseMapper { */ CuMemberMyMarketVO selectMyMarket(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry); - /** * 会员首页我的市场 * @@ -306,11 +275,7 @@ public interface SaOrderMapper extends BaseMapper { List selectMyMarketDetail(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry); /** - * @description: 查询当天已支付订单信息 - * @author: zhang jing - * @date: 2023/5/17 14:37 - * @param: [orderType] - * @return: java.util.List + * 查询当天已支付订单信息 **/ List querySaOrderByOrderType(@Param("payTime") String payTime); @@ -343,11 +308,7 @@ public interface SaOrderMapper extends BaseMapper { @Param("pkCountry") Integer pkCountry); /** - * @description: 批量插入虚拟订单数据 - * @author: zhang jing - * @date: 2023/10/12 11:51 - * @param: [orderList] - * @return: int + * 批量插入虚拟订单数据 **/ int insertUnrealOrderBach(@Param("orderList") List orderList); @@ -368,10 +329,7 @@ public interface SaOrderMapper extends BaseMapper { BigDecimal getMemberOrderAchieve(@Param("pkMember") Long pkMember); /* - * @description: 根据发货单查询销售订单 - * @author: sui q - * @date: 2023/11/30 10:58 - * @param: null null + * 根据发货单查询销售订单 **/ List querySaOrderByDeliverList(@Param("deliverItemExtList") List deliverItemExtList); @@ -388,10 +346,7 @@ public interface SaOrderMapper extends BaseMapper { @Param("pkCountry") Integer pkCountry); /* - * @description: 查询订单，存在可能已经撤单的 - * @author: sui q - * @date: 2024/4/28 15:47 - * @param: null null + * 查询订单，存在可能已经撤单的 **/ SaOrder querySaOrderExtByPkId(Long pkId); @@ -405,10 +360,7 @@ public interface SaOrderMapper extends BaseMapper { SaOrder querySumAmountAndAchieve(@Param("pkMember") Long pkMember, @Param("notOrderCode") String notOrderCode); /* - * @description: 查询店铺自提、店铺配送未发货订单，用于店铺发货界面 - * @author: sui q - * @date: 2024/5/14 10:52 - * @param: null null + * 查询店铺自提、店铺配送未发货订单，用于店铺发货界面 **/ List queryStoreSaOrderByParam(@Param("orderQueryParam") OrderQueryParam orderQueryParam); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/MyOrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/MyOrderParam.java index 24c1933..ecddf37 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/MyOrderParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/MyOrderParam.java @@ -6,11 +6,7 @@ import lombok.Data; import java.util.Date; /** - * @Description: 我的订单查询入参 - * @Author: jiang chao - * @Time: 2023/1/13 15:55 - * @Classname: ApiOrderParam - * @PackageName: com.hzs.sale.order.param + * 我的订单查询入参 */ @Data public class MyOrderParam { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java index 5ccaec5..74a155f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java @@ -16,13 +16,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -/** - * @author: sui q - * @time: 2022/8/27 16:50 - * @description: - * @classname: OrderParam - * @package_name: com.hzs.sale.order.param - */ @Data @Builder @AllArgsConstructor @@ -273,7 +266,7 @@ public class OrderParam implements Serializable { private Integer pkStorehouse; /** - * 新人礼包方案主键 + * 新人礼包方案主键 */ private Long pkNewPeople; @@ -287,11 +280,6 @@ public class OrderParam implements Serializable { */ private List orderItemsParams; - /** - * 用于下单时更新可用量 - */ - private List availableNumList; - /** * 是否首单 */ @@ -318,10 +306,7 @@ public class OrderParam implements Serializable { private List placeDeptList; /** - * @Description: 验证保存的必输字段 - * @return: List - * @Author: sui q - * @Date: 2022/8/29 11:10 + * 验证保存的必输字段 */ @JsonIgnore public List getValidSaveField() { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderSelectParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderSelectParam.java index c368f5b..8c5d806 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderSelectParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderSelectParam.java @@ -5,11 +5,7 @@ import lombok.Data; import java.util.List; /** - * @Description: 订单选择参数 - * @Author: jiang chao - * @Time: 2023/3/10 14:12 - * @Classname: OrderSelectParam - * @PackageName: com.hzs.sale.order.param + * 订单选择参数 */ @Data public class OrderSelectParam { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderItemsServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderItemsServiceProvider.java index e861711..6da1ecb 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderItemsServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderItemsServiceProvider.java @@ -10,11 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 销售订单-明细表 - * @Author: zhangjing - * @Time: 2023/11/16 20:06 - * @Classname: SaOrderItemsServiceProvider - * @PackageName: com.hzs.sale.order.provider + * 销售订单-明细表 */ @Slf4j @DubboService diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java index e797ebe..24e1078 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java @@ -1,23 +1,16 @@ package com.hzs.sale.order.provider; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EOrderStatus; -import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.domain.member.ext.CuMemberAccountExt; import com.hzs.common.domain.sale.ext.SaDeliverItemsExt; 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.sale.order.ISaOrderServiceApi; -import com.hzs.sale.order.dto.SaOrderRangeDto; import com.hzs.sale.order.param.OrderQueryParam; -import com.hzs.sale.order.param.OrderSelectParam; import com.hzs.sale.order.service.ISaOrderItemsService; import com.hzs.sale.order.service.ISaOrderService; -import com.hzs.sale.order.vo.OrderRangeVO; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; @@ -60,44 +53,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi { return R.ok(iSaOrderService.queryDeliverySaOrderByDay(startDate, endDate)); } - @Override - public R querySaOrderByDay(Date startDate, Date endDate, String orderCode) { - List saOrderList = iSaOrderService.querySaOrderByTime(startDate, endDate, orderCode); - if (CollectionUtil.isNotEmpty(saOrderList)) { - return R.ok(saOrderList.get(0)); - } - return R.ok(null); - } - - @Override - public R> querySaOrderByTimeForStore(Date startDate, Date endDate) { - return R.ok(iSaOrderService.querySaOrderByTimeForStore(startDate, endDate)); - } - - @Override - public R>> queryOrderRangeVO(List saOrderList) { - List orderRangeVOList = iSaOrderItemsService.queryOrderRangeVO(saOrderList); - Map> saOrderRangeDtoMap = new HashMap<>(ComputeUtil.mapInitCapacity(saOrderList.size())); - orderRangeVOList.forEach(orderRangeVO -> { - SaOrderRangeDto saOrderRangeDto = BeanUtil.copyProperties(orderRangeVO, SaOrderRangeDto.class); - if (saOrderRangeDtoMap.containsKey(saOrderRangeDto.getOrderCode())) { - saOrderRangeDtoMap.get(saOrderRangeDto.getOrderCode()).add(saOrderRangeDto); - } else { - List saOrderRangeDtoList = new ArrayList<>(); - saOrderRangeDtoList.add(saOrderRangeDto); - saOrderRangeDtoMap.put(saOrderRangeDto.getOrderCode(), saOrderRangeDtoList); - } - }); - return R.ok(saOrderRangeDtoMap); - } - - @Override - public R> queryOrderItemsListByOrderId(List pkOrderList, Integer pkCountry) { - OrderSelectParam param = new OrderSelectParam(); - param.setPkOrderList(pkOrderList); - return R.ok(iSaOrderService.queryOrderSelect(param, pkCountry)); - } - @Override @Transactional(rollbackFor = Exception.class) public R regEmptyOrderApproved(ApprovalBusinessResultDTO approvalBusinessResultDTO) { @@ -148,17 +103,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi { return R.fail(); } - @Override - public R saveOrder(SaOrderExt saOrderExt) { - try { - iSaOrderService.saveSaOrderByOrderExt(saOrderExt); - } catch (Exception e) { - e.printStackTrace(); - return R.fail(e.getMessage()); - } - return R.ok(); - } - @Override public R insertUnrealOrderBach(List orderList) { try { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java index 4e23025..af448bf 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java @@ -12,7 +12,6 @@ import com.hzs.sale.deliver.vo.DeliverExcludeProductVO; import com.hzs.sale.deliver.vo.DeliverUnhandledVO; import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.order.param.WaresOrderParam; -import com.hzs.sale.order.vo.OrderRangeVO; import com.hzs.sale.order.vo.WaresOrderVo; import java.util.Date; @@ -20,9 +19,6 @@ import java.util.List; /** * 销售订单-明细表 服务类 - * - * @author hzs - * @since 2022-08-31 */ public interface ISaOrderItemsService extends IService { @@ -76,18 +72,9 @@ public interface ISaOrderItemsService extends IService { * 更新订单明细表，将订单明细更改为删除 * * @param saOrder - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/24 20:48 */ Boolean updateOrderItems(SaOrder saOrder); - /* - * @description: - * @author: sui q - * @date: 2023/7/27 16:16 - * @param: null null - **/ void updateOrderItemsByMemberList(List memberList, Long pkApprove, Date currentDateTime); /** @@ -96,22 +83,9 @@ public interface ISaOrderItemsService extends IService { * @param pkOrderItemsId 订单明细 * @param pkApprove 审核人 * @param currentDate 更新时间 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/28 11:25 */ Boolean updateOrderItemsById(List pkOrderItemsId, Long pkApprove, Date currentDate); - /** - * 查询出所有有极差的 - * - * @param saOrderList 订单列表 - * @return: List - * @Author: sui q - * @Date: 2022/12/9 14:09 - */ - List queryOrderRangeVO(List saOrderList); - /** * 根据订单ID查询订单明细列表 * @@ -120,15 +94,6 @@ public interface ISaOrderItemsService extends IService { */ List queryListByOrderId(List orderIdList); - /** - * @description: 根据订单id查询订单商品列表 - * @author: zhang jing - * @date: 2023/5/29 15:37 - * @param: [orderIdList, tOrderIdList] - * @return: java.util.List - **/ - List waresListByOrderId(List orderIdList); - /** * 根据订单明细ID查询订单明细列表 * @@ -158,13 +123,8 @@ public interface ISaOrderItemsService extends IService { */ List selectByList(Long pkOrder); - /** - * @description: 根据订单ID查询商品 - * @author: zhang jing - * @date: 2023/4/21 18:02 - * @param: [canApplyOrderVO] - * @return: java.util.List + * 根据订单ID查询商品 **/ List getOrderItemsParams(List orderIdList); @@ -184,14 +144,6 @@ public interface ISaOrderItemsService extends IService { */ int checkOrderItemsPutOn(String orderCode); - /** - * 根据订单明细查询订单购买人信息 - * - * @param pkId 订单明细ID - * @return - */ - Long queryPkMemberByOrderItemsId(Long pkId); - /** * 更新订单明细从已合单更新为已付款 * @@ -213,10 +165,7 @@ public interface ISaOrderItemsService extends IService { boolean orderItemsReturn(List orderItemsIdList, Long userId, Integer pkCountry); /* - * @description: 根据订单对订单进行发货，公司发到店铺 - * @author: sui q - * @date: 2024/5/14 9:32 - * @param: null null + * 根据订单对订单进行发货，公司发到店铺 **/ Boolean sendDeliverBySaOrder(List saOrderExtList, Long pkMember); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 661bc19..7c1e8c5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -10,7 +10,6 @@ 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.scm.ic.ext.IcAvailableNumExt; import com.hzs.sale.deliver.param.DeliverSecondParam; import com.hzs.sale.deliver.vo.DeliverSecondVO; import com.hzs.sale.index.vo.CuMemberMyMarketVO; @@ -18,18 +17,13 @@ import com.hzs.sale.order.param.*; import com.hzs.sale.order.vo.*; import com.hzs.system.config.dto.GradeDTO; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.Date; import java.util.List; /** - * @Description: 订单的service处理类 - * @Author: sui q - * @Time: 2022/8/29 11:36 - * @Classname: IOrderService - * @PackageName: com.hzs.sale.order.service + * 订单的service处理类 */ public interface ISaOrderService extends IService { @@ -38,22 +32,13 @@ public interface ISaOrderService extends IService { * 根据手机号查询出目前系统所有的会员 * * @param cuMember 会员的各种属性、手机号码必输 国家 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 17:35 */ List queryMemberExtByCondition(CuMember cuMember); - /** * 查找安置人伞上 * * @param placeParentId 安置人 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List querySponsorOnUmbrella(Long placeParentId, String phone); @@ -61,10 +46,6 @@ public interface ISaOrderService extends IService { * 查找安置人伞下 * * @param memberId 会员编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList); @@ -72,10 +53,6 @@ public interface ISaOrderService extends IService { * 查找安置人伞下 * * @param memberId 安置人，编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 */ List queryPlaceSponsorUnderUmbrella(Long memberId, String placeParent); @@ -84,41 +61,13 @@ public interface ISaOrderService 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); - /** - * 查找血缘伞上，推荐人 - * - * @param parentId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - List queryBloodKinshipOnUmbrella(Long parentId); - - /** - * 查找血缘伞下，推荐人 - * - * @param memberId 推荐人编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - List queryBloodKinshipUnderUmbrella(Long memberId); - /** * 根据订单编号查询订单 * * @param saOrder 订单 - * @return: SaOrder 订单 - * @Author: sui q - * @Date: 2022/9/21 17:30 */ SaOrder querySaleOrderByOrderCode(SaOrder saOrder); @@ -127,9 +76,6 @@ public interface ISaOrderService extends IService { * * @param saOrder 订单 * @param itemIdList 订单明细主键 - * @return: SaOrderExt 订单 - * @Author: sui q - * @Date: 2022/10/10 15:29 */ SaOrderExt querySaleOrderExtByOrderCode(SaOrder saOrder, List itemIdList); @@ -140,9 +86,6 @@ public interface ISaOrderService extends IService { * @param pkMember 会员编号 * @param pkReference 推荐人编号 * @param orderType 订单类型 - * @return: List - * @Author: sui q - * @Date: 2022/9/1 20:24 */ List querySaleOrderByPkMember(Integer pkCountry, Long pkMember, Long pkReference, Integer orderType); @@ -153,17 +96,11 @@ public interface ISaOrderService extends IService { * @param pkCountry 国家 * @param pkMember 会员编号 * @param pkReference 推荐人编号 - * @return: List - * @Author: sui q - * @Date: 2022/9/1 20:24 */ Integer querySaleOrderByPkMember(Integer pkCountry, Long pkMember, Long pkReference); /* - * @description: 查询网体是否存在推荐人 - * @author: sui q - * @date: 2023/9/11 9:53 - * @param: null null + * 查询网体是否存在推荐人 **/ Integer queryCuMemberByPkMember(Long pkReference); @@ -171,9 +108,6 @@ public interface ISaOrderService extends IService { * 跟会员端进行交互的查询订单的方法 * * @param orderQueryParam 交互参数 - * @return: List - * @Author: sui q - * @Date: 2022/10/19 16:58 */ List querySaleOrderByCondition(OrderQueryParam orderQueryParam); @@ -181,10 +115,6 @@ public interface ISaOrderService extends IService { * 根据key值从redis中获取到会员信息 * * @param pkId 会员主键 - * @Description: - * @return: CuMember - * @Author: sui q - * @Date: 2022/8/29 20:48 */ CuMember getCuMemberByKey(Long pkId); @@ -192,10 +122,6 @@ public interface ISaOrderService extends IService { * 根据key值从redis中获取到会员信息 * * @param code 会员编号 - * @Description: - * @return: CuMember - * @Author: sui q - * @Date: 2022/8/29 20:48 */ CuMember getCuMemberByCode(String code); @@ -203,10 +129,6 @@ public interface ISaOrderService extends IService { * 加锁，将键锁定 * * @param key 锁定的键 - * @Description: - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/5 9:24 */ Boolean lockKey(String key); @@ -214,9 +136,6 @@ public interface ISaOrderService extends IService { * 查询会员账户状态，账户信息 * * @param cuMemberAccount 会员账户条件信息 - * @return: List - * @Author: sui q - * @Date: 2022/9/5 11:57 */ List queryMemberAccountByCondition(CuMemberAccount cuMemberAccount); @@ -225,8 +144,6 @@ public interface ISaOrderService extends IService { * * @param cuMemberAccount 会员账户 * @param saOrder 订单信息 - * @Author: sui q - * @Date: 2022/9/5 15:28 */ CuMemberAccountExt queryOrderSpendDetails(CuMemberAccountExt cuMemberAccount, SaOrder saOrder, List orderItemList); @@ -235,17 +152,11 @@ public interface ISaOrderService extends IService { * 将会员端传递过来的保单信息封装为订单信息,待支付时直接入库，直接保存时先放入redis暂存，待支付时在保存入库 * * @param orderParam 会员端的报单信息 - * @return: SaOrderExt - * @Author: sui q - * @Date: 2022/9/8 11:01 */ Boolean confirmRegSaOrderByOrderParam(OrderParam orderParam); /* - * @description: 确认嗨粉订单根据参数 - * @author: sui q - * @date: 2023/5/31 11:35 - * @param: null null + * 确认嗨粉订单根据参数 **/ Boolean confirmSelfFunOrderByOrderParam(OrderParam orderParam); @@ -254,9 +165,6 @@ public interface ISaOrderService extends IService { * * @param orderParam 前台参数 * @param cuMember 会员 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/11 11:45 */ SaOrderExt packageSaOrder(OrderParam orderParam, CuMember cuMember); @@ -264,17 +172,11 @@ public interface ISaOrderService extends IService { * 封装需要保存的销售订单和会员 * * @param orderParam 前台参数 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/11 11:45 */ CuMember packageCuMember(OrderParam orderParam); /* - * @description: 这是会员等级 - * @author: sui q - * @date: 2023/6/7 11:09 - * @param: null null + * 这是会员等级 **/ Boolean setLastCuMemberGrade(CuMember cuMember, SaOrder saOrderExt); @@ -285,8 +187,6 @@ public interface ISaOrderService extends IService { * @param newCuMember 新会员信息 * @param cuMemberAccountExt 支付账户信息 * @param isHaiFun 是否嗨粉 - * @Author: sui q - * @Date: 2022/9/13 13:37 */ Boolean payRegSaOrder(SaOrderExt saOrderExt, CuMember newCuMember, CuMemberAccountExt cuMemberAccountExt, Boolean isHaiFun); @@ -296,9 +196,6 @@ public interface ISaOrderService extends IService { * * @param saOrderExt 订单信息 * @param cuMemberAccountExt 会员账户 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 10:24 */ Boolean payUpgradeSaOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt); @@ -306,17 +203,11 @@ public interface ISaOrderService extends IService { * 生成升级待支付订单 * * @param orderParam 参数信息 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/24 21:16 */ Boolean confirmRepurchaseSaOrder(OrderParam orderParam); /* - * @description: 生成新人礼包 - * @author: sui q - * @date: 2023/5/10 13:58 - * @param: null null + * 生成新人礼包 **/ Boolean confirmNewPeopleGift(OrderParam orderParam); @@ -325,9 +216,6 @@ public interface ISaOrderService extends IService { * * @param saOrderExt 订单 * @param cuMemberAccountExt 会员账户 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 11:29 */ Boolean payRepurchaseSaOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt); @@ -343,9 +231,6 @@ public interface ISaOrderService extends IService { * * @param pkCountry 国家 * @param specialArea 所属专区 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/21 17:22 */ boolean getIsToBePayByOrderType(Integer pkCountry, Integer specialArea); @@ -354,9 +239,6 @@ public interface ISaOrderService extends IService { * * @param pkCountry 国家 * @param specialArea 所属专区 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/21 17:22 */ Long getIsToBePayTime(Integer pkCountry, Integer specialArea); @@ -364,9 +246,6 @@ public interface ISaOrderService extends IService { * 查询邮费 * * @param orderParam 前台传递的参数 - * @return: void - * @Author: sui q - * @Date: 2022/9/21 16:22 */ void queryPostageByParam(OrderParam orderParam); @@ -374,29 +253,15 @@ public interface ISaOrderService extends IService { * 计算会员等级 * * @param orderParam 商品列表、专区 - * @return: OrderReturn 返回参数 - * @Author: sui q - * @Date: 2022/9/24 14:38 */ OrderReturn computeLevel(OrderParam orderParam); - /* - * @description: 验证是否满足下单 - * @author: sui q - * @date: 2023/7/25 10:45 - * @param: null null - **/ - String validateEnoughShopping(OrderParam orderParam); - /** * 根据订单编号执行订单撤销操作 * * @param pkApprove 审核人 * @param orderCancelParam 撤单参数 * @param validateCancelOrderVO 订单 - * @return: void - * @Author: sui q - * @Date: 2022/10/22 15:01 */ void revokeSaOrderByOrderCode(Long pkApprove, OrderCancelParam orderCancelParam, ValidateCancelOrderVO validateCancelOrderVO); @@ -405,9 +270,6 @@ public interface ISaOrderService extends IService { * * @param pkCountry 国家 * @param pkGrade 等级 - * @return: R - * @Author: sui q - * @Date: 2022/10/25 14:12 */ GradeDTO queryGradeConfigByCondition(Integer pkCountry, Integer pkGrade); @@ -416,9 +278,6 @@ public interface ISaOrderService extends IService { * * @param cuMember 会员 需要放(推荐人、国家、新用户姓名、新用户手机号) * @param isFirstAchieve 是否验证首购业绩 - * @return: SysUser - * @Author: sui q - * @Date: 2022/3/12 10:42 */ CuMember obtainLastResettleByRecommend(CuMember cuMember, Boolean isFirstAchieve, Boolean isFirst); @@ -426,43 +285,23 @@ public interface ISaOrderService extends IService { * 生成空单注册 * * @param orderBlankRegParams 参数 - * @return: String - * @Date: 2022/11/14 15:10 */ String registerEmptyOrder(OrderBlankRegParams orderBlankRegParams); /** * 验证是否必须有首单 + * 验证第二部门是否需要验证首单 * * @param pkParent 推荐人主键 * @param pkCountry 国家 - * @Description: 验证第二部门是否需要验证首单 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/7 9:29 */ boolean validateFirstOrder(Long pkParent, Integer pkCountry); - /** - * 验证是否左区必须现有安置才能安置右区 - * - * @param pkPlaceParent 安置位置 - * @param pkCountry 国家 - * @Description: 验证第二部门是否需要验证首单 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/7 9:29 - */ - boolean validateLeftExistMember(Long pkPlaceParent, Integer pkCountry); - /** * 查询时间范围内的订单，需要查询出del_flag = 1的值 * * @param startDate 开始时间 * @param endDate 结束时间 - * @return: List - * @Author: sui q - * @Date: 2022/11/4 9:05 */ List querySaOrderByTime(Date startDate, Date endDate, String orderCode); @@ -471,9 +310,6 @@ public interface ISaOrderService extends IService { * * @param startDate 开始时间 * @param endDate 结束时间 - * @return: List - * @Author: sui q - * @Date: 2022/11/4 9:05 */ List querySaOrderByEffectiveDay(Date startDate, Date endDate); @@ -482,28 +318,14 @@ public interface ISaOrderService extends IService { * * @param startDate 开始时间 * @param endDate 结束时间 - * @return: List - * @Author: sui q - * @Date: 2022/11/4 9:05 */ List queryDeliverySaOrderByDay(Date startDate, Date endDate); - /* - * @description: 计算店铺奖金，查询订单 - * @author: sui q - * @date: 2023/5/8 15:45 - * @param: null null - **/ - List querySaOrderByTimeForStore(Date startDate, Date endDate); - /** * 获取系统参数 * * @param pkCountry 国家 * @param key 键 - * @return: String - * @Author: sui q - * @Date: 2022/11/10 14:10 */ String querySystemConfigByKey(Integer pkCountry, String key); @@ -643,16 +465,6 @@ public interface ISaOrderService extends IService { */ List queryOrderSelect(OrderSelectParam param, Integer pkCountry); - /** - * 在线支付 - * - * @param orderCode 订单编号 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/15 15:44 - */ - Boolean onlinePaymentCallBack(Long pkMember, String orderCode); - /** * 空单注册审核通过 * @@ -717,7 +529,6 @@ public interface ISaOrderService extends IService { */ List secondList(DeliverSecondParam param, Integer pkCountry); - /** * 会员首页我的市场 * @@ -728,19 +539,12 @@ public interface ISaOrderService extends IService { CuMemberMyMarketVO selectMyMarket(Long pkMember, Integer pkCountry); /** - * @description: 查询当天已支付订单信息 - * @author: zhang jing - * @date: 2023/5/17 14:37 - * @param: [orderType] - * @return: java.util.List + * 查询当天已支付订单信息 **/ List querySaOrderByOrderType(String payTime); /* - * @description: 根据时间端查询订单累计业绩累计金额 - * @author: sui q - * @date: 2023/7/3 14:51 - * @param: null null + * 根据时间端查询订单累计业绩累计金额 **/ SaOrder queryOrderTotalAchieveByTime(Date startDate, Date endDate); @@ -760,24 +564,11 @@ public interface ISaOrderService extends IService { */ int insertBach(List orderList, List orderItemsList); - /* - * @description: 生成三方销售订单 - * @author: sui q - * @date: 2024/4/24 14:16 - * @param: null null - **/ - void saveSaOrderByOrderExt(SaOrderExt saOrderExt); - /** - * @description: 批量插入虚拟订单数据 - * @author: zhang jing - * @date: 2023/10/12 11:56 - * @param: [orderList, orderItemsList] - * @return: int + * 批量插入虚拟订单数据 **/ int insertUnrealOrderBach(List orderList); - /** * 查询会员店铺订单 * @@ -788,7 +579,6 @@ public interface ISaOrderService extends IService { */ List myStoreOrderList(MyOrderParam param, Integer pkStore, Integer pkCountry); - /** * 保存订单信息返回ID * @@ -798,7 +588,6 @@ public interface ISaOrderService extends IService { */ Long saveOrderInfo(SaOrder saOrder, SaOrderItems orderItems); - /** * 查询升级金额以及业绩 * @@ -816,14 +605,10 @@ public interface ISaOrderService extends IService { BigDecimal getMemberOrderAchieve(Long pkMember); /* - * @description: 根据发货单查询销售订单 - * @author: sui q - * @date: 2023/11/30 10:58 - * @param: null null + * 根据发货单查询销售订单 **/ List querySaOrderByDeliverList(List deliverItemExtList); - /** * 查询店铺 * @@ -835,26 +620,12 @@ public interface ISaOrderService extends IService { int getStoreNum(List statusList, Integer pkStore, Integer pkCountry); /* - * @description: 发送更新可用量的消息 - * @author: sui q - * @date: 2023/12/18 9:20 - * @param: null null - **/ - void convertAvailableNumMsg(List availableNumList); - - /* - * @description: 查询订单，存在可能已经撤单的 - * @author: sui q - * @date: 2024/4/28 15:47 - * @param: null null + * 查询订单，存在可能已经撤单的 **/ SaOrder querySaOrderExtByPkId(Long pkId); /* - * @description: 查询店铺自提、店铺配送未发货订单，用于店铺发货界面 - * @author: sui q - * @date: 2024/5/14 10:52 - * @param: null null + * 查询店铺自提、店铺配送未发货订单，用于店铺发货界面 **/ List queryStoreSaOrderByParam(OrderQueryParam orderQueryParam); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java index 923388a..5295ab3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java @@ -54,11 +54,7 @@ import java.math.BigDecimal; import java.util.*; /** - * @Description: 用于处理订单的处理逻辑 - * @Author: sui q - * @Time: 2022/9/8 17:47 - * @Classname: SaOrderHandle - * @PackageName: com.hzs.sale.order.service.impl + * 用于处理订单的处理逻辑 */ @Component @Slf4j @@ -127,12 +123,10 @@ public class SaOrderHandle { } /** + * 生成用户 + * * @param orderParam 需要保存的会员基本信息 * @param centerMember 报单中心会员编号 - * @Description: 生成用户 - * @return: void - * @Author: sui q - * @Date: 2022/9/8 16:03 */ CuMember packageSaveUser(OrderParam orderParam, CuMember centerMember) { // 获取新的订单编号 @@ -179,12 +173,11 @@ public class SaOrderHandle { } /** + * 封装订单标题 + * * @param cuMember 会员 * @param saOrder 订单主表 * @param orderParam 订单商品信息 - * @Description: 封装订单标题 - * @Author: sui q - * @Date: 2022/9/8 11:04 */ void packSaOrderItems(CuMember cuMember, SaOrderExt saOrder, OrderParam orderParam) { orderParam.setPostage(BigDecimal.ZERO); @@ -194,25 +187,21 @@ public class SaOrderHandle { } /** + * 查询邮费 + * * @param cuMember 会员 * @param orderParam 参数 - * @Description: 查询邮费 - * @return: void - * @Author: sui q - * @Date: 2022/9/21 16:21 */ List queryPostage(CuMember cuMember, OrderParam orderParam) { return getSaOrderItems(cuMember, null, orderParam); } /** + * 计算邮费 + * * @param cuMember 会员 * @param saOrder 主表 * @param orderParam 参数 - * @Description: 因为邮费 - * @return: List 明细 - * @Author: sui q - * @Date: 2022/9/21 16:26 */ private List getSaOrderItems(CuMember cuMember, SaOrderExt saOrder, OrderParam orderParam) { // 当前国家 @@ -323,9 +312,6 @@ public class SaOrderHandle { * 计算订单价值（价格、业绩） * * @param orderParam 商品列表、专区 - * @return: void - * @Author: sui q - * @Date: 2022/9/24 14:38 */ SaOrder computeSaOrderAchieve(OrderParam orderParam) { // 商品编号 + sku主键 + 数量 @@ -343,23 +329,6 @@ public class SaOrderHandle { return saOrder; } - /* - * @description: 购买创客礼包必须满足1125业绩 - * @author: sui q - * @date: 2023/7/25 10:56 - * @param: null null - **/ - String validateEnoughShopping(OrderParam orderParam) { - // 商品编号 + sku主键 + 数量 - List bdWaresDetailExtList = getWaresDetailExtList(orderParam, null); - BigDecimal orderAchieve = BigDecimal.ZERO; - for (BdWaresDetailExt bdWaresDetailExt : bdWaresDetailExtList) { - Integer num = bdWaresDetailExt.getQuantity() * bdWaresDetailExt.getWaresQuantity(); - orderAchieve = ComputeUtil.computeAdd(orderAchieve, ComputeUtil.computeMultiply(bdWaresDetailExt.getAchieve(), num)); - } - return null; - } - /** * 将购买的商品明细封装为数据库中的商品明细 * @@ -521,9 +490,6 @@ public class SaOrderHandle { * 实际重量 = 长*宽*高/6000 利用重量计费公式计算实际邮费 * 判断重量计费跟体积计费哪个大使用哪个计费方法 * 陆运、空运、海运（国内默认陆运） - * @return: BigDecimal - * @Author: sui q - * @Date: 2022/9/20 20:48 */ private BigDecimal computePostage(BdPostageDetail postageDetail, BigDecimal weight) { BigDecimal postage = postageDetail.getFirstPostage(); @@ -553,16 +519,14 @@ public class SaOrderHandle { } /** + * 获取订单子表 + * * @param cuMember 会员 * @param saOrder 订单主表 * @param currency 币种 * @param saOrderItemsList 订单明细 * @param waresDetailExt 商品明细 * @param specialArea 所属专区 - * @Description: 获取订单子表 - * @return: SaOrderItems - * @Author: sui q - * @Date: 2022/9/20 17:58 */ private SaOrderItems getSaOrderItems(CuMember cuMember, SaOrderExt saOrder, CurrencyDTO currency, List saOrderItemsList, BdWaresDetailExt waresDetailExt, @@ -659,14 +623,11 @@ public class SaOrderHandle { } /** + * orderType 1 = 注册，注册不用找累计 2 升级需要 + * * @param specialArea 专区 * @param settleOrderAmount 订单金额 * @param settleOrderPv 订单业绩 - * @param pkCountry 国家 - * @Description: orderType 1 = 注册，注册不用找累计 2 升级需要 - * @return: List - * @Author: sui q - * @Date: 2022/2/17 11:27 */ GradeDTO getMemberGradeAndAwardByCountry(CuMember cuMember, Integer specialArea, BigDecimal settleOrderAmount, BigDecimal settleOrderPv, Integer pkCountry, String upgradeWay) { @@ -755,11 +716,9 @@ public class SaOrderHandle { } /** + * 转换，将销售订单转换为传到前台的销售订单VO + * * @param saOrderVO 销售订单 - * @Description: 转换，将销售订单转换为传到前台的销售订单VO - * @return: void - * @Author: sui q - * @Date: 2022/10/19 20:24 */ void transformSaOrderToVO(SaOrderVO saOrderVO) { // 处理会员编号，汇率，顶点 @@ -786,9 +745,6 @@ public class SaOrderHandle { * * @param pkCountry 国家 * @param pkGrade 等级 - * @return: R - * @Author: sui q - * @Date: 2022/10/25 14:12 */ GradeDTO queryGradeConfigByCondition(Integer pkCountry, Integer pkGrade) { return gradeServiceApi.queryGradeConfigByCondition(pkCountry, pkGrade).getData(); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java index e7c414c..d2fa43c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java @@ -18,7 +18,6 @@ import com.hzs.sale.order.mapper.SaOrderItemsMapper; import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.order.param.WaresOrderParam; import com.hzs.sale.order.service.ISaOrderItemsService; -import com.hzs.sale.order.vo.OrderRangeVO; import com.hzs.sale.order.vo.WaresOrderVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,9 +27,6 @@ import java.util.*; /** * 销售订单-明细表 服务实现类 - * - * @author hzs - * @since 2022-08-31 */ @Service public class SaOrderItemsServiceImpl extends ServiceImpl implements ISaOrderItemsService { @@ -82,77 +78,31 @@ public class SaOrderItemsServiceImpl extends ServiceImpl 0; } - @Override - public List queryOrderRangeVO(List saOrderList) { - List> orderList = saOrderHandle.handleCutList(saOrderList); - List orderRangeVOList = new ArrayList<>(); - orderList.forEach(list -> { - List orderRangeVoS = baseMapper.queryOrderRangeVO(list); - orderRangeVOList.addAll(orderRangeVoS); - }); - return orderRangeVOList; - } - @Override public List queryListByOrderId(List orderIdList) { return baseMapper.queryListByOrderId(orderIdList); } - /** - * @description: 根据订单ID查询订单商品明细列表 - * @author: zhang jing - * @date: 2023/5/29 15:39 - * @param: [orderIdList, tOrderIdList] - * @return: java.util.List - **/ - @Override - public List waresListByOrderId(List orderIdList) { - return baseMapper.waresListByOrderId(orderIdList); - } - - @Override public List queryListByItemId(List itemIdList, List statusList, Integer pkCountry) { return baseMapper.queryListByItemId(itemIdList, statusList, pkCountry); } - /** - * 查询商品订单 - * - * @param waresOrderParam - * @return - */ @Override public List selectByInvestmentList(WaresOrderParam waresOrderParam) { return baseMapper.selectByInvestmentList(waresOrderParam); } - /** - * 定时关闭订单 - */ @Override public void closeOrder(Integer pkCountry, String data, Integer orderType) { baseMapper.closeOrder(pkCountry, data, orderType); } - /** - * 根据订单主键查询信息 - * - * @param pkOrder - * @return - */ @Override public List selectByList(Long pkOrder) { return baseMapper.selectByList(pkOrder); } - /** - * @description: 根据订单ID查询商品 - * @author: zhang jing - * @date: 2023/4/21 18:02 - * @param: [canApplyOrderVO] - * @return: java.util.List - **/ @Override public List getOrderItemsParams(List orderIdList) { return baseMapper.getOrderItemsParams(orderIdList); @@ -168,11 +118,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl pkOrderList, Integer pkCountry, Long userId) { return baseMapper.updateToPayByPkOrder(pkOrderList, pkCountry, userId); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 6a47399..738c1c6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.dto.AcPeopleGiftProductDTO; import com.hzs.activity.people.IAcPeopleServiceServiceApi; -import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; @@ -36,7 +35,6 @@ import com.hzs.common.domain.sale.ext.*; import com.hzs.common.domain.sale.order.*; import com.hzs.common.domain.sale.product.BdProductExtend; import com.hzs.common.domain.sale.wares.BdWares; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.security.service.UserTokenService; @@ -94,11 +92,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** - * @Description: 订单的逻辑类 - * @Author: sui q - * @Time: 2022/8/29 11:41 - * @Classname: OrderServiceImpl - * @PackageName: com.hzs.sale.order.service.impl + * 订单的逻辑类 */ @Service @Slf4j @@ -158,12 +152,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Autowired private ISaStoreBonusService storeBonusService; - private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } + private RedisService redisService; @Override public List queryMemberExtByCondition(CuMember cuMember) { @@ -175,71 +165,21 @@ public class SaOrderServiceImpl extends ServiceImpl impl return memberServiceApi.querySponsorOnUmbrella(placeParentId, null, phone).getData(); } - /** - * 查找安置人伞下 - * - * @param memberId 会员编号 - * @Description: - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ @Override public List selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List cuMemberExtList) { return memberServiceApi.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList).getData(); } - /** - * @param memberId 安置人，编号 - * @Description: 查找安置人伞下 - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ @Override public List queryPlaceSponsorUnderUmbrella(Long memberId, String placeParent) { return memberServiceApi.queryPlaceSponsorUnderUmbrella(memberId, placeParent).getData(); } - /** - * 根据会员编号，查找该会员编号极左极下的那个人 - * - * @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) { return memberServiceApi.queryPlaceSponsorLastLeft(memberId, placeDept).getData(); } - - /** - * @param parentId 推荐人编号 - * @Description: 查找血缘伞上，推荐人 - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - @Override - public List queryBloodKinshipOnUmbrella(Long parentId) { - return memberServiceApi.queryBloodKinshipOnUmbrella(parentId).getData(); - } - - /** - * @param memberId 推荐人编号 - * @Description: 查找血缘伞下，推荐人 - * @return: List - * @Author: sui q - * @Date: 2022/8/29 20:54 - */ - @Override - public List queryBloodKinshipUnderUmbrella(Long memberId) { - return memberServiceApi.queryBloodKinshipUnderUmbrella(memberId).getData(); - } - @Override public SaOrder querySaleOrderByOrderCode(SaOrder saOrder) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -442,15 +382,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return flag; } - /** - * 点击确认订单按钮 - * 将会员端传递过来的保单信息封装为订单信息,待支付时直接入库，直接保存时先放入redis暂存，待支付时在保存入库 - * - * @param orderParam 会员端的报单信息 - * @return: SaOrderExt - * @Author: sui q - * @Date: 2022/9/8 11:01 - */ @Override @Transactional(rollbackFor = Exception.class) public Boolean confirmRegSaOrderByOrderParam(OrderParam orderParam) { @@ -841,11 +772,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl } /** + * 销售订单更改状态为待支付 + * * @param saOrderExt 销售订单 - * @Description: 销售订单更改状态为待支付 - * @return: void - * @Author: sui q - * @Date: 2022/10/24 21:35 */ public void encapsulationSaOrder(SaOrderExt saOrderExt) { saOrderExt.setPayTime(new Date()); @@ -864,9 +793,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl * * @param saOrderExt 订单信息 * @param cuMemberAccountExt 会员账户 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 10:24 */ @Override @Transactional(rollbackFor = Exception.class) @@ -1102,11 +1028,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return orderReturn; } - @Override - public String validateEnoughShopping(OrderParam orderParam) { - return saOrderHandle.validateEnoughShopping(orderParam); - } - private GradeDTO calculateGradeDTO(Integer specialArea, Integer pkCountry, Long pkMember, SaOrder saOrder, OrderReturn orderReturn) { BigDecimal orderAmount = saOrder.getOrderAmount(); BigDecimal orderAchieve = saOrder.getOrderAchieve(); @@ -1613,20 +1534,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } // 订单撤销成功回退可用量 - // 验证订单是否有仓库，有仓库的可以回退，没有的回退 - if (saOrderExt.getPkStorehouse() != null) { - saOrderExt.setPkModified(pkApprove); - if (saOrderExt.getOrderItemsExtList() == null && CollectionUtil.isNotEmpty(saOrderExt.getOrderItemsList())) { - List saOrderItemsExtList = new ArrayList<>(); - for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { - SaOrderItemsExt saOrderItemsExt = BeanUtil.copyProperties(saOrderItems, SaOrderItemsExt.class); - saOrderItemsExtList.add(saOrderItemsExt); - } - saOrderExt.setOrderItemsExtList(saOrderItemsExtList); - } - log.info("生成回退可用量消息，activity.exchange：{}", JSONUtil.toJsonStr(saOrderExt)); - rabbitTemplate.convertAndSend(RabbitMqConstants.AVAILABLE_NMU_BACK_EXCHANGE, RabbitMqConstants.AVAILABLE_NMU_BACK_KEY, saOrderExt); - } try { rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_BACK_EXCHANGE, RabbitMqConstants.ACTIVITY_BACK_KEY, saOrderExt); } catch (Exception e) { @@ -1669,12 +1576,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl } /** + * 验证第二部门是否需要验证首单 + * * @param pkParent 推荐人 * @param pkCountry 国家 - * @Description: 验证第二部门是否需要验证首单 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/7 9:29 */ @Override public boolean validateFirstOrder(Long pkParent, Integer pkCountry) { @@ -1686,25 +1591,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return false; } - /** - * @param pkPlaceParent 安置位置 - * @param pkCountry 国家 - * @Description: 验证第二部门是否需要验证首单 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/7 9:29 - */ - @Override - public boolean validateLeftExistMember(Long pkPlaceParent, Integer pkCountry) { - String validateParent = querySystemConfigByKey(pkCountry, ESystemConfig.PARENT_VALIDATE.getKey()); - if (EYesNo.YES.getIntValue() == Integer.parseInt(validateParent)) { - // 因为使用Member作为入参，此处 category 传入 10，代表 0=正常，1=待激活 - List cuMemberExtList = queryMemberExtByCondition(CuMember.builder().pkPlaceParent(pkPlaceParent).placeDept(EPlaceDept.LEFT_DEPT.getValue()).category(10).build()); - return cuMemberExtList.size() == 0; - } - return false; - } - @Override public List querySaOrderByTime(Date startDate, Date endDate, String orderCode) { return baseMapper.querySaOrderByTime(startDate, endDate, orderCode); @@ -1720,11 +1606,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryDeliverySaOrderByDay(startDate, endDate); } - @Override - public List querySaOrderByTimeForStore(Date startDate, Date endDate) { - return baseMapper.querySaOrderByTimeForStore(startDate, endDate); - } - @Override public String querySystemConfigByKey(Integer pkCountry, String key) { return systemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData(); @@ -1854,12 +1735,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderItemsService.update(orderItemsUpdateWrapper); } - /** - * 商品订单信息 - * - * @param waresOrderParam - * @return - */ @Override public List selectByOrderInfoList(WaresOrderParam waresOrderParam) { return baseMapper.selectByOrderInfoList(waresOrderParam); @@ -1875,62 +1750,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryOrderSelect(param, pkCountry); } - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean onlinePaymentCallBack(Long pkMember, String orderCode) { - if (StringUtils.isEmpty(orderCode)) { - return Boolean.FALSE; - } - log.info("在线支付回调接受的参数pkMember:{}, orderCode:{}!", pkMember, orderCode); - SaOrder querySaOrder = SaOrder.builder().orderStatus(EOrderStatus.WAIT_PAY.getValue()).orderCode(orderCode).build(); - SaOrderExt saOrderExt = querySaleOrderExtByOrderCode(querySaOrder, null); - if (saOrderExt == null) { - saOrderExt = redisService.getCacheObject(CacheConstants.TEMP_ORDER + pkMember + orderCode); - if (saOrderExt == null) { - return Boolean.FALSE; - } - } - if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { - // 注册订单 - if (saOrderExt.getPkCreator().equals(saOrderExt.getPkMember())) { - return Boolean.TRUE; - } - } else if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType()) { - // 复购订单 - // 判断是否消费过生成了会员 - CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember()); - if (cuMember == null) { - return Boolean.TRUE; - } - } - CuMember newCuMember = null; - if (saOrderExt.getPkMember() != null) { - newCuMember = getCuMemberByKey(saOrderExt.getPkMember()); - } - if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { - boolean isToBePay = getIsToBePayByOrderType(saOrderExt.getPkCountry(), saOrderExt.getOrderType()); - OrderParam orderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + pkMember + orderCode); - if (newCuMember == null && !isToBePay) { - newCuMember = packageCuMember(orderParam); - saOrderExt = packageSaOrder(orderParam, newCuMember); - } - if (newCuMember == null) { - throw new RuntimeException("生成会员失败"); - } - // 注册订单 - payRegSaOrder(saOrderExt, newCuMember, null, Boolean.FALSE); - } else if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { - log.info("在线支付回调接受的参数saOrderExt:{}!", JSONUtil.toJsonStr(saOrderExt)); - // 升级订单 - payUpgradeSaOrder(saOrderExt, null); - } else { - // 其他订单 - payRepurchaseSaOrder(saOrderExt, null); - } - log.info("在线支付回调成功，返回{}", Boolean.TRUE); - return Boolean.TRUE; - } - private CuMember calculateHaFunMemberGrade(SaOrderExt saOrderExt, CuMember newCuMember) { CuMember cuMember = null; if (newCuMember != null && Objects.equals(MagicNumberConstants.CHINA_HA_FUN, newCuMember.getPkSettleGrade()) && @@ -1946,12 +1765,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return cuMember; } - /** - * 空单注册审核通过 - * - * @param approvalBusinessResultDTO - * @return - */ @Override public Boolean regEmptyOrderApproved(ApprovalBusinessResultDTO approvalBusinessResultDTO) { R cuMemberServiceLogR = cuMemberServiceLogServiceApi.selectByBusinessNo(approvalBusinessResultDTO.getBusinessCode()); @@ -1961,12 +1774,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return true; } - /** - * 空单注册审核驳回 - * - * @param approvalBusinessResultDTO - * @return - */ @Override public Boolean regEmptyOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { R cuMemberServiceLogR = cuMemberServiceLogServiceApi.selectByBusinessNo(approvalBusinessResultDTO.getBusinessCode()); @@ -1998,9 +1805,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return true; } - /** - * 定时关单 订单三十分钟未支付自动关闭 - */ @Override public void closeOrder() { R> configMap = systemConfigServiceApi.getSystemConfig(); @@ -2031,8 +1835,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (orderList.size() > 0) { baseMapper.closeOrder(country.getPkId(), specialAreaTime.getAttributeValue(), orderType); saOrderItemsService.closeOrder(country.getPkId(), specialAreaTime.getAttributeValue(), orderType); - // 调用随工返还积分 - // cuMemberAccountService.cancelOrderBackPoint(orderList); } } } @@ -2040,53 +1842,26 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - /** - * 统计用户pv - * - * @param startPayDate 开始支付时间 - * @param endPayDate 结束支付时间 - * @param memberId 会员id - * @return - */ @Override public BigDecimal selectBySumPv(Date startPayDate, Date endPayDate, Long memberId) { return baseMapper.selectBySumPv(startPayDate, endPayDate, memberId); } - /** - * 统计用户金额 - * - * @param startPayDate 开始支付时间 - * @param endPayDate 结束支付时间 - * @param memberId 会员id - * @return - */ @Override public BigDecimal selectBySumAmount(Date startPayDate, Date endPayDate, Long memberId) { return baseMapper.selectBySumAmount(startPayDate, endPayDate, memberId); } - /** - * @description: 查询当天已支付订单信息 - * @author: zhang jing - * @date: 2023/5/17 14:37 - * @param: [orderType] - * @return: java.util.List - **/ @Override public List querySaOrderByOrderType(String payTime) { return baseMapper.querySaOrderByOrderType(payTime); } - @Override public List queryOrderType(Long memberId, Integer pkCountry) { return baseMapper.queryOrderType(memberId, pkCountry); } - /** - * 商品销量累计 - */ @Override public void waresSalesAccrual(List waresNumberParamList) { try { @@ -2156,43 +1931,17 @@ public class SaOrderServiceImpl extends ServiceImpl impl return i; } - @Override - @Transactional(rollbackFor = Exception.class) - public void saveSaOrderByOrderExt(SaOrderExt saOrderExt) { - save(saOrderExt); - for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { - saOrderItems.setPkOrder(saOrderExt.getPkId()); - } - saOrderItemsService.saveBatch(saOrderExt.getOrderItemsList()); - } - - /** - * @description: 批量插入虚拟订单数据 - * @author: zhang jing - * @date: 2023/10/12 11:56 - * @param: [orderList] - * @return: int - **/ @Transactional(rollbackFor = Exception.class) @Override public int insertUnrealOrderBach(List orderList) { return baseMapper.insertUnrealOrderBach(orderList); } - /** - * 查询会员店铺订单 - * - * @param param - * @param pkStore - * @param pkCountry - * @return - */ @Override public List myStoreOrderList(MyOrderParam param, Integer pkStore, Integer pkCountry) { return baseMapper.myStoreOrderList(param, pkStore, pkCountry); } - @Override @Transactional(rollbackFor = Exception.class) public Long saveOrderInfo(SaOrder saOrder, SaOrderItems orderItems) { @@ -2207,12 +1956,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryUpgradeAmountAndAchieve(pkMember); } - /** - * 查询会员订单总业绩 - * - * @param pkMember - * @return - */ @Override public BigDecimal getMemberOrderAchieve(Long pkMember) { return baseMapper.getMemberOrderAchieve(pkMember); @@ -2223,28 +1966,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.querySaOrderByDeliverList(deliverItemExtList); } - /** - * 查询店铺 - * - * @param statusList - * @param pkStore - * @param pkCountry - * @return - */ @Override public int getStoreNum(List statusList, Integer pkStore, Integer pkCountry) { return baseMapper.getStoreNum(statusList, pkStore, pkCountry); } - @Override - public void convertAvailableNumMsg(List availableNumList) { - if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) { - return; - } - log.info("生产活动消息，activity.exchange：{}", JSONUtil.toJsonStr(availableNumList)); - rabbitTemplate.convertAndSend(RabbitMqConstants.AVAILABLE_NMU_EXCHANGE, RabbitMqConstants.AVAILABLE_NMU_KEY, availableNumList); - } - @Override public SaOrder querySaOrderExtByPkId(Long pkId) { return baseMapper.querySaOrderExtByPkId(pkId); @@ -2261,13 +1987,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryStoreSaOrderByParam(orderQueryParam); } - /** - * 校验年包价格 - * - * @param cuMember 会员 - * @param saOrder 订单 - * @return true=可以购买 - */ @Override public boolean checkRenewalAmount(CuMember cuMember, SaOrderExt saOrder) { if (null == cuMember) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderRangeVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderRangeVO.java deleted file mode 100644 index 99451da..0000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderRangeVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.sale.order.vo; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: - * @Author: sui q - * @Time: 2022/12/9 13:45 - * @Classname: OrderRangeVO - * @PackageName: com.hz.wares.vo - */ -@Data -public class OrderRangeVO implements Serializable { - - private Long pkOrderItems; - - private String orderCode; - - private Integer pkWaresSpecsSku; - - private Integer quantity; - - private BigDecimal orderPrice; - - private BigDecimal orderAchieve; - - private Integer pkRange; - - private Integer rangeValue; - - private BigDecimal rangePrice; - - private BigDecimal rangeAchieve; - - private Integer pkCountry; -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderSelfPickupVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderSelfPickupVO.java deleted file mode 100644 index f0b8f20..0000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderSelfPickupVO.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.hzs.sale.order.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.sale.order.param.OrderItemsParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @description: 订单自提VO - * @author: zhang jing - * @date: 2023/5/29 14:56 - * @param: - * @return: - **/ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class OrderSelfPickupVO { - - /** - * 订单id - */ - private Long pkId; - /** - * 订单id - */ - private Long pkOrder; - /** - * 订单编号 - */ - private String orderCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - /** - * 订单类型（EOrderType） - */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE) - private Integer orderType; - /** - * 订单类型显示 - */ - private String orderTypeVal; - - /** - * 订单金额 - */ - private BigDecimal orderAmount; - - /** - * 注册编号 - */ - private String creatorCode; - - /** - * 订单业绩（PV） - */ - private BigDecimal orderAchieve; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 订单状态（EOrderStatus） - */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS) - private Integer orderStatus; - /** - * 订单状态显示 - */ - private String orderStatusVal; - - /** - * 收货人 - */ - private String recName; - - /** - * 收货电话 - */ - private String recPhone; - - /** - * 省 - */ - private Integer recProvince; - - /** - * 市 - */ - private Integer recCity; - - /** - * 县 - */ - private Integer recCounty; - - /** - * 省 - */ - private String recProvinceVal; - - /** - * 市 - */ - private String recCityVal; - - /** - * 县 - */ - private String recCountyVal; - - /** - * 收货地址 - */ - private String recAddress; - - /** - * 备注 - */ - private String remark; - - /** - * 订单商品明细 - */ - private List waresOrderList; - - /** - * 商品编号 - */ - private String waresCode; - - /** - * 商品数量 - */ - private Integer quantity; - - /** - * 商品明细主键 - */ - private Integer pkWaresDetail; - - /** - * sku主键 - */ - private Integer pkWaresSpecsSku; - - /** - * 规格明细主键 - */ - private Integer pkWaresSpecs; - /** - * 所属专区 - */ - private Integer specialArea; - - /** - * 审核状态（0=待提交，1=待审核，2=审核通过，3=审核驳回） - */ - @Transaction(transactionKey = EnumsPrefixConstants.APPROVE_RECHARGE_OPERATION) - private Integer approveStatus; - private String approveStatusVal; - - /** - * 汇率 - */ - private BigDecimal inExchangeRate; - - /** - * 提货码 - */ - private String selfCode; - - - - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/RefundOrderVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/RefundOrderVO.java deleted file mode 100644 index b105b3f..0000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/RefundOrderVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.sale.order.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @Description: 订单退单返回VO - * @Author: jiang chao - * @Time: 2023/9/22 10:24 - * @Classname: RefundOrderVO - * @PackageName: com.hzs.sale.order.vo - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class RefundOrderVO { - - /** - * 订单ID - */ - private Long pkId; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员姓名 - */ - private String memberName; - - /** - * 明细数据 - */ - private List orderItemsExtList; - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java index ced0117..6adaea3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java @@ -9,14 +9,9 @@ import com.hzs.sale.product.vo.ProductVo; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Set; /** - * @Description: 邮费相关mapper - * @Author: yuhui - * @Time: 2022/8/29 10:59 - * @Classname: BdProductMapper - * @PackageName: com.hzs.sale.product.mapper + * 邮费相关mapper */ public interface BdProductMapper extends BaseMapper { @@ -36,19 +31,7 @@ public interface BdProductMapper extends BaseMapper { List selectByQueryList(ProductParams productParams); /* - * @description: 根据产品id查询产品 - * @author: sui q - * @date: 2023/5/29 16:07 - * @param: null null - **/ - List queryProductExtById(@Param("productIdSet") Set productIdSet, @Param("pkCountry") Integer pkCountry, - @Param("repurchaseType") Integer repurchaseType); - - /* - * @description: 根据规格、主键查询产品 - * @author: sui q - * @date: 2023/11/27 15:52 - * @param: null null + * 根据规格、主键查询产品 **/ List queryProductExtBySpecsId(@Param("productSpecsList") List productSpecsList, @Param("pkCountry") Integer pkCountry); @@ -67,10 +50,11 @@ public interface BdProductMapper extends BaseMapper { * @param pkCountry 所属国家 * @return */ - List queryProductExistSpecs(@Param("pkCountry") Integer pkCountry,@Param("query") String query); + List queryProductExistSpecs(@Param("pkCountry") Integer pkCountry, @Param("query") String query); /** * 查询产品信息 + * * @param productId * @return */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/provider/IProductServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/provider/IProductServiceProvider.java index e51fb09..9d79317 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/provider/IProductServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/provider/IProductServiceProvider.java @@ -1,9 +1,7 @@ package com.hzs.sale.product.provider; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.domain.R; import com.hzs.common.domain.sale.classify.BdSpecs; import com.hzs.common.domain.sale.ext.BdProductExt; @@ -18,15 +16,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; -import java.util.stream.Collectors; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/15 17:56 - * @Classname: IProductServiceProvider - * @PackageName: com.hzs.sale.product.provider - */ @Slf4j @DubboService public class IProductServiceProvider implements IProductServiceApi { @@ -37,12 +27,6 @@ public class IProductServiceProvider implements IProductServiceApi { @Autowired private IBdSpecsService specsService; - /** - * 根据产品id 查询产品 - * - * @param productId - * @return - */ @Override public R getProduct(Integer productId) { BdProduct product = productService.getProduct(productId); @@ -54,18 +38,6 @@ public class IProductServiceProvider implements IProductServiceApi { return R.ok(productDTO); } - @Override - public R> queryProductDtoById(Set productIdSet, Integer pkCountry, Integer repurchaseType) { - List productExtList = productService.queryProductById(productIdSet, pkCountry, repurchaseType); - List productDtoList = new ArrayList<>(productExtList.size()); - productExtList.forEach(bdProductExt -> { - ProductDTO productDTO = BeanUtil.copyProperties(bdProductExt, ProductDTO.class); - productDTO.setProductId(bdProductExt.getPkId()); - productDtoList.add(productDTO); - }); - return R.ok(productDtoList); - } - @Override public R> queryProductDtoById(List productSpecsList, Integer pkCountry) { List productExtList = productService.queryProductExtById(productSpecsList, pkCountry); @@ -85,42 +57,10 @@ public class IProductServiceProvider implements IProductServiceApi { return R.ok(productDTO); } - @Override - public R> getProductMap(Collection productIdList, Integer pkCountry) { - Map resultMap = new HashMap<>(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in(SystemFieldConstants.PK_ID, productIdList); - if (null != pkCountry) { - queryWrapper.in(SystemFieldConstants.PK_COUNTRY, pkCountry); - } - List list = productService.list(queryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - for (BdProduct bdProduct : list) { - resultMap.put(bdProduct.getPkId(), bdProduct); - } - } - return R.ok(resultMap); - } - @Override public R> queryBdSpecsByIdList(List idList) { return R.ok(specsService.queryBdSpecsByIdList(idList)); } - /** - * 根据产品主键修改所关联商品是下架/预售 - * @param productDTOList - * @return - */ - @Override - public R updateWaresPreSaleStatus(List productDTOList) { - List productList = productDTOList.stream().map(a -> { - BdProduct bdProduct = new BdProduct(); - bdProduct.setPkId(a.getProductId()); - return bdProduct; - }).collect(Collectors.toList()); - return R.ok(productService.updateWaresPreSaleStatus(productList)); - } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java index 980962d..4f29440 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java @@ -10,14 +10,9 @@ import com.hzs.system.sys.dto.LoginUser; import java.util.List; import java.util.Map; -import java.util.Set; /** - * @Description: 产品相关服务 - * @Author: yuhui - * @Time: 2022/8/29 10:59 - * @Classname: IBdProductService - * @PackageName: com.hzs.sale.product.service + * 产品相关服务 */ public interface IBdProductService extends IService { @@ -25,25 +20,11 @@ public interface IBdProductService extends IService { * 根据产品主键获得产品 * * @param pkProduct 主键 - * @return: ProductParams - * @Author: sui q - * @Date: 2022/9/20 20:29 */ BdProduct getProduct(Integer pkProduct); /* - * @description: 根据产品id查询产品 - * @author: sui q - * @date: 2023/5/29 16:07 - * @param: null null - **/ - List queryProductById(Set productIdSet, Integer pkCountry, Integer repurchaseType); - - /* - * @description: 根据规格、主键查询产品 - * @author: sui q - * @date: 2023/11/27 15:52 - * @param: null null + * 根据规格、主键查询产品 **/ List queryProductExtById(List productSpecsList, Integer pkCountry); @@ -97,15 +78,6 @@ public interface IBdProductService extends IService { */ void floatingRoof(Integer productId); - /** - * 新增产品记录添加审核 - * - * @param productParams - * @param loginUser - * @param modifyRecordTypeValue 类型 - */ - Boolean saveProductModifyRecord(ProductParams productParams, LoginUser loginUser, Integer modifyRecordTypeValue); - /** * 查询产品map * @@ -115,32 +87,17 @@ public interface IBdProductService extends IService { */ Map queryProductMap(List pkProductList, Integer pkCountry); - - /** - * 根据产品名称查询产品列表 - * - * @param pkCountry 所属国家 - * @param productName 产品名称 - * @return - */ - List queryListLikeProductName(Integer pkCountry, String productName); - /** * 查询带有规格的产品列表 * * @param pkCountry 所属国家 * @return */ - List queryProductExistSpecs(Integer pkCountry,String query); + List queryProductExistSpecs(Integer pkCountry, String query); - /** - * 根据产品主键修改所关联商品是下架/预售 - * @param productList - * @return - */ - Boolean updateWaresPreSaleStatus(List productList); /** * 查询产品信息 + * * @param productId * @return */ @@ -148,6 +105,7 @@ public interface IBdProductService extends IService { /** * 查询产品规格信息 + * * @param productCode * @param pkCountry * @return diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java index 6059b95..14fb22c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java @@ -2,7 +2,6 @@ package com.hzs.sale.product.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,18 +11,13 @@ import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; import com.hzs.common.core.service.RedisService; import com.hzs.common.domain.sale.ext.BdProductExt; -import com.hzs.common.domain.sale.modifyRecord.BdModifyRecord; import com.hzs.common.domain.sale.product.BdProduct; import com.hzs.common.domain.sale.product.BdProductExtend; import com.hzs.common.domain.sale.product.BdProductSpecs; import com.hzs.common.domain.sale.wares.BdUnit; -import com.hzs.common.domain.sale.wares.BdWaresExtend; -import com.hzs.common.domain.system.sys.SysUser; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.sale.modifyrecord.service.IBdModifyRecordService; import com.hzs.sale.product.vo.BdProductSpecsInfo; import com.hzs.sale.product.vo.ProductSpecsVo; -import com.hzs.sale.product.vo.WaresDetailVo; import com.hzs.sale.product.controller.manage.params.ProductParams; import com.hzs.sale.product.mapper.BdProductMapper; import com.hzs.sale.product.service.IBdProductExtendService; @@ -31,11 +25,7 @@ import com.hzs.sale.product.service.IBdProductService; import com.hzs.sale.product.service.IBdProductSpecsService; import com.hzs.sale.product.vo.ProductVo; import com.hzs.sale.unit.service.IBdUnitService; -import com.hzs.sale.wares.service.IBdWaresDetailService; -import com.hzs.sale.wares.service.IBdWaresExtendService; import com.hzs.system.base.ITransactionServiceApi; -import com.hzs.system.sys.IApprovalServiceApi; -import com.hzs.system.sys.IUserServiceApi; import com.hzs.system.sys.dto.LoginUser; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -43,54 +33,28 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.stream.Collectors; /** * 产品 服务实现类 - * - * @author hzs - * @since 2022-09-01 */ @Service public class BdProductServiceImpl extends ServiceImpl implements IBdProductService { + @Autowired private IBdProductSpecsService productSpecsService; @Autowired - private IBdWaresExtendService waresExtendService; - @Autowired - private IBdWaresDetailService waresDetailService; - @Autowired - private IBdModifyRecordService modifyRecordService; - @Autowired private IBdProductService productService; @Autowired private IBdProductExtendService productExtendService; @Autowired private IBdUnitService unitService; - - @DubboReference - private IUserServiceApi userServiceApi; - @DubboReference - private ITransactionServiceApi transactionServiceApi; - @DubboReference - private IApprovalServiceApi approvalServiceApi; - + @Autowired private RedisService redisService; + @DubboReference + ITransactionServiceApi transactionServiceApi; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - /** - * 根据产品主键获得产品 - * - * @param pkProduct 主键 - * @return: ProductParams - * @Author: sui q - * @Date: 2022/9/20 20:29 - */ @Override public BdProduct getProduct(Integer pkProduct) { BdProduct bdProduct = redisService.getCacheObject(CacheConstants.BD_PRODUCT + pkProduct); @@ -103,32 +67,15 @@ public class BdProductServiceImpl extends ServiceImpl queryProductById(Set productIdSet, Integer pkCountry, Integer repurchaseType) { - return baseMapper.queryProductExtById(productIdSet, pkCountry, repurchaseType); - } - @Override public List queryProductExtById(List productSpecsList, Integer pkCountry) { return baseMapper.queryProductExtBySpecsId(productSpecsList, pkCountry); } - /** - * 新增商品信息 - * - * @param productParams - */ @Override @Transactional(rollbackFor = Exception.class) public String saveProduct(ProductParams productParams, LoginUser loginUser) { -// loginUser = new LoginUser(); -// loginUser.setDataCountry(1); -// loginUser.setUserId(1L); -// loginUser.setUsername("admin"); String productCode = productParams.getProductCode(); - // 查询最末商品编号 生成商品编号 -// String productCode = CreateNormsCodeUtils.createProductCode(productService.getLastProductCode()); - BdProduct bdProduct = BeanUtil.copyProperties(productParams, BdProduct.class); R transaction = transactionServiceApi.createTransaction(loginUser.getDataCountry(), ETransactionKey.PRODUCT, productParams.getProductName(), EYesNo.NO, EYesNo.NO); bdProduct.setProductCode(productCode); @@ -150,7 +97,6 @@ public class BdProductServiceImpl extends ServiceImpl productSpecsList = new ArrayList<>(); for (Integer id : productParams.getPkSpecsType()) { BdProductSpecs productSpecs = new BdProductSpecs(); productSpecs.setPkProduct(bdProduct.getPkId()); @@ -159,19 +105,9 @@ public class BdProductServiceImpl extends ServiceImpl transaction = transactionServiceApi.createTransaction(loginUser.getDataCountry(), ETransactionKey.PRODUCT, productParams.getProductName(), EYesNo.NO, EYesNo.NO); bdProduct.setPkId(productParams.getPkId()); @@ -216,7 +144,6 @@ public class BdProductServiceImpl extends ServiceImpl removeWrapper = new QueryWrapper<>(); removeWrapper.eq("PK_PRODUCT", bdProduct.getPkId()); productSpecsService.remove(removeWrapper); - // List productSpecsList = new ArrayList<>(); for (Integer id : productParams.getPkSpecsType()) { BdProductSpecs productSpecs = new BdProductSpecs(); productSpecs.setPkProduct(bdProduct.getPkId()); @@ -224,10 +151,8 @@ public class BdProductServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("PK_PRODUCT", productId); @@ -351,33 +257,6 @@ public class BdProductServiceImpl extends ServiceImpl user = userServiceApi.selectUserById(SecurityUtils.getUserId()); - BdModifyRecord modifyRecord = BdModifyRecord.builder().newValue(JSONUtil.toJsonStr(productParams)) - .auditStatus(EModifyRecordStatus.CHECK_PENDING.getValue()) - .pkCountry(loginUser.getDataCountry()) - .pkCreator(loginUser.getUserId()) - .type(modifyRecordTypeValue) - .creationTime(new Date()) - .name(productParams.getProductName()) - .code(productParams.getProductCode()) - .creatorName(SecurityUtils.getUsername()) - .pkCreationDept(user.getData().getPkDept()) - .creationDeptName(user.getData().getDeptName()) - .pkCreator(SecurityUtils.getUserId()) - .build(); - return modifyRecordService.save(modifyRecord); - } - @Override public Map queryProductMap(List pkProductList, Integer pkCountry) { Map resultMap = new HashMap<>(); @@ -399,37 +278,22 @@ public class BdProductServiceImpl extends ServiceImpl queryListLikeProductName(Integer pkCountry, String productName) { - return baseMapper.queryListLikeProductName(pkCountry, productName); + public List queryProductExistSpecs(Integer pkCountry, String query) { + return baseMapper.queryProductExistSpecs(pkCountry, query); } - @Override - public List queryProductExistSpecs(Integer pkCountry,String query) { - return baseMapper.queryProductExistSpecs(pkCountry,query); - } - /** - * 查询产品信息 - * @param productId - * @return - */ @Override public ProductVo getByProductId(Integer productId) { return baseMapper.getByProductId(productId); } - /** - * 查询产品规格信息 - * @param productCode - * @param pkCountry - * @return - */ @Override public ProductVo getByProductCodeInfo(String productCode, Integer pkCountry) { - BdProduct product = productService.getOne(new QueryWrapper().eq("PRODUCT_CODE",productCode)); + BdProduct product = productService.getOne(new QueryWrapper().eq("PRODUCT_CODE", productCode)); ProductVo productVo = new ProductVo(); - if (product != null){ + if (product != null) { - List productSpecsVos = productSpecsService.queryListByProductId(product.getPkId(),pkCountry); + List productSpecsVos = productSpecsService.queryListByProductId(product.getPkId(), pkCountry); for (ProductSpecsVo productSpecs : productSpecsVos) { List specsList = productSpecsService.findByPkSpecsType(productSpecs.getPkSpecsType()); productSpecs.setProductSpecsList(specsList); @@ -441,7 +305,7 @@ public class BdProductServiceImpl extends ServiceImpl productList) { - List list = productList.stream().map(a -> { - return a.getPkId(); - }).collect(Collectors.toList()); - - try { - List waresDetailVoList = waresDetailService.listByPkProduct(list); - for (WaresDetailVo waresDetailVo : waresDetailVoList) { - if (waresDetailVo.getIsPreSale().equals(EYesNo.YES.getIntValue())){ - // 是预售 修改为预售状态 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_WARES",waresDetailVo.getPkWares()); - updateWrapper.set("PRE_SALE_STATUS",EPresaleStatus.PRESALE.getValue()); - waresExtendService.update(updateWrapper); - }else if (waresDetailVo.getIsPreSale().equals(EYesNo.NO.getIntValue())){ - // 缺货状态 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_WARES",waresDetailVo.getPkWares()); - updateWrapper.set("PRE_SALE_STATUS",EPresaleStatus.OUT_STOCK.getValue()); - waresExtendService.update(updateWrapper); - } - - } - } catch (Exception e){ - e.printStackTrace(); - return false; - } - - return true; - } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/WaresDetailVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/WaresDetailVo.java index dfb031f..d034fea 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/WaresDetailVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/WaresDetailVo.java @@ -1,21 +1,7 @@ -package com.hzs.sale.product.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/24 16:20 - * @Classname: WaresDetailVo - * @PackageName: com.hzs.sale.product.vo - */ +package com.hzs.sale.product.vo; import lombok.Data; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.product.vo - *@Author: yh - *@CreateTime: 2024-04-24 16:20 - *@Description: TODO - *@Version: 1.0 - */ @Data public class WaresDetailVo { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java index 5a0a601..89569f6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java @@ -9,23 +9,12 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -/** - * @Description: - * @Author: sui q - * @Time: 2022/10/25 13:47 - * @Classname: SaleApprovalBusiness - * @PackageName: com.hzs.sale.pub.provider - */ @Slf4j @DubboService public class SaleApprovalBusinessProvider implements ISaleApprovalServiceApi { - private ISaleApprovalBusiness saleApprovalBusiness; - @Autowired - public void setSaleApprovalBusiness(ISaleApprovalBusiness saleApprovalBusiness) { - this.saleApprovalBusiness = saleApprovalBusiness; - } + private ISaleApprovalBusiness saleApprovalBusiness; @Override public R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/ISaleApprovalBusiness.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/ISaleApprovalBusiness.java index 7b53627..fe88d60 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/ISaleApprovalBusiness.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/ISaleApprovalBusiness.java @@ -4,11 +4,7 @@ import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; /** - * @Description: 销售模块统一的审批入口处理类，用于回调接口 - * @Author: sui q - * @Time: 2022/10/22 14:41 - * @Classname: IApprovalBusiness - * @PackageName: com.hzs.sale.pub + * 销售模块统一的审批入口处理类，用于回调接口 */ public interface ISaleApprovalBusiness { @@ -16,9 +12,6 @@ public interface ISaleApprovalBusiness { * 提供销售模块统一的审核回调方法 * * @param approvalBusinessResultDTO - * @return: void - * @Author: sui q - * @Date: 2022/10/22 14:48 */ void approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/impl/SaleApprovalBusiness.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/impl/SaleApprovalBusiness.java index c3addc0..5249254 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/impl/SaleApprovalBusiness.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/impl/SaleApprovalBusiness.java @@ -42,11 +42,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @Description: 订单模块统一的审批结束回调入口 - * @Author: sui q - * @Time: 2022/10/22 14:44 - * @Classname: ApprovalBusiness - * @PackageName: com.hzs.sale.pub.service.impl + * 订单模块统一的审批结束回调入口 */ @Service @Slf4j diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresDetailMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresDetailMapper.java index 84bc44c..83709c5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresDetailMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresDetailMapper.java @@ -3,7 +3,6 @@ package com.hzs.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.sale.product.vo.WaresDetailVo; import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.wares.param.CuProductParams; import org.apache.ibatis.annotations.Param; @@ -11,12 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 商品发布明细表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-09-09 */ public interface BdWaresDetailMapper extends BaseMapper { @@ -26,26 +20,11 @@ public interface BdWaresDetailMapper extends BaseMapper { * @param specialAreaList 专区 * @param transType 运输方式 * @param orderItemsParams 参数 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 */ List queryWaresDetailByCondition(@Param("specialAreaList") List specialAreaList, @Param("transType") Integer transType, @Param("orderItemsParams") List orderItemsParams); - /** - * 根据条件查询商品信息 - * - * @param specialAreaList 专区 - * @param orderItemsParams 参数 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 - */ - List queryWaresDetailSpecsByCondition(@Param("specialAreaList") List specialAreaList, - @Param("orderItemsParams") List orderItemsParams); - /** * 根据商品编号查询 * @@ -63,10 +42,4 @@ public interface BdWaresDetailMapper extends BaseMapper { */ List selectByPkWares(@Param("pkWares") Integer pkWares); - /** - * 根据产品主键查询商品列表 - * @param pkProducts - * @return - */ - List listByPkProduct(@Param("pkProducts") List pkProducts); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresItemsParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresItemsParams.java index 270af26..57602a4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresItemsParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresItemsParams.java @@ -1,7 +1,5 @@ package com.hzs.sale.wares.param; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -9,16 +7,9 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.math.BigDecimal; -import java.util.List; -import java.util.Map; -import java.util.Set; /** - * @Description: 返回到会员端的明细表 - * @Author: sui q - * @Time: 2022/9/19 11:25 - * @Classname: CuWaresItemsParams - * @PackageName: com.hzs.sale.wares.param + * 返回到会员端的明细表 */ @Data @Builder @@ -97,7 +88,7 @@ public class CuWaresItemsParams implements Serializable { private BigDecimal priceTotal; /** - *商品bv + * 商品bv */ private BigDecimal assAchieve; /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java index 736cac5..8fefe56 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java @@ -3,21 +3,13 @@ package com.hzs.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.common.domain.scm.ic.IcAvailableNum; -import com.hzs.sale.product.vo.WaresDetailVo; import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.wares.param.CuProductParams; -import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 商品发布明细表 服务类 - *

- * - * @author hzs - * @since 2022-09-09 */ public interface IBdWaresDetailService extends IService { @@ -26,24 +18,9 @@ public interface IBdWaresDetailService extends IService { * * @param specialArea 专区 * @param transType 运输方式 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 */ List queryWaresDetailByCondition(Integer specialArea, Integer transType, List orderItemsParams); - /** - * 根据条件查询商品信息 - * - * @param specialAreaList 专区 - * @param orderItemsParams 参数 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 - */ - List queryWaresDetailSpecsByCondition(List specialAreaList, Integer pkCorp, Integer pkStorehouse, - List orderItemsParams); - /** * 查询商品编号 * @@ -61,10 +38,4 @@ public interface IBdWaresDetailService extends IService { */ List selectByPkWares(Integer pkWares); - /** - * 根据产品主键查询商品列表 - * @param pkProduct - * @return - */ - List listByPkProduct(List pkProduct); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresExtendService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresExtendService.java index 49f89b0..2552b7a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresExtendService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresExtendService.java @@ -1,38 +1,33 @@ package com.hzs.sale.wares.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.sale.wares.BdWaresExtend; import com.hzs.sale.order.param.WaresNumberParam; -import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** - *

* 商品发布扩展表 服务类 - *

- * - * @author hzs - * @since 2022-09-09 */ public interface IBdWaresExtendService extends IService { /** * 修改销量 + * * @param waresNumberParamList */ - void updateWaresSalesAccrual( List waresNumberParamList); + void updateWaresSalesAccrual(List waresNumberParamList); /** * 修改上下架时间 + * * @param waresId */ - void updatePutOnTime( Integer waresId); + void updatePutOnTime(Integer waresId); /** * 修改上下架时间 + * * @param waresId */ void updatePutOffTime(Integer waresId); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java index cf07f09..31a8d1c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java @@ -14,9 +14,6 @@ import java.util.List; /** * 规格sku表 服务类 - * - * @author hzs - * @since 2022-09-09 */ public interface IBdWaresSpecsSkuService extends IService { @@ -27,9 +24,6 @@ public interface IBdWaresSpecsSkuService extends IService { * @param waresCode 商品编号 * @param loginMemberId 登录用户主键 * @param pkCountry 前端传递结算国（） - * @return: List - * @Author: sui q - * @Date: 2022/9/19 11:21 */ CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry); @@ -37,9 +31,6 @@ public interface IBdWaresSpecsSkuService extends IService { * 通过规格列表查询商品最小库存单位， * * @param cuWaresItemsParams 明细参数，产品明细， - * @return: SpecsSkuParam - * @Author: sui q - * @Date: 2022/9/19 16:26 */ SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams); @@ -75,10 +66,7 @@ public interface IBdWaresSpecsSkuService extends IService { List selectByPkIds(List pkWaresSpecsSku); /* - * @description: 查询商品封装为返回到会员端商品信息 - * @author: sui q - * @date: 2023/5/10 19:57 - * @param: null null + * 查询商品封装为返回到会员端商品信息 **/ WaresItemVo selectWaresItemsVO(Long pkMember, Integer pkCountry, Integer specialArea, String waresCode, List productGroup, Integer quantity); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java index 9914c42..6ddb91f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java @@ -3,19 +3,14 @@ package com.hzs.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.utils.ComputeUtil; import com.hzs.common.domain.sale.ext.BdWaresDetailExt; import com.hzs.common.domain.sale.wares.BdWaresDetail; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.sale.product.vo.WaresDetailVo; import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.order.param.WaresItemsParam; import com.hzs.sale.util.WaresSpecialUtil; import com.hzs.sale.wares.mapper.BdWaresDetailMapper; import com.hzs.sale.wares.param.CuProductParams; import com.hzs.sale.wares.service.IBdWaresDetailService; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -25,25 +20,11 @@ import java.util.List; import java.util.Map; /** - *

* 商品发布明细表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-09 */ @Service public class BdWaresDetailServiceImpl extends ServiceImpl implements IBdWaresDetailService { - /** - * 根据条件查询商品信息 - * - * @param specialArea 专区 - * @param transType 运输方式 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 - */ @Override public List queryWaresDetailByCondition(Integer specialArea, Integer transType, List orderItemsParams) { List bdWaresDetailExtList = new ArrayList<>(); @@ -79,90 +60,15 @@ public class BdWaresDetailServiceImpl extends ServiceImpl queryWaresDetailSpecsByCondition(List specialAreaList, Integer pkCorp, Integer pkStorehouse, - 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()) - .build(); - bdWaresDetailExt.setQuantity(waresItemsParam.getQuantity()); - bdWaresDetailExtList.add(bdWaresDetailExt); - } - } - List waresDetailExtList = baseMapper.queryWaresDetailSpecsByCondition(specialAreaList, 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"); - } - waresDetailExt.setQuantity(waresDetailExt.getWaresQuantity() * waresDetailExt.getQuantity()); - }); - } - Map availableNumHashMap = new HashMap<>(); - for (BdWaresDetailExt bdWaresDetailExt : bdWaresDetailExtList) { - String key = bdWaresDetailExt.getWaresCode() + "_" + bdWaresDetailExt.getPkWaresSpecsSku() + "_" + bdWaresDetailExt.getPkProduct(); - if (availableNumHashMap.containsKey(key)){ - IcAvailableNum availableNum = availableNumHashMap.get(key); - availableNum.setAvailableNum(ComputeUtil.computeAdd(availableNum.getAvailableNum(), BigDecimal.valueOf(bdWaresDetailExt.getQuantity()))); - }else{ - IcAvailableNum availableNum = IcAvailableNum.builder() - .availableNum(BigDecimal.valueOf(bdWaresDetailExt.getQuantity())) - .pkProduct(bdWaresDetailExt.getPkProduct()) - .pkCorp(pkCorp) - .pkProductBas(bdWaresDetailExt.getPkProductBas()) - .pkUnit(bdWaresDetailExt.getPkUnit()) - .pkStorehouse(pkStorehouse) - .preSaleStatus(bdWaresDetailExt.getPreSaleStatus()) - .build(); - List scmItemSpecs = BeanUtil.copyToList(bdWaresDetailExt.getWaresSpecsList(), ScmItemSpecs.class); - availableNum.setScmItemSpecsList(scmItemSpecs); - availableNumHashMap.put(key, availableNum); - } - } - return new ArrayList<>(availableNumHashMap.values()); - } - - /** - * 查询商品编号 - * - * @param waresCode - * @param specialAreaList - * @return - */ @Override public List selectByWaresCode(String waresCode, List specialAreaList) { return baseMapper.selectByWaresCode(waresCode, specialAreaList); } - /** - * 根据商品主键查询 - * - * @param pkWares - * @return - */ @Override public List selectByPkWares(Integer pkWares) { return baseMapper.selectByPkWares(pkWares); } - /** - * 根据产品主键查询商品列表 - * @param pkProduct - * @return - */ - @Override - public List listByPkProduct(List pkProduct) { - return baseMapper.listByPkProduct(pkProduct); - } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresExtendServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresExtendServiceImpl.java index bec4e1f..585dde9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresExtendServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresExtendServiceImpl.java @@ -1,6 +1,5 @@ package com.hzs.sale.wares.service.impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.sale.wares.BdWaresExtend; import com.hzs.sale.order.param.WaresNumberParam; @@ -12,38 +11,24 @@ import java.util.Date; import java.util.List; /** - *

* 商品发布扩展表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-09 */ @Service public class BdWaresExtendServiceImpl extends ServiceImpl implements IBdWaresExtendService { - /** - * 修改销量 - * @param waresNumberParamList - */ + @Override public void updateWaresSalesAccrual(List waresNumberParamList) { baseMapper.updateWaresSalesAccrual(waresNumberParamList); } - /** - * 修改上下架时间 - * @param waresId - */ + @Override public void updatePutOnTime(Integer waresId) { baseMapper.updatePutOnTime(waresId); } - /** - * 修改上下架时间 - * @param waresId - */ @Override public void updatePutOffTime(Integer waresId) { baseMapper.updatePutOffTime(waresId); } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java index cc78c02..a3cccb3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java @@ -15,7 +15,6 @@ import com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt; import com.hzs.common.domain.sale.wares.BdWaresLabel; import com.hzs.common.domain.sale.wares.BdWaresRange; import com.hzs.common.domain.sale.wares.BdWaresSpecsSku; -import com.hzs.common.domain.scm.ic.IcAvailableNum; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdLabel; import com.hzs.common.domain.system.ext.BdLabelExt; @@ -29,7 +28,6 @@ import com.hzs.sale.util.WaresSpecialUtil; import com.hzs.sale.wares.mapper.BdWaresSpecsSkuMapper; import com.hzs.sale.wares.param.*; import com.hzs.sale.wares.service.*; -import com.hzs.scm.pub.IScmBillServiceApi; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAwardsServiceApi; @@ -45,9 +43,6 @@ import java.util.stream.Collectors; /** * 规格sku表 服务实现类 - * - * @author hzs - * @since 2022-09-09 */ @Service public class BdWaresSpecsSkuServiceImpl extends ServiceImpl implements IBdWaresSpecsSkuService { @@ -69,8 +64,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl - * @Author: sui q - * @Date: 2022/9/27 10:51 */ private List setUpWaresItemsParams(Integer pkCountry, List bdWaresSpecsSkuExtList, Map specsNameMap, Map> specsIdMap, BigDecimal inExchangeRate) { List cuWaresItemsParamsList = new ArrayList<>(); @@ -237,24 +227,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl speceIdList = specsIdMap.get(bdWaresSpecsSkuExt.getPkId()); - // 查询可用量 - IcAvailableNum icAvailableNum = scmBillServiceApi.queryAvailableNumByCondition(pkCountry, bdWaresSpecsSkuExt.getPkProduct(), speceIdList).getData(); - if (icAvailableNum != null) { - cuWaresItemsParams.setInventoryNum(icAvailableNum.getAvailableNum()); - } - } -// Map specsTypeParamsMap = new HashMap<>(4); -// setSpecsMap(bdWaresSpecsSkuExt, specsTypeParamsMap); - // 规格分类 -// Set typeParamsSet = new HashSet<>(); -// typeParamsSet.add(specsTypeParamsMap.get(bdWaresSpecsSkuExt.getPkSpecsType())); -// cuWaresItemsParams.setTypeParamsSet(typeParamsSet); -// cuWaresItemsParams.setSpecsTypeParamsMap(specsTypeParamsMap); -// cuWaresItemsParamsMap.put(bdWaresSpecsSkuExt.getPkProduct(), cuWaresItemsParams); cuWaresItemsParamsList.add(cuWaresItemsParams); -// } }); return cuWaresItemsParamsList; } @@ -267,46 +240,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl specsTypeParamsMap) { - SpecsTypeParams bdWaresSpecs = SpecsTypeParams.builder() - .pkSpecsType(bdWaresSpecsSkuExt.getPkSpecsType()) - .typeName(bdWaresSpecsSkuExt.getSpecsTypeName()) - .build(); - // 规格 - Set specsParamsSet = new HashSet<>(); - setSpecsParams(bdWaresSpecsSkuExt, specsParamsSet); - bdWaresSpecs.setSpecsParamsSet(specsParamsSet); - specsTypeParamsMap.put(bdWaresSpecs.getPkSpecsType(), bdWaresSpecs); - } - - /** - * 设置规格明细 - * - * @param bdWaresSpecsSkuExt sku - * @param specsParamsList 规格明细 - */ - private void setSpecsParams(BdWaresSpecsSkuExt bdWaresSpecsSkuExt, Set specsParamsList) { - SpecsParams specsParams = SpecsParams.builder() - .pkSpecs(bdWaresSpecsSkuExt.getPkSpecs()) - .specsName(bdWaresSpecsSkuExt.getSpecsName()) - .build(); - specsParamsList.add(specsParams); - } - - /** - * 通过规格列表查询商品最小库存单位， - * - * @param cuWaresItemsParams 明细参数 - * @return: SpecsSkuParam - * @Author: sui q - * @Date: 2022/9/19 16:26 - */ @Override public SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams) { BdWaresSpecsSkuExt bdWaresSpecsSkuExt = baseMapper.queryWaresDetailSkuBySpecs(cuWaresItemsParams); @@ -317,44 +250,21 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByWaresSpecsSku(List waresIds) { return baseMapper.selectByWaresSpecsSku(waresIds); } - /** - * 根据id 批量查询sku 信息 - * - * @param pkWaresSpecsSku - * @return - */ @Override public List selectByPkIds(List pkWaresSpecsSku) { return baseMapper.selectByPkIds(pkWaresSpecsSku); @@ -452,35 +362,16 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByMinWaresSpecsSku(Integer pkWares) { return baseMapper.selectByMinWaresSpecsSku(pkWares); } - /** - * 根据id 查询 - * - * @param pkWaresSpecsSku - * @return - */ @Override public BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku) { return baseMapper.selectByPkWaresSpecsSku(pkWaresSpecsSku); } - /** - * 批量查询 sku 的最小值 - * - * @param pkWaresIds - * @return - */ @Override public List selectByMinWaresSpecsSkuByPkWaresList(List pkWaresIds) { return baseMapper.selectByMinWaresSpecsSkuByPkWaresList(pkWaresIds); diff --git a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml index 45e7251..451a57e 100644 --- a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml @@ -68,7 +68,7 @@ dubbo: threads: 400 cloud: # 订阅服务 - subscribed-services: bd-system, bd-member, bd-third, bd-bonus,bd-scm + subscribed-services: bd-system, bd-member, bd-third, bd-bonus scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.sale diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml index 9c2bdbe..5278e95 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml @@ -68,29 +68,6 @@ - - - - - - diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/modifyRecord/BdModifyRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/modifyRecord/BdModifyRecordMapper.xml index 0b34256..4afa496 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/modifyRecord/BdModifyRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/modifyRecord/BdModifyRecordMapper.xml @@ -4,32 +4,17 @@ - - - - - - - - - - - + + + + + + + + + + + - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, OLD_VALUE, NEW_VALUE, AUDIT_STATUS, TYPE - - - - diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml index f31ce74..4525c63 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml @@ -427,28 +427,6 @@ order by soi.creation_time desc, so.order_code desc - - update SA_ORDER_ITEMS @@ -555,42 +533,6 @@ order by creation_time desc, order_status, is_gift desc - - - - - - - - diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index 2384e67..5f60820 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -202,6 +202,7 @@ and so.tran_type = #{tranType} + + + update sa_order set DEL_FLAG = 1, @@ -1228,25 +1231,6 @@ order by so.creation_time desc - - select product_code from (select t.product_code from BD_PRODUCT t where t.del_flag = 0 order by product_code desc) @@ -157,16 +150,6 @@ order by pe.SORT - select distinct bp.*,bu.NAME unitStr from bd_product bp - left join bd_product_specs bps - on bps.pk_product = bp.pk_id - left join bd_unit bu on bu.PK_ID = bp.UNIT + left join bd_product_specs bps + on bps.pk_product = bp.pk_id + left join bd_unit bu on bu.PK_ID = bp.UNIT where bp.del_flag = 0 - and bp.pk_country = #{pkCountry} - and bp.enable_state = 0 - and bps.del_flag = 0 + and bp.pk_country = #{pkCountry} + and bp.enable_state = 0 + and bps.del_flag = 0 AND (bp.PRODUCT_CODE like #{query}||'%' or bp.PRODUCT_NAME like #{query}||'%') @@ -195,18 +178,18 @@ diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml index ac83d9a..36a83f9 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml @@ -30,12 +30,12 @@ - - + + - + @@ -103,43 +103,6 @@ - - - diff --git a/bd-business/bd-business-scm/pom.xml b/bd-business/bd-business-scm/pom.xml index 837fa45..5b1d81a 100644 --- a/bd-business/bd-business-scm/pom.xml +++ b/bd-business/bd-business-scm/pom.xml @@ -29,12 +29,6 @@ bd-api-sale - - - com.bd.africa - bd-api-scm - - com.bd.africa bd-common-aop diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java index 2d8ea68..71aabb3 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralInHController.java @@ -1,6 +1,5 @@ package com.hzs.scm.general.controller.manage; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; @@ -23,7 +22,6 @@ import com.hzs.scm.general.service.IIcGeneralInHService; import com.hzs.scm.general.vo.IcGeneralInBVO; import com.hzs.scm.general.vo.IcGeneralInExcelVO; import com.hzs.scm.general.vo.IcGeneralInVO; -import com.hzs.scm.pub.param.ScmApproveParam; import com.hzs.scm.pub.service.IScmOrderApproveLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -34,12 +32,7 @@ import java.util.ArrayList; import java.util.List; /** - *

* 其他入库表头 前端控制器 - *

- * - * @author hzs - * @since 2023-11-27 */ @RestController @RequestMapping("/manage/general-in") @@ -48,16 +41,9 @@ public class IcGeneralInHController extends IcGeneralController { @Autowired private IIcGeneralInHService generalInhService; - @Autowired private IIcGeneralInBService generalInBiService; - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - /** * 查询列表 * @@ -77,7 +63,7 @@ public class IcGeneralInHController extends IcGeneralController { for (IcGeneralInHExt generalInExt : generalInExtList) { IcGeneralInVO icGeneralInVO = BeanUtil.copyProperties(generalInExt, IcGeneralInVO.class); List generalInbExtList = generalInExt.getGeneralInbExtList(); - if(CollectionUtil.isNotEmpty(generalInbExtList)) { + if (CollectionUtil.isNotEmpty(generalInbExtList)) { List returnbVoList = BeanUtil.copyToList(generalInbExtList, IcGeneralInBVO.class); icGeneralInVO.setGeneralInbExtList(returnbVoList); } @@ -106,7 +92,7 @@ public class IcGeneralInHController extends IcGeneralController { */ @PostMapping("/export-list-total") @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, GeneralParam generalParam){ + public void exportListTransInTotal(HttpServletResponse response, GeneralParam generalParam) { generalParam.setPkCountry(SecurityUtils.getPkCountry()); List generalInExtList = generalInhService.queryDisGeneralInExtByCondition(generalParam); List generalInExcelVoList = packageScmExportVo(generalInExtList); @@ -190,28 +176,4 @@ public class IcGeneralInHController extends IcGeneralController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - IcGeneralInHExt generalInhExt = generalInhService.queryGeneralInById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (generalInhExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_IN_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IC_GENERAL_IN_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - generalInhService.auditGeneralInByApproveParamSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java index 6a6a5dd..f87f63a 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/controller/manage/IcGeneralOutHController.java @@ -1,6 +1,5 @@ package com.hzs.scm.general.controller.manage; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; @@ -12,8 +11,6 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.scm.general.ext.IcGeneralOutBExt; import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.core.utils.TransactionUtils; import com.hzs.scm.general.controller.IcGeneralController; @@ -23,8 +20,6 @@ import com.hzs.scm.general.service.IIcGeneralOutHService; import com.hzs.scm.general.vo.IcGeneralOutBVO; import com.hzs.scm.general.vo.IcGeneralOutExcelVO; import com.hzs.scm.general.vo.IcGeneralOutVO; -import com.hzs.scm.pub.param.ScmApproveParam; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,12 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; /** - *

* 其他出库单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-11-27 */ @RestController @RequestMapping("/manage/general-out") @@ -48,12 +38,6 @@ public class IcGeneralOutHController extends IcGeneralController { @Autowired private IIcGeneralOutHService generalOutService; - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private UserTokenService userTokenService; - @Autowired private IIcGeneralOutBService generalOutBiService; @@ -91,7 +75,7 @@ public class IcGeneralOutHController extends IcGeneralController { for (IcGeneralOutHExt generalOutExt : generalOutExtList) { IcGeneralOutVO generalOutVO = BeanUtil.copyProperties(generalOutExt, IcGeneralOutVO.class); List generalOutbExtList = generalOutExt.getGeneralOutbExtList(); - if(CollectionUtil.isNotEmpty(generalOutbExtList)) { + if (CollectionUtil.isNotEmpty(generalOutbExtList)) { List returnbVoList = BeanUtil.copyToList(generalOutbExtList, IcGeneralOutBVO.class); generalOutVO.setGeneralOutbExtList(returnbVoList); } @@ -105,7 +89,7 @@ public class IcGeneralOutHController extends IcGeneralController { */ @PostMapping("/export-list-total") @Log(module = EOperationModule.GENERAL_IN, business = EOperationBusiness.GENERAL_IN, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, GeneralParam generalParam){ + public void exportListTransInTotal(HttpServletResponse response, GeneralParam generalParam) { generalParam.setPkCountry(SecurityUtils.getPkCountry()); List generalOutExtList = generalOutService.queryDisGeneralOutExtCondition(generalParam); List generalOutExcelVoList = packageScmExportVo(generalOutExtList); @@ -192,28 +176,4 @@ public class IcGeneralOutHController extends IcGeneralController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.GENERAL_OUT, business = EOperationBusiness.GENERAL_OUT, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - IcGeneralOutHExt generalOutExt = generalOutService.queryGeneralOutById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (generalOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IC_GENERAL_OUT_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - generalOutService.auditGeneralOutByApproveParamSubmit(generalOutExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java index c05d9ec..eacff23 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralInHService.java @@ -67,28 +67,4 @@ public interface IIcGeneralInHService extends IService { * @param: null null **/ void deleteGeneralIn(Long pkId, Long pkMember); - - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditGeneralInByApproveParamSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralInByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralInByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java index 9c04670..f91dbe1 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/IIcGeneralOutHService.java @@ -67,28 +67,4 @@ public interface IIcGeneralOutHService extends IService { * @param: null null **/ void deleteGeneralOut(Long pkId, Long pkMember); - - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditGeneralOutByApproveParamSubmit(IcGeneralOutHExt generalOutExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditGeneralOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java index ef432f4..1b83c7f 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/general/service/impl/IcGeneralInHServiceImpl.java @@ -202,26 +202,6 @@ public class IcGeneralInHServiceImpl extends ServiceImpl icGeneralOutbExtList = generalOutBiService.queryGeneralOutBiByList(EScmOrderType.GENERAL_OUT.getValue(), generalOutExt.getGeneralOutbExtList()); - if(icGeneralOutbExtList != null && icGeneralOutbExtList.size() >0){ - generalOutExt.setGeneralOutbExtList(icGeneralOutbExtList); - } - // 更新存货现存量表，更新库存 - onHandNumService.mergeIcOnHandNumByGeneralOut(generalOutExt, generalOutExt.getGeneralOutbExtList(), EScmOrderType.GENERAL_OUT.getValue(), loginUser.getUserId()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.IC_GENERAL_OUT_APPROVE, EOrderPrefix.IC_GENERAL_OUT_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditGeneralOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveGeneralByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditGeneralOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveGeneralByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - /* * @description: 将采购订单的参数转换为能保存的订单 * @author: sui q diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java index 29e263a..e6e2ec1 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableNumMapper.java @@ -1,9 +1,7 @@ package com.hzs.scm.ic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.IcOnHandNum; import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; import com.hzs.common.domain.scm.pub.ScmItemSpecs; @@ -13,78 +11,34 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 可用量 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-09 */ public interface IcAvailableNumMapper extends BaseMapper { /* - * @description: 出入口的时候更新原来现存量的数量 - * @author: sui q - * @date: 2023/11/22 17:04 - * @param: null null + * 出入口的时候更新原来现存量的数量 **/ Integer updateAvailableNumByNum(IcAvailableNum availableNum); /* - * @description: 入库单是新增或修改 可用量表 - * @author: sui q - * @date: 2023/11/21 16:19 - * @param: null null - **/ - void mergeIcAvailableNumByIcOnHandNum(@Param("availableNumList") List availableNumList); - - /* - * @description: 查询产品是否存在现存量表 - * @author: sui q - * @date: 2023/11/22 15:04 - * @param: null null + * 查询产品是否存在现存量表 **/ List queryIcAvailableNumByCondition(@Param("icOnHandNum") IcOnHandNumExt icOnHandNum, @Param("scmItemSpecsList") List scmItemSpecsList); /* - * @description: 下单时验证可用量 - * @author: sui q - * @date: 2023/12/11 10:01 - * @param: null null - **/ - List queryAvailableNumByProduct(@Param("availableNumList") List availableNumList); - - /* - * @description: 下单时验证可用量 - * @author: sui q - * @date: 2023/12/11 10:01 - * @param: null null + * 下单时验证可用量 **/ List queryAvailableNumByAvaliable(@Param("availableNumExt") IcAvailableNumExt availableNumExt); /* - * @description: 根据查询条件查询可用量 - * @author: sui q - * @date: 2023/12/18 15:10 - * @param: null null + * 根据查询条件查询可用量 **/ List queryAvailableNumByCondition(AvailableNum availableNum); /* - * @description: 查询可用量 - * @author: sui q - * @date: 2024/1/18 10:46 - * @param: null null + * 查询可用量 **/ IcAvailableNum queryAvailableNumBySpecsId(@Param("pkStorehouse") Integer pkStorehouse, @Param("pkProduct") Integer pkProduct, @Param("specsIdList") List specsIdList); - - /* - * @description: 根据销售订单查询可用量，封装数据 - * @author: sui q - * @date: 2024/4/17 11:18 - * @param: null null - **/ - List queryAvailableNumByOrder(@Param("saOrderExt") SaOrderExt saOrderExt); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java index fdd4cdb..afde147 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/mapper/IcAvailableSpecsMapper.java @@ -2,35 +2,18 @@ package com.hzs.scm.ic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.scm.ic.IcAvailableSpecs; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 可用量规格明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-11 */ public interface IcAvailableSpecsMapper extends BaseMapper { /* - * @description: 不存在的保存现存量明细 - * @author: sui q - * @date: 2023/11/22 16:52 - * @param: null null + * 不存在的保存现存量明细 **/ void mergeIcAvailableSpecsByList(@Param("availableSpecsList") List availableSpecsList); - /* - * @description:查询产品规格 - * @author: sui q - * @date: 2024/4/17 11:47 - * @param: null null - **/ - List queryAvailableSpecs(@Param("specsIsArr") int[] specsIsArr); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java index e18aae4..fae282a 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableNumService.java @@ -1,9 +1,7 @@ package com.hzs.scm.ic.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.IcOnHandNum; import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; import com.hzs.scm.ic.param.AvailableNum; @@ -11,76 +9,32 @@ import com.hzs.scm.ic.param.AvailableNum; import java.util.List; /** - *

* 可用量 服务类 - *

- * - * @author hzs - * @since 2023-12-09 */ public interface IIcAvailableNumService extends IService { /* - * @description: 可用量表是新增或修改 可用量表 - * @author: sui q - * @date: 2023/11/21 16:19 - * @param: null null + * 可用量表是新增或修改 可用量表 **/ void mergeIcAvailableNumByIcOnHandNum(List onHandNumList, Long pkMember); /* - * @description: 可用量表是新增或修改 撤销订单，退单时回退可用量 - * @author: sui q - * @date: 2023/11/21 16:19 - * @param: null null - **/ - void mergeIcAvailableNumByOrder(SaOrderExt saOrderExt); - - /* - * @description: 插入新的可用量 - * @author: sui q - * @date: 2023/12/18 15:50 - * @param: null null + * 插入新的可用量 **/ void insertIcAvailableNumByParam(AvailableNum availableNum, Long pkMember); /* - * @description: 出库扣减 可用量表 - * @author: sui q - * @date: 2023/11/21 16:19 - * @param: null null + * 出库扣减 可用量表 **/ void updateDeductIcAvailableNumByGeneralOut(IcAvailableNum availableNum, Long pkMember); /* - * @description: 更新可用量 - * @author: sui q - * @date: 2023/12/18 9:28 - * @param: null null - **/ - void updateDeductIcAvailableNumByList(List availableNumList); - - /* - * @description: 下单时验证可用量 - * @author: sui q - * @date: 2023/12/11 10:01 - * @param: null null - **/ - List queryAvailableNumByProduct(List availableNumList); - - /* - * @description: 根据查询条件查询可用量 - * @author: sui q - * @date: 2023/12/18 15:10 - * @param: null null + * 根据查询条件查询可用量 **/ List queryAvailableNumByCondition(AvailableNum availableNum); /* - * @description: 查询可用量 - * @author: sui q - * @date: 2024/1/18 10:46 - * @param: null null + * 查询可用量 **/ IcAvailableNum queryAvailableNumByCondition(Integer pkCountry, Integer pkProduct, List speceIdList); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java index 991660c..74001f0 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/IIcAvailableSpecsService.java @@ -2,25 +2,16 @@ package com.hzs.scm.ic.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.scm.ic.IcAvailableSpecs; -import com.hzs.common.domain.scm.ic.IcOnHandSpecs; import java.util.List; /** - *

* 可用量规格明细 服务类 - *

- * - * @author hzs - * @since 2023-12-11 */ public interface IIcAvailableSpecsService extends IService { /* - * @description: 不存在的保存现存量明细 - * @author: sui q - * @date: 2023/11/22 16:52 - * @param: null null + * 不存在的保存现存量明细 **/ void mergeIcAvailableSpecsByList(List availableSpecsList); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java index 13c340e..a47904a 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/ic/service/impl/IcAvailableNumServiceImpl.java @@ -2,33 +2,22 @@ package com.hzs.scm.ic.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.ScmFieldConstants; import com.hzs.common.core.constant.msg.ScmMsgConstants; -import com.hzs.common.core.enums.EPresaleStatus; -import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.reflect.ReflectUtils; -import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.scm.ic.IcAvailableNum; import com.hzs.common.domain.scm.ic.IcAvailableSpecs; -import com.hzs.common.domain.scm.ic.IcOnHandNum; import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; import com.hzs.common.domain.scm.ic.ext.IcOnHandNumExt; -import com.hzs.common.domain.scm.pub.ScmItemSpecs; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; import com.hzs.common.domain.system.base.BdStorehouse; -import com.hzs.sale.product.IProductServiceApi; -import com.hzs.sale.product.dto.ProductDTO; import com.hzs.scm.ic.mapper.IcAvailableNumMapper; -import com.hzs.scm.ic.mapper.IcAvailableSpecsMapper; import com.hzs.scm.ic.param.AvailableNum; import com.hzs.scm.ic.service.IIcAvailableNumService; import com.hzs.scm.ic.service.IIcAvailableSpecsService; -import com.hzs.scm.sale.service.IIcDelSaleLogService; import com.hzs.system.base.ICountryServiceApi; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -38,12 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; /** - *

* 可用量 服务实现类 - *

- * - * @author hzs - * @since 2023-12-09 */ @Service public class IcAvailableNumServiceImpl extends ServiceImpl implements IIcAvailableNumService { @@ -54,17 +38,8 @@ public class IcAvailableNumServiceImpl extends ServiceImpl0){ + if (availableSpecsList.size() > 0) { saveAvailableSpecsList.addAll(availableSpecsList); } } @@ -105,28 +80,6 @@ public class IcAvailableNumServiceImpl extends ServiceImpl onHandNumExtList = baseMapper.queryAvailableNumByOrder(saOrderExt); - List updateHandNumList = new ArrayList<>(); - for (IcOnHandNumExt onHandNumExt : onHandNumExtList) { - if(onHandNumExt.getPkProductBas() == null){ - continue; - } - String[] specsIsArr = onHandNumExt.getSpecsNameId().split(","); - // 查询规格 - int[] pkSpecsArr = Arrays.stream(specsIsArr).mapToInt(Integer::parseInt).toArray(); - List availableSpecsList = availableSpecsMapper.queryAvailableSpecs(pkSpecsArr); - onHandNumExt.setScmItemSpecsList(availableSpecsList); - updateHandNumList.add(onHandNumExt); - } - mergeIcAvailableNumByIcOnHandNum(updateHandNumList, saOrderExt.getPkModified()); - } - @Override @Transactional(rollbackFor = Exception.class) public void insertIcAvailableNumByParam(AvailableNum availableNum, Long pkMember) { @@ -183,109 +136,6 @@ public class IcAvailableNumServiceImpl extends ServiceImpl availableNumList) { - List availableKeyList = new ArrayList<>(); - IcDelSaleLog icDelSaleLog = IcDelSaleLog.builder() - .acceptParam(JSONUtil.toJsonStr(availableNumList)) - .successStatus(EYesNo.YES.getIntValue()) - .sourceCode(availableNumList.get(0).getOrderCode()) - .billType(2) - .build(); - icDelSaleLog.setPkCreator(availableNumList.get(0).getPkModified()); - icDelSaleLog.setPkCountry(availableNumList.get(0).getPkCountry()); - for (IcAvailableNum availableNum : availableNumList) { - availableKeyList.add(CacheConstants.IC_AVAILABLE_NUM_LOCK + availableNum.getPkId()); - } - try { - redisService.lockKeyByList(availableKeyList); - // 拆分 拆为预售和非预售 验证预售品是否存在现存量 - List updateAvailableNumList = new ArrayList<>(); - // 新增可用量List - List inserAvailableNumList = new ArrayList<>(); - List updateWaresList = new ArrayList<>(); - for (IcAvailableNumExt availableNumExt : availableNumList) { - List icAvailableNumExtList = baseMapper.queryAvailableNumByAvaliable(availableNumExt); - if (icAvailableNumExtList != null && icAvailableNumExtList.size() >0) { - availableNumExt.setPkId(icAvailableNumExtList.get(0).getPkId()); - updateAvailableNumList.add(availableNumExt); - }else if(EPresaleStatus.PRESALE.getValue() == availableNumExt.getPreSaleStatus()) { - inserAvailableNumList.add(availableNumExt); - }else{ - // 非预售产品可用量不足更新产品为下架或者预售 - updateWaresList.add(availableNumExt); - } - } - if(updateAvailableNumList.size() >0) { - baseMapper.mergeIcAvailableNumByIcOnHandNum(updateAvailableNumList); - } - if(inserAvailableNumList.size()>0){ - for (IcAvailableNumExt availableNumExt : inserAvailableNumList) { - IcAvailableNum icAvailableNum = IcAvailableNum.builder() - .pkCorp(availableNumExt.getPkCorp()) - .pkCubasdoc(availableNumExt.getPkCubasdoc()) - .pkProductBas(availableNumExt.getPkProductBas()) - .pkProduct(availableNumExt.getPkProduct()) - .pkUnit(availableNumExt.getPkUnit()) - .pkStorehouse(availableNumExt.getPkStorehouse()) - .availableNum(availableNumExt.getAvailableNum().negate()) - .build(); - // 根据产品id查询产品基本主键 - icAvailableNum.setPkCountry(availableNumExt.getPkCountry()); - icAvailableNum.setPkCreator(availableNumExt.getPkModified()); - List availableSpecsList = packageIcOnHandItemList(availableNumExt.getPkModified(), availableNumExt.getScmItemSpecsList(), icAvailableNum); - save(icAvailableNum); - for (IcAvailableSpecs availableSpecs : availableSpecsList) { - availableSpecs.setPkAvailableNum(icAvailableNum.getPkId()); - availableSpecs.setPkCreator(icAvailableNum.getPkCreator()); - availableSpecs.setPkCountry(icAvailableNum.getPkCountry()); - } - if(availableSpecsList.size() >0){ - // 更新保存 - availableSpecsService.mergeIcAvailableSpecsByList(availableSpecsList); - } - } - } - if(updateWaresList.size() >0){ - try { - // 更新状态 - List productDtoList = new ArrayList<>(); - for (IcAvailableNumExt availableNumExt : updateWaresList) { - if(availableNumExt.getPkProduct() != null) { - ProductDTO productDTO = new ProductDTO(); - productDTO.setProductId(availableNumExt.getPkProduct()); - productDtoList.add(productDTO); - } - } - if(productDtoList.size() >0) { - productServiceApi.updateWaresPreSaleStatus(productDtoList); - } - }catch (Exception e){ - e.printStackTrace(); - } - } - } catch (Exception e) { - e.printStackTrace(); - icDelSaleLog.setErrorMsg(e.getMessage()); - icDelSaleLog.setSuccessStatus(EYesNo.NO.getIntValue()); - throw new RuntimeException(e); - } finally { - // 记录日志 - try { - delSaleLogService.save(icDelSaleLog); - } catch (Exception e) { - e.printStackTrace(); - } - redisService.unlockByList(availableKeyList); - } - } - - @Override - public List queryAvailableNumByProduct(List availableNumList) { - return baseMapper.queryAvailableNumByProduct(availableNumList); - } - @Override public List queryAvailableNumByCondition(AvailableNum availableNum) { return baseMapper.queryAvailableNumByCondition(availableNum); @@ -295,7 +145,7 @@ public class IcAvailableNumServiceImpl extends ServiceImpl speceIdList) { // 根据国家查询仓库 BdStorehouse bdStorehouse = countryServiceApi.queryBdStorehouseByCountry(pkCountry).getData(); - if(bdStorehouse != null){ + if (bdStorehouse != null) { return baseMapper.queryAvailableNumBySpecsId(bdStorehouse.getPkId(), pkProduct, speceIdList); } return null; @@ -315,7 +165,7 @@ public class IcAvailableNumServiceImpl extends ServiceImpl0) { + if (availableSpecsList.size() > 0) { for (int i = 0; i < availableSpecsList.size(); i++) { IcAvailableSpecs scmItemSpecs = availableSpecsList.get(i); key.append(scmItemSpecs.getPkSpecs()); @@ -323,10 +173,10 @@ public class IcAvailableNumServiceImpl extends ServiceImpl * 可用量规格明细 服务实现类 - *

- * - * @author hzs - * @since 2023-12-11 */ @Service public class IcAvailableSpecsServiceImpl extends ServiceImpl implements IIcAvailableSpecsService { diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java index 06766af..213e572 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/controller/manage/IcInventoryHController.java @@ -49,12 +49,7 @@ import java.util.*; import java.util.stream.Collectors; /** - *

* 库存盘点单表头 前端控制器 - *

- * - * @author hzs - * @since 2023-12-20 */ @RestController @RequestMapping("/manage/inventory") @@ -97,7 +92,7 @@ public class IcInventoryHController extends ScmController { for (IcInventoryHExt inventoryExt : inventoryExtList) { InventoryVO inventoryVO = BeanUtil.copyProperties(inventoryExt, InventoryVO.class); List inventoryBiExtList = inventoryExt.getInventoryBiExtList(); - if(CollectionUtil.isNotEmpty(inventoryBiExtList)) { + if (CollectionUtil.isNotEmpty(inventoryBiExtList)) { List returnbVoList = BeanUtil.copyToList(inventoryBiExtList, InventoryBVO.class); inventoryVO.setInventoryBiExtList(returnbVoList); } @@ -180,31 +175,6 @@ public class IcInventoryHController extends ScmController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.INVENTORY_ORDER, business = EOperationBusiness.INVENTORY_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if (scmApproveParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - IcInventoryHExt inventoryExt = inventoryService.queryInventoryById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (inventoryExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.INVENTORY_ORDER_APPROVE.getValue(), null); - if (CollectionUtil.isNotEmpty(scmOrderApproveLogs)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.INVENTORY_ORDER_EXISTS_AGENT)); - } - inventoryService.auditInventoryByApproveParamSubmit(inventoryExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - protected String validateInventoryParam(InventoryParam inventoryParam) { if (validateInventoryFieldParam(inventoryParam)) { return MemberMsgConstants.REQUIRED_NOT_EMPTY; @@ -257,12 +227,12 @@ public class IcInventoryHController extends ScmController { inventoryBiParam.setNdiffastnum(ComputeUtil.computeSubtract(icOnHandNum.getNonhandnum(), inventoryBiParam.getNadjustnum()).abs()); inventoryBiParam.setScmItemSpecsList(BeanUtil.copyToList(icOnHandNum.getScmItemSpecsList(), ItemSpecsParam.class)); } - if(EInventoryType.INVENTORY_OUT.getValue() == inventoryParam.getInvType()){ - if(ComputeUtil.compareValue(inventoryBiParam.getNadjustnum(), inventoryBiParam.getNonhandnum())){ + if (EInventoryType.INVENTORY_OUT.getValue() == inventoryParam.getInvType()) { + if (ComputeUtil.compareValue(inventoryBiParam.getNadjustnum(), inventoryBiParam.getNonhandnum())) { return ScmMsgConstants.INVENTORY_OUT; } - }else{ - if(ComputeUtil.compareValue(inventoryBiParam.getNonhandnum(), inventoryBiParam.getNadjustnum())){ + } else { + if (ComputeUtil.compareValue(inventoryBiParam.getNonhandnum(), inventoryBiParam.getNadjustnum())) { return ScmMsgConstants.INVENTORY_IN; } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java index 6d5b2e1..45af1d4 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/IIcInventoryHService.java @@ -68,27 +68,4 @@ public interface IIcInventoryHService extends IService { **/ void deleteInventory(Long pkId, Long pkMember); - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditInventoryByApproveParamSubmit(IcInventoryHExt inventoryExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditInventoryByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditInventoryByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java index e035d9f..aba3ce6 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/inventory/service/impl/IcInventoryHServiceImpl.java @@ -193,41 +193,6 @@ public class IcInventoryHServiceImpl extends ServiceImpl inventoryBiList = inventoryBiService.queryInventoryBiByPk(EScmOrderType.INVENTORY_ORDER.getValue(), inventoryExt.getInventoryBiExtList()); - if(inventoryBiList != null && inventoryBiList.size() >0){ - inventoryExt.setInventoryBiExtList(inventoryBiList); - } - for (IcInventoryBExt inventoryBiExt : inventoryExt.getInventoryBiExtList()) { - inventoryBiExt.setPkStorehouse(inventoryExt.getPkWarehouse()); - inventoryBiExt.setNnum(inventoryBiExt.getNdiffastnum()); - } - // 更新存货现存量表，更新库存 - // 转换数据，封装为可以出库的数据 - onHandNumService.mergeIcOnHandNumByGeneralOut(inventoryExt, inventoryExt.getInventoryBiExtList(), EScmOrderType.INVENTORY_ORDER.getValue(), loginUser.getUserId()); - } - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.INVENTORY_ORDER_APPROVE, EOrderPrefix.INVENTORY_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditInventoryByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveInventoryByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditInventoryByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveInventoryByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - /* * @description: 将采购订单的参数转换为能保存的订单 * @author: sui q diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/manage/IoOrderController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/manage/IoOrderController.java index 8fbe0b4..7c0a4e7 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/manage/IoOrderController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/manage/IoOrderController.java @@ -77,7 +77,7 @@ public class IoOrderController extends ScmController { for (IoOrderExt ioOrderExt : orderExtList) { IoOrderVo ioOrderVo = BeanUtil.copyProperties(ioOrderExt, IoOrderVo.class); List orderItemsExtList = ioOrderExt.getOrderItemsExtList(); - if(CollectionUtil.isNotEmpty(orderItemsExtList)) { + if (CollectionUtil.isNotEmpty(orderItemsExtList)) { List returnbVoList = BeanUtil.copyToList(orderItemsExtList, IoOrderBVo.class); ioOrderVo.setScmReturnbVoList(returnbVoList); } @@ -161,7 +161,7 @@ public class IoOrderController extends ScmController { return MemberMsgConstants.REQUIRED_NOT_EMPTY; } // 验证供应商 - if(ioOrderParam.getPkCubasdoc() != null) { + if (ioOrderParam.getPkCubasdoc() != null) { String msg = validateCuBasDoc(ioOrderParam.getPkCubasdoc(), pkCountry); if (ObjectUtil.isNotEmpty(msg)) { return msg; @@ -169,10 +169,10 @@ public class IoOrderController extends ScmController { } // 验证采购组织 String msg = validateSysCorp(ioOrderParam.getPkCorp(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ + if (ObjectUtil.isNotEmpty(msg)) { return msg; } - if(storehouseIdSet.size() >0) { + if (storehouseIdSet.size() > 0) { // 验证仓库，根据采购组织验证 msg = validateStorehouse(storehouseIdSet, pkCountry, ioOrderParam.getPkCorp()); if (ObjectUtil.isNotEmpty(msg)) { @@ -182,7 +182,7 @@ public class IoOrderController extends ScmController { // 验证产品，根据产品 // 验证规格、规格分类 需要根据产品查询 处理specsName String message = validateProductBas(ioOrderParam.getOrderItemsParamList()); - if(ObjectUtil.isNotEmpty(message)){ + if (ObjectUtil.isNotEmpty(message)) { return message; } return null; @@ -201,7 +201,7 @@ public class IoOrderController extends ScmController { return Boolean.TRUE; } // 验证产品id 仓库id - if(orderItemsParam.getPkStorehouse() != null) { + if (orderItemsParam.getPkStorehouse() != null) { storehouseIdSet.add(orderItemsParam.getPkStorehouse()); } } @@ -228,29 +228,4 @@ public class IoOrderController extends ScmController { orderService.deleteIoOrder(pkId, SecurityUtils.getUserId()); return AjaxResult.success(); } - - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.IO_ORDER, business = EOperationBusiness.IO_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitIoOrder(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_NOT_EXIST)); - } - IoOrderExt ioOrderExt = orderService.queryIoOrderById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (ioOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IO_ORDER_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IO_ORDER_EXISTS_AGENT)); - } - orderService.auditIoOrderByIoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java index bcaab0c..ea35849 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/IIoOrderService.java @@ -68,29 +68,4 @@ public interface IIoOrderService extends IService { **/ void deleteIoOrder(Long pkOrder, Long pkMember); - - /* - * @description: 提交业务领用（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditIoOrderByIoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过业务领用 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditIoOrderByIoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回业务领用 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditIoOrderByIoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java index 985f2c1..3672cef 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/io/service/impl/IoOrderServiceImpl.java @@ -223,26 +223,6 @@ public class IoOrderServiceImpl extends ServiceImpl impl redisService.unlock(orderLockKey); } - @Override - @Transactional(rollbackFor = Exception.class) - public void auditIoOrderByIoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { -// 更新单据状态 - updateIoOrderStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.IO_ORDER_APPROVE, EOrderPrefix.IO_ORDER_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditIoOrderByIoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveIoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditIoOrderByIoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveIoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - private String approveIoOrderByStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Integer scmOrderStatus, Integer approveStatus) { // 查询订单日志表 List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/listener/ScmDeliverListener.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/listener/ScmDeliverListener.java deleted file mode 100644 index 0bb95ca..0000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/listener/ScmDeliverListener.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.scm.listener; - -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.ext.SaDeliverExt; -import com.hzs.sale.deliver.ISaDeliverServiceApi; -import com.hzs.scm.pub.dto.DeliverDTO; -import com.hzs.scm.sale.service.IIcSaleoutHService; -import com.hzs.system.sys.dto.LoginUser; -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.List; - -/** - * @Description: 进销存发货处理监听 - * @Author: jiang chao - * @Time: 2023/12/19 14:24 - * @Classname: ScmDeliverListener - * @PackageName: com.hzs.third.mqcall.listener - */ -@Slf4j -@Component -public class ScmDeliverListener { - - @DubboReference - private ISaDeliverServiceApi iSaDeliverServiceApi; - - @Autowired - private IIcSaleoutHService saleOutService; - - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.SCM_DELIVER_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.SCM_DELIVER_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.SCM_DELIVER_KEY)) - @RabbitHandler - public void onMessage(Message message, Channel channel) throws Exception { - // 手动应答 - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - // 根据传入的ID获取翻译内容 - DeliverDTO deliverDTO = message.getPayload(); - log.info("进销存发货处理数据：{}", deliverDTO); - LoginUser loginUser = deliverDTO.getLoginUser(); - // 查询发货单及明细数据 - R> r = iSaDeliverServiceApi.queryDeliverList(deliverDTO.getDeliverIdList(), loginUser.getDataCountry()); - if (r.isSuccess()) { - List saDeliverExtList = r.getData(); - for (SaDeliverExt saDeliverExt : saDeliverExtList) { - saleOutService.executeDeliverTransSaleOutByParam(saDeliverExt); - } - return; - } - log.error("查询发货单及明细数据失败：{}", r.getMsg()); - } - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java index d608902..13e5622 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/mapper/ScmBillNoMapper.java @@ -7,28 +7,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 订单编号规则设置 Mapper 接口 - *

- * - * @author hzs - * @since 2024-02-21 */ public interface ScmBillNoMapper extends BaseMapper { /* - * @description: 更新尾号 - * @author: sui q - * @date: 2024/2/21 14:33 - * @param: null null + * 更新尾号 **/ void updateScmBillNo(ScmBillNo scmBillNo); - /* - * @description: 更新单据号尾号，重新更新为0 - * @author: sui q - * @date: 2024/2/21 15:31 - * @param: null null - **/ - void updateScmBillNoNextValue(@Param("dayBillNoList") List dayBillNoList); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java index 78448a5..f7b58df 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/IScmBillNoService.java @@ -4,36 +4,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.scm.no.ScmBillNo; /** - *

* 订单编号规则设置 服务类 - *

- * - * @author hzs - * @since 2024-02-21 */ public interface IScmBillNoService extends IService { /* - * @description: 根据订单类型查询供应链单据编号规则 - * @author: sui q - * @date: 2024/2/21 14:02 - * @param: null null + * 根据订单类型查询供应链单据编号规则 **/ ScmBillNo queryScmBillNoByOrderType(Integer orderType); /* - * @description: 根据订单类型获得单据号 - * @author: sui q - * @date: 2024/2/21 14:18 - * @param: null null + * 根据订单类型获得单据号 **/ String createScmBillNoByOrderType(Integer orderType); - /* - * @description: 更新订单编号规则，初始化值 - * @author: sui q - * @date: 2024/2/21 15:19 - * @param: null null - **/ - void updateScmBillNoNextValue(); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java index 2b7c37a..bbbf165 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/no/service/impl/ScmBillNoServiceImpl.java @@ -3,7 +3,6 @@ package com.hzs.scm.no.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EResetType; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.scm.no.ScmBillNo; @@ -12,16 +11,10 @@ import com.hzs.scm.no.service.IScmBillNoService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; /** - *

* 订单编号规则设置 服务实现类 - *

- * - * @author hzs - * @since 2024-02-21 */ @Service public class ScmBillNoServiceImpl extends ServiceImpl implements IScmBillNoService { @@ -31,7 +24,7 @@ public class ScmBillNoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ORDER_TYPE", orderType); List scmBillNoList = baseMapper.selectList(queryWrapper); - if(CollectionUtil.isNotEmpty(scmBillNoList)){ + if (CollectionUtil.isNotEmpty(scmBillNoList)) { return scmBillNoList.get(0); } return null; @@ -41,52 +34,23 @@ public class ScmBillNoServiceImpl extends ServiceImpl scmBillNoList = baseMapper.selectList(new QueryWrapper<>()); - if(CollectionUtil.isNotEmpty(scmBillNoList)){ - List dayBillNoList = new ArrayList<>(); - List monthBillNoList = new ArrayList<>(); - List yearBillNoList = new ArrayList<>(); - for (ScmBillNo scmBillNo : scmBillNoList) { - if(EResetType.DAY.getValue() == scmBillNo.getResetType()){ - dayBillNoList.add(scmBillNo); - }else if(EResetType.MONTH.getValue() == scmBillNo.getResetType()){ - monthBillNoList.add(scmBillNo); - }else if(EResetType.YEAR.getValue() == scmBillNo.getResetType()){ - yearBillNoList.add(scmBillNo); - } - } - // 更新月 - if (DateUtils.currentDay() == 1 && monthBillNoList.size() >0) { - if(DateUtils.currentMonth() == 1 && yearBillNoList.size() >0){ - dayBillNoList.addAll(yearBillNoList); - } - dayBillNoList.addAll(monthBillNoList); - } - if(dayBillNoList.size() >0){ - baseMapper.updateScmBillNoNextValue(dayBillNoList); - } - } - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java index 7618a6a..42c5578 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/controller/manage/PoOrderController.java @@ -75,7 +75,7 @@ public class PoOrderController extends ScmController { for (PoOrderExt poOrderExt : poOrderExtList) { PoOrderVo poOrderVo = BeanUtil.copyProperties(poOrderExt, PoOrderVo.class); List poOrderItemsExtList = poOrderExt.getPoOrderItemsExtList(); - if(CollectionUtil.isNotEmpty(poOrderItemsExtList)) { + if (CollectionUtil.isNotEmpty(poOrderItemsExtList)) { List returnbVoList = BeanUtil.copyToList(poOrderItemsExtList, PoOrderBVo.class); poOrderVo.setScmReturnbVoList(returnbVoList); } @@ -188,23 +188,23 @@ public class PoOrderController extends ScmController { } // 验证供应商 String msg = validateCuBasDoc(poOrderParam.getPkCubasdoc(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ + if (ObjectUtil.isNotEmpty(msg)) { return msg; } // 验证采购组织 msg = validateSysCorp(poOrderParam.getPkCorp(), pkCountry); - if(ObjectUtil.isNotEmpty(msg)){ + if (ObjectUtil.isNotEmpty(msg)) { return msg; } // 验证仓库，根据采购组织验证 msg = validateStorehouse(storehouseIdSet, pkCountry, poOrderParam.getPkCorp()); - if(ObjectUtil.isNotEmpty(msg)){ + if (ObjectUtil.isNotEmpty(msg)) { return msg; } // 验证产品，根据产品 // 验证规格、规格分类 需要根据产品查询 处理specsName String message = validateProductBas(poOrderParam.getPoOrderItemsParamList()); - if(ObjectUtil.isNotEmpty(message)){ + if (ObjectUtil.isNotEmpty(message)) { return message; } return null; @@ -220,7 +220,7 @@ public class PoOrderController extends ScmController { if (poOrderItemsParam.getPkProductBas() == null || poOrderItemsParam.getPkStorehouse() == null || poOrderItemsParam.getPkUnit() == null || poOrderItemsParam.getNnum() == null || poOrderItemsParam.getNorigprice() == null || - CollectionUtil.isEmpty(poOrderItemsParam.getScmItemSpecsList())) { + CollectionUtil.isEmpty(poOrderItemsParam.getScmItemSpecsList())) { return Boolean.TRUE; } // 验证产品id 仓库id @@ -256,28 +256,4 @@ public class PoOrderController extends ScmController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.PO_ORDER, business = EOperationBusiness.PO_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitPoOrder(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PO_ORDER_NOT_EXIST)); - } - PoOrderExt poOrderExt = poOrderService.queryPoOrderById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (poOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PO_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.PO_ORDER_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - poOrderService.auditPoOrderByPoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java index eb35382..0ded35f 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/IPoOrderService.java @@ -86,31 +86,6 @@ public interface IPoOrderService extends IService { **/ List queryPoOrderToStoreByCondition(PoOrderParam poOrderParam); - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditPoOrderByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPoOrderByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPoOrderByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* * @description: 根据入库数量更新累计入库数量 * @author: sui q diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java index a6dd563..423e865 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/po/service/impl/PoOrderServiceImpl.java @@ -216,27 +216,6 @@ public class PoOrderServiceImpl extends ServiceImpl impl return baseMapper.queryPoOrderToStoreByCondition(poOrderParam); } - @Override - @Transactional(rollbackFor = Exception.class) - public void auditPoOrderByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updatePoOrderStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.PO_ORDER_APPROVE, EOrderPrefix.PO_ORDER_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPoOrderByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditPoOrderByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approvePoOrderByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - - @Override @Transactional(rollbackFor = Exception.class) public void updatePoOrderItemsTotalNum(List icPurchaseInbList, Long pkMember) { diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/product/provider/IBdProductBasSpecsServiceProvider.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/product/provider/IBdProductBasSpecsServiceProvider.java deleted file mode 100644 index fb85694..0000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/product/provider/IBdProductBasSpecsServiceProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.scm.product.provider;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:27 - * @Classname: IBdProductBasSpecsServiceProvider - * @PackageName: com.hzs.scm.product.provider - */ - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.product.BdProductBasSpecs; -import com.hzs.scm.product.IBdProductBasSpecsServiceApi; -import com.hzs.scm.product.service.IBdProductBasSpecsService; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.provider - *@Author: yh - *@CreateTime: 2023-11-23 18:27 - *@Description: TODO - *@Version: 1.0 - */ -@Slf4j -@DubboService -public class IBdProductBasSpecsServiceProvider implements IBdProductBasSpecsServiceApi { - - @Autowired - private IBdProductBasSpecsService productBasSpecsService; - - /** - * 新增 - * @param productBasSpecsList - * @return - */ - @Override - public R saveAll(List productBasSpecsList) { - return R.ok(productBasSpecsService.saveBatch(productBasSpecsList)); - } - /** - * 删除 （根据pkProductBas删除） - * @param pkProductBasList - * @return - */ - @Override - public R removeByPkProductBasList(List pkProductBasList) { - return R.ok(productBasSpecsService.remove(new QueryWrapper().in("PK_PRODUCT_BAS",pkProductBasList))); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/product/provider/IProductBasServiceProvider.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/product/provider/IProductBasServiceProvider.java deleted file mode 100644 index aa6c0d6..0000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/product/provider/IProductBasServiceProvider.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzs.scm.product.provider;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/23 18:00 - * @Classname: IProductBasServiceProvider - * @PackageName: com.hzs.scm.product.provider - */ - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.sale.product.BdProductBas; -import com.hzs.scm.product.IProductBasServiceApi; -import com.hzs.scm.product.dto.ProductBasDTO; -import com.hzs.scm.product.service.IBdProductBasService; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.scm.product.provider - *@Author: yh - *@CreateTime: 2023-11-23 18:00 - *@Description: TODO - *@Version: 1.0 - */ -@Slf4j -@DubboService -public class IProductBasServiceProvider implements IProductBasServiceApi { - - @Autowired - private IBdProductBasService productBasService; - @Autowired - private RedisService redisService; - - /** - * 批量新增 - * @param productBas - * @return - */ - public R save(BdProductBas productBas){ - boolean isSave = productBasService.save(productBas); - if (isSave){ - return R.ok(productBas); - }else { - return R.fail(); - } - } - /** - * 根据id 修改 - */ - @Override - public R updateById(BdProductBas productBas) { - productBasService.updateById(productBas); - redisService.deleteObject(CacheConstants.BD_PRODUCT_BAS + productBas.getPkId()); - redisService.deleteObject(CacheConstants.BD_PRODUCT_BAS + productBas.getProductCode()); - return R.ok(); - } - /** - * 根据id 查询 - * @return - */ - @Override - public R getProductBasById(Integer pkId) { - BdProductBas productBas = productBasService.getProductBasById(pkId); - return R.ok(BeanUtil.copyProperties(productBas, ProductBasDTO.class)); - } - - /** - * 根据产品编号 查询 - * @return - */ - @Override - public R getProductBasByProductCode(String productCode) { - BdProductBas productBas = productBasService.getProductBasByProductCode(productCode); - return R.ok(BeanUtil.copyProperties(productBas, ProductBasDTO.class)); - } - - -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java index ba3e4cf..89b19db 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/param/ScmApproveParam.java @@ -5,14 +5,6 @@ import lombok.*; import java.util.List; -/** - * @description: TODO - * @author: sui q - * @time: 2023/11/24 17:05 - * @classname: ScmApproveParam - * @package_name: com.hzs.scm.pub - * version 1.0.0 - */ @EqualsAndHashCode(callSuper = true) @Data @Builder diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/provider/ScmBillServiceProvider.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/provider/ScmBillServiceProvider.java deleted file mode 100644 index 3c37adc..0000000 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/pub/provider/ScmBillServiceProvider.java +++ /dev/null @@ -1,352 +0,0 @@ -package com.hzs.scm.pub.provider; - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.enums.EApproveStatus; -import com.hzs.common.core.enums.EScmOrderStatus; -import com.hzs.common.core.exception.base.BaseException; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralInHExt; -import com.hzs.common.domain.scm.general.ext.IcGeneralOutHExt; -import com.hzs.common.domain.scm.ic.IcAvailableNum; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.common.domain.scm.inventory.ext.IcInventoryHExt; -import com.hzs.common.domain.scm.io.ext.IoOrderExt; -import com.hzs.common.domain.scm.po.ext.PoOrderExt; -import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.purchase.ext.IcPurchaseInHExt; -import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransInHExt; -import com.hzs.common.domain.scm.trans.ext.IcTransOutHExt; -import com.hzs.common.domain.scm.trans.ext.TransferOrderExt; -import com.hzs.scm.general.service.IIcGeneralInHService; -import com.hzs.scm.general.service.IIcGeneralOutHService; -import com.hzs.scm.ic.service.IIcAvailableNumService; -import com.hzs.scm.inventory.service.IIcInventoryHService; -import com.hzs.scm.io.service.IIoOrderService; -import com.hzs.scm.no.service.IScmBillNoService; -import com.hzs.scm.po.service.IPoOrderService; -import com.hzs.scm.pub.IScmBillServiceApi; -import com.hzs.scm.pub.dto.BillDTO; -import com.hzs.scm.pub.dto.BillItemDTO; -import com.hzs.scm.pub.service.IScmOrderApproveLogService; -import com.hzs.scm.purchase.service.IIcPurchaseInHService; -import com.hzs.scm.sale.service.IIcSaleoutHService; -import com.hzs.scm.trans.service.IIcTransInHService; -import com.hzs.scm.trans.service.IIcTransOutHService; -import com.hzs.scm.trans.service.ITransferOrderService; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; -import java.util.List; - -/** - * 供应链单据对外接口发布 - */ -@DubboService -public class ScmBillServiceProvider implements IScmBillServiceApi { - - @Autowired - private IScmOrderApproveLogService scmOrderApproveLogService; - - @Autowired - private IPoOrderService poOrderService; - - @Autowired - private IIcPurchaseInHService purchaseInhService; - - @Autowired - private IIcGeneralInHService generalInhService; - - @Autowired - private IIcGeneralOutHService generalOutService; - - @Autowired - private ITransferOrderService transferOrderService; - - @Autowired - private IIcTransOutHService transOutService; - - @Autowired - private IIcTransInHService transInService; - - @Autowired - private IIcAvailableNumService availableNumService; - - @Autowired - private IIcInventoryHService inventoryService; - - @Autowired - private IScmBillNoService scmBillNoService; - - @Autowired - private IIoOrderService ioOrderService; - - @Autowired - private IIcSaleoutHService saleOutService; - - @Override - public R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - try { - // 返回内容 - String str = null; - if (EApproveStatus.FINISH.getValue() == approvalBusinessResultDTO.getEApproveStatus().getValue()) { - // 通过处理 - switch (approvalBusinessResultDTO.getEApprovalBusiness()) { - case PO_ORDER_APPROVE: - // 采购订单 - str = poOrderService.auditPoOrderByPoOrderAgree(approvalBusinessResultDTO); - break; - case IC_PURCHASE_APPROVE: - // 采购入库 - str = purchaseInhService.auditPurchaseByPoOrderAgree(approvalBusinessResultDTO); - break; - case IC_GENERAL_IN_APPROVE: - // 其他入库 - str = generalInhService.auditGeneralInByApproveParamAgree(approvalBusinessResultDTO); - break; - case IC_GENERAL_OUT_APPROVE: - // 其他出库 - str = generalOutService.auditGeneralOutByApproveParamAgree(approvalBusinessResultDTO); - break; - case TRANSFER_ORDER_APPROVE: - // 调拨订单 - str = transferOrderService.auditTransferOrderTransferOrderAgree(approvalBusinessResultDTO); - break; - case TRANSFER_OUT_APPROVE: - // 调拨出库 - str = transOutService.auditTransferOutByApproveParamAgree(approvalBusinessResultDTO); - break; - case TRANSFER_IN_APPROVE: - // 调拨入库 - str = transInService.auditTransferInByPoOrderAgree(approvalBusinessResultDTO); - break; - case INVENTORY_ORDER_APPROVE: - // 库存盘点单 - str = inventoryService.auditInventoryByApproveParamAgree(approvalBusinessResultDTO); - break; - case BACK_SALE_OUT_APPROVE: - // 销售退货单 - str = saleOutService.auditBackSaleOutAgree(approvalBusinessResultDTO); - break; - case BACK_PURCHASE_APPROVE: - // 采购退货单 - str = purchaseInhService.auditPurchaseOutByPoOrderAgree(approvalBusinessResultDTO); - break; - case IO_ORDER_APPROVE: - // 业务领用订单 - str = ioOrderService.auditIoOrderByIoOrderAgree(approvalBusinessResultDTO); - break; - } - } else { - // 驳回处理 - switch (approvalBusinessResultDTO.getEApprovalBusiness()) { - case PO_ORDER_APPROVE: - // 采购订单 - str = poOrderService.auditPoOrderByPoOrderReject(approvalBusinessResultDTO); - break; - case IC_PURCHASE_APPROVE: - // 采购入库 - str = purchaseInhService.auditPurchaseByPoOrderReject(approvalBusinessResultDTO); - break; - case IC_GENERAL_IN_APPROVE: - // 其他入库 - str = generalInhService.auditGeneralInByApproveParamReject(approvalBusinessResultDTO); - break; - case IC_GENERAL_OUT_APPROVE: - // 其他出库 - str = generalOutService.auditGeneralOutByApproveParamReject(approvalBusinessResultDTO); - break; - case TRANSFER_ORDER_APPROVE: - // 调拨订单 - str = transferOrderService.auditTransferOrderByTransferOrderReject(approvalBusinessResultDTO); - break; - case TRANSFER_OUT_APPROVE: - // 调拨出库 - str = transOutService.auditTransferOutByApproveParamReject(approvalBusinessResultDTO); - break; - case TRANSFER_IN_APPROVE: - // 调拨入库 - str = transInService.auditTransferInByPoOrderReject(approvalBusinessResultDTO); - break; - case INVENTORY_ORDER_APPROVE: - // 库存盘点单 - str = inventoryService.auditInventoryByApproveParamReject(approvalBusinessResultDTO); - break; - case BACK_SALE_OUT_APPROVE: - // 销售退货单 - str = saleOutService.auditBackSaleOutReject(approvalBusinessResultDTO); - break; - case BACK_PURCHASE_APPROVE: - // 采购退货单 - str = purchaseInhService.auditPurchaseOutByPoOrderReject(approvalBusinessResultDTO); - break; - case IO_ORDER_APPROVE: - // 业务领用订单 - str = ioOrderService.auditIoOrderByIoOrderReject(approvalBusinessResultDTO); - break; - } - } - if (StringUtils.isNotEmpty(str)) { - // 返回有信息，说明有问题，抛出异常 - throw new BaseException(str); - } - } catch (Exception e) { - return R.fail(e.getMessage()); - } - return R.ok(); - } - - @Override - public R> queryBillDtoByCondition(EApprovalBusiness eApprovalBusiness, String businessCode) { - List scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, eApprovalBusiness.getValue(), businessCode); - if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { - return R.fail("没有查找到对应的签呈"); - } - List billDtoList = new ArrayList<>(); - switch (eApprovalBusiness) { - case PO_ORDER_APPROVE: - PoOrderExt poOrderExt = poOrderService.queryDisPoOrderById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (poOrderExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(poOrderExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, poOrderExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(poOrderExt.getPoOrderItemsExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - case IC_PURCHASE_APPROVE: - case BACK_PURCHASE_APPROVE: - IcPurchaseInHExt icPurchaseInhExt = purchaseInhService.queryDisPurchaseInhExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (icPurchaseInhExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(icPurchaseInhExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, icPurchaseInhExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(icPurchaseInhExt.getIcPurchaseInbList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case IC_GENERAL_IN_APPROVE: - IcGeneralInHExt generalInExt = generalInhService.queryDisGeneralInExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (generalInExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(generalInExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, generalInExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(generalInExt.getGeneralInbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case IC_GENERAL_OUT_APPROVE: - IcGeneralOutHExt generalOutExt = generalOutService.queryDisGeneralOutExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (generalOutExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(generalOutExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, generalOutExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(generalOutExt.getGeneralOutbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case TRANSFER_ORDER_APPROVE: - TransferOrderExt transferOrderExt = transferOrderService.queryDisTransferOrderById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transferOrderExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(transferOrderExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, transferOrderExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(transferOrderExt.getTransferOrderItemsList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case TRANSFER_IN_APPROVE: - IcTransInHExt transInExt = transInService.queryDisTransferInInhExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transInExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(transInExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, transInExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(transInExt.getTransInbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case TRANSFER_OUT_APPROVE: - IcTransOutHExt transOutExt = transOutService.queryDisTransferOutExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (transOutExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(transOutExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, transOutExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(transOutExt.getTransOutbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case INVENTORY_ORDER_APPROVE: - IcInventoryHExt inventoryExt = inventoryService.queryDisInventoryExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (inventoryExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(inventoryExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, inventoryExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(inventoryExt.getInventoryBiExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case BACK_SALE_OUT_APPROVE: - IcSaleoutHExt saleOutExt = saleOutService.queryDisSaleOutExtById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (saleOutExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(saleOutExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saleOutExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(saleOutExt.getSaleoutbExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - case IO_ORDER_APPROVE: - IoOrderExt ioOrderExt = ioOrderService.queryDisIoOrderById(scmOrderApproveLogList.get(0).getPkOrder(), EScmOrderStatus.SUBMIT.getValue()); - if (ioOrderExt != null) { - BillDTO billDTO = BeanUtil.copyProperties(ioOrderExt, BillDTO.class, "billDtoList"); - billDTO.setOrderDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, ioOrderExt.getOrderDate())); - List billItemDtoList = BeanUtil.copyToList(ioOrderExt.getOrderItemsExtList(), BillItemDTO.class); - billDTO.setBillDtoList(billItemDtoList); - billDtoList.add(billDTO); - } - break; - } - return R.ok(billDtoList); - } - - @Override - public R> queryAvailableNumByProduct(List availableNumList) { - return R.ok(availableNumService.queryAvailableNumByProduct(availableNumList)); - } - - @Override - public R updateDeductIcAvailableNumByList(List availableNumList) { - try { - availableNumService.updateDeductIcAvailableNumByList(availableNumList); - } catch (Exception e) { - return R.fail(); - } - return R.ok(Boolean.TRUE); - } - - @Override - public R queryAvailableNumByCondition(Integer pkCountry, Integer pkProduct, List speceIdList) { - return R.ok(availableNumService.queryAvailableNumByCondition(pkCountry, pkProduct, speceIdList)); - } - - @Override - public R updateScmBillNoNextValue() { - scmBillNoService.updateScmBillNoNextValue(); - return R.ok(Boolean.TRUE); - } - - @Override - public R backSaOrderAvailable(SaOrderExt saOrderExt) { - try { - availableNumService.mergeIcAvailableNumByOrder(saOrderExt); - } catch (Exception e) { - return R.fail(); - } - return R.ok(Boolean.TRUE); - } -} diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java index 63b6e98..923ce69 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/controller/manage/IcPurchaseInHController.java @@ -115,7 +115,7 @@ public class IcPurchaseInHController extends ScmController { */ @PostMapping("/export-list-total") @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.EXPORT) - public void exportListPurchaseInTotal(HttpServletResponse response, PurchaseInParam purchaseInParam){ + public void exportListPurchaseInTotal(HttpServletResponse response, PurchaseInParam purchaseInParam) { purchaseInParam.setPkCountry(SecurityUtils.getPkCountry()); purchaseInParam.setReturnStatus(EDealerYesNo.NO.getValue()); List icPurchaseInExtList = icPurchaseInhService.queryTotalPurchaseInhExtByCondition(purchaseInParam); @@ -128,7 +128,7 @@ public class IcPurchaseInHController extends ScmController { List purchaseInVoList = new ArrayList<>(); for (IcPurchaseInHExt purchaseInExt : purchaseInExtList) { PurchaseInVo purchaseInVo = BeanUtil.copyProperties(purchaseInExt, PurchaseInVo.class); - List purchaseInbiList= purchaseInExt.getIcPurchaseInbList(); + List purchaseInbiList = purchaseInExt.getIcPurchaseInbList(); if (CollectionUtil.isNotEmpty(purchaseInbiList)) { List returnbVoList = BeanUtil.copyToList(purchaseInbiList, PurchaseInBVo.class); purchaseInVo.setIcPurchaseInbList(returnbVoList); @@ -141,7 +141,7 @@ public class IcPurchaseInHController extends ScmController { private List packageScmExportVo(List purchaseInExtList) { List purchaseInVoList = new ArrayList<>(); for (IcPurchaseInHExt purchaseInExt : purchaseInExtList) { - List purchaseInbiList= purchaseInExt.getIcPurchaseInbList(); + List purchaseInbiList = purchaseInExt.getIcPurchaseInbList(); for (IcPurchaseInBExt icPurchaseInBiExt : purchaseInbiList) { PurchaseExcelVO purchaseExcelVo = BeanUtil.copyProperties(purchaseInExt, PurchaseExcelVO.class); setScmItemsExcel(icPurchaseInBiExt, purchaseExcelVo); @@ -157,7 +157,7 @@ public class IcPurchaseInHController extends ScmController { */ @PostMapping("/export-back-total") @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.EXPORT) - public void exportListPurchaseInBackTotal(HttpServletResponse response, PurchaseInParam purchaseInParam){ + public void exportListPurchaseInBackTotal(HttpServletResponse response, PurchaseInParam purchaseInParam) { purchaseInParam.setPkCountry(SecurityUtils.getPkCountry()); purchaseInParam.setReturnStatus(EDealerYesNo.YES.getValue()); List icPurchaseInExtList = icPurchaseInhService.queryTotalPurchaseInhExtByCondition(purchaseInParam); @@ -169,7 +169,7 @@ public class IcPurchaseInHController extends ScmController { private List packageBackScmExportVo(List purchaseInExtList) { List purchaseInVoList = new ArrayList<>(); for (IcPurchaseInHExt purchaseInExt : purchaseInExtList) { - List purchaseInbiList= purchaseInExt.getIcPurchaseInbList(); + List purchaseInbiList = purchaseInExt.getIcPurchaseInbList(); for (IcPurchaseInBExt icPurchaseInBiExt : purchaseInbiList) { PurchaseOutExcelVO purchaseExcelVo = BeanUtil.copyProperties(purchaseInExt, PurchaseOutExcelVO.class); setScmItemsExcel(icPurchaseInBiExt, purchaseExcelVo); @@ -198,58 +198,24 @@ public class IcPurchaseInHController extends ScmController { /** * 退货 + * * @param purchaseInhParam 入参 */ @PostMapping("/out-back") @Log(module = EOperationModule.PO_PURCHASE_OUT, business = EOperationBusiness.PO_PURCHASE_OUT, method = EOperationMethod.BACK) public AjaxResult backPurchaseIn(@RequestBody PurchaseInParam purchaseInhParam) { - if(purchaseInhParam.getPkId() == null){ + if (purchaseInhParam.getPkId() == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } // 验证是否存在采购入库单 IcPurchaseInHExt purchaseInExt = icPurchaseInhService.queryPurchaseInExtById(purchaseInhParam.getPkId(), null, SecurityUtils.getPkCountry()); - if(purchaseInExt == null || purchaseInExt.getOrderStatus() < EScmOrderStatus.APPROVE.getValue()){ + if (purchaseInExt == null || purchaseInExt.getOrderStatus() < EScmOrderStatus.APPROVE.getValue()) { return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); } icPurchaseInhService.insertSavePurchaseBack(purchaseInExt, purchaseInhParam); return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/out-submit") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.SUBMIT) - public AjaxResult submitBackPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_NOT_EXIST)); - } - IcPurchaseInHExt purchaseInExt = icPurchaseInhService.queryPurchaseInExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if(purchaseInExt == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_OUT_NOT_EXIST)); - } - // 查询原始订单是否已经退货 - for (IcPurchaseInBExt purchaseInBiExt : purchaseInExt.getIcPurchaseInbList()) { - if(purchaseInBiExt.getPkSource() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - IcPurchaseInHExt oldPurchaseInExt = icPurchaseInhService.queryPurchaseInExtById(purchaseInBiExt.getPkSource(), null, null); - if (oldPurchaseInExt == null || oldPurchaseInExt.getOrderStatus() < EScmOrderStatus.APPROVE.getValue()) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.BACK_SALE_OUT_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - icPurchaseInhService.auditPurchaseOutByPoOrderSubmit(purchaseInExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - private String validatePurchaseParam(PurchaseInParam purchaseInhParam) { List orderItemsParamList = new ArrayList<>(); if (validatePurchaseIn(purchaseInhParam, orderItemsParamList)) { @@ -264,7 +230,7 @@ public class IcPurchaseInHController extends ScmController { // 验证产品 Set idList = purchaseInhParam.getPurchaseInBParamList().stream().map(PurchaseInBParam::getPkProductBas).collect(Collectors.toSet()); Map bdProductBasExtMap = getBdProductBasExtMap(idList); - if (bdProductBasExtMap == null){ + if (bdProductBasExtMap == null) { return ScmMsgConstants.PRODUCT_NOT_EXIST; } // 判断是否有批次，有批次需要验证批次 @@ -275,7 +241,7 @@ public class IcPurchaseInHController extends ScmController { Set batchCodeSet = new HashSet<>(); for (PurchaseInBParam purchaseInbParam : purchaseInhParam.getPurchaseInBParamList()) { if (purchaseInbParam.getPkBatchCode() != null) { - if(bdProductBasExtMap.containsKey(purchaseInbParam.getPkProductBas())){ + if (bdProductBasExtMap.containsKey(purchaseInbParam.getPkProductBas())) { purchaseInbParam.setPkProduct(bdProductBasExtMap.get(purchaseInbParam.getPkProductBas()).getPkProduct()); } BatchCodeParam batchCodeParam = BatchCodeParam.builder() @@ -388,28 +354,4 @@ public class IcPurchaseInHController extends ScmController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.PO_PURCHASE, business = EOperationBusiness.PO_PURCHASE, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchaseIn(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - IcPurchaseInHExt purchaseInhExt = icPurchaseInhService.queryPurchaseInhExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (purchaseInhExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_PURCHASE_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.IC_PURCHASE_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.PURCHASE_EXISTS_AGENT)); - } - icPurchaseInhService.auditPurchaseByPoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java index e44bcec..ba7367b 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/IIcPurchaseInHService.java @@ -54,30 +54,6 @@ public interface IIcPurchaseInHService extends IService { **/ void deletePurchaseByPk(Long pkPurchase, Long pkMember); - /* - * @description: 提交采购入库单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditPurchaseByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - /* * @description: 根据主键查询销售出库单 * @author: sui q @@ -118,27 +94,4 @@ public interface IIcPurchaseInHService extends IService { **/ List queryTotalPurchaseInhExtByCondition(PurchaseInParam purchaseInParam); - /* - * @description: 提交采购退货单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditPurchaseOutByPoOrderSubmit(IcPurchaseInHExt purchaseInExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购退货单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseOutByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购退货单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditPurchaseOutByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java index 58fcd04..54330dc 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/purchase/service/impl/IcPurchaseinHServiceImpl.java @@ -298,27 +298,6 @@ public class IcPurchaseinHServiceImpl extends ServiceImpl saleoutbExtList = saleOutHiExt.getSaleoutbExtList(); - if(CollectionUtil.isNotEmpty(saleoutbExtList)) { + if (CollectionUtil.isNotEmpty(saleoutbExtList)) { List returnbVoList = BeanUtil.copyToList(saleoutbExtList, SaleOutBVO.class); saleOutHiVo.setSaleOutBiVoList(returnbVoList); } @@ -106,7 +106,7 @@ public class IcSaleoutHController extends ScmController { */ @PostMapping("/export-list-total") @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.EXPORT) - public void exportListSaleOutTotal(HttpServletResponse response, SaleOutParam saleOutParam){ + public void exportListSaleOutTotal(HttpServletResponse response, SaleOutParam saleOutParam) { saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); saleOutParam.setReturnStatus(EDealerYesNo.NO.getValue()); List saleOutHiList = saleOutService.queryDisSaleOutExtCondition(saleOutParam); @@ -133,7 +133,7 @@ public class IcSaleoutHController extends ScmController { */ @PostMapping("/export-back-total") @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.EXPORT) - public void exportListBackSaleOutTotal(HttpServletResponse response, SaleOutParam saleOutParam){ + public void exportListBackSaleOutTotal(HttpServletResponse response, SaleOutParam saleOutParam) { saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); saleOutParam.setReturnStatus(EDealerYesNo.YES.getValue()); List saleOutHiList = saleOutService.queryDisSaleOutExtCondition(saleOutParam); @@ -174,52 +174,18 @@ public class IcSaleoutHController extends ScmController { @PostMapping("/back") @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.BACK) public AjaxResult backSaleOut(@RequestBody SaleOutParam saleOutParam) { - if(saleOutParam.getPkId() == null){ + if (saleOutParam.getPkId() == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } // 验证是否存在销售出库单 saleOutParam.setPkCountry(SecurityUtils.getPkCountry()); saleOutParam.setOrderStatus(EScmOrderStatus.CLOSE.getValue()); IcSaleoutHExt saleOutExt = saleOutService.querySaleOutExtById(saleOutParam); - if(saleOutExt == null){ + if (saleOutExt == null) { return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_BACK_NOT_EXIST)); } saleOutService.saveBackSaleOutByParam(saleOutExt, saleOutParam); return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.SALE_OUT, business = EOperationBusiness.SALE_OUT, method = EOperationMethod.SUBMIT) - public AjaxResult submitBackSaleOut(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_NOT_EXIST)); - } - IcSaleoutHExt saleOutExt = saleOutService.querySaleOutExtId(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (saleOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_NOT_EXIST)); - } - // 查询原始订单是否已经退货 - for (IcSaleoutBExt saleOutBiExt : saleOutExt.getSaleoutbExtList()) { - if(saleOutBiExt.getPkSource() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_NOT_EXIST)); - } - IcSaleoutHExt oldSaleOutExt = saleOutService.querySaleOutExtId(saleOutBiExt.getPkSource(), EScmOrderStatus.CLOSE.getValue()); - if (oldSaleOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.SALE_OUT_NOT_EXIST)); - } - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.BACK_SALE_OUT_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.BACK_SALE_OUT_EXISTS_AGENT)); - } - saleOutService.auditBackSaleOutSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java index d95555d..06eddd8 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcDelSaleLogMapper.java @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.scm.sale.IcDelSaleLog; /** - *

* 发货单生成销售出库日志 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-01 */ public interface IcDelSaleLogMapper extends BaseMapper { diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java index 079598d..05ae4bf 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/mapper/IcSaleoutHMapper.java @@ -9,44 +9,27 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 销售出库单表头 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-29 */ public interface IcSaleoutHMapper extends BaseMapper { /* - * @description: 获取明细表 seq - * @author: sui q - * @date: 2023/11/30 16:22 - * @param: null null + * 获取明细表 seq **/ List querySaleOutSql(Integer size); /* - * @description: 批量保存销售出库根据list - * @author: sui q - * @date: 2023/11/30 17:27 - * @param: null null + * 批量保存销售出库根据list **/ void insertSaleOutByList(@Param("saleOutExtList") List saleOutExtList); /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null + * 查询会员端显示的采购入库单 **/ List queryDisSaleOutExtCondition(SaleOutParam saleOutParam); /* - * @description: 根据订单主键查询其他入库 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null + * 根据订单主键查询其他入库 **/ IcSaleoutHExt querySaleOutExtId(@Param("pkId") Long pkId, @Param("orderStatus") Integer orderStatus); diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java index b178afe..fb449d6 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcDelSaleLogService.java @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.scm.sale.IcDelSaleLog; /** - *

* 发货单生成销售出库日志 服务类 - *

- * - * @author hzs - * @since 2023-12-01 */ public interface IIcDelSaleLogService extends IService { diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java index b95f49e..342aed5 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/IIcSaleoutHService.java @@ -12,93 +12,37 @@ import com.hzs.system.sys.dto.LoginUser; import java.util.List; /** - *

* 销售出库单表头 服务类 - *

- * - * @author hzs - * @since 2023-11-29 */ public interface IIcSaleoutHService extends IService { /* - * @description: 将接受到的收货单参数转换为销售出库单 - * @author: sui q - * @date: 2023/12/1 14:04 - * @param: null null - **/ - void executeDeliverTransSaleOutByParam(SaDeliverExt deliverExt); - - /* - * @description: 保存销售出库单 - * @author: sui q - * @date: 2024/3/4 11:18 - * @param: null null + * 保存销售出库单 **/ void saveSaleOutBySaDeliver(SaDeliverExt deliverExt); /* - * @description: 退货保存销售退货单 - * @author: sui q - * @date: 2024/3/4 11:02 - * @param: null null + * 退货保存销售退货单 **/ void saveBackSaleOutByParam(IcSaleoutHExt saleOutExt, SaleOutParam saleOutParam); /* - * @description: 查询会员端显示的采购入库单 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null + * 查询会员端显示的采购入库单 **/ List queryDisSaleOutExtCondition(SaleOutParam saleOutParam); /* - * @description: 根据主键查询销售出库单 - * @author: sui q - * @date: 2023/11/24 13:52 - * @param: null null + * 根据主键查询销售出库单 **/ IcSaleoutHExt querySaleOutExtById(SaleOutParam saleOutParam); /* - * @description: 根据订单主键查询销售出库单 - * @author: sui q - * @date: 2023/11/21 10:47 - * @param: null null + * 根据订单主键查询销售出库单 **/ IcSaleoutHExt querySaleOutExtId(Long pkId, Integer orderStatus); /* - * @description: 查询会员端显示的盘点 - * @author: sui q - * @date: 2023/11/25 9:55 - * @param: null null + * 查询会员端显示的盘点 **/ IcSaleoutHExt queryDisSaleOutExtById(Long pkId, Integer orderStatus); - - /* - * @description: 提交销售退货单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditBackSaleOutSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过销售退货单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditBackSaleOutAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - - /* - * @description: 审核驳回销售退货单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditBackSaleOutReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java index fff7ad5..9edf673 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcDelSaleLogServiceImpl.java @@ -7,12 +7,7 @@ import com.hzs.scm.sale.service.IIcDelSaleLogService; import org.springframework.stereotype.Service; /** - *

* 发货单生成销售出库日志 服务实现类 - *

- * - * @author hzs - * @since 2023-12-01 */ @Service public class IcDelSaleLogServiceImpl extends ServiceImpl implements IIcDelSaleLogService { diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java index a8b62cc..e11955f 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/sale/service/impl/IcSaleoutHServiceImpl.java @@ -2,7 +2,6 @@ package com.hzs.scm.sale.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.SaOrderFieldConstants; @@ -21,12 +20,10 @@ import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.scm.pub.ScmItemSpecs; import com.hzs.common.domain.scm.pub.ScmOrderApproveLog; -import com.hzs.common.domain.scm.sale.IcDelSaleLog; import com.hzs.common.domain.scm.sale.IcSaleoutB; import com.hzs.common.domain.scm.sale.IcSaleoutH; import com.hzs.common.domain.scm.sale.ext.IcSaleoutBExt; import com.hzs.common.domain.scm.sale.ext.IcSaleoutHExt; -import com.hzs.common.domain.system.base.BdStorehouse; import com.hzs.common.domain.system.sys.SysUser; import com.hzs.sale.order.ISaOrderItemsServiceApi; import com.hzs.sale.order.ISaOrderServiceApi; @@ -38,10 +35,8 @@ import com.hzs.scm.pub.service.IScmItemSpecsService; import com.hzs.scm.pub.service.IScmOrderApproveLogService; import com.hzs.scm.sale.mapper.IcSaleoutHMapper; import com.hzs.scm.sale.param.SaleOutParam; -import com.hzs.scm.sale.service.IIcDelSaleLogService; import com.hzs.scm.sale.service.IIcSaleoutBService; import com.hzs.scm.sale.service.IIcSaleoutHService; -import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.sys.IUserServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.LoginUser; @@ -56,73 +51,32 @@ import java.util.*; import java.util.stream.Collectors; /** - *

* 销售出库单表头 服务实现类 - *

- * - * @author hzs - * @since 2023-11-29 */ @Service public class IcSaleoutHServiceImpl extends ServiceImpl implements IIcSaleoutHService { - @DubboReference - private IUserServiceApi userServiceApi; - @Autowired private IScmBillNoService scmBillNoService; - - @DubboReference - private ISaOrderServiceApi saOrderServiceApi; - - @DubboReference - private IProductServiceApi productServiceApi; - @Autowired private IIcSaleoutBService saleOutBiService; - @Autowired private IIcOnHandNumService onHandNumService; - @Autowired private IScmItemSpecsService scmItemSpecsService; - - @Autowired - private IIcDelSaleLogService delSaleLogService; - @Autowired private IScmOrderApproveLogService scmOrderApproveLogService; - @Autowired private IIcOnHandNumService icOnHandNumService; @DubboReference - private ISaOrderItemsServiceApi saOrderItemsServiceApi; - + ISaOrderItemsServiceApi saOrderItemsServiceApi; @DubboReference - private ICurrencyServiceApi currencyServiceApi; - - @Override - @Transactional(rollbackFor = Exception.class) - public void executeDeliverTransSaleOutByParam(SaDeliverExt deliverExt) { - IcDelSaleLog icDelSaleLog = IcDelSaleLog.builder() - .acceptParam(JSONUtil.toJsonStr(deliverExt)) - .sourceCode(deliverExt.getDeliverCode()) - .successStatus(EYesNo.YES.getIntValue()) - .build(); - icDelSaleLog.setPkCreator(deliverExt.getPkCreator()); - icDelSaleLog.setPkCountry(deliverExt.getPkCountry()); - try{ - saveSaleOutBySaDeliver(deliverExt); - }catch (Exception e){ - icDelSaleLog.setErrorMsg(e.getMessage()); - icDelSaleLog.setSuccessStatus(EYesNo.NO.getIntValue()); - throw new RuntimeException(e); - }finally { - // 记录日志 - delSaleLogService.save(icDelSaleLog); - } - } + ISaOrderServiceApi saOrderServiceApi; + @DubboReference + IProductServiceApi productServiceApi; + @DubboReference + IUserServiceApi userServiceApi; @Override @Transactional(rollbackFor = Exception.class) @@ -135,7 +89,7 @@ public class IcSaleoutHServiceImpl extends ServiceImpl saOrderExtList = saOrderServiceApi.querySaOrderByDeliverList(deliverExt.getSaDeliverItemsExtList()).getData(); - if(CollectionUtil.isEmpty(saOrderExtList)){ + if (CollectionUtil.isEmpty(saOrderExtList)) { throw new RuntimeException(ScmMsgConstants.SO_ORDER_NOT_EXIST); } Map saOrderExtMap = new HashMap<>(); @@ -322,9 +276,9 @@ public class IcSaleoutHServiceImpl extends ServiceImpl saleOutExtList = baseMapper.queryDisSaleOutExtCondition(saleOutParam); - if(saleOutExtList == null || saleOutExtList.size() ==0){ - return null; + List saleOutExtList = baseMapper.queryDisSaleOutExtCondition(saleOutParam); + if (saleOutExtList == null || saleOutExtList.size() == 0) { + return null; } // 查询明细表，需要携带规格 IcSaleoutHExt saleOutExt = saleOutExtList.get(0); @@ -344,32 +298,12 @@ public class IcSaleoutHServiceImpl extends ServiceImpl saleOutExtList = baseMapper.queryDisSaleOutExtCondition(saleOutParam); - if(CollectionUtil.isNotEmpty(saleOutExtList)){ + if (CollectionUtil.isNotEmpty(saleOutExtList)) { return saleOutExtList.get(0); } return null; } - @Override - @Transactional(rollbackFor = Exception.class) - public void auditBackSaleOutSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser) { - // 更新单据状态 - updateBackSaleOutStatus(scmApproveParam.getPkId(), loginUser, EScmOrderStatus.SUBMIT.getValue()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.BACK_SALE_OUT_APPROVE, EOrderPrefix.IC_SALE_OUT_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditBackSaleOutAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveBackSaleOutByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditBackSaleOutReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveBackSaleOutByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - private void updateBackSaleOutStatus(Long pkId, LoginUser loginUser, Integer orderStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set(SaOrderFieldConstants.ORDER_STATUS, orderStatus); @@ -379,7 +313,7 @@ public class IcSaleoutHServiceImpl extends ServiceImpl scmOrderApproveLogList = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(null, approvalBusinessResultDTO.getEApprovalBusiness().getValue(), approvalBusinessResultDTO.getBusinessCode()); if (scmOrderApproveLogList == null || scmOrderApproveLogList.size() == 0) { @@ -393,7 +327,7 @@ public class IcSaleoutHServiceImpl extends ServiceImpl saleOutBiExtList = saleOutBiService.queryBackSaleOutBiByPk(EScmOrderType.SALE_OUT.getValue(), saleOutExt.getSaleoutbExtList()); - if(saleOutBiExtList != null && saleOutBiExtList.size() >0){ + if (saleOutBiExtList != null && saleOutBiExtList.size() > 0) { saleOutExt.setSaleoutbExtList(saleOutBiExtList); } // 退货入不良品仓 @@ -417,7 +351,7 @@ public class IcSaleoutHServiceImpl extends ServiceImpl transferInList = new ArrayList<>(); for (IcTransInHExt transInExt : transInExtList) { TransferInVo transferInVo = BeanUtil.copyProperties(transInExt, TransferInVo.class); - List transInbiExtList= transInExt.getTransInbExtList(); + List transInbiExtList = transInExt.getTransInbExtList(); if (CollectionUtil.isNotEmpty(transInbiExtList)) { List returnbVoList = BeanUtil.copyToList(transInbiExtList, TransferInBVo.class); transferInVo.setScmReturnbVoList(returnbVoList); @@ -109,7 +109,7 @@ public class IcTransInHController extends ScmController { */ @PostMapping("/export-list-total") @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, TransferParam transferParam){ + public void exportListTransInTotal(HttpServletResponse response, TransferParam transferParam) { transferParam.setPkCountry(SecurityUtils.getPkCountry()); transferParam.setOrderState(EScmOrderStatus.APPROVE.getValue()); List transInExtList = transInService.queryDisTransferInInExtByCondition(transferParam); @@ -121,7 +121,7 @@ public class IcTransInHController extends ScmController { private List packageScmExportVo(List transInExtList) { List transferExcelVoList = new ArrayList<>(); for (IcTransInHExt transInExt : transInExtList) { - List transInbExtList= transInExt.getTransInbExtList(); + List transInbExtList = transInExt.getTransInbExtList(); for (IcTransInBExt transInBiExt : transInbExtList) { TransferExcelVO transferExcelVO = BeanUtil.copyProperties(transInExt, TransferExcelVO.class); setScmItemsExcel(transInBiExt, transferExcelVO); @@ -165,7 +165,7 @@ public class IcTransInHController extends ScmController { // 验证产品 Map specsMap = new HashMap<>(); String message = validateProduct(transferParam.getTransferItemParamList(), specsMap); - if(ObjectUtil.isNotEmpty(message)){ + if (ObjectUtil.isNotEmpty(message)) { return message; } // Set idList = transferParam.getTransferItemParamList().stream().map(TransferItemParam::getPkProductBas).collect(Collectors.toSet()); @@ -177,7 +177,7 @@ public class IcTransInHController extends ScmController { IcTransOutHExt transOutExt = transOutExtList.get(0); transferParam.setPkCorp(transOutExt.getPkCorp()); message = validateProductBatchCode(transferParam.getTransferItemParamList(), specsMap); - if(ObjectUtil.isNotEmpty(message)){ + if (ObjectUtil.isNotEmpty(message)) { return message; } // if (validateBatchCodeByTransParam(transferParam, bdProductBasExtMap)){ @@ -206,7 +206,7 @@ public class IcTransInHController extends ScmController { transferItemParam.getPkTransferOut() == null || transferItemParam.getPkTransferOutB() == null || transferItemParam.getBizDate() == null || transferItemParam.getNnum() == null || /*transferItemParam.getPkStorehouse() == null ||*/ transferItemParam.getPkOutStorehouse() == null || - transferItemParam.getScmItemSpecsList() == null || transferItemParam.getScmItemSpecsList().size() ==0 ) { + transferItemParam.getScmItemSpecsList() == null || transferItemParam.getScmItemSpecsList().size() == 0) { return Boolean.TRUE; } transferItemParams.add(transferItemParam); @@ -253,29 +253,4 @@ public class IcTransInHController extends ScmController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.TRANSFER_IN, business = EOperationBusiness.TRANSFER_IN, method = EOperationMethod.UPDATE) - public AjaxResult submitTransferIn(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if(scmApproveParam.getPkId() == null){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_NOT_EXIST)); - } - IcTransInHExt transInExt = transInService.queryTransferInInhExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue(), SecurityUtils.getPkCountry()); - if (transInExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.TRANSFER_IN_APPROVE.getValue(), null); - if(CollectionUtil.isNotEmpty(scmOrderApproveLogs)){ - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_IN_EXISTS_AGENT)); - } - transInService.auditTransferInByPoOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java index 0ac1950..8a673d4 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/IcTransOutHController.java @@ -83,7 +83,7 @@ public class IcTransOutHController extends ScmController { */ @PostMapping("/export-list-total") @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.EXPORT) - public void exportListTransInTotal(HttpServletResponse response, TransferParam transferParam){ + public void exportListTransInTotal(HttpServletResponse response, TransferParam transferParam) { transferParam.setPkCountry(SecurityUtils.getPkCountry()); transferParam.setOrderState(EScmOrderStatus.APPROVE.getValue()); List transoutExtList = transOutService.queryTransferOutToStoreByCondition(transferParam); @@ -95,7 +95,7 @@ public class IcTransOutHController extends ScmController { private List packageScmExportVo(List transInExtList) { List transferExcelVoList = new ArrayList<>(); for (IcTransOutHExt transOutExt : transInExtList) { - List transOutbExtList= transOutExt.getTransOutbExtList(); + List transOutbExtList = transOutExt.getTransOutbExtList(); for (IcTransOutBExt transOutBiExt : transOutbExtList) { TransferOutExcelVO transferExcelVO = BeanUtil.copyProperties(transOutExt, TransferOutExcelVO.class); setScmItemsExcel(transOutBiExt, transferExcelVO); @@ -157,7 +157,7 @@ public class IcTransOutHController extends ScmController { List transferOrderList = new ArrayList<>(); for (IcTransOutHExt transOutExt : transoutExtList) { TransferOutVo transferOutVo = BeanUtil.copyProperties(transOutExt, TransferOutVo.class); - List transOutbExtList= transOutExt.getTransOutbExtList(); + List transOutbExtList = transOutExt.getTransOutbExtList(); if (CollectionUtil.isNotEmpty(transOutbExtList)) { List returnbVoList = BeanUtil.copyToList(transOutbExtList, TransferOutBVo.class); transferOutVo.setScmReturnbVoList(returnbVoList); @@ -186,31 +186,6 @@ public class IcTransOutHController extends ScmController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.TRANSFER_OUT, business = EOperationBusiness.TRANSFER_OUT, method = EOperationMethod.UPDATE) - public AjaxResult submitPurchase(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if (scmApproveParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - IcTransOutHExt transOutExt = transOutService.queryDisTransferOutExtById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (transOutExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.IC_GENERAL_OUT_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.TRANSFER_OUT_APPROVE.getValue(), null); - if (CollectionUtil.isNotEmpty(scmOrderApproveLogs)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_OUT_EXISTS_AGENT)); - } - transOutService.auditTransferOutByApproveParamSubmit(transOutExt, scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } - private String validateTransferOutParam(TransferParam transferParam) { List orderItemsParamList = new ArrayList<>(); if (validateTransferOutFieldParam(transferParam, orderItemsParamList)) { @@ -228,7 +203,7 @@ public class IcTransOutHController extends ScmController { } size += transferOrderExt.getTransferOrderItemsList().size(); } - if(size != orderItemsParamList.size()){ + if (size != orderItemsParamList.size()) { return ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST; } transferParam.setPkCountry(SecurityUtils.getPkCountry()); diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java index 43e3a42..40d53b6 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/controller/manage/TransferOrderController.java @@ -200,13 +200,13 @@ public class TransferOrderController extends ScmController { CollectionUtil.isEmpty(transferItemParam.getScmItemSpecsList())) { return Boolean.TRUE; } - if(storehouseIdMap.containsKey(transferParam.getPkCountry())){ + if (storehouseIdMap.containsKey(transferParam.getPkCountry())) { List storehouseIdSet = storehouseIdMap.get(transferParam.getPkCountry()); QueryStoreParam queryStoreParam = new QueryStoreParam(); queryStoreParam.setPkCorp(transferParam.getPkCorp()); queryStoreParam.setPkStorehouse(transferItemParam.getPkStorehouse()); storehouseIdSet.add(queryStoreParam); - }else{ + } else { List queryStoreParamList = new ArrayList<>(); QueryStoreParam queryStoreParam = new QueryStoreParam(); queryStoreParam.setPkCorp(transferParam.getPkCorp()); @@ -214,13 +214,13 @@ public class TransferOrderController extends ScmController { queryStoreParamList.add(queryStoreParam); storehouseIdMap.put(transferParam.getPkCountry(), queryStoreParamList); } - if(storehouseIdMap.containsKey(transferParam.getPkInCountry())){ + if (storehouseIdMap.containsKey(transferParam.getPkInCountry())) { List storehouseIdSet = storehouseIdMap.get(transferParam.getPkInCountry()); QueryStoreParam queryStoreParam = new QueryStoreParam(); queryStoreParam.setPkCorp(transferParam.getPkInCorp()); queryStoreParam.setPkStorehouse(transferItemParam.getPkInStorehouse()); storehouseIdSet.add(queryStoreParam); - }else { + } else { List queryStoreParamList = new ArrayList<>(); QueryStoreParam queryStoreParam = new QueryStoreParam(); queryStoreParam.setPkCorp(transferParam.getPkInCorp()); @@ -256,28 +256,4 @@ public class TransferOrderController extends ScmController { return AjaxResult.success(); } - /** - * 撤销订单并入库（走签呈），签呈页面点击确定按钮 - * - * @param scmApproveParam 参数 - */ - @PostMapping("/submit") - @Log(module = EOperationModule.TRANSFER_ORDER, business = EOperationBusiness.TRANSFER_ORDER, method = EOperationMethod.UPDATE) - public AjaxResult submitTransferOrder(@RequestBody ScmApproveParam scmApproveParam) { - scmApproveParam.setPkCountry(SecurityUtils.getPkCountry()); - if (scmApproveParam.getPkId() == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST)); - } - TransferOrderExt transferOrderExt = transferOrderService.queryDisTransferOrderById(scmApproveParam.getPkId(), EScmOrderStatus.SAVE.getValue()); - if (transferOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_NOT_EXIST)); - } - // 验证该订单是否存在签呈，存在待审核的签呈不能再次发起 - List scmOrderApproveLogs = scmOrderApproveLogService.queryScmOrderApproveLogByCondition(scmApproveParam.getPkId(), EApprovalBusiness.TRANSFER_ORDER_APPROVE.getValue(), null); - if (CollectionUtil.isNotEmpty(scmOrderApproveLogs)) { - return AjaxResult.error(TransactionUtils.getContent(ScmMsgConstants.TRANSFER_ORDER_EXISTS_AGENT)); - } - transferOrderService.auditTransferOrderTransferOrderSubmit(scmApproveParam, userTokenService.getLoginUser()); - return AjaxResult.success(); - } } diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java index 4f0bf47..a6b7b27 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransInHService.java @@ -47,30 +47,6 @@ public interface IIcTransInHService extends IService { **/ void deleteTransferInByPk(Long pkTransferIn, Long pkMember); - /* - * @description: 提交采购入库单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditTransferInByPoOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferInByPoOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购入库单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferInByPoOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - /* * @description: 根据主键查询入库单 * @author: sui q diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java index 7bc7768..78b46bf 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/IIcTransOutHService.java @@ -77,30 +77,6 @@ public interface IIcTransOutHService extends IService { **/ void deleteTransferOut(Long pkId, Long pkMember); - /* - * @description: 提交采购订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditTransferOutByApproveParamSubmit(IcTransOutHExt transOutHExt, ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回采购订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - /* * @description: 参照生成调拨出库单，可能存在多个调拨订单生成一个入库单，支持1对多 多对1 diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java index fa15f28..d575877 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/ITransferOrderService.java @@ -87,30 +87,6 @@ public interface ITransferOrderService extends IService { **/ List queryTransferOrderToStoreByCondition(TransferParam transferParam); - /* - * @description: 提交调拨订单（走审批） - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - void auditTransferOrderTransferOrderSubmit(ScmApproveParam scmApproveParam, LoginUser loginUser); - - /* - * @description: 审核通过调拨订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOrderTransferOrderAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /* - * @description: 审核驳回调拨订单 - * @author: sui q - * @date: 2023/11/22 14:16 - * @param: null null - **/ - String auditTransferOrderByTransferOrderReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - /* * @description: 根据入库数量更新累计入库数量 * @author: sui q diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java index f6dce58..b4e2766 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/IcTransInHServiceImpl.java @@ -206,26 +206,6 @@ public class IcTransInHServiceImpl extends ServiceImpl transOutBiExtList = transOutBiService.queryTransferOutBiByPk(EScmOrderType.TRANS_OUT.getValue(), transOutExt.getTransOutbExtList()); - if(transOutBiExtList != null && transOutBiExtList.size() >0){ - transOutExt.setTransOutbExtList(transOutBiExtList); - } - // 更新存货现存量表，更新数量 - onHandNumService.mergeIcOnHandNumByGeneralOut(transOutExt, transOutExt.getTransOutbExtList(), EScmOrderType.TRANS_OUT.getValue(), loginUser.getUserId()); - scmOrderApproveLogService.submitOrder(scmApproveParam, EApprovalBusiness.TRANSFER_OUT_APPROVE, EOrderPrefix.TR_TRANS_OUT_CODE, loginUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferOutByApproveParamAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferByStatus(approvalBusinessResultDTO, EScmOrderStatus.APPROVE.getValue(), EAgentApprovalStatus.APPROVED.getValue()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String auditTransferOutByApproveParamReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - return approveTransferByStatus(approvalBusinessResultDTO, EScmOrderStatus.SAVE.getValue(), EAgentApprovalStatus.REFUSE.getValue()); - } - @Override public List queryTransferOutByOrderItems(List orderItemsParamList) { return baseMapper.queryTransferOutByOrderItems(orderItemsParamList); diff --git a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java index 7ea3592..72d0108 100644 --- a/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java +++ b/bd-business/bd-business-scm/src/main/java/com/hzs/scm/trans/service/impl/TransferOrderServiceImpl.java @@ -222,26 +222,6 @@ public class TransferOrderServiceImpl extends ServiceImpl transferInbList, Long pkMember) { diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml index 40af22e..621d813 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml @@ -4,47 +4,35 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - merge into ic_available_num a - using( - - select #{item.pkId} pk_id,#{item.availableNum} available_num,#{item.pkModified} pk_modified, - #{item.modifiedTime} modified_time from dual - - ) b - on (a.pk_id=b.pk_id) - when matched then - update set a.available_num=a.available_num-b.available_num,a.pk_modified=b.pk_modified, - a.modified_time=b.modified_time - + update ic_available_num set available_num = available_num + #{availableNum}, @@ -55,41 +43,23 @@ - + + + - + diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml index e8deba7..bdad293 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableSpecsMapper.xml @@ -4,18 +4,19 @@ - - - - - - - - - - - + + + + + + + + + + + + merge into IC_AVAILABLE_SPECS ip using ( @@ -32,12 +33,4 @@ b.SPECS_NAME,b.pk_country,b.pk_creator) - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml index 2947403..892cd44 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/no/ScmBillNoMapper.xml @@ -4,39 +4,31 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - update SCM_BILL_NO set MODIFIED_TIME=sysdate,NEXT_VALUE=NEXT_VALUE+1 - where pk_id=#{pkId} and del_flag=0 + update SCM_BILL_NO + set MODIFIED_TIME=sysdate, + NEXT_VALUE=NEXT_VALUE + 1 + where pk_id = #{pkId} + and del_flag = 0 - - merge into SCM_BILL_NO a - using ( - - select #{item.pkId} pk_id,#{item.initialValue} initial_value from dual - - ) b - on (a.pk_id=b.pk_id) - when matched then - update set a.next_value=b.initial_value - diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml index 352e89b..1ac96f6 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml @@ -4,64 +4,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + insert ALL - + into ic_saleout_h(pk_id,pk_dept,pk_whsmanager,customer_type, pk_customer,pk_storehouse,order_date,order_status, pk_corp,total_num,order_code,pk_creator,pk_country) @@ -74,10 +75,12 @@ SELECT 1 FROM dual + + diff --git a/bd-business/bd-business-system/pom.xml b/bd-business/bd-business-system/pom.xml index af89e71..db5a954 100644 --- a/bd-business/bd-business-system/pom.xml +++ b/bd-business/bd-business-system/pom.xml @@ -54,11 +54,6 @@ bd-business-common - - com.bd.africa - bd-api-scm - - diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdCubasdocMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdCubasdocMapper.java index 39b3f89..c454aab 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdCubasdocMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdCubasdocMapper.java @@ -9,20 +9,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 供应商设置 Mapper 接口 - *

- * - * @author hzs - * @since 2023-11-20 */ public interface BdCubasdocMapper extends BaseMapper { /* - * @description: 根据条件查询客商 - * @author: sui q - * @date: 2023/11/20 10:57 - * @param: null null + * 根据条件查询客商 **/ List queryCubasdocByCondition(@Param("cubasdocParam") BdCubasdocParam cubasdocParam); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java index e504851..2fa2947 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java @@ -13,11 +13,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 行政区划dubbo服务 - * @Author: jiang chao - * @Time: 2022/10/21 11:32 - * @Classname: AreaServiceProvider - * @PackageName: com.hzs.system.base.provider + * 行政区划dubbo服务 */ @DubboService public class AreaServiceProvider implements IAreaServiceApi { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/BarCodeServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/BarCodeServiceProvider.java index 991d502..340bf41 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/BarCodeServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/BarCodeServiceProvider.java @@ -13,11 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 条码dubbo服务 - * @Author: jiang chao - * @Time: 2022/11/2 11:59 - * @Classname: BarCodeServiceProvider - * @PackageName: com.hzs.system.base.provider + * 条码dubbo服务 */ @DubboService public class BarCodeServiceProvider implements IBarCodeServiceApi { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CountryServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CountryServiceProvider.java index 8319229..84fbf05 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CountryServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CountryServiceProvider.java @@ -17,24 +17,17 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.Map; /** - * Description: 国家dubbo服务 - * Author: jiang chao - * Time: 2022/8/31 16:52 - * Classname: CountryServiceProvider - * PackageName: com.hzs.system.base.provider + * 国家dubbo服务 */ @DubboService public class CountryServiceProvider implements ICountryServiceApi { @Autowired private IBdCountryService countryService; - @Autowired private IBdCurrencyService currencyService; - @Autowired private IBdAccountService accountService; - @Autowired private IBdStorehouseService bdStorehouseService; @@ -54,11 +47,11 @@ public class CountryServiceProvider implements ICountryServiceApi { @Override public R updateConfigEffectById(Integer businessType, Integer pkId) { - if(EDelayBusType.COUNTRY.getValue() == businessType){ + if (EDelayBusType.COUNTRY.getValue() == businessType) { countryService.updateCountryId(pkId); - }else if(EDelayBusType.CURRENCY.getValue() == businessType){ + } else if (EDelayBusType.CURRENCY.getValue() == businessType) { currencyService.updateCurrencyById(pkId); - }else if(EDelayBusType.ACCOUNT.getValue() == businessType){ + } else if (EDelayBusType.ACCOUNT.getValue() == businessType) { accountService.updateAccountById(pkId); } return R.ok(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java index 3bba473..42fd595 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java @@ -21,13 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.*; import java.util.stream.Collectors; -/** - * @Description: - * @Author: sui q - * @Time: 2022/9/8 15:13 - * @Classname: ICurrencyServiceProvider - * @PackageName: com.hzs.system.base.provider - */ @DubboService public class CurrencyServiceProvider implements ICurrencyServiceApi { @@ -72,12 +65,6 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi { return R.ok(currencyDTOList); } - /** - * 根据id查询汇率 - * - * @param currencyId - * @return - */ @Override public R getCurrencyByPkId(Integer currencyId) { BdCurrency bdCurrency = currencyService.getByPkid(currencyId); @@ -87,7 +74,7 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi { @Override public R queryBdStorehouseByProvince(Integer province, Integer... type) { int storeType = 1; - if(type != null && type.length >0){ + if (type != null && type.length > 0) { storeType = type[0]; } return R.ok(storehouseAreaMiddleService.queryBdStorehouseByProvince(province, storeType)); @@ -98,20 +85,12 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi { return R.ok(storehouseAreaMiddleService.queryStorehouseListByProvince(provinceList)); } - /** - * 根据id 查询所属历史币种 - * - * @return - */ @Override public R getByHistoryPkId(Integer currencyId) { BdCurrency bdCurrency = currencyService.getByHistoryPkid(currencyId); return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class)); } - /** - * 查询所有的币种 - */ @Override public R> findAll() { List currencyList = currencyService.list(); @@ -128,7 +107,7 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi { .pkId(pkId) .build(); List bdCubasdocList = bdCubasdocService.querySupplierByCondition(cubasdocParam); - if(CollectionUtil.isNotEmpty(bdCubasdocList)){ + if (CollectionUtil.isNotEmpty(bdCubasdocList)) { return R.ok(bdCubasdocList.get(0)); } return R.ok(null); @@ -141,7 +120,7 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi { .pkId(pkId) .build(); List bdCubasdocList = bdCubasdocService.queryCustomerByCondition(customerParam); - if(CollectionUtil.isNotEmpty(bdCubasdocList)){ + if (CollectionUtil.isNotEmpty(bdCubasdocList)) { return R.ok(bdCubasdocList.get(0)); } return R.ok(null); @@ -157,9 +136,4 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi { return R.ok(storehouseService.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp)); } - @Override - public R queryBdStorehouseById(Integer pkId) { - return R.ok(storehouseService.getById(pkId)); - } - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/NoticeServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/NoticeServiceProvider.java index e9e71d6..4fbed73 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/NoticeServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/NoticeServiceProvider.java @@ -18,20 +18,15 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; - /** - * @Description: 会员钱包审核Doubbo服务 - * @Author: ljc - * @Time: 2022/9/24 13:53 - * @Classname: IMemberAccountAuditServiceProvider - * @Package_name: com.hzs.member.account.provider + * 会员钱包审核Doubbo服务 */ @Slf4j @DubboService public class NoticeServiceProvider implements INoticeAuditServiceApi { @Autowired - IBdNoticeService bdNoticeService; + private IBdNoticeService bdNoticeService; @Override public R noticeAuditProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) { @@ -77,7 +72,7 @@ public class NoticeServiceProvider implements INoticeAuditServiceApi { } /** - * TDO转业务参数 + * 转业务参数 * * @param approvalBusinessResultDTO 业务审批操作DTO * @param approveState 审核状态 diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/PlatformMessageServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/PlatformMessageServiceProvider.java index 0a62412..d374ce5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/PlatformMessageServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/PlatformMessageServiceProvider.java @@ -14,12 +14,6 @@ import java.util.List; /** * 后台站内信服务 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/5 21:34 - * @Classname: PlatformMessageServiceProvider - * @Package_name: com.hzs.system.base.provider */ @Slf4j @DubboService diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/SystemConfigServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/SystemConfigServiceProvider.java index 35b3012..3a84c9c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/SystemConfigServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/SystemConfigServiceProvider.java @@ -12,13 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.*; -/** - * @Description: - * @Author: sui q - * @Time: 2022/11/10 11:29 - * @Classname: SystemConfigServiceProvider - * @PackageName: com.hzs.system.base.provider - */ @DubboService public class SystemConfigServiceProvider implements ISystemConfigServiceApi { @@ -28,7 +21,6 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi { @Autowired private IBdCountryService bdCountryService; - @Override public R getBonusSystemConfig(Integer pkCountry, String key) { return R.ok(systemConfigService.getSystemConfig(pkCountry, key)); @@ -69,13 +61,6 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi { return R.ok(systemConfigMap); } - /** - * 批量查询所有国家的订单时间参数 - * - * @return: R> - * @Author: yh - * @Date: 2022/11/10 14:04 - */ @Override public R> getSystemConfig() { List countryList = bdCountryService.getAllCountry(); @@ -92,4 +77,5 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi { return R.ok(systemConfigMap); } + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCountryService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCountryService.java index 6788c43..0e65186 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCountryService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCountryService.java @@ -21,19 +21,13 @@ public interface IBdCountryService extends IService { /** * 更新国家 + * * @param pkCountry 国家 - * @return: BdCountry - * @Author: sui q - * @Date: 2023/3/10 15:18 - */ + */ void updateCountryId(Integer pkCountry); /** * 获取所有国家 - * - * @return: List - * @Author: sui q - * @Date: 2022/11/15 14:08 */ List getAllCountry(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCubasdocService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCubasdocService.java index 297ad03..cadbe81 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCubasdocService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCubasdocService.java @@ -8,60 +8,33 @@ import com.hzs.system.base.param.BdCubasdocParam; import java.util.List; /** - *

* 供应商设置 服务类 - *

- * - * @author hzs - * @since 2023-11-20 */ public interface IBdCubasdocService extends IService { /* - * @description: 根据条件查询供应商 - * @author: sui q - * @date: 2023/11/20 16:47 - * @param: null null + * 根据条件查询供应商 **/ List querySupplierByCondition(BdCubasdocParam cubasdocParam); /* - * @description: 根据条件查询客户 - * @author: sui q - * @date: 2023/11/29 13:42 - * @param: null null + * 根据条件查询客户 **/ List queryCustomerByCondition(BdCubasdocParam cubasdocParam); /* - * @description: 根据条件查询客商 - * @author: sui q - * @date: 2023/11/20 10:57 - * @param: null null + * 根据条件查询客商 **/ List queryCubasdocByCondition(BdCubasdocParam cubasdocParam); /* - * @description: 保存供应商 - * @author: sui q - * @date: 2023/11/20 10:58 - * @param: null null + * 保存供应商 **/ void saveCubasdoc(BdCubasdocParam cubasdocParam, Long pkMember); /* - * @description: 删除客商 - * @author: sui q - * @date: 2023/11/20 13:43 - * @param: null null + * 删除客商 **/ void deleteCuBasdoc(Integer pkId, Long pkMember); - /* - * @description: 获得供应商 - * @author: sui q - * @date: 2023/11/20 16:38 - * @param: null null - **/ - BdCubasdoc getBdCubasdocById(Integer pkId); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdCubasdocServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdCubasdocServiceImpl.java index 40886ae..7536027 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdCubasdocServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdCubasdocServiceImpl.java @@ -21,12 +21,7 @@ import java.util.ArrayList; import java.util.List; /** - *

* 供应商设置 服务实现类 - *

- * - * @author hzs - * @since 2023-11-20 */ @Service public class BdCubasdocServiceImpl extends ServiceImpl implements IBdCubasdocService { @@ -67,11 +62,11 @@ public class BdCubasdocServiceImpl extends ServiceImpl * 消费配置详情表 Mapper 接口 - *

- * - * @author zhangjing - * @since 2022-08-26 */ public interface BdAreaCurrencyDetailMapper extends BaseMapper { @@ -35,11 +29,7 @@ public interface BdAreaCurrencyDetailMapper extends BaseMapper + * 获取消费配置详情列表 **/ List getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java index 8de5a12..a481ecd 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java @@ -1,26 +1,16 @@ package com.hzs.system.config.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdAwards; import org.apache.ibatis.annotations.Param; /** - *

- * Mapper 接口 - *

- * - * @author zhangjing - * @since 2022-09-08 + * Mapper 接口 */ public interface BdAwardsMapper extends BaseMapper { /** - * @description: 查询等级或奖衔是否被使用 - * @author: zhang jing - * @date: 2023/3/2 17:37 - * @param: [pkRegisterGrade, pkSettleGrade, pkAwards] - * @return: java.lang.Integer + * 查询等级或奖衔是否被使用 **/ Integer checkGradeAwards(@Param("pkRegisterGrade") Long pkRegisterGrade, @Param("pkSettleGrade") Long pkSettleGrade, diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusItemsMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusItemsMapper.java index e7ac2f3..0c8b84b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusItemsMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusItemsMapper.java @@ -1,16 +1,10 @@ package com.hzs.system.config.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdBonusItems; /** - *

* 奖项配置 Mapper 接口 - *

- * - * @author zhangjing - * @since 2022-11-09 */ public interface BdBonusItemsMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdWithdrawalSpecialMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdWithdrawalSpecialMapper.java index 09cc471..12840da 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdWithdrawalSpecialMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdWithdrawalSpecialMapper.java @@ -1,16 +1,10 @@ package com.hzs.system.config.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdWithdrawalSpecial; /** - *

* 提现设置特殊配置 Mapper 接口 - *

- * - * @author zhangjing - * @since 2022-09-06 */ public interface BdWithdrawalSpecialMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/BdAreaCurrencyDetailParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/BdAreaCurrencyDetailParam.java index e6c2dc3..e7acb7a 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/BdAreaCurrencyDetailParam.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/BdAreaCurrencyDetailParam.java @@ -13,12 +13,7 @@ import java.util.HashMap; import java.util.Map; /** - *

* 消费配置详情表 - *

- * - * @author zhangjing - * @since 2022-08-26 */ @EqualsAndHashCode(callSuper = true) @Data @@ -109,5 +104,4 @@ public class BdAreaCurrencyDetailParam extends BaseEntity { } - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AccountServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AccountServiceProvider.java index 453f02c..49af117 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AccountServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AccountServiceProvider.java @@ -15,11 +15,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 币种配置的dubbo服务类 - * @Author: zhang jing - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider + * 币种配置的dubbo服务类 */ @DubboService public class AccountServiceProvider implements IAccountServiceApi { @@ -27,13 +23,6 @@ public class AccountServiceProvider implements IAccountServiceApi { @Autowired private IBdAccountService accountService; - /** - * @description: 根据币种属性查询币种列表（账户类型） - * @author: zhang jing - * @date: 2022/9/22 10:04 - * @param: [accountProperty, pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryAccountByType(Integer accountProperty, Integer pkCountry) { return R.ok(accountService.queryAccountByType(accountProperty, pkCountry)); @@ -44,25 +33,11 @@ public class AccountServiceProvider implements IAccountServiceApi { return R.ok(accountService.queryAccountByType(accountType, pkCountryList)); } - /** - * @description: 根据pkid查询币种信息 - * @author: zhang jing - * @date: 2022/10/11 17:44 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getAccount(Integer pkId) { return R.ok(accountService.getBdAccount(pkId)); } - /** - * @description: 根据币种值查询币种 - * @author: zhang jing - * @date: 2023/3/17 11:11 - * @param: [fieldValue] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getBdAccountByFieldValue(Integer pkCountry, Integer fieldValue) { return R.ok(accountService.getBdAccountByFieldValue(pkCountry, fieldValue)); @@ -106,30 +81,11 @@ public class AccountServiceProvider implements IAccountServiceApi { return R.ok(accountService.queryAccountByCondition(pkCountry)); } - /** - * @description: 查询币种转换 - * @author: zhang jing - * @date: 2023/3/16 11:53 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getPkAccount(Integer pkId) { return R.ok(accountService.getPkAccount(pkId)); } - @Override - public R queryPostageAccount(Integer pkCountry) { - return R.ok(accountService.queryPostageAccount(pkCountry)); - } - - /** - * @description: 会员端账户查询 - * @author: zhang jing - * @date: 2023/4/7 15:25 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> memberAccountByType(Integer pkCountry) { return R.ok(accountService.memberAccountByType(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AreaCurrencyServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AreaCurrencyServiceProvider.java index 5836030..bdadbb3 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AreaCurrencyServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AreaCurrencyServiceProvider.java @@ -18,11 +18,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 专区币种配置提供的公共api服务 - * @Author: sui q - * @Time: 2022/9/6 10:41 - * @Classname: AreaCurrencyServiceProvider - * @PackageName: com.hzs.system.config.provider + * 专区币种配置提供的公共api服务 */ @DubboService public class AreaCurrencyServiceProvider implements IAreaCurrencyServiceApi { @@ -45,14 +41,6 @@ public class AreaCurrencyServiceProvider implements IAreaCurrencyServiceApi { return R.ok(areaCurrencyDTOList); } - /** - * 根据条件查找对应的币种配置 - * @param specialArea 所属专区 - * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 - */ @Override public R> queryAreaCurrencyByCondition(Integer specialArea, Integer pkCountry) { List areaCurrencyExtList = bdAccountService.queryAreaCurrencyByCondition(specialArea, pkCountry); @@ -66,9 +54,10 @@ public class AreaCurrencyServiceProvider implements IAreaCurrencyServiceApi { SpecialCurrencyParam specialCurrencyParam = new SpecialCurrencyParam(); specialCurrencyParam.setPkId(pkSpecialAccount); List bdSpecialCurrencyExtList = specialCurrencyService.querySpecialCurrencyList(specialCurrencyParam); - if(CollectionUtil.isNotEmpty(bdSpecialCurrencyExtList) && CollectionUtil.isNotEmpty(bdSpecialCurrencyExtList.get(0).getSpecialCurrencyDetailList())){ + if (CollectionUtil.isNotEmpty(bdSpecialCurrencyExtList) && CollectionUtil.isNotEmpty(bdSpecialCurrencyExtList.get(0).getSpecialCurrencyDetailList())) { return R.ok(BeanUtil.copyToList(bdSpecialCurrencyExtList.get(0).getSpecialCurrencyDetailList(), AreaCurrencyDTO.class)); } return R.ok(null); } + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java index f5b5bfb..0c5a5fd 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java @@ -3,12 +3,9 @@ package com.hzs.system.config.provider; import cn.hutool.core.bean.BeanUtil; import com.hzs.common.core.domain.R; import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.config.BdAwards; -import com.hzs.common.domain.system.config.ext.BdAwardsExt; import com.hzs.system.base.service.IBdCountryService; import com.hzs.system.config.IAwardsServiceApi; -import com.hzs.system.config.dto.GradeDTO; import com.hzs.system.config.service.IBdAwardsService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; @DubboService public class AwardsServiceProvider implements IAwardsServiceApi { @@ -24,43 +20,16 @@ public class AwardsServiceProvider implements IAwardsServiceApi { @Autowired private IBdAwardsService awardsService; - @Autowired - private IBdCountryService bdCountryService; - - /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:17 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryAwards(Integer pkCountry) { return R.ok(awardsService.queryAwards(pkCountry)); } - /** - * @description: 根据pkID查询奖衔信息 - * @author: zhang jing - * @date: 2022/10/10 11:52 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getAwardsOne(Integer pkId) { return R.ok(BeanUtil.copyProperties(awardsService.getBdAwardsOne(pkId), BdAwards.class)); } - - - - /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/11/11 14:17 - * @param: [pkCountrySet] - * @return: com.hzs.common.core.domain.R>> - **/ @Override public R> getAwards() { List awardsList = awardsService.queryAwards(); @@ -72,31 +41,11 @@ public class AwardsServiceProvider implements IAwardsServiceApi { return R.ok(countryAwardsMap); } - /** - * @description: 根据国家查询辅导分红列表 - * @author: zhang jing - * @date: 2022/11/11 14:16 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - @Override - public R> coachBonusList(Integer pkCountry) { - return R.ok(awardsService.coachBonusList(pkCountry)); - } - /** - * 根据所属国家查询奖衔 - * @param pkCountry - * @return - */ @Override public R> queryByPkCountryAwards(Integer pkCountry) { return R.ok(awardsService.queryByPkCountryAwards(pkCountry)); } - /** - * 根据所属国家查询奖衔 - * @param countryList - * @return - */ + @Override public R> queryAwardsByIdList(List countryList) { return R.ok(awardsService.queryAwardsByIdList(countryList)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BdAreaCurrencyServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BdAreaCurrencyServiceProvider.java deleted file mode 100644 index f60e560..0000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BdAreaCurrencyServiceProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.system.config.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.ext.BdAreaCurrencyExt; -import com.hzs.system.config.IBdAreaCurrencyServiceApi; -import com.hzs.system.config.service.IBdAreaCurrencyService; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - - -/** - * @Description: 消费配置配置的dubbo服务类 - * @Author: zhang jing - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider - */ -@DubboService -public class BdAreaCurrencyServiceProvider implements IBdAreaCurrencyServiceApi { - - @Autowired - private IBdAreaCurrencyService bdAreaCurrencyService; - - /** - * @description: 查询兑换复消扣款配置 - * @author: zhang jing - * @date: 2023/10/11 17:28 - * @param: [] - * @return: com.hzs.common.core.domain.R - **/ - @Override - public R queryAreaCurrency() { - return R.ok(bdAreaCurrencyService.queryAreaCurrency()); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java index b8e3729..4586e47 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java @@ -25,11 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.*; /** - * @description: 奖项配置 - * @author: zhang jing - * @date: 2022/11/10 17:02 - * @param: - * @return: + * 奖项配置 **/ @DubboService public class BonusItemsServiceProvider implements IBonusItemsServiceApi { @@ -76,24 +72,11 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { @Autowired private IBdBonusCloudService bdBonusCloudService; - /** - * @description: 根据国家查询奖项配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:17 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryBonusItems(Integer pkCountry) { return R.ok(bonusItemsService.queryBonusItems(pkCountry)); } - @Override - public R> queryExistsBonusItems(List bonusValueList) { - return R.ok(bonusItemsService.queryBonusItemsByValue(bonusValueList)); - } - - @Override public R queryBonusItems(Integer pkCountry, Integer pkBonusItems) { return R.ok(bonusItemsService.queryBonusItems(pkCountry, pkBonusItems)); @@ -152,7 +135,7 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { private Map getBdBonusItemsExtMap(Set countrySet) { Map bonusItemsMap = new HashMap<>(ComputeUtil.mapInitCapacity(countrySet.size() * 8)); - countrySet.forEach(pkCountry->{ + countrySet.forEach(pkCountry -> { List bdBonusItemsExtList = bonusItemsService.queryCalBonusItems(pkCountry); for (BdBonusItemsExt bdBonusItemsExt : bdBonusItemsExtList) { bonusItemsMap.put(pkCountry.toString() + bdBonusItemsExt.getBonusValue().toString(), bdBonusItemsExt); @@ -162,19 +145,16 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { } /** - * 嗨粉直推奖励 - * @return: Map> - * @Author: sui q - * @Date: 2023/2/21 11:11 - */ + * 嗨粉直推奖励 + */ private Map> getBonusHiPinkMap() { List bdBonusHiPinks = bdBonusHiPinkService.queryBonusHiPink(); - Map> bonusHiPinkMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusHiPinks.size())); + Map> bonusHiPinkMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusHiPinks.size())); bdBonusHiPinks.forEach(bdBonusHiPink -> { BonusHiPinkDTO bonusHiPinkDTO = BeanUtil.copyProperties(bdBonusHiPink, BonusHiPinkDTO.class); - if(bonusHiPinkMap.containsKey(bonusHiPinkDTO.getPkCountry())){ + if (bonusHiPinkMap.containsKey(bonusHiPinkDTO.getPkCountry())) { bonusHiPinkMap.get(bonusHiPinkDTO.getPkCountry()).add(bonusHiPinkDTO); - }else{ + } else { List bonusHiPinkDTOList = new ArrayList<>(); bonusHiPinkDTOList.add(bonusHiPinkDTO); bonusHiPinkMap.put(bonusHiPinkDTO.getPkCountry(), bonusHiPinkDTOList); @@ -185,18 +165,15 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { /** * 复购直推奖励 - * @return: Map> - * @Author: sui q - * @Date: 2023/2/21 11:11 */ private Map> getRepurchasePushMap() { List bdRepoDirectPushList = bdRepoDirectPushService.queryRepoDirectPush(); - Map> repurchasePushMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdRepoDirectPushList.size())); + Map> repurchasePushMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdRepoDirectPushList.size())); bdRepoDirectPushList.forEach(bdRepoDirectPush -> { BonusRepurchasePushDTO bonusRepurchasePushDTO = BeanUtil.copyProperties(bdRepoDirectPush, BonusRepurchasePushDTO.class); - if(repurchasePushMap.containsKey(bonusRepurchasePushDTO.getPkCountry())){ + if (repurchasePushMap.containsKey(bonusRepurchasePushDTO.getPkCountry())) { repurchasePushMap.get(bonusRepurchasePushDTO.getPkCountry()).put(bonusRepurchasePushDTO.getAlgebra(), bonusRepurchasePushDTO); - }else{ + } else { Map map = new HashMap<>(); map.put(bonusRepurchasePushDTO.getAlgebra(), bonusRepurchasePushDTO); repurchasePushMap.put(bonusRepurchasePushDTO.getPkCountry(), map); @@ -206,10 +183,7 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { } /** - * @Description: 获得奖金循环配置的参数 - * @return: void - * @Author: sui q - * @Date: 2022/11/14 17:20 + * 获得奖金循环配置的参数 */ private Map getBonusLoopConfig() { List bonusDirectLoopList = bdBonusDirectLoopService.queryBonusDirectLoop(); @@ -223,15 +197,12 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { } /** - * @Description: 获得奖金 推荐什么等级 直推奖励配置 - * @return: void - * @Author: sui q - * @Date: 2022/11/14 17:20 + * 获得奖金 推荐什么等级 直推奖励配置 */ private Map getBonusDirectConfig() { - List bdBonusDirectList = bdBonusDirectService.queryBonusDirect(); + List bdBonusDirectList = bdBonusDirectService.queryBonusDirect(); Map directDtoHashMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusDirectList.size())); - bdBonusDirectList.forEach(bdBonusDirect ->{ + bdBonusDirectList.forEach(bdBonusDirect -> { BonusDirectDTO bonusDirectDTO = BeanUtil.copyProperties(bdBonusDirect, BonusDirectDTO.class); directDtoHashMap.put(bonusDirectDTO.getPkCountry().toString() + bonusDirectDTO.getRangeType() + bonusDirectDTO.getPkLevel(), bonusDirectDTO); }); @@ -239,15 +210,12 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { } /** - * @Description: 获得奖金 推荐什么等级 直推奖励配置 - * @return: void - * @Author: sui q - * @Date: 2022/11/14 17:20 + * 获得奖金 推荐什么等级 直推奖励配置 */ private Map getBonusDifferenceConfig() { - List bdBonusDifferenceList = bdBonusDifferenceService.queryBonusDifference(); + List bdBonusDifferenceList = bdBonusDifferenceService.queryBonusDifference(); Map bonusDifferenceDtoMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusDifferenceList.size())); - bdBonusDifferenceList.forEach(bonusDirectDTO ->{ + bdBonusDifferenceList.forEach(bonusDirectDTO -> { BonusDifferenceDTO bonusDifferenceDTO = BeanUtil.copyProperties(bonusDirectDTO, BonusDifferenceDTO.class); bonusDifferenceDtoMap.put(bonusDifferenceDTO.getPkCountry(), bonusDifferenceDTO); }); @@ -256,15 +224,12 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { /** - * @Description: 拓展奖拓展的次数 国家作为键 - * @return: Map - * @Author: sui q - * @Date: 2022/11/16 9:34 + * 拓展奖拓展的次数 国家作为键 */ - private Map getBonusExpandConfig(){ + private Map getBonusExpandConfig() { List bdBonusExpandList = bdBonusExpandService.queryBdBonusExpand(); Map bdBonusExpandMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusExpandList.size())); - bdBonusExpandList.forEach(bdBonusExpand ->{ + bdBonusExpandList.forEach(bdBonusExpand -> { BonusExpandDTO bonusExpandDTO = BeanUtil.copyProperties(bdBonusExpand, BonusExpandDTO.class); bdBonusExpandMap.put(bonusExpandDTO.getPkCountry(), bonusExpandDTO); }); @@ -273,11 +238,8 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { /** * 获取等级对应的拓展奖对应参数 - * @return: Map - * @Author: sui q - * @Date: 2022/11/15 16:57 */ - private Map getBonusExpandGradeConfig(){ + private Map getBonusExpandGradeConfig() { List bdGradeList = gradeService.queryBdGrade(); Map bdGradeMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdGradeList.size())); bdGradeList.forEach(bdGrade -> @@ -287,18 +249,15 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { /** * 获取等级对应的拓展奖对应参数 - * @return: Map - * @Author: sui q - * @Date: 2022/11/15 16:57 */ - private Map> getSeeBonusGradeConfig(){ + private Map> getSeeBonusGradeConfig() { // 获取国家的见点奖 List bdGradeList = gradeService.queryBdGrade(); - Map>bdGradeMap = new HashMap<>(); - bdGradeList.forEach(bdGrade ->{ - if(bdGradeMap.containsKey(bdGrade.getPkCountry())){ + Map> bdGradeMap = new HashMap<>(); + bdGradeList.forEach(bdGrade -> { + if (bdGradeMap.containsKey(bdGrade.getPkCountry())) { bdGradeMap.get(bdGrade.getPkCountry()).add(bdGrade); - }else{ + } else { List gradeList = new ArrayList<>(); gradeList.add(bdGrade); bdGradeMap.put(bdGrade.getPkCountry(), gradeList); @@ -309,27 +268,21 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { /** * 获取奖衔对应的辅导奖对应参数 - * @return: Map - * @Author: sui q - * @Date: 2022/11/15 16:57 */ - private Map getBonusCoachConfig(Map awardsValueMap){ + private Map getBonusCoachConfig(Map awardsValueMap) { List bdAwardsList = awardsService.queryAwards(); Map bdAwardsMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdAwardsList.size())); - bdAwardsList.forEach(bdAwards ->{ - bdAwardsMap.put(bdAwards.getPkCountry().toString()+ ERangeType.AWARDS.getValue() + bdAwards.getPkId(), bdAwards); - awardsValueMap.put(bdAwards.getPkCountry().toString()+ ERangeType.AWARDS.getValue() + bdAwards.getAwardsValue(), bdAwards); + bdAwardsList.forEach(bdAwards -> { + bdAwardsMap.put(bdAwards.getPkCountry().toString() + ERangeType.AWARDS.getValue() + bdAwards.getPkId(), bdAwards); + awardsValueMap.put(bdAwards.getPkCountry().toString() + ERangeType.AWARDS.getValue() + bdAwards.getAwardsValue(), bdAwards); }); return bdAwardsMap; } /** * 获取每个国家奖金项对应的扣项 - * @return: Map - * @Author: sui q - * @Date: 2022/11/15 16:57 */ - private Map getBonusDeductConfig(){ + private Map getBonusDeductConfig() { List bdBonusDeductList = bdBonusDeductService.queryBonusDeduct(); Map bdBonusDeductMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusDeductList.size())); bdBonusDeductList.forEach(bdBonusDeduct -> @@ -339,25 +292,19 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi { /** * 获取每个国家奖金项对应的扣项 - * @return: Map - * @Author: sui q - * @Date: 2022/11/15 16:57 */ - private Map getBonusServiceConfig(){ + private Map getBonusServiceConfig() { List bdBonusServiceList = bdBonusServiceService.queryBonusService(); Map bdBonusDeductMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusServiceList.size())); bdBonusServiceList.forEach(bdBonusService -> - bdBonusDeductMap.put(bdBonusService.getPkCountry().toString() + bdBonusService.getServiceType() , bdBonusService)); + bdBonusDeductMap.put(bdBonusService.getPkCountry().toString() + bdBonusService.getServiceType(), bdBonusService)); return bdBonusDeductMap; } /** * 获取每个国家奖金项对应的扣项 - * @return: Map - * @Author: sui q - * @Date: 2022/11/15 16:57 */ - private Map getBonusCloudConfig(){ + private Map getBonusCloudConfig() { List bonusCloudList = bdBonusCloudService.queryBdBonusCloud(); Map bdBonusCloudHashMap = new HashMap<>(ComputeUtil.mapInitCapacity(bonusCloudList.size())); bonusCloudList.forEach(bdBonusCloud -> diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java index 3b767d1..cb50183 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdGrade; -import com.hzs.common.domain.system.config.ext.BdStoreLevelExt; import com.hzs.common.domain.system.ext.BdGradeScopeExt; import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.config.dto.GradeDTO; @@ -26,8 +25,6 @@ public class GradeServiceProvider implements IGradeServiceApi { private IBdGradeService gradeService; @Autowired private IBdGradeScopeService gradeScopeService; - @Autowired - private IBdStoreLevelService storeLevelService; @Override public R getGrade(Integer pkId) { @@ -117,11 +114,6 @@ public class GradeServiceProvider implements IGradeServiceApi { return R.ok(gradeDTOList); } - @Override - public R> queryStoreLevel() { - return R.ok(storeLevelService.queryStoreLevel()); - } - @Override public R> queryGrowUpFootmarkGrade(Integer pkCountry) { return R.ok(gradeService.queryGrowUpFootmarkGrade(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ITradeConfigServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ITradeConfigServiceProvider.java index d49d0b6..b402e7a 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ITradeConfigServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ITradeConfigServiceProvider.java @@ -11,13 +11,6 @@ import com.hzs.system.config.vo.BdTradeWhiteConfigVO; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -/** - * @Description: - * @Author: ljc - * @Time: 2023/8/21 15:10 - * @Classname: ITradeConfigServiceProvider - * @Package_name: com.hzs.system.config.provider - */ @DubboService public class ITradeConfigServiceProvider implements ITradeConfigServiceApi { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java index 701392e..b3025d8 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java @@ -14,22 +14,12 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/16 15:58 - * @Classname: IVertexServiceProvider - * @PackageName: com.hzs.sale.vertex.provider - */ @DubboService public class IVertexServiceProvider implements IVertexServiceApi { + @Autowired private IBdVertexService vertexService; - /** - * 查询所有体系配置 - * @return - */ @Override public R> findAll() { List list = vertexService.list(); @@ -40,14 +30,11 @@ public class IVertexServiceProvider implements IVertexServiceApi { } return R.ok(resultList); } - /** - * 查询所有体系配置(根据国家) - * @return - */ + @Override public R> findAllByPkCountry(Integer pkCountry) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_COUNTRY",pkCountry); + queryWrapper.eq("PK_COUNTRY", pkCountry); List list = vertexService.list(queryWrapper); List resultList = new ArrayList<>(); for (BdVertex bdVertex : list) { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/LabelServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/LabelServiceProvider.java index f6dd49f..8c80d3c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/LabelServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/LabelServiceProvider.java @@ -11,16 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 标签配置 dubbo服务 - * @Author: ljc - * @Time: 2023/2/1 19:07 - * @Classname: LabelServiceProvider - * @Package_name: com.hzs.system.config.provider + * 标签配置 dubbo服务 */ @DubboService public class LabelServiceProvider implements ILabelServiceApi { + @Autowired - IBdLabelService bdLabelService; + private IBdLabelService bdLabelService; @Override public R getByPkId(Integer labelId) { @@ -29,8 +26,7 @@ public class LabelServiceProvider implements ILabelServiceApi { @Override public R> getLabelByType(Integer labelType, Integer pkCountry) { - return R.ok(BeanUtil.copyToList(bdLabelService.findLabelByType(labelType,pkCountry),LabelConfigDTO.class)); + return R.ok(BeanUtil.copyToList(bdLabelService.findLabelByType(labelType, pkCountry), LabelConfigDTO.class)); } - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/RangeServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/RangeServiceProvider.java index facc7f3..461ce54 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/RangeServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/RangeServiceProvider.java @@ -15,11 +15,7 @@ import java.util.List; import java.util.Map; /** - * @description: 极差配置 - * @author: zhang jing - * @date: 2022/11/10 17:02 - * @param: - * @return: + * 极差配置 **/ @DubboService public class RangeServiceProvider implements IRangeServiceApi { @@ -27,13 +23,6 @@ public class RangeServiceProvider implements IRangeServiceApi { @Autowired private IBdRangeService rangeService; - /** - * @description: 根据国家查询极差配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:17 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryRange(Integer pkCountry) { return R.ok(rangeService.queryRange(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ServiceChargeServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ServiceChargeServiceProvider.java index 7d9b9a5..0238951 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ServiceChargeServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ServiceChargeServiceProvider.java @@ -12,11 +12,7 @@ import java.util.ArrayList; import java.util.List; /** - * @description: 业务办理手续费dubbo服务类 - * @author: zhang jing - * @date: 2023/1/7 15:04 - * @param: - * @return: + * 业务办理手续费dubbo服务类 **/ @DubboService public class ServiceChargeServiceProvider implements IServiceChargeServiceApi { @@ -24,13 +20,6 @@ public class ServiceChargeServiceProvider implements IServiceChargeServiceApi { @Autowired private IBdServiceChargeService serviceChargeService; - /** - * @description: 根据业务类型查询扣款 - * @author: zhang jing - * @date: 2023/1/7 15:13 - * @param: [serviceChargeDTO] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getServiceChargeByType(ServiceChargeDTO serviceChargeDTO) { ServiceChargeDTO dto = serviceChargeService.getServiceChargeByType(serviceChargeDTO); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ShopServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ShopServiceProvider.java index 62beafe..aa58f2c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ShopServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ShopServiceProvider.java @@ -12,26 +12,12 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -/** - * @description: 奖项配置 - * @author: zhang jing - * @date: 2022/11/10 17:02 - * @param: - * @return: - **/ @DubboService public class ShopServiceProvider implements IShopServiceApi { @Autowired private IBdShopService shopService; - /** - * @description: 根据国家查询奖项配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:17 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryShop(Integer pkCountry) { return R.ok(shopService.queryShop(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/TransferServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/TransferServiceProvider.java index 5fafcb5..035d065 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/TransferServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/TransferServiceProvider.java @@ -3,19 +3,12 @@ package com.hzs.system.config.provider; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdTransfer; import com.hzs.system.config.ITransferServiceApi; -import com.hzs.system.config.ITransferServiceApi; import com.hzs.system.config.service.IBdTransferService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; - /** - * @description: 转账配置的dubbo服务类 - * @author: zhang jing - * @date: 2022/9/28 15:26 - * @param: - * @return: + * 转账配置的dubbo服务类 **/ @DubboService public class TransferServiceProvider implements ITransferServiceApi { @@ -23,13 +16,6 @@ public class TransferServiceProvider implements ITransferServiceApi { @Autowired private IBdTransferService withdrawalService; - /** - * @description: 根据国家查询转账配置列表 - * @author: zhang jing - * @date: 2022/9/28 10:34 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R queryTransfer(Integer pkCountry) { return R.ok(withdrawalService.queryTransfer(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalAutoServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalAutoServiceProvider.java index c418d8b..111a103 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalAutoServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalAutoServiceProvider.java @@ -10,11 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 提现配置的dubbo服务类 - * @Author: zhang jing - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider + * 提现配置的dubbo服务类 */ @DubboService public class WithdrawalAutoServiceProvider implements IWithdrawalAutoServiceApi { @@ -22,13 +18,6 @@ public class WithdrawalAutoServiceProvider implements IWithdrawalAutoServiceApi @Autowired private IBdWithdrawalAutoService withdrawalAutoService; - /** - * @description: 根据国家查询自动提现明细列表 - * @author: zhang jing - * @date: 2022/9/27 15:20 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryWithdrawalAuto(Integer pkCountry) { return R.ok(withdrawalAutoService.queryWithdrawalAuto(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalProcessServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalProcessServiceProvider.java index 5fb9727..d7bfad6 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalProcessServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalProcessServiceProvider.java @@ -7,14 +7,8 @@ import com.hzs.system.config.service.IBdWithdrawalProcessService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; - /** - * @Description: 提现配置的dubbo服务类 - * @Author: zhang jing - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider + * 提现配置的dubbo服务类 */ @DubboService public class WithdrawalProcessServiceProvider implements IWithdrawalProcessServiceApi { @@ -22,14 +16,6 @@ public class WithdrawalProcessServiceProvider implements IWithdrawalProcessServi @Autowired private IBdWithdrawalProcessService withdrawalProcessService; - - /** - * @description: 根据国家查询提现手续费配置 - * @author: zhang jing - * @date: 2022/11/2 17:22 - * @param: [pkCountry]国家 - * @return: java.util.List> - **/ @Override public R queryBdWithdrawalProcess(Integer pkCountry) { return R.ok(withdrawalProcessService.queryBdWithdrawalProcess(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalServiceProvider.java index 88691f8..58614c2 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalServiceProvider.java @@ -1,13 +1,8 @@ package com.hzs.system.config.provider; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdAccount; import com.hzs.common.domain.system.config.BdWithdrawal; -import com.hzs.common.domain.system.config.BdWithdrawalAuto; -import com.hzs.system.config.IAccountServiceApi; import com.hzs.system.config.IWithdrawalServiceApi; -import com.hzs.system.config.service.IBdAccountService; -import com.hzs.system.config.service.IBdWithdrawalAutoService; import com.hzs.system.config.service.IBdWithdrawalService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; @@ -15,11 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 提现配置的dubbo服务类 - * @Author: zhang jing - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider + * 提现配置的dubbo服务类 */ @DubboService public class WithdrawalServiceProvider implements IWithdrawalServiceApi { @@ -27,27 +18,14 @@ public class WithdrawalServiceProvider implements IWithdrawalServiceApi { @Autowired private IBdWithdrawalService withdrawalService; - /** - * @description: 根据国家查询提现配置明细列表 - * @author: zhang jing - * @date: 2022/9/27 15:08 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R queryWithdrawal(Integer pkCountry) { return R.ok(withdrawalService.queryWithdrawal(pkCountry)); } - /** - * @description: 查询所有自动提现的配置 - * @author: zhang jing - * @date: 2022/11/1 19:43 - * @param: [] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryWithdrawalByIsAuto() { return R.ok(withdrawalService.queryWithdrawalByIsAuto()); } + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalSpecialServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalSpecialServiceProvider.java deleted file mode 100644 index 7793de5..0000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalSpecialServiceProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.system.config.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdWithdrawalSpecial; -import com.hzs.system.config.IWithdrawalSpecialServiceApi; -import com.hzs.system.config.service.IBdWithdrawalSpecialService; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - - -@DubboService -public class WithdrawalSpecialServiceProvider implements IWithdrawalSpecialServiceApi { - - @Autowired - private IBdWithdrawalSpecialService withdrawalSpecialService; - - /** - * @description: 根据国家查询提现设置特殊配置 - * @author: zhang jing - * @date: 2022/9/27 16:24 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - @Override - public R> queryWithdrawalSpecial(Integer pkCountry) { - return R.ok(withdrawalSpecialService.queryWithdrawalSpecial(pkCountry)); - } - - /** - * @description: 根据会员编号查询提现特殊配置 - * @author: zhang jing - * @date: 2022/9/27 16:34 - * @param: [pkCountry, memberCode] - * @return: com.hzs.common.core.domain.R - **/ - @Override - public R getWithdrawalSpecial(Integer pkCountry, String memberCode) { - return R.ok(withdrawalSpecialService.getWithdrawalSpecial(pkCountry,memberCode)); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java index b65736d..1322024 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java @@ -11,11 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 提现配置的dubbo服务类 - * @Author: zhang jing - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider + * 提现配置的dubbo服务类 */ @DubboService public class WithdrawalTaxServiceProvider implements IWithdrawalTaxServiceApi { @@ -23,13 +19,6 @@ public class WithdrawalTaxServiceProvider implements IWithdrawalTaxServiceApi { @Autowired private IBdWithdrawalTaxService withdrawalTaxService; - /** - * @description: 根据国家查询个税明细 - * @author: zhang jing - * @date: 2022/9/27 16:14 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R queryWithdrawalTax(Integer pkCountry) { return R.ok(withdrawalTaxService.queryWithdrawalTax(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAccountService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAccountService.java index 9a90633..cd654ae 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAccountService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAccountService.java @@ -1,6 +1,5 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdAccount; import com.hzs.common.domain.system.config.ext.BdAccountExt; @@ -10,12 +9,7 @@ import java.util.Collection; import java.util.List; /** - *

* 币种配置表 服务类 - *

- * - * @author zhangjing - * @since 2022-08-25 */ public interface IBdAccountService extends IService { @@ -24,18 +18,11 @@ public interface IBdAccountService extends IService { * * @param specialArea 所属专区 * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 */ List queryAreaCurrencyByCondition(Integer specialArea, Integer pkCountry); /** - * @description: 根据币种属性查询币种列表（账户类型） - * @author: zhang jing - * @date: 2022/9/22 10:00 - * @param: [accountProperty, pkCountry] - * @return: java.util.List + * 根据币种属性查询币种列表（账户类型） **/ List queryAccountByType(Integer accountProperty, Integer pkCountry); @@ -49,39 +36,23 @@ public interface IBdAccountService extends IService { List queryAccountByType(Integer accountType, Collection pkCountryList); /** - * @description: 根据pkid查询币种信息 - * @author: zhang jing - * @date: 2022/10/11 17:49 - * @param: [pkId] - * @return: com.hzs.common.domain.system.config.BdAccount + * 根据pkid查询币种信息 **/ BdAccount getBdAccount(Integer pkId); /** - * @description: 根据币种值查询币种 - * @author: zhang jing - * @date: 2023/3/17 11:05 - * @param: [fieldValue] - * @return: com.hzs.common.domain.system.config.BdAccount + * 根据币种值查询币种 **/ BdAccount getBdAccountByFieldValue(Integer pkCountry, Integer fieldValue); /** - * @description: 会员端账户查询 - * @author: zhang jing - * @date: 2023/4/7 13:47 - * @param: [pkCountry] - * @return: java.util.List + * 会员端账户查询 **/ List memberAccountByType(Integer pkCountry); /** - * @description: 查询币种配置列表 - * @author: zhang jing - * @date: 2022/10/25 15:40 - * @param: [bdAccountExt] - * @return: java.util.List + * 查询币种配置列表 **/ List selectBdAccountList(BdAccountExt bdAccountExt); @@ -89,18 +60,11 @@ public interface IBdAccountService extends IService { * 更新账户生效根据主键 * * @param pkId 主键 - * @return: void - * @Author: sui q - * @Date: 2023/3/11 10:19 */ void updateAccountById(Integer pkId); /** - * @description: 查询所有会员账户是否有值 - * @author: zhang jing - * @date: 2023/3/13 11:03 - * @param: [bdAccountExt] - * @return: java.lang.Integer + * 查询所有会员账户是否有值 **/ Integer selectMemberAccountCount(BdAccountExt bdAccountExt); @@ -108,34 +72,16 @@ public interface IBdAccountService extends IService { * 查询币种 * * @param pkCountry 国家 - * @return: BdAccount - * @Author: sui q - * @Date: 2023/3/15 19:08 */ BdAccount queryAccountByCondition(Integer pkCountry); /** - * @description: 查询币种转换 - * @author: zhang jing - * @date: 2023/3/16 11:51 - * @param: [pkId] - * @return: java.lang.Integer + * 查询币种转换 **/ Integer getPkAccount(Integer pkId); - /** - * 查询邮费扣除币种 - * - * @param pkCountry 所属国家 - * @return - */ - BdAccount queryPostageAccount(Integer pkCountry); - /* - * @description: 查询国家所有启用的币种 - * @author: sui q - * @date: 2023/7/21 15:25 - * @param: null null + * 查询国家所有启用的币种 **/ List queryBdAccount(Integer pkCountry); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyDetailService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyDetailService.java index 236faa0..2db53b2 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyDetailService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyDetailService.java @@ -1,20 +1,13 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdAreaCurrencyDetail; import com.hzs.common.domain.system.config.ext.BdAreaCurrencyDetailExt; -import com.hzs.system.config.param.BdAreaCurrencyDetailParam; import java.util.List; /** - *

* 消费配置详情表 服务类 - *

- * - * @author zhangjing - * @since 2022-08-26 */ public interface IBdAreaCurrencyDetailService extends IService { @@ -33,12 +26,10 @@ public interface IBdAreaCurrencyDetailService extends IService + * 获取消费配置详情列表 **/ List getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt); + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyService.java index 18b2ff5..19c59e3 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyService.java @@ -1,48 +1,24 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdAreaCurrency; import com.hzs.common.domain.system.config.ext.BdAreaCurrencyExt; - /** - *

* 消费配置表 服务类 - *

- * - * @author zhangjing - * @since 2022-08-26 */ public interface IBdAreaCurrencyService extends IService { /** - * @description: 新增消费配置+新增消费配置详情 - * @author: zhang jing - * @date: 2022/10/26 17:48 - * @param: [areaCurrencyExt] - * @return: boolean + * 新增消费配置+新增消费配置详情 **/ boolean saveAreaCurrency(BdAreaCurrencyExt areaCurrencyExt); /** - * @description: 修改消费配置+修改消费配置详情 - * @author: zhang jing - * @date: 2022/10/26 17:48 - * @param: [areaCurrencyExt] - * @return: boolean + * 修改消费配置+修改消费配置详情 **/ boolean updateAreaCurrency(BdAreaCurrencyExt areaCurrencyExt); boolean delAreaCurrency(BdAreaCurrency bdAreaCurrency); - /** - * @description: 查询兑换复消扣款配置 - * @author: zhang jing - * @date: 2023/10/11 17:17 - * @param: [] - * @return: com.hzs.common.domain.system.config.BdAreaCurrency - **/ - BdAreaCurrencyExt queryAreaCurrency(); - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java index 83425ff..4a7bb69 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java @@ -1,111 +1,69 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.ext.BdAwardsExt; -import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

- * 服务类 - *

- * - * @author zhangjing - * @since 2022-09-08 + * 服务类 */ public interface IBdAwardsService extends IService { /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:15 - * @param: [pkCountry] - * @return: java.util.List + * 根据国家查询奖衔配置列表 **/ List queryAwards(Integer pkCountry); + /** * 根据pkID查询奖衔信息 - * @author: zhang jing - * @date: 2022/10/10 11:52 - * @param: [pkId] 奖衔主键 - * @return: com.hzs.common.domain.system.config.BdAwards **/ BdAwards getBdAwardsOne(Integer pkId); /** - * @description: 生成奖衔 - * @author: zhang jing - * @date: 2022/10/22 9:55 - * @param: [awards] - * @return: boolean + * 生成奖衔 **/ - boolean generate (BdAwards awards); + boolean generate(BdAwards awards); /** - * @description: 修改辅导分红配置 - * @author: zhang jing - * @date: 2022/11/1 10:50 - * @param: [awardsExt] - * @return: boolean + * 修改辅导分红配置 **/ boolean updateAwards(BdAwardsExt awardsExt); /** - * @description: 修改环球积分 - * @author: zhang jing - * @date: 2022/11/2 9:46 - * @param: [awardsExt] - * @return: boolean + * 修改环球积分 **/ boolean updateLobalIntegral(BdAwardsExt awardsExt); /** - * @description: 修改车奖积分 - * @author: zhang jing - * @date: 2022/11/2 9:46 - * @param: [awardsExt] - * @return: boolean + * 修改车奖积分 **/ boolean updateGlobalIntegral(BdAwardsExt awardsExt); /** - * @description: 根据国家查询辅导分红列表 - * @author: zhang jing - * @date: 2022/11/11 9:45 - * @param: [pkCountry] - * @return: java.util.List - **/ - List coachBonusList(Integer pkCountry); + * 查询所有奖衔 + */ + List queryAwards(); /** - * 查询所有奖衔 - * @return: List - * @Author: sui q - * @Date: 2023/2/21 15:46 - */ - List queryAwards(); - /** - * @description: 查询等级或奖衔是否被使用 - * @author: zhang jing - * @date: 2023/3/2 17:36 - * @param: [pkRegisterGrade, pkSettleGrade, pkAwards] - * @return: java.lang.Integer + * 查询等级或奖衔是否被使用 **/ Integer checkGradeAwards(Long pkRegisterGrade, Long pkSettleGrade, Long pkAwards); + /** * 根据所属国家查询奖衔 + * * @param pkCountry * @return */ List queryByPkCountryAwards(Integer pkCountry); + /** * 根据所属国家查询奖衔 + * * @param countryList * @return */ diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusItemsService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusItemsService.java index abae1fa..77a9784 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusItemsService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusItemsService.java @@ -1,6 +1,5 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdBonusItems; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; @@ -8,58 +7,30 @@ import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; import java.util.List; /** - *

* 奖项配置 服务类 - *

- * - * @author zhangjing - * @since 2022-11-09 */ public interface IBdBonusItemsService extends IService { /** - * @description: 生成奖项配置 - * @author: zhang jing - * @date: 2022/11/10 17:17 - * @param: [bonusItems] - * @return: boolean + * 生成奖项配置 **/ boolean generate(BdBonusItems bonusItems); /** - * @description: 根据国家查询奖项配置列表 - * @author: zhang jing - * @date: 2022/11/10 17:17 - * @param: [pkCountry] - * @return: java.util.List + * 根据国家查询奖项配置列表 **/ List queryBonusItems(Integer pkCountry); /** - * @description: 根据国家查询奖项配置列表 - * @author: zhang jing - * @date: 2022/11/10 17:17 - * @param: [pkCountry] - * @return: java.util.List + * 根据国家查询奖项配置列表 **/ List queryCalBonusItems(Integer pkCountry); /** * 查询奖金项 - * @param bonusValueList 奖金值 - * @return: List - * @Author: sui q - * @Date: 2023/3/14 10:08 - */ - List queryBonusItemsByValue(List bonusValueList); - - /** - * 查询奖金项 - * @param pkCountry 国家 + * + * @param pkCountry 国家 * @param pkBonusItems 奖金项 - * @return: BdBonusItemsExt - * @Author: sui q - * @Date: 2023/3/7 18:07 - */ + */ BdBonusItems queryBonusItems(Integer pkCountry, Integer pkBonusItems); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdShopService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdShopService.java index 1199e13..6f37155 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdShopService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdShopService.java @@ -1,6 +1,5 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdShop; import com.hzs.common.domain.system.config.ext.BdShopExt; @@ -8,30 +7,17 @@ import com.hzs.common.domain.system.config.ext.BdShopExt; import java.util.List; /** - *

* 店铺配置 服务类 - *

- * - * @author zhangjing - * @since 2022-09-15 */ public interface IBdShopService extends IService { /** - * @description: 生成店铺（配送中心） - * @author: zhang jing - * @date: 2022/10/28 18:37 - * @param: [shop] - * @return: boolean + * 生成店铺（配送中心） **/ boolean generate(BdShop shop); /** - * @description: 根据国家查询配送中心列表 - * @author: zhang jing - * @date: 2022/11/11 19:41 - * @param: [pkCountry] - * @return: java.util.List + * 根据国家查询配送中心列表 **/ List queryShop(Integer pkCountry); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdStoreLevelService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdStoreLevelService.java index 1c03e45..987a894 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdStoreLevelService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdStoreLevelService.java @@ -1,56 +1,29 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdStoreLevel; import com.hzs.common.domain.system.config.ext.BdStoreLevelExt; -import com.hzs.system.config.dto.GradeDTO; import com.hzs.system.config.vo.BdStoreLevelVO; import java.util.List; /** - *

* 店铺等级配置 服务类 - *

- * - * @author hzs - * @since 2023-05-04 */ public interface IBdStoreLevelService extends IService { - /* - * @description: 查询店铺等级 - * @author: sui q - * @date: 2023/5/8 16:41 - * @param: null null - **/ - List queryStoreLevel(); - /** - * @description: 新增店铺等级配置 - * @author: zhang jing - * @date: 2023/5/8 19:56 - * @param: [storeLevelVO] - * @return: boolean + * 新增店铺等级配置 **/ boolean saveStoreLevel(BdStoreLevelVO storeLevelVO); /** - * @description: 修改店铺等级配置 - * @author: zhang jing - * @date: 2023/5/8 20:07 - * @param: [storeLevelVO] - * @return: boolean + * 修改店铺等级配置 **/ boolean updateStoreLevel(BdStoreLevelVO storeLevelVO); /** - * @description: 删除 - * @author: zhang jing - * @date: 2023/5/8 20:09 - * @param: [storeLevelVO] - * @return: boolean + * 删除 **/ boolean delStoreLevel(BdStoreLevelVO storeLevelVO); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalSpecialService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalSpecialService.java index 3beb9a8..8039d46 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalSpecialService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalSpecialService.java @@ -1,35 +1,11 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdWithdrawalSpecial; -import java.util.List; - /** - *

* 提现设置特殊配置 服务类 - *

- * - * @author zhangjing - * @since 2022-09-06 */ public interface IBdWithdrawalSpecialService extends IService { - /** - * @description: 根据国家查询提现设置特殊配置 - * @author: zhang jing - * @date: 2022/9/27 16:24 - * @param: [pkCountry] - * @return: java.util.List - **/ - List queryWithdrawalSpecial(Integer pkCountry); - /** - * @description: 根据会员编号查询提现特殊配置 - * @author: zhang jing - * @date: 2022/9/27 16:34 - * @param: [pkCountry, memberCode] - * @return: com.hzs.common.domain.system.config.BdWithdrawalSpecial - **/ - BdWithdrawalSpecial getWithdrawalSpecial(Integer pkCountry, String memberCode); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAccountServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAccountServiceImpl.java index ea026dc..06d297b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAccountServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAccountServiceImpl.java @@ -25,35 +25,17 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - *

* 币种配置表 服务实现类 - *

- * - * @author zhangjing - * @since 2022-08-25 */ @Service public class BdAccountServiceImpl extends ServiceImpl implements IBdAccountService { + @Autowired private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - - /** - * 根据条件查找对应的币种配置 - * - * @param specialArea 所属专区 - * @param pkCountry 国家 - * @return: List - * @Author: sui q - * @Date: 2022/9/6 10:37 - */ @Override public List queryAreaCurrencyByCondition(Integer specialArea, Integer pkCountry) { - String key = CacheConstants.BD_AREA_CURRENCY + pkCountry + specialArea; + String key = CacheConstants.BD_AREA_CURRENCY + pkCountry + specialArea; List areaCurrencyList = redisService.getCacheList(key); if (areaCurrencyList == null || areaCurrencyList.size() == 0) { areaCurrencyList = baseMapper.queryAreaCurrencyByCondition(specialArea, pkCountry); @@ -68,13 +50,6 @@ public class BdAccountServiceImpl extends ServiceImpl - **/ @Override public List queryAccountByType(Integer accountProperty, Integer pkCountry) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -105,13 +80,6 @@ public class BdAccountServiceImpl extends ServiceImpl - **/ @Override public List memberAccountByType(Integer pkCountry) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -122,19 +90,12 @@ public class BdAccountServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("PK_ID",pkId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("PK_ID", pkId); queryWrapper.le("EFFECTIVE_DATE", DateUtils.currentDateTime()); account = baseMapper.selectOne(queryWrapper); if (account != null) { @@ -144,29 +105,15 @@ public class BdAccountServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("FIELD_VALUE",fieldValue); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("FIELD_VALUE", fieldValue); queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); queryWrapper.le("EFFECTIVE_DATE", DateUtils.currentDateTime()); return baseMapper.selectOne(queryWrapper); } - /** - * @description: 查询币种配置列表 - * @author: zhang jing - * @date: 2022/10/25 15:40 - * @param: [bdAccountExt] - * @return: java.util.List - **/ @Override public List selectBdAccountList(BdAccountExt bdAccountExt) { return baseMapper.selectBdAccountList(bdAccountExt); @@ -175,19 +122,12 @@ public class BdAccountServiceImpl extends ServiceImpl bdAccountList = baseMapper.selectList(queryWrapper); - if(bdAccountList != null && bdAccountList.size() > 0){ + if (bdAccountList != null && bdAccountList.size() > 0) { return bdAccountList.get(0); } return null; } - /** - * @description: 查询币种转换 - * @author: zhang jing - * @date: 2023/3/16 11:45 - * @param: [pkId] - * @return: java.lang.Integer - **/ @Override public Integer getPkAccount(Integer pkId) { Integer pkAccount = redisService.getCacheObject(CacheConstants.BD_ACCOUNT_CHANGE + pkId); - if(StringUtils.isNull(pkAccount)){ + if (StringUtils.isNull(pkAccount)) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_ID",pkId); - BdAccount account=baseMapper.selectOne(queryWrapper); - if(StringUtils.isNotNull(account)&&StringUtils.isNotNull(account.getPkBdAccount())){ - pkAccount=account.getPkBdAccount(); - }else{ - pkAccount=pkId; + queryWrapper.eq("PK_ID", pkId); + BdAccount account = baseMapper.selectOne(queryWrapper); + if (StringUtils.isNotNull(account) && StringUtils.isNotNull(account.getPkBdAccount())) { + pkAccount = account.getPkBdAccount(); + } else { + pkAccount = pkId; } redisService.setCacheObject(CacheConstants.BD_ACCOUNT_CHANGE + pkId, pkAccount); } return pkAccount; } - @Override - public BdAccount queryPostageAccount(Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - queryWrapper.eq("IS_POSTAGE", EYesNo.YES.getIntValue()); - List bdAccountList = baseMapper.selectList(queryWrapper); - if(bdAccountList != null && bdAccountList.size() > 0){ - return bdAccountList.get(0); - } - return null; - } - @Override public List queryBdAccount(Integer pkCountry) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyDetailServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyDetailServiceImpl.java index f7d76e8..ed5f66f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyDetailServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyDetailServiceImpl.java @@ -1,66 +1,33 @@ package com.hzs.system.config.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.ELanguages; -import com.hzs.common.core.enums.EYesNo; import com.hzs.common.domain.system.config.BdAreaCurrencyDetail; import com.hzs.common.domain.system.config.ext.BdAreaCurrencyDetailExt; -import com.hzs.system.base.ITransactionServiceApi; import com.hzs.system.config.mapper.BdAreaCurrencyDetailMapper; -import com.hzs.system.config.param.BdAreaCurrencyDetailParam; import com.hzs.system.config.service.IBdAreaCurrencyDetailService; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import java.util.List; /** - *

* 消费配置详情表 服务实现类 - *

- * - * @author zhangjing - * @since 2022-08-26 */ @Service public class BdAreaCurrencyDetailServiceImpl extends ServiceImpl implements IBdAreaCurrencyDetailService { - @DubboReference - private ITransactionServiceApi iTransactionServiceApi; - - /** - * 获取可使用最扣除大比例 - * - * @param areaCurrencyDetail - * @return - */ @Override public BdAreaCurrencyDetail getSumDeductRatio(BdAreaCurrencyDetail areaCurrencyDetail) { return baseMapper.getSumDeductRatio(areaCurrencyDetail); } - /** - * 校验扣款顺序是否唯一 - * - * @param areaCurrencyDetail - * @return - */ @Override public BdAreaCurrencyDetail checkDeductSort(BdAreaCurrencyDetail areaCurrencyDetail) { return baseMapper.checkDeductSort(areaCurrencyDetail); } - /** - * @description: 获取消费配置详情列表 - * @author: zhang jing - * @date: 2022/8/30 17:51 - * @param: [areaCurrencyDetailVo] - * @return: java.util.List - **/ @Override public List getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt) { - List list= baseMapper.getAreaCurrencyDetailList(areaCurrencyDetailExt); - return list; + return baseMapper.getAreaCurrencyDetailList(areaCurrencyDetailExt); } + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyServiceImpl.java index 732bb60..ba7f6a9 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyServiceImpl.java @@ -1,13 +1,10 @@ package com.hzs.system.config.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.ESpecialArea; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.service.RedisService; import com.hzs.common.domain.system.config.BdAreaCurrency; @@ -27,9 +24,6 @@ import java.util.List; /** * 消费配置表 服务实现类 - * - * @author zhangjing - * @since 2022-08-26 */ @Service public class BdAreaCurrencyServiceImpl extends ServiceImpl implements IBdAreaCurrencyService { @@ -41,13 +35,6 @@ public class BdAreaCurrencyServiceImpl extends ServiceImpl detailsList = areaCurrencyExt.getDetailsList(); @@ -110,13 +90,6 @@ public class BdAreaCurrencyServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("SPECIAL_AREA", ESpecialArea.RESALE_INTEGRAL_AREA.getValue()); - queryWrapper.lt("EFFECTIVE_DATE", new Date()); - BdAreaCurrency bac = baseMapper.selectOne(queryWrapper); - BdAreaCurrencyExt bacExt = BeanUtil.copyProperties(bac, BdAreaCurrencyExt.class); - if (null == bac) { - return bacExt; - } - BdAreaCurrencyDetailExt areaCurrencyDetailExt = new BdAreaCurrencyDetailExt(); - areaCurrencyDetailExt.setPkAreaCurrency(bac.getPkId().intValue()); - List detailsList = areaCurrencyDetailService.getAreaCurrencyDetailList(areaCurrencyDetailExt); - bacExt.setDetailsList(detailsList); - return bacExt; - } - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java index 9cf0107..60020c0 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java @@ -10,7 +10,6 @@ import com.hzs.common.core.enums.ETransactionKey; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.enums.EnableStatus; import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.ext.BdAwardsExt; import com.hzs.common.security.utils.SecurityUtils; @@ -21,105 +20,65 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; /** - *

- * 奖衔配置服务实现类 - *

- * - * @author zhangjing - * @since 2022-09-08 + * 奖衔配置服务实现类 */ @Service public class BdAwardsServiceImpl extends ServiceImpl implements IBdAwardsService { + @Autowired private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - @DubboReference - private ITransactionServiceApi iTransactionServiceApi; + ITransactionServiceApi iTransactionServiceApi; - - /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:10 - * @param: [pkCountry] - * @return: java.util.List - **/ @Override public List queryAwards(Integer pkCountry) { return getBdAwards(pkCountry); } - - - /** - * @description: 根据pkID查询奖衔信息 - * @author: zhang jing - * @date: 2022/10/10 11:51 - * @param: [pkId] - * @return: com.hzs.common.domain.system.config.BdAwards - **/ @Override public BdAwards getBdAwardsOne(Integer pkId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_ID",pkId); + queryWrapper.eq("PK_ID", pkId); return baseMapper.selectOne(queryWrapper); } - - /** - * @description: 根据国家查询奖衔配置 - * @author: zhang jing - * @date: 2022/11/10 16:59 - * @param: [pkCountry] - * @return: java.util.List + * 根据国家查询奖衔配置 **/ private List getBdAwards(Integer pkCountry) { List awards = redisService.getCacheList(CacheConstants.BD_AWARDS + pkCountry); - if(CollectionUtil.isEmpty(awards)){ + if (CollectionUtil.isEmpty(awards)) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_COUNTRY",pkCountry); + queryWrapper.eq("PK_COUNTRY", pkCountry); queryWrapper.eq("ENABLE_STATE", EnableStatus.ENABLE.getValue()); queryWrapper.orderByAsc("AWARDS_VALUE"); awards = baseMapper.selectList(queryWrapper); - if(CollectionUtil.isNotEmpty(awards)){ + if (CollectionUtil.isNotEmpty(awards)) { redisService.setCacheListIfPresent(CacheConstants.BD_AWARDS + pkCountry, awards); } } return awards; } - /** - * @description: 生成奖衔 - * @author: zhang jing - * @date: 2022/10/22 9:58 - * @param: [awards] - * @return: boolean - **/ @Override public boolean generate(BdAwards awards) { - Integer pkCountry= SecurityUtils.getPkCountry(); + Integer pkCountry = SecurityUtils.getPkCountry(); for (EAwards value : EAwards.values()) { awards.setAwardsValue(value.getValue()); awards.setAwardsName(value.getLabel()); //字段翻译保存到数据库 - R pkTransaction= iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.AWARDS, + R pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.AWARDS, value.getLabel(), EYesNo.YES, EYesNo.NO); awards.setPkTransaction(pkTransaction.getData()); awards.setPkCountry(pkCountry); awards.setPkCreator(SecurityUtils.getUserId()); awards.setCreationTime(new Date()); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("AWARDS_VALUE", value.getValue()); List list = baseMapper.selectList(queryWrapper); if (CollectionUtil.isEmpty(list)) { @@ -130,85 +89,30 @@ public class BdAwardsServiceImpl extends ServiceImpl i return true; } - /** - * @description: 修改辅导分红配置 - * @author: zhang jing - * @date: 2022/11/1 10:49 - * @param: [awardsExt] - * @return: boolean - **/ @Override public boolean updateAwards(BdAwardsExt awardsExt) { - for(BdAwards awards:awardsExt.getAwardsList()){ + for (BdAwards awards : awardsExt.getAwardsList()) { baseMapper.updateById(awards); } return true; } - /** - * @description: 修改环球积分 - * @author: zhang jing - * @date: 2022/11/2 9:48 - * @param: [awardsExt] - * @return: boolean - **/ @Override public boolean updateLobalIntegral(BdAwardsExt awardsExt) { - for(BdAwards awards:awardsExt.getLobalIntegralList()){ + for (BdAwards awards : awardsExt.getLobalIntegralList()) { baseMapper.updateById(awards); } return true; } - /** - * @description: 修改车奖积分 - * @author: zhang jing - * @date: 2022/11/2 9:48 - * @param: [awardsExt] - * @return: boolean - **/ @Override public boolean updateGlobalIntegral(BdAwardsExt awardsExt) { - for(BdAwards awards:awardsExt.getCarAwardPointsList()){ + for (BdAwards awards : awardsExt.getCarAwardPointsList()) { baseMapper.updateById(awards); } return true; } - /** - * @description: 根据国家查询辅导分红列表 - * @author: zhang jing - * @date: 2022/11/11 9:47 - * @param: [pkCountry] - * @return: java.util.List - **/ - @Override - public List coachBonusList(Integer pkCountry) { - List listExt = redisService.getCacheList(CacheConstants.BD_AWARDS_COACH + pkCountry); - List listExtNew=new ArrayList<>(); - if(CollectionUtil.isEmpty(listExt)){ - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - queryWrapper.orderByAsc("AWARDS_VALUE"); - List list = baseMapper.selectList(queryWrapper); - if(CollectionUtil.isNotEmpty(list)){ - for(BdAwards ba: list){ - BdAwardsExt baExt=new BdAwardsExt(); - baExt.setPkId(ba.getPkId()); - baExt.setAwardsName(ba.getAwardsName()); - baExt.setCoachAlgebra(ba.getCoachAlgebra()); - baExt.setCoachRatio(ba.getCoachRatio()); - baExt.setAbonusRatio(ba.getAbonusRatio()); - listExtNew.add(baExt); - } - redisService.setCacheList(CacheConstants.BD_AWARDS_COACH + pkCountry, listExtNew); - } - return listExtNew; - }else{ - return listExt; - } - } - @Override public List queryAwards() { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -220,41 +124,25 @@ public class BdAwardsServiceImpl extends ServiceImpl i return baseMapper.selectList(queryWrapper); } - /** - * @description: 查询等级或奖衔是否被使用 - * @author: zhang jing - * @date: 2023/3/2 17:37 - * @param: [pkRegisterGrade, pkSettleGrade, pkAwards] - * @return: java.lang.Integer - **/ @Override public Integer checkGradeAwards(Long pkRegisterGrade, Long pkSettleGrade, Long pkAwards) { - return baseMapper.checkGradeAwards(pkRegisterGrade,pkSettleGrade,pkAwards); + return baseMapper.checkGradeAwards(pkRegisterGrade, pkSettleGrade, pkAwards); } - /** - * 根据所属国家查询奖衔 - * @param pkCountry - * @return - */ + @Override public List queryByPkCountryAwards(Integer pkCountry) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_COUNTRY",pkCountry); + queryWrapper.eq("PK_COUNTRY", pkCountry); queryWrapper.eq("ENABLE_STATE", EnableStatus.ENABLE.getValue()); queryWrapper.orderByAsc("AWARDS_VALUE"); - List awards = baseMapper.selectList(queryWrapper); - return awards; + return baseMapper.selectList(queryWrapper); } - /** - * 根据所属国家查询奖衔 - * @param countryList - * @return - */ + @Override public List queryAwardsByIdList(List countryList) { QueryWrapper queryWrapper = new QueryWrapper<>(); - - queryWrapper.in("PK_COUNTRY",countryList); + queryWrapper.in("PK_COUNTRY", countryList); return this.list(queryWrapper); } + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java index d498435..215ba7b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java @@ -26,33 +26,17 @@ import org.springframework.stereotype.Service; import java.util.*; /** - *

* 奖项配置 服务实现类 - *

- * - * @author zhangjing - * @since 2022-11-09 */ @Service public class BdBonusItemsServiceImpl extends ServiceImpl implements IBdBonusItemsService { @DubboReference - private ITransactionServiceApi iTransactionServiceApi; - - private RedisService redisService; + ITransactionServiceApi iTransactionServiceApi; @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } + private RedisService redisService; - /** - * @description: 生成奖项配置 - * @author: zhang jing - * @date: 2022/11/9 19:38 - * @param: [bonusItems] - * @return: boolean - **/ @Override public boolean generate(BdBonusItems bonusItems) { Integer pkCountry = SecurityUtils.getPkCountry(); @@ -66,11 +50,11 @@ public class BdBonusItemsServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper(); - queryWrapper.eq("BONUS_VALUE",value.getValue()); - queryWrapper.eq("PK_COUNTRY",pkCountry); - BdBonusItems items= baseMapper.selectOne(queryWrapper); - if(StringUtils.isNull(items)){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("BONUS_VALUE", value.getValue()); + queryWrapper.eq("PK_COUNTRY", pkCountry); + BdBonusItems items = baseMapper.selectOne(queryWrapper); + if (StringUtils.isNull(items)) { baseMapper.insert(bonusItems); redisService.deleteObject(CacheConstants.BD_BONUS_ITEMS + SecurityUtils.getPkCountry()); } @@ -78,13 +62,6 @@ public class BdBonusItemsServiceImpl extends ServiceImpl - **/ @Override public List queryBonusItems(Integer pkCountry) { List bonusItemsExtList = redisService.getCacheList(CacheConstants.BD_BONUS_ITEMS + pkCountry); @@ -115,13 +92,6 @@ public class BdBonusItemsServiceImpl extends ServiceImpl queryBonusItemsByValue(List bonusValueList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("BONUS_VALUE", bonusValueList); - return baseMapper.selectList(queryWrapper); - } - @Override public BdBonusItems queryBonusItems(Integer pkCountry, Integer pkBonusItems) { List bonusItemsExtList = redisService.getCacheList(CacheConstants.BD_BONUS_ITEMS + pkCountry); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdStoreLevelServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdStoreLevelServiceImpl.java index b06060b..3974090 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdStoreLevelServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdStoreLevelServiceImpl.java @@ -5,12 +5,9 @@ import cn.hutool.core.collection.CollectionUtil; 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.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdStoreLevel; import com.hzs.common.domain.system.config.BdStoreLevelDetail; import com.hzs.common.domain.system.config.ext.BdStoreLevelExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.config.dto.GradeDTO; import com.hzs.system.config.mapper.BdStoreLevelMapper; import com.hzs.system.config.service.IBdStoreLevelDetailService; import com.hzs.system.config.service.IBdStoreLevelService; @@ -18,16 +15,10 @@ import com.hzs.system.config.vo.BdStoreLevelVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** - *

* 店铺等级配置 服务实现类 - *

- * - * @author hzs - * @since 2023-05-04 */ @Service public class BdStoreLevelServiceImpl extends ServiceImpl implements IBdStoreLevelService { @@ -35,27 +26,13 @@ public class BdStoreLevelServiceImpl extends ServiceImpl queryStoreLevel() { - return baseMapper.queryStoreLevel(); - } - - - /** - * @description: 新增店铺等级配置 - * @author: zhang jing - * @date: 2023/5/8 19:55 - * @param: [storeLevelVO] - * @return: boolean - **/ @Override public boolean saveStoreLevel(BdStoreLevelVO storeLevelVO) { - BdStoreLevel storeLevel= BeanUtil.copyProperties(storeLevelVO, BdStoreLevel.class); + BdStoreLevel storeLevel = BeanUtil.copyProperties(storeLevelVO, BdStoreLevel.class); baseMapper.insert(storeLevel); storeLevelVO.setPkId(storeLevel.getPkId()); - if(CollectionUtil.isNotEmpty(storeLevelVO.getDetailList())){ - for(BdStoreLevelDetail sd:storeLevelVO.getDetailList()){ + if (CollectionUtil.isNotEmpty(storeLevelVO.getDetailList())) { + for (BdStoreLevelDetail sd : storeLevelVO.getDetailList()) { sd.setPkStoreLevel(storeLevel.getPkId()); sd.setCreationTime(storeLevelVO.getCreationTime()); sd.setPkCountry(storeLevelVO.getPkCountry()); @@ -66,25 +43,18 @@ public class BdStoreLevelServiceImpl extends ServiceImpl updateWrapper=new UpdateWrapper(); - updateWrapper.eq("PK_STORE_LEVEL",storeLevelVO.getPkId()); + BdStoreLevel storeLevel = BeanUtil.copyProperties(storeLevelVO, BdStoreLevel.class); + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("PK_STORE_LEVEL", storeLevelVO.getPkId()); updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); updateWrapper.set("PK_MODIFIED", storeLevelVO.getPkModified()); updateWrapper.set("MODIFIED_TIME", storeLevelVO.getModifiedTime()); storeLevelDetailService.update(updateWrapper); baseMapper.updateById(storeLevel); - if(CollectionUtil.isNotEmpty(storeLevelVO.getDetailList())){ - for(BdStoreLevelDetail sd:storeLevelVO.getDetailList()){ + if (CollectionUtil.isNotEmpty(storeLevelVO.getDetailList())) { + for (BdStoreLevelDetail sd : storeLevelVO.getDetailList()) { sd.setPkStoreLevel(storeLevel.getPkId()); sd.setCreationTime(storeLevelVO.getModifiedTime()); sd.setPkCountry(storeLevelVO.getPkCountry()); @@ -95,24 +65,17 @@ public class BdStoreLevelServiceImpl extends ServiceImpl updateWrapper=new UpdateWrapper(); - updateWrapper.eq("PK_STORE_LEVEL",storeLevel.getPkId()); + BdStoreLevel storeLevel = BeanUtil.copyProperties(storeLevelVO, BdStoreLevel.class); + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("PK_STORE_LEVEL", storeLevel.getPkId()); updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); updateWrapper.set("PK_MODIFIED", storeLevelVO.getPkModified()); updateWrapper.set("MODIFIED_TIME", storeLevelVO.getModifiedTime()); - baseMapper.update(null,updateWrapper); - UpdateWrapper updateWrapper1=new UpdateWrapper(); - updateWrapper1.eq("PK_STORE_LEVEL",storeLevelVO.getPkId()); + baseMapper.update(null, updateWrapper); + UpdateWrapper updateWrapper1 = new UpdateWrapper(); + updateWrapper1.eq("PK_STORE_LEVEL", storeLevelVO.getPkId()); updateWrapper1.set("DEL_FLAG", EDelFlag.DELETE.getValue()); updateWrapper1.set("PK_MODIFIED", storeLevelVO.getPkModified()); updateWrapper1.set("MODIFIED_TIME", storeLevelVO.getModifiedTime()); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalSpecialServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalSpecialServiceImpl.java index 1b3f192..96e0000 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalSpecialServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalSpecialServiceImpl.java @@ -1,78 +1,16 @@ package com.hzs.system.config.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.service.RedisService; import com.hzs.common.domain.system.config.BdWithdrawalSpecial; import com.hzs.system.config.mapper.BdWithdrawalSpecialMapper; import com.hzs.system.config.service.IBdWithdrawalSpecialService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - /** - *

* 提现设置特殊配置 服务实现类 - *

- * - * @author zhangjing - * @since 2022-09-06 */ @Service public class BdWithdrawalSpecialServiceImpl extends ServiceImpl implements IBdWithdrawalSpecialService { - private RedisService redisService; - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - - - /** - * @description: 根据国家查询提现设置特殊配置 - * @author: zhang jing - * @date: 2022/9/27 16:23 - * @param: [pkCountry] - * @return: java.util.List - **/ - @Override - public List queryWithdrawalSpecial(Integer pkCountry) { - List withdrawalSpecial = redisService.getCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL + pkCountry); - if(null == withdrawalSpecial){ - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY",pkCountry); - withdrawalSpecial = baseMapper.selectList(queryWrapper); - if(null != withdrawalSpecial){ - redisService.setCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL + pkCountry, withdrawalSpecial); - } - } - return withdrawalSpecial; - } - - /** - * @description: 根据会员编号查询提现特殊配置 - * @author: zhang jing - * @date: 2022/9/27 16:34 - * @param: [pkCountry, memberCode] - * @return: com.hzs.common.domain.system.config.BdWithdrawalSpecial - **/ - @Override - public BdWithdrawalSpecial getWithdrawalSpecial(Integer pkCountry, String memberCode) { - BdWithdrawalSpecial withdrawalSpecial = redisService.getCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL_MEMBER_CODE + memberCode); - if(null == withdrawalSpecial){ - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY",pkCountry); - queryWrapper.eq("MEMBER_CODE",memberCode); - withdrawalSpecial = baseMapper.selectOne(queryWrapper); - if(null != withdrawalSpecial){ - redisService.setCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL_MEMBER_CODE + memberCode, withdrawalSpecial); - } - } - return withdrawalSpecial; - } - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 2b3ff15..3d7dd74 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -39,22 +39,14 @@ import java.util.Map; import java.util.stream.Collectors; /** - * Description: 查询枚举的公共controller - * Author: sui q - * Time: 2022/9/29 10:11 - * Classname: EnumsController - * PackageName: com.hzs.system.enums.controller + * 查询枚举的公共controller */ @RestController @RequestMapping("/pub/enums") public class EnumsController extends BaseController { - private IBdSystemConfigService bdSystemConfigService; - @Autowired - public void setBdSystemConfigService(IBdSystemConfigService bdSystemConfigService) { - this.bdSystemConfigService = bdSystemConfigService; - } + private IBdSystemConfigService bdSystemConfigService; @Autowired private IBdGradeService gradeService; @@ -75,9 +67,9 @@ public class EnumsController extends BaseController { private RedisService redisService; @DubboReference - private IMenuColumnServiceApi iMenuColumnServiceApi; + IMenuColumnServiceApi iMenuColumnServiceApi; @DubboReference - private ICuStoreServiceApi iCuStoreServiceApi; + ICuStoreServiceApi iCuStoreServiceApi; /** @@ -316,20 +308,6 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - /** - * 设备状态枚举 - * - * @return - */ - @GetMapping("/machine-state") - public AjaxResult machineState() { - List enumEntityList = new ArrayList<>(); - for (EMachineState value : EMachineState.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.MACHINE_STATE)); - } - return AjaxResult.success(enumEntityList); - } - /** * 代数枚举 * @@ -345,11 +323,7 @@ public class EnumsController extends BaseController { } /** - * @description: 直推配置取值枚举 - * @author: zhang jing - * @date: 2023/6/2 16:32 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 直推配置取值枚举 **/ @GetMapping("/take-value-type") public AjaxResult takeValueType() { @@ -376,11 +350,7 @@ public class EnumsController extends BaseController { } /** - * @description: 专区枚举list - * @author: zhang jing - * @date: 2022/9/29 16:29 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 专区枚举list **/ @GetMapping("/special-area") public AjaxResult specialArea() { @@ -394,27 +364,19 @@ public class EnumsController extends BaseController { } /** - * @description: 直推方式枚举 - * @author: zhang jing - * @date: 2024/4/7 11:25 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 直推方式枚举 **/ @GetMapping("/directPushMode") public AjaxResult directPushMode() { List enumEntityList = new ArrayList<>(); for (EDirectPushMode value : EDirectPushMode.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.DIRECT_PUSH_MODE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.DIRECT_PUSH_MODE)); } return AjaxResult.success(enumEntityList); } /** - * @description: 店铺等级枚举 - * @author: zhang jing - * @date: 2024/8/7 13:29 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 店铺等级枚举 **/ @GetMapping("/levelValue") public AjaxResult levelValue() { @@ -426,11 +388,7 @@ public class EnumsController extends BaseController { } /** - * @description: 车奖旅游奖达标枚举 - * @author: zhang jing - * @date: 2024/4/7 11:25 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 车奖旅游奖达标枚举 **/ @GetMapping("/standard") public AjaxResult standard() { @@ -442,11 +400,7 @@ public class EnumsController extends BaseController { } /** - * @description: 地区类型枚举 - * @author: zhang jing - * @date: 2022/9/29 16:29 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 地区类型枚举 **/ @GetMapping("/areaType") public AjaxResult areaType() { @@ -460,11 +414,7 @@ public class EnumsController extends BaseController { } /** - * @description: 专区枚举-消费配置专用 - * @author: zhang jing - * @date: 2023/5/8 15:10 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 专区枚举-消费配置专用 **/ @GetMapping("/special-area-consume") public AjaxResult specialAreaConsume() { @@ -476,11 +426,7 @@ public class EnumsController extends BaseController { } /** - * @description: 注水业绩枚举 - * @author: zhang jing - * @date: 2023/3/28 17:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 注水业绩枚举 **/ @GetMapping("/member-achieve") public AjaxResult memberAchieve() { @@ -492,11 +438,7 @@ public class EnumsController extends BaseController { } /** - * @description: 注水方式枚举 - * @author: zhang jing - * @date: 2023/4/11 14:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 注水方式枚举 **/ @GetMapping("/member-watertype") public AjaxResult watertype() { @@ -508,11 +450,7 @@ public class EnumsController extends BaseController { } /** - * @description: 统计值枚举 - * @author: zhang jing - * @date: 2022/9/30 14:30 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult STATISTICAL_VALUE + * 统计值枚举 **/ @GetMapping("/statistical-value") public AjaxResult statisticalValue() { @@ -524,11 +462,7 @@ public class EnumsController extends BaseController { } /** - * @description: 注册权限 - * @author: zhang jing - * @date: 2022/9/30 14:57 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 注册权限 **/ @GetMapping("/registration-authority") public AjaxResult registrationAuthority() { @@ -540,11 +474,7 @@ public class EnumsController extends BaseController { } /** - * @description: 关系类型 - * @author: zhang jing - * @date: 2022/9/30 14:59 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 关系类型 **/ @GetMapping("/relation-type") public AjaxResult relationType() { @@ -556,11 +486,7 @@ public class EnumsController extends BaseController { } /** - * @description: 极差类型 - * @author: zhang jing - * @date: 2022/9/30 15:18 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 极差类型 **/ @GetMapping("/range-type") public AjaxResult rangeType() { @@ -573,11 +499,7 @@ public class EnumsController extends BaseController { /** - * @description: 计算类型 - * @author: zhang jing - * @date: 2022/9/30 15:24 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 计算类型 **/ @GetMapping("/cal-type") public AjaxResult calType() { @@ -589,11 +511,7 @@ public class EnumsController extends BaseController { } /** - * @description: 货币种类 - * @author: zhang jing - * @date: 2022/9/30 15:34 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 货币种类 **/ @GetMapping("/account") public AjaxResult account() { @@ -605,11 +523,7 @@ public class EnumsController extends BaseController { } /** - * @description: 账户状态（会员登录账户） - * @author: zhang jing - * @date: 2022/9/30 15:38 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 账户状态（会员登录账户） **/ @GetMapping("/account-status") public AjaxResult accountStatus() { @@ -621,11 +535,7 @@ public class EnumsController extends BaseController { } /** - * @description: 活动类型 - * @author: zhang jing - * @date: 2022/9/30 15:40 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 活动类型 **/ @GetMapping("/activity-type") public AjaxResult activityType() { @@ -639,11 +549,7 @@ public class EnumsController extends BaseController { } /** - * @description: 代理等级 - * @author: zhang jing - * @date: 2022/9/30 15:41 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 代理等级 **/ @GetMapping("/agent-grade") public AjaxResult agentGrade() { @@ -656,11 +562,7 @@ public class EnumsController extends BaseController { /** - * @description: 条码状态 - * @author: zhang jing - * @date: 2022/9/30 15:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 条码状态 **/ @GetMapping("/barcode-status") public AjaxResult barcodeStatus() { @@ -672,7 +574,8 @@ public class EnumsController extends BaseController { } /** - * @description: 会员类型 + * 会员类型 + * * @author: zhang jing * @date: 2022/9/30 16:26 * @param: [] @@ -688,7 +591,8 @@ public class EnumsController extends BaseController { } /** - * @description: 发货方式 + * 发货方式 + * * @author: zhang jing * @date: 2022/9/30 16:28 * @param: [] @@ -761,7 +665,8 @@ public class EnumsController extends BaseController { } /** - * @description: 发货状态 + * 发货状态 + * * @author: zhang jing * @date: 2022/9/30 16:30 * @param: [] @@ -777,7 +682,8 @@ public class EnumsController extends BaseController { } /** - * @description: 赠送类型 + * 赠送类型 + * * @author: zhang jing * @date: 2022/9/30 16:31 * @param: [] @@ -793,43 +699,7 @@ public class EnumsController extends BaseController { } /** - * @description: 邮件发送类型 - * @author: zhang jing - * @date: 2022/9/30 16:36 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/mailTypeList") - public AjaxResult getEMailTypeList() { - List enumEntityList = new ArrayList<>(); - for (EMailType value : EMailType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.MAIL_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - - /** - * @description: 首页banner类型枚举类 - * @author: zhang jing - * @date: 2022/10/13 11:27 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/getEHomeBannerTypeList") - public AjaxResult getEHomeBannerTypeList() { - List enumEntityList = new ArrayList<>(); - for (EHomeBannerType value : EHomeBannerType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.EHOME_BANNER_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - - /** - * @description: 提现配置取整类型枚举列表 - * @author: zhang jing - * @date: 2022/10/19 9:21 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 提现配置取整类型枚举列表 **/ @GetMapping("/getERoundingTypeList") public AjaxResult getERoundingTypeList() { @@ -841,11 +711,7 @@ public class EnumsController extends BaseController { } /** - * @description: 转账特殊设置枚举 - * @author: zhang jing - * @date: 2022/10/21 9:58 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 转账特殊设置枚举 **/ @GetMapping("/getETransferSpecialList") public AjaxResult getETransferSpecialList() { @@ -857,11 +723,7 @@ public class EnumsController extends BaseController { } /** - * @description: 用户状态枚举 - * @author: zhang jing - * @date: 2022/10/21 17:39 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 用户状态枚举 **/ @GetMapping("/getEUserStatusList") public AjaxResult getEUserStatusList() { @@ -873,11 +735,7 @@ public class EnumsController extends BaseController { } /** - * @description: 验证类型枚举 - * @author: zhang jing - * @date: 2022/10/21 17:40 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 验证类型枚举 **/ @GetMapping("/getEVerificationTypeList") public AjaxResult getEVerificationTypeList() { @@ -889,11 +747,7 @@ public class EnumsController extends BaseController { } /** - * @description: 钱包状态枚举 - * @author: zhang jing - * @date: 2022/10/21 17:41 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 钱包状态枚举 **/ @GetMapping("/get-sallet-status") public AjaxResult getEWalletStatusList() { @@ -905,11 +759,7 @@ public class EnumsController extends BaseController { } /** - * @description: 商品权限类型枚举 - * @author: zhang jing - * @date: 2022/10/21 17:44 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 商品权限类型枚举 **/ @GetMapping("/getEWaresPermissionTypeList") public AjaxResult getEWaresPermissionTypeList() { @@ -921,11 +771,7 @@ public class EnumsController extends BaseController { } /** - * @description: 是否经销商枚举类 - * @author: zhang jing - * @date: 2022/10/21 17:46 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 是否经销商枚举类 **/ @GetMapping("/dealer-yes-no") public AjaxResult dealerYesNo() { @@ -937,11 +783,7 @@ public class EnumsController extends BaseController { } /** - * @description: 系统是否枚举类 - * @author: zhang jing - * @date: 2022/10/21 17:46 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 系统是否枚举类 **/ @GetMapping("/yes-no") public AjaxResult yesNo() { @@ -1307,7 +1149,8 @@ public class EnumsController extends BaseController { } /** - * @description: 奖项枚举类 + * 奖项枚举类 + * * @author: zhang jing * @date: 2022/11/9 19:54 * @param: [] @@ -1341,7 +1184,8 @@ public class EnumsController extends BaseController { /** - * @description: 公布日期、发布日期、可提现日期 枚举 + * 公布日期、发布日期、可提现日期 枚举 + * * @author: zhang jing * @date: 2022/11/9 19:55 * @param: [] @@ -1357,7 +1201,8 @@ public class EnumsController extends BaseController { } /** - * @description: 奖结算周期枚举 + * 奖结算周期枚举 + * * @author: zhang jing * @date: 2022/11/9 19:56 * @param: [] @@ -1429,7 +1274,8 @@ public class EnumsController extends BaseController { } /** - * @description: 订单来源枚举 + * 订单来源枚举 + * * @author: zhang jing * @date: 2022/11/17 14:56 * @param: [] @@ -1445,7 +1291,8 @@ public class EnumsController extends BaseController { } /** - * @description: 是否认证枚举 + * 是否认证枚举 + * * @author: zhang jing * @date: 2022/11/17 15:05 * @param: [] @@ -1461,7 +1308,8 @@ public class EnumsController extends BaseController { } /** - * @description: 是否上传枚举 + * 是否上传枚举 + * * @author: zhang jing * @date: 2022/11/17 15:09 * @param: [] @@ -1477,7 +1325,8 @@ public class EnumsController extends BaseController { } /** - * @description: 钱包账户状态 + * 钱包账户状态 + * * @author: zhang jing * @date: 2022/9/30 15:38 * @param: [] @@ -1623,29 +1472,8 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - /** - * @description: 发布位置 - * @author: zhang jing - * @date: 2022/12/8 17:48 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @GetMapping("/position") - public AjaxResult getEPosition() { - List enumEntityList = new ArrayList<>(); - for (EPosition value : EPosition.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.POSITION)); - } - return AjaxResult.success(enumEntityList); - } - - /** - * @description: 发布位置 - * @author: zhang jing - * @date: 2022/12/8 17:48 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 发布位置 **/ @GetMapping("/position-two") public AjaxResult getEPositionTwo() { @@ -1929,20 +1757,6 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - /** - * 支付类型 - * - * @return - */ - @GetMapping("/pay-type") - public AjaxResult payType() { - List enumEntityList = new ArrayList<>(); - for (EPayType value : EPayType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.PAY_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - /** * 提货类型 * @@ -2200,7 +2014,7 @@ public class EnumsController extends BaseController { if (CollectionUtil.isNotEmpty(handleBusinessEnumList)) { if (map != null) { handleBusinessEnumList.forEach(itm -> { - if (map.get(itm.getEditTypeKey())!=null&&map.get(itm.getEditTypeKey()) == 0) { + if (map.get(itm.getEditTypeKey()) != null && map.get(itm.getEditTypeKey()) == 0) { handleBusinessEnumListNew.add(itm); } }); @@ -2663,6 +2477,7 @@ public class EnumsController extends BaseController { } return AjaxResult.success(enumEntityList); } + /** * 个人服务状态 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java index 0d93a8d..ef5324c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java @@ -15,11 +15,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 枚举初始化控制器 - * @Author: jiang chao - * @Time: 2022/10/20 14:56 - * @Classname: EnumsInitController - * @PackageName: com.hzs.system.enums.controller + * 枚举初始化控制器 */ @Slf4j @RestController @@ -82,10 +78,6 @@ public class EnumsInitController { for (EAlgebra value : EAlgebra.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 设备状态枚举 - for (EMachineState value : EMachineState.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } // 奖衔枚举枚举 for (EAwards value : EAwards.values()) { @@ -108,10 +100,6 @@ public class EnumsInitController { for (EModifyName value : EModifyName.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 官网 广告banner发布位置 - for (EPosition value : EPosition.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } // 考核状态(会员端专用) for (EMemberAssessStatus value : EMemberAssessStatus.values()) { @@ -282,16 +270,6 @@ public class EnumsInitController { initList.add(this.createData(value.getKey(), value.getLabel())); } - //邮件发送类型 - for (EMailType value : EMailType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } - - //首页banner类型枚举类 - for (EHomeBannerType value : EHomeBannerType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } - //转账特殊设置枚举 for (ETransferSpecial value : ETransferSpecial.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); @@ -562,12 +540,6 @@ public class EnumsInitController { for (EPayStatus value : EPayStatus.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - /** - * 支付类型 - */ - for (EPayType value : EPayType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } /** * 站内信业务类型 @@ -581,7 +553,6 @@ public class EnumsInitController { } - /** * 证件类型 */ @@ -691,7 +662,7 @@ public class EnumsInitController { for (EPersonalServiceType value : EPersonalServiceType.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - for(EStoreStatus value : EStoreStatus.values()){ + for (EStoreStatus value : EStoreStatus.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java index 4481bf9..c45e2ce 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java @@ -36,12 +36,9 @@ import com.hzs.member.base.dto.NotActivePointDTO; import com.hzs.member.base.dto.UpPolicyCurrencyDTO; import com.hzs.member.handlebusiness.ICuHandleBusinessServiceApi; import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; -import com.hzs.member.self.ICuSelfServiceServiceApi; import com.hzs.member.store.ICuStoreServiceApi; import com.hzs.member.store.dto.StoreDto; import com.hzs.sale.pub.ISaleApprovalServiceApi; -import com.hzs.scm.pub.IScmBillServiceApi; -import com.hzs.scm.pub.dto.BillDTO; import com.hzs.system.sys.param.ApprovalBusinessParam; import com.hzs.system.sys.service.*; import com.hzs.system.sys.vo.ApprovalBusinessVO; @@ -57,11 +54,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * Description: 审批业务处理 - * Author: jiang chao - * Time: 2022/9/21 15:05 - * Classname: SysApprovalBusinessController - * PackageName: com.hzs.system.sys.controller.manage + * 审批业务处理 */ @RestController @RequestMapping("/manage/approval-business") @@ -85,25 +78,21 @@ public class SysApprovalBusinessController extends BaseController { private RedisService redisService; @DubboReference - private ICuHandleBusinessServiceApi iCuHandleBusinessServiceApi; + ICuHandleBusinessServiceApi iCuHandleBusinessServiceApi; @DubboReference - private ISaleApprovalServiceApi iSaleApprovalServiceApi; + ISaleApprovalServiceApi iSaleApprovalServiceApi; @DubboReference - private ICuMemberAchieveLogServiceApi achieveLogServiceApi; + ICuMemberAchieveLogServiceApi achieveLogServiceApi; @DubboReference - private ICuAwardsControlServiceApi controlServiceApi; + ICuAwardsControlServiceApi controlServiceApi; @DubboReference - private ICuSelfServiceServiceApi cuSelfServiceServiceApi; + IActivityApprovalServiceApi iActivityApprovalServiceApi; @DubboReference - private IActivityApprovalServiceApi iActivityApprovalServiceApi; + IUpPolicyCurrencyServiceApi upPolicyCurrencyServiceApi; @DubboReference - private IUpPolicyCurrencyServiceApi upPolicyCurrencyServiceApi; + IMemberServiceApi iMemberServiceApi; @DubboReference - private IMemberServiceApi iMemberServiceApi; - @DubboReference - private IScmBillServiceApi scmBillServiceApi; - @DubboReference - private ICuStoreServiceApi iCuStoreServiceApi; + ICuStoreServiceApi iCuStoreServiceApi; /** * 获取审批详情 @@ -263,14 +252,6 @@ public class SysApprovalBusinessController extends BaseController { } } break; - case SCM_BUSINESS: - R> billVo = scmBillServiceApi.queryBillDtoByCondition(EApprovalBusiness.getEnumByValue(approvalBusinessExt.getApprovalBusiness()), approvalBusinessExt.getBusinessCode()); - if (billVo.isSuccess()) { - if (CollectionUtil.isNotEmpty(billVo.getData())) { - approvalBusinessVO.setBusinessData(JSONUtil.toJsonStr(billVo.getData())); - } - } - break; } return AjaxResult.success(approvalBusinessVO); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/ApprovalServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/ApprovalServiceProvider.java index f94ec18..269dfb9 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/ApprovalServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/ApprovalServiceProvider.java @@ -20,11 +20,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * Description: 审批dubbo服务 - * Author: jiang chao - * Time: 2022/10/9 11:24 - * Classname: ApprovalServiceProvider - * PackageName: com.hzs.system.sys.provider + * 审批dubbo服务 */ @Slf4j @DubboService diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/BusinessLogServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/BusinessLogServiceProvider.java index 0f10dc2..fad3e71 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/BusinessLogServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/BusinessLogServiceProvider.java @@ -13,11 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 业务操作明细dubbo服务 - * @Author: jiang chao - * @Time: 2023/8/3 18:15 - * @Classname: BusinessLogServiceProvider - * @PackageName: com.hzs.system.sys.provider + * 业务操作明细dubbo服务 */ @Slf4j @DubboService diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/MenuColumnServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/MenuColumnServiceProvider.java index 39b09b8..6b04cab 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/MenuColumnServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/MenuColumnServiceProvider.java @@ -13,11 +13,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 菜单列服务 - * @Author: jiang chao - * @Time: 2023/6/8 11:23 - * @Classname: MenuColumnServiceProvider - * @PackageName: com.hzs.system.sys.provider + * 菜单列服务 */ @DubboService public class MenuColumnServiceProvider implements IMenuColumnServiceApi { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/OperationLogServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/OperationLogServiceProvider.java index 5a0edef..39d027f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/OperationLogServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/provider/OperationLogServiceProvider.java @@ -8,11 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * Description: 后台日志操作dubbo服务 - * Author: jiang chao - * Time: 2022/9/14 15:38 - * Classname: OperationLogServiceProvider - * PackageName: com.hzs.system.sys.provider + * 后台日志操作dubbo服务 */ @DubboService public class OperationLogServiceProvider implements IOperationLogServiceApi { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/IApprovalService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/IApprovalService.java index cbd1a96..b8de5ed 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/IApprovalService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/IApprovalService.java @@ -8,11 +8,7 @@ import com.hzs.system.sys.dto.LoginUser; import java.util.List; /** - * Description: 审批业务处理 - * Author: jiang chao - * Time: 2022/9/22 16:14 - * Classname: IApprovalService - * PackageName: com.hzs.system.sys.service + * 审批业务处理 */ public interface IApprovalService { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java index c327e69..2eea0f0 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java @@ -19,10 +19,8 @@ import com.hzs.member.account.IBusinessCommission; import com.hzs.member.account.IMemberAccountAuditServiceApi; import com.hzs.member.account.dto.BusinessCommissionDTO; import com.hzs.member.handlebusiness.ICuHandleBusinessServiceApi; -import com.hzs.member.self.ICuSelfServiceServiceApi; import com.hzs.sale.order.dto.OrderUseBarCodeDTO; import com.hzs.sale.pub.ISaleApprovalServiceApi; -import com.hzs.scm.pub.IScmBillServiceApi; import com.hzs.system.base.IApprovalPushInfo; import com.hzs.system.base.IBarCodeServiceApi; import com.hzs.system.base.INoticeAuditServiceApi; @@ -41,11 +39,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * Description: 审批业务处理 - * Author: jiang chao - * Time: 2022/9/22 16:14 - * Classname: ApprovalServiceImpl - * PackageName: com.hzs.system.sys.service.impl + * 审批业务处理 */ @Slf4j @Service @@ -73,27 +67,21 @@ public class ApprovalServiceImpl implements IApprovalService { private ISysDeptService iSysDeptService; @DubboReference - private IScmBillServiceApi scmBillServiceApi; - + IBusinessCommission iBusinessCommission; @DubboReference - private IBusinessCommission iBusinessCommission; + IBarCodeServiceApi iBarCodeServiceApi; @DubboReference - private IBarCodeServiceApi iBarCodeServiceApi; + ICuHandleBusinessServiceApi iCuHandleBusinessServiceApi; @DubboReference - private ICuHandleBusinessServiceApi iCuHandleBusinessServiceApi; + ISaleApprovalServiceApi iSaleApprovalServiceApi; @DubboReference - private ISaleApprovalServiceApi iSaleApprovalServiceApi; + IMemberAccountAuditServiceApi iMemberAccountAuditServiceApi; @DubboReference - private IMemberAccountAuditServiceApi iMemberAccountAuditServiceApi; + INoticeAuditServiceApi iNoticeAuditServiceApi; @DubboReference - private INoticeAuditServiceApi iNoticeAuditServiceApi; + IActivityApprovalServiceApi iActivityApprovalServiceApi; @DubboReference - private IActivityApprovalServiceApi iActivityApprovalServiceApi; - @DubboReference - private IApprovalPushInfo iApprovalPushInfo; - - @DubboReference - private ICuSelfServiceServiceApi cuSelfServiceServiceApi; + IApprovalPushInfo iApprovalPushInfo; @Transactional(rollbackFor = Exception.class) @@ -500,10 +488,6 @@ public class ApprovalServiceImpl implements IApprovalService { // 活动相关处理 resultR = iActivityApprovalServiceApi.approvalCallback(approvalBusinessResultDTO); break; - case SCM_BUSINESS: - // 供应链相关处理 - resultR = scmBillServiceApi.approvalCallback(approvalBusinessResultDTO); - break; } if (null == resultR) { diff --git a/bd-business/bd-business-system/src/main/resources/bootstrap.yml b/bd-business/bd-business-system/src/main/resources/bootstrap.yml index 3ca3b40..3391306 100644 --- a/bd-business/bd-business-system/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-system/src/main/resources/bootstrap.yml @@ -67,7 +67,7 @@ dubbo: port: -1 cloud: # 订阅服务 - subscribed-services: bd-system, bd-third, bd-member, bd-sale, bd-scm + subscribed-services: bd-system, bd-third, bd-member, bd-sale scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.system diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/config/BdConfig.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/config/BdConfig.java index 175374d..a7b3d5f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/config/BdConfig.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/config/BdConfig.java @@ -19,24 +19,6 @@ public class BdConfig { * PC地址 */ private static String pc; - /** - * 公众号地址 - */ - private static String gzh; - /** - * IOS地址 - */ - private static String ios; - /** - * android地址 - */ - private static String android; - /** - * 系统（非洲：africa，欧洲：europe，亚洲：asia） - */ - private static String system; - - private static Integer enable; public static String getEnv() { return env; @@ -54,43 +36,4 @@ public class BdConfig { BdConfig.pc = pc; } - public static String getGzh() { - return gzh; - } - - public void setGzh(String gzh) { - BdConfig.gzh = gzh; - } - - public static String getIos() { - return ios; - } - - public void setIos(String ios) { - BdConfig.ios = ios; - } - - public static String getAndroid() { - return android; - } - - public void setAndroid(String android) { - BdConfig.android = android; - } - - public static Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - BdConfig.enable = enable; - } - - public static String getSystem() { - return system; - } - - public void setSystem(String system) { - BdConfig.system = system; - } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ActivityFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ActivityFieldConstants.java index 10ee8b6..e067f7b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ActivityFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ActivityFieldConstants.java @@ -1,12 +1,7 @@ package com.hzs.common.core.constant; /** - * @description: 活动字段值 - * @author: sui q - * @time: 2023/4/22 10:04 - * @classname: ActivityFieldConstants - * @package_name: com.hzs.common.core.constant - * version 1.0.0 + * 活动字段值 */ public class ActivityFieldConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java index e786679..4eecd50 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java @@ -1,48 +1,41 @@ package com.hzs.common.core.constant; -/** - * @Description: - * @Author: sui q - * @Time: 2022/12/20 10:18 - * @Classname: BonusFieldConstants - * @PackageName: com.hzs.common.core.constant - */ public class BonusFieldConstants { /** * 税前收益 */ - public static final String PRETAX_INCOME= "pretaxIncome"; + public static final String PRETAX_INCOME = "pretaxIncome"; /** * 扣除个税 */ - public static final String INCOME_TAX= "incomeTax"; + public static final String INCOME_TAX = "incomeTax"; /** * 实际收益 */ - public static final String REAL_INCOME= "realIncome"; + public static final String REAL_INCOME = "realIncome"; /** * 收益占比 */ - public static final String INCOME_RATIO= "incomeRatio"; + public static final String INCOME_RATIO = "incomeRatio"; /** * 首购实发小计 */ - public static final String PUR_REAL_SUBTOTAL= "purRealSubtotal"; + public static final String PUR_REAL_SUBTOTAL = "purRealSubtotal"; /** * 复购实发小计 */ - public static final String REPUR_REAL_SUBTOTAL= "repurRealSubtotal"; + public static final String REPUR_REAL_SUBTOTAL = "repurRealSubtotal"; /** * 实发收益总计 */ - public static final String REAL_INCOME_TOTAL= "realIncomeTotal"; + public static final String REAL_INCOME_TOTAL = "realIncomeTotal"; /** * 奖金类型 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java index 89651ff..0190c18 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java @@ -200,16 +200,12 @@ public class CacheConstants { */ public static final String BD_WITHDRAWAL_TAX = CACHE_PREFIX + "withdrawalTax:"; + /** * 提现特殊配置列表 */ public static final String BD_WITHDRAWAL_SPECIAL = CACHE_PREFIX + "withdrawalSpecial:"; - /** - * 根据会员编号查询提现特殊配置 - */ - public static final String BD_WITHDRAWAL_SPECIAL_MEMBER_CODE = CACHE_PREFIX + "withdrawalSpecial:memberCode:"; - /** * 转账配置配置列表 */ @@ -413,13 +409,6 @@ public class CacheConstants { */ public static final String CU_MEMBER_BANK_LOCK = CACHE_PREFIX + "bank:"; - /** - * 不显示购买协议key - * 例：国家ID为107不显示购买协议，需要添加缓存key为：global_africa:not_buy_agreement:107 - * 使用时会判断是否存在这个key，如果存在则会返回不显示购买协议的标记 - */ - public static final String NOT_BUY_AGREEMENT_FLAG = CACHE_PREFIX + "not_buy_agreement:"; - /** * 2024.05.20 签呈需求，指定部分国家控制发货方式 * 例：国家ID为107需要控制发货方式，需要添加缓存key为：global_africa:control_deliver:107 @@ -427,9 +416,4 @@ public class CacheConstants { */ public static final String CONTROL_DELIVERY_FLAG = CACHE_PREFIX + "control_deliver:"; - /** - * 2024.08.19 签呈需求，注册时必须输入银行信息。当缓存KEY不存在时，则需要必填银行相关信息；如果缓存KEY存在时，则不需要必填银行相关字段 - */ - public static final String REGISTER_BANK_FLAG = CACHE_PREFIX + "register_bank:"; - } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java index b1f2a30..31c673f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 国家常量信息 - * - * @author hzs */ public class CountryConstants { @@ -17,9 +15,4 @@ public class CountryConstants { */ public static final int CHINA_COUNTRY = 1; - /** - * 多哥，用于测试，以后改为生产 - */ - public static final int TOGO_COUNTRY = 26; - } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java index 06b1fee..b31caff 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * @Description: 定义枚举的key值 - * @Author: sui q - * @Time: 2022/11/10 14:40 - * @Classname: EnumsKeyConstants - * @PackageName: com.hzs.common.core.constant + * 定义枚举的key值 */ public class EnumsKeyConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java index 463d20e..18df822 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * Description: 定义每个枚举的前缀，用于自动翻译 - * Author: sui q - * Time: 2022/9/1 16:51 - * Classname: EnumsPrefixConstants - * PackageName: com.hzs.common.core.constant + * 定义每个枚举的前缀，用于自动翻译 */ public class EnumsPrefixConstants { @@ -75,17 +71,11 @@ public class EnumsPrefixConstants { public static final String CURRENCY_TYPE = "ENU_CURRENCY_TYPE_"; - /** * 业绩类型(枚举) */ public static final String ACHIEVEMENT_TYPE = "ENU_ACHIEVEMENT_TYPE_"; - /** - * 设备状态(枚举) - */ - public static final String MACHINE_STATE = "ENU_MACHINE_STATE_"; - /** * 列表显示隐藏控制枚举 */ @@ -177,11 +167,6 @@ public class EnumsPrefixConstants { */ public static final String BARCODE_STATUS = "ENU_BAR_S_"; - /** - * 回调业务状态 - */ - public static final String CALLBACK_STATUS = "ENU_CALL_S_"; - /** * 计算类型 */ @@ -277,11 +262,6 @@ public class EnumsPrefixConstants { */ public static final String LOGINTYPE = "ENU_LOGIN_T_"; - /** - * 邮件发送类型 - */ - public static final String MAIL_TYPE = "ENU_MALL_T_"; - /** * 会员更名、密码修改类型 */ @@ -324,7 +304,6 @@ public class EnumsPrefixConstants { public static final String STANDARD_STATE = "ENU_STA_S_"; - /** * 考核状态 */ @@ -551,21 +530,11 @@ public class EnumsPrefixConstants { */ public static final String ENU_TRA = "ENU_TRA_"; - /** - * 首页banner类型枚举类 - */ - public static final String HOME_BANNER_TYPE = "HOME_BANNER_TYPE_"; - /** * 提现配置-整取类型 */ public static final String EROUNDING_TYPE = "ROUNDING_TYPE_"; - /** - * 首页banner类型枚举 - */ - public static final String EHOME_BANNER_TYPE = "HOME_BANNER_TYPE_"; - /** * 用户状态 */ @@ -702,7 +671,6 @@ public class EnumsPrefixConstants { public static final String DIRECT_PUSH_MODE = "ENU_DIRECT_PUSH_MODE_"; - /** * 推荐类型枚举 */ @@ -768,8 +736,6 @@ public class EnumsPrefixConstants { public static final String EAREA_TYPE = "ENU_EAREA_TYPE_"; - - /** * 登录状态 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java index 9ca0e06..b63f6a8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 返回状态码 - * - * @author hzs */ public class HttpStatus { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java index 984864c..6cb24f8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 语言常量信息 - * - * @author hzs */ public class LanguageConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java index 96f23d0..5ff3a51 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java @@ -33,12 +33,12 @@ public class MagicNumberConstants { /** * 更新条数 */ - public static final Integer BATCH_UPDATE_NUM = 600; + public static final Integer BATCH_UPDATE_NUM = 400; /** * 数据库批量更新(删除) */ - public static final Integer DELETE_DATA_BATCH_UPDATE_NUM = 100; + public static final Integer DELETE_DATA_BATCH_UPDATE_NUM = 200; /** * 系统管理员主键 @@ -74,8 +74,6 @@ public class MagicNumberConstants { */ public static final Integer CANCEL_ORDER = 6; - public static final String COUNTRY_MEMBER_CODE = "GJ30720200"; - /** * 前缀 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java index 27afe6f..7b38193 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * @Description: 会员奖金字符串常量 - * @Author: sui q - * @Time: 2023/3/21 9:46 - * @Classname: MemberBonusFieldConstants - * @PackageName: com.hzs.common.core.constant + * 会员奖金字符串常量 */ public class MemberBonusFieldConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java index 1aa5160..787071a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * @Description:会员前台字符串常量 - * @Author: sui q - * @Time: 2022/8/29 10:20 - * @Classname: MemberFieldConstants - * @PackageName: com.hzs.common.core.constant + * 会员前台字符串常量 */ public class MemberFieldConstants { @@ -29,11 +25,6 @@ public class MemberFieldConstants { */ public static final String MEMBER_CODE = "member_code"; - /** - * 推荐人 - */ - public static final String PK_REFERENCE = "pk_reference"; - /** * 推荐人主键 */ @@ -141,32 +132,9 @@ public class MemberFieldConstants { */ public static final String CONSUME_MONEY = "CONSUME_MONEY"; - /** - * 可提现金额 - */ - public static final String CASH_MONEY = "CASH_MONEY"; - - /** - * 周期值 - */ - public static final String PERIOD_VALUE = "m"; - /** - * 左区周期值 - */ - public static final String LEFT_PERIOD_VALUE = "ml"; - /** - * 右区周期值 - */ - public static final String RIGHT_PERIOD_VALUE = "mr"; - - - /** - * 周期键 - */ - public static final String CYCLE_KEY = "cycleKey"; - /** * 数量 */ public static final String QUANTITY = "QUANTITY"; + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFrameworkConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFrameworkConstants.java index 6cfda3f..569bfb9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFrameworkConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFrameworkConstants.java @@ -1,65 +1,62 @@ package com.hzs.common.core.constant; /** - * @Description: 会员架构展示头像 - * @Author: yuhui - * @Time: 2023/2/9 10:53 - * @Classname: MemberFrameworkConstants - * @PackageName: com.hzs.common.core.constant + * 会员架构展示头像 */ public class MemberFrameworkConstants { /** * 虚拟点位头像 */ - public static final String xuni = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/xuni.png"; + public static final String xuni = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/xuni.png"; /** * 待激活 */ - public static final String toBeActivated = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/daijihuo.png"; + public static final String toBeActivated = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/daijihuo.png"; /** * 嗨粉 */ - public static final String Hi_Pink = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/haifen.png"; + public static final String Hi_Pink = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/haifen.png"; /** * 启动卡 */ - public static final String START_UP = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/qidongka.png"; + public static final String START_UP = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/qidongka.png"; /** * 优客 */ - public static final String YOU_KE = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/youke.png"; + public static final String YOU_KE = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/youke.png"; /** * 创客 */ - public static final String MAKER = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/chuangke.png"; + public static final String MAKER = "https://hzs-in.oss-cn-beijing.aliyuncs.com/product/framework/chuangke.png"; /** * vip */ - public static final String VIP = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230428/44c9c2d4-02dc-4668-be78-fd29439b007c.png"; + public static final String VIP = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230428/44c9c2d4-02dc-4668-be78-fd29439b007c.png"; /** * svip */ - public static final String S_VIP = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230428/5a4f6f65-dccb-486d-b3b9-3b60e6bbbcec.png"; + public static final String S_VIP = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230428/5a4f6f65-dccb-486d-b3b9-3b60e6bbbcec.png"; /** * 区代 */ - public static final String COUNTY_AGENT = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230524/16244e18-77e1-4e20-8821-af3428671d8a.png"; + public static final String COUNTY_AGENT = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230524/16244e18-77e1-4e20-8821-af3428671d8a.png"; /** * 市代 */ - public static final String CITY_AGENT = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230524/66946ef1-8271-402e-96fb-5c2a1c569773.png"; + public static final String CITY_AGENT = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230524/66946ef1-8271-402e-96fb-5c2a1c569773.png"; + /** * 已注销 */ - public static final String LOG_OFF = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230428/2bee2968-2955-48ee-8705-de839ffc117a.png"; + public static final String LOG_OFF = "https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/20230428/2bee2968-2955-48ee-8705-de839ffc117a.png"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java index 3d42eb0..dd01075 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * RabbitMq 静态变量 - * - * @author hzs **/ public class RabbitMqConstants { @@ -25,19 +23,6 @@ public class RabbitMqConstants { */ public static final String TRANSLATE_KEY = PREFIX + "translate.key"; - /** - * 奖金秒接 exchange - */ - public static final String ORDER_SECOND_EXCHANGE = PREFIX + "order.second.exchange"; - /** - * 奖金秒接 queue - */ - public static final String ORDER_SECOND_QUEUE = PREFIX + "order.second.queue"; - /** - * 奖金秒接 key - */ - public static final String ORDER_SECOND_KEY = PREFIX + "order.second.key"; - ////////////////////////////// 活动MQ推送 开始 ////////////////////////////// /** @@ -111,42 +96,4 @@ public class RabbitMqConstants { */ public static final String CONSUME_UPGRADE_KEY = PREFIX + "consume.upgrade.key"; - /** - * 可用量 exchange - */ - public static final String AVAILABLE_NMU_EXCHANGE = PREFIX + "available.exchange"; - /** - * 可用量 queue - */ - public static final String AVAILABLE_NMU_QUEUE = PREFIX + "available.queue"; - /** - * 可用量 key - */ - public static final String AVAILABLE_NMU_KEY = PREFIX + "available.key"; - - /** - * 可用量回退 exchange - */ - public static final String AVAILABLE_NMU_BACK_EXCHANGE = PREFIX + "available.back.exchange"; - /** - * 可用量回退 queue - */ - public static final String AVAILABLE_NMU_BACK_QUEUE = PREFIX + "available.back.queue"; - /** - * 可用量回退 key - */ - public static final String AVAILABLE_NMU_BACK_KEY = PREFIX + "available.back.key"; - - /** - * 进销存发货同步 exchange - */ - public static final String SCM_DELIVER_EXCHANGE = PREFIX + "scm.deliver.exchange"; - /** - * 进销存发货同步 queue - */ - public static final String SCM_DELIVER_QUEUE = PREFIX + "scm.deliver.queue"; - /** - * 进销存发货同步 key - */ - public static final String SCM_DELIVER_KEY = PREFIX + "scm.deliver.key"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java index a53350c..9f72cad 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant; -/** - * @Description: - * @Author: sui q - * @Time: 2023/1/5 14:01 - * @Classname: SaOrderFieldConstants - * @PackageName: com.hzs.common.core.constant - */ public class SaOrderFieldConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java index 4e79a69..2066e40 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java @@ -1,12 +1,7 @@ package com.hzs.common.core.constant; /** - * @description: 供应链模块的反射字段 - * @author: sui q - * @time: 2023/11/22 14:33 - * @classname: ScmFieldConstants - * @package_name: com.hzs.common.core.constant - * version 1.0.0 + * 供应链模块的反射字段 */ public class ScmFieldConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java index e71cdec..03c04b8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 权限相关通用常量 - * - * @author hzs */ public class SecurityConstants { @@ -20,7 +18,7 @@ public class SecurityConstants { */ public static final String DETAILS_USERNAME = "username"; /** - * 用户类型（0管理员，1会员，2=分享注册会员，3=生态科技仓小程序游客） + * 用户类型（0管理员，1会员） */ public static final String DETAILS_USER_TYPE = "user_type"; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java index 5f12da9..3103441 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java @@ -2,7 +2,6 @@ package com.hzs.common.core.constant; /** * 系统使用常量 - * @author sshcode */ public class SysConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java index 0a1687a..bc2224b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * @Description: 表名 - * @Author: sui q - * @Time: 2022/11/2 13:35 - * @Classname: TableNameConstants - * @PackageName: com.hzs.common.core.constant + * 表名 */ public class TableNameConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java index 5578153..71d839a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * Token的Key常量 - * - * @author hzs */ public class TokenConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java index 8132c08..80925fc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 用户常量信息 - * - * @author hzs */ public class UserConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/VertexConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/VertexConstants.java index 359992f..47de294 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/VertexConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/VertexConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * @Description: 记录系统中各顶点的主键信息 - * @Author: sui q - * @Time: 2022/11/15 13:34 - * @Classname: VertexConstants - * @PackageName: com.hzs.common.core.constant + * 记录系统中各顶点的主键信息 */ public class VertexConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/WaresConstans.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/WaresConstans.java index 415f688..7d44e8a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/WaresConstans.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/WaresConstans.java @@ -1,16 +1,7 @@ package com.hzs.common.core.constant; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.common.core.constant - *@Author: yh - *@CreateTime: 2023-03-21 10:38 - *@Description: TODO - *@Version: 1.0 - */ public class WaresConstans { - /** * 排序最大值 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java index 203d819..ea075b4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java @@ -1,12 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @description: 活动提示常量 - * @author: sui q - * @time: 2023/4/22 10:21 - * @classname: ActivityMsgConstants - * @package_name: com.hzs.common.core.constant.msg - * version 1.0.0 + * 活动提示常量 */ public class ActivityMsgConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java index f106131..36dd4ba 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java @@ -1,19 +1,5 @@ -package com.hzs.common.core.constant.msg;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/4 15:36 - * @Classname: AreaConstants - * @PackageName: com.hzs.common.core.constant - */ +package com.hzs.common.core.constant.msg; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.common.core.constant - * @Author: yh - * @CreateTime: 2023-08-04 15:36 - * @Description: TODO - * @Version: 1.0 - */ public class AreaMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java index bcc3445..cd46e7e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 奖金相关记录返回到前台的所有通知消息 - * @Author: sui q - * @Time: 2022/11/17 10:53 - * @Classname: BonusMsgConstants - * @PackageName: com.hzs.common.core.constant.msg + * 奖金相关记录返回到前台的所有通知消息 */ public class BonusMsgConstants { @@ -44,7 +40,7 @@ public class BonusMsgConstants { public static String SERVICE = "订单编号%s,%s为%s贡献了报单服务费收益,计算业绩%f,报单服务费比例%f。"; /** -// * 创客空间直推收益备注 -- 订单编号%s,%s为%s贡献了创客空间直推收益,直推收益%f。 + * // * 创客空间直推收益备注 -- 订单编号%s,%s为%s贡献了创客空间直推收益,直推收益%f。 */ public static String MAKER_DIRECT = "订单编号%s,%s为%s贡献了创客空间直推收益,直推收益%f。"; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java index 970311c..bd056a0 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @description: 配置相关记录返回到前台的所有通知消息 - * @author: zhang jing - * @date: 2022/9/5 14:39 - * @param: - * @return: + * 配置相关记录返回到前台的所有通知消息 **/ public class ConfigMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java index 16cb59c..22510be 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 签呈的相关提示 - * @Author: sui q - * @Time: 2023/3/25 11:12 - * @Classname: DocumentMsgConstants - * @PackageName: com.hzs.common.core.constant.msg + * 签呈的相关提示 */ public class DocumentMsgConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java index 4233866..4fd3e35 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 财务模块词条 - * @Author: ljc - * @Time: 2022/11/3 15:37 - * @Classname: FinanceMsgConstants - * @Package_name: com.hzs.common.core.constant.msg + * 财务模块词条 */ public class FinanceMsgConstants { /** @@ -488,7 +484,6 @@ public class FinanceMsgConstants { public static final String RECOIL_DETAILS_EXPORT = "MSG_FINANCE_141"; - /** * 账号异常无法接受转账 -- 账号异常无法接受转账 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java index 1f437fc..3e5f99d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 会员记录返回到前台的所有通知消息 - * @Author: sui q - * @Time: 2022/8/29 9:16 - * @Classname: MemberMsgConstants - * @PackageName: com.hzs.common.core.constant + * 会员记录返回到前台的所有通知消息 */ public class MemberMsgConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java index fcf50db..1912b07 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java @@ -2,12 +2,6 @@ package com.hzs.common.core.constant.msg; /** * 公告、站内信词条 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/11 17:42 - * @Classname: NoticeMsgConstants - * @Package_name: com.hzs.common.core.constant.msg */ public class NoticeMsgConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java index ba7c970..4432d66 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 产品相关 - * @Author: yuhui - * @Time: 2022/9/8 9:31 - * @Classname: ProductMsgConstants - * @PackageName: com.hzs.common.core.constant.msg + * 产品相关 */ public class ProductMsgConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java index 068dba7..868a8c2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 订单记录返回到前台的所有通知消息 - * @Author: sui q - * @Time: 2022/9/21 17:36 - * @Classname: SaOrderMsgConstants - * @PackageName: com.hzs.common.core.constant.msg + * 订单记录返回到前台的所有通知消息 */ public class SaOrderMsgConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java index f1976d9..98e807e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java @@ -1,30 +1,25 @@ package com.hzs.common.core.constant.msg; /** - * @description: 供应链模块后台返回到前台的提示语 - * @author: sui q - * @time: 2023/11/20 15:25 - * @classname: ScmMsgConstants - * @package_name: com.hzs.common.core.constant.msg - * version 1.0.0 + * 供应链模块后台返回到前台的提示语 */ public class ScmMsgConstants { - public static final String PO_ORDER_NOT_EXIST = "没有查询到采购订单，不能操作！"; + public static final String PO_ORDER_NOT_EXIST = "没有查询到采购订单，不能操作！"; - public static final String SO_ORDER_NOT_EXIST = "没有查询到销售订单，不能操作！"; + public static final String SO_ORDER_NOT_EXIST = "没有查询到销售订单，不能操作！"; - public static final String IO_ORDER_NOT_EXIST = "没有查询到业务领用订单，不能操作！"; + public static final String IO_ORDER_NOT_EXIST = "没有查询到业务领用订单，不能操作！"; public static final String IO_ORDER_EXISTS_AGENT = "该业务领用订单存在已经提交的签呈，不能再次发起签呈！"; - public static final String SUPPLIER_NOT_QUERY = "没有查询到供应商，请重新选择供应商！"; + public static final String SUPPLIER_NOT_QUERY = "没有查询到供应商，请重新选择供应商！"; - public static final String CUSTOMER_NOT_QUERY = "没有查询到客户，请重新选择客户！"; + public static final String CUSTOMER_NOT_QUERY = "没有查询到客户，请重新选择客户！"; - public static final String CORP_NOT_QUERY = "没有查询到库存公司，请重新选择库存公司！"; + public static final String CORP_NOT_QUERY = "没有查询到库存公司，请重新选择库存公司！"; - public static final String STOREHOUSE_NOT_QUERY = "没有查询到选择的仓库，请重新选择仓库！"; + public static final String STOREHOUSE_NOT_QUERY = "没有查询到选择的仓库，请重新选择仓库！"; public static final String PURCHASE_BODY_NOT_EMPTY = "采购入库单明细没有选择来源于同供应商采购订单明细，请重新选择！"; @@ -34,26 +29,26 @@ public class ScmMsgConstants { public static final String PRODUCT_HAS_EXIST = "选择的产品已经存在，请重新选择！"; - public static final String IC_PURCHASE_NOT_EXIST = "没有查询到采购入库单，不能操作！"; + public static final String IC_PURCHASE_NOT_EXIST = "没有查询到采购入库单，不能操作！"; - public static final String IC_PURCHASE_OUT_NOT_EXIST = "没有查询到采购退货单，不能操作！"; + public static final String IC_PURCHASE_OUT_NOT_EXIST = "没有查询到采购退货单，不能操作！"; public static final String PURCHASE_EXISTS_AGENT = "该采购入库单存在已经提交的签呈，不能再次发起签呈！"; - public static final String IC_GENERAL_IN_NOT_EXIST = "没有查询到其他入库单，不能操作！"; + public static final String IC_GENERAL_IN_NOT_EXIST = "没有查询到其他入库单，不能操作！"; - public static final String IC_GENERAL_OUT_NOT_EXIST = "没有查询到其他出库单，不能操作！"; + public static final String IC_GENERAL_OUT_NOT_EXIST = "没有查询到其他出库单，不能操作！"; - public static final String TRANSFER_ORDER_NOT_EXIST = "没有查询到调拨订单，不能操作！"; + public static final String TRANSFER_ORDER_NOT_EXIST = "没有查询到调拨订单，不能操作！"; public static final String TRANSFER_ORDER_EXISTS_AGENT = "该调拨订单存在已经提交的签呈，不能再次发起签呈！"; - public static final String TRANSFER_IN_NOT_EXIST = "没有查询到调拨入库单，不能操作！"; + public static final String TRANSFER_IN_NOT_EXIST = "没有查询到调拨入库单，不能操作！"; - public static final String TRANSFER_OUT_NOT_EXIST = "没有查询到调拨出库单，不能操作！"; + public static final String TRANSFER_OUT_NOT_EXIST = "没有查询到调拨出库单，不能操作！"; - public static final String INVENTORY_ORDER_NOT_EXIST = "没有查询到库存盘点单，不能操作！"; + public static final String INVENTORY_ORDER_NOT_EXIST = "没有查询到库存盘点单，不能操作！"; public static final String TRANSFER_IN_EXISTS_AGENT = "该调拨入库单存在已经提交的签呈，不能再次发起签呈！"; @@ -65,15 +60,13 @@ public class ScmMsgConstants { public static final String IC_AVAILABLE_NUM_NOT_EMPTY = "产品可用量不足，不能扣减库存，不能出库！"; - public static final String AVAILABLE_NUM_NOT_EXIST = "没有查询到该仓库该产品的可用量，不能操作！"; + public static final String AVAILABLE_NUM_NOT_EXIST = "没有查询到该仓库该产品的可用量，不能操作！"; - public static final String SELECT_BATCH_CODE_NOT_EXIST = "没有查询到批次号，不能操作！"; + public static final String SELECT_BATCH_CODE_NOT_EXIST = "没有查询到批次号，不能操作！"; - public static final String BATCH_CODE_HAS_EXIST = "批次号已经存在，请修改批次号！"; + public static final String BATCH_CODE_HAS_EXIST = "批次号已经存在，请修改批次号！"; - public static final String AVAILABLE_NUM_EXIST = "已经存在该仓库该产品的可用量，不能新增！"; - - public static final String AVAILABLE_NUM_NOT_ENOUGH = "商品可售量不足，不能购买！"; + public static final String AVAILABLE_NUM_EXIST = "已经存在该仓库该产品的可用量，不能新增！"; public static final String IC_ON_HAND_NUM_B_NOT_EXIST = "产品现存量流水有问题，不能回退库存，不能驳回！"; @@ -85,15 +78,15 @@ public class ScmMsgConstants { public static final String INVENTORY_IN = "盘盈账面数量必须小于调整数量！"; - public static final String SALE_OUT_NOT_EXIST = "没有查询到销售出库单，不能操作！"; + public static final String SALE_OUT_NOT_EXIST = "没有查询到销售出库单，不能操作！"; - public static final String SALE_OUT_BACK_NOT_EXIST = "没有查询到销售出库单或销售出库单已经退货，不能操作！"; + public static final String SALE_OUT_BACK_NOT_EXIST = "没有查询到销售出库单或销售出库单已经退货，不能操作！"; - public static final String BACK_SALE_OUT_NOT_EXIST = "没有查询到销售退货单，不能操作！"; + public static final String BACK_SALE_OUT_NOT_EXIST = "没有查询到销售退货单，不能操作！"; public static final String BACK_SALE_OUT_EXISTS_AGENT = "该销售退货单存在已经提交的签呈，不能再次发起签呈！"; - public static final String IC_ON_HAND_NUM_VALID_PERIOD ="产品快到有效期，及时清理库存！"; + public static final String IC_ON_HAND_NUM_VALID_PERIOD = "产品快到有效期，及时清理库存！"; public static final String IC_ON_HAND_NUM_NOT_EMPTY_WARN = "产品现存量不足预警值，及时补充库存！"; public static final String STORE_NOT_EMPTY = "该账号没有绑定店铺，不能操作！"; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java index 9eac3f8..d316a9d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 系统提示信息 - * @Author: sui q - * @Time: 2023/3/25 11:12 - * @Classname: DocumentMsgConstants - * @PackageName: com.hzs.common.core.constant.msg + * 系统提示信息 */ public class SystemMsgConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java index 0c59b2e..9caa4d0 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 商品相关 - * @Author: yuhui - * @Time: 2022/9/9 13:50 - * @Classname: WaresMsgConstans - * @PackageName: com.hzs.common.core.constant.msg + * 商品相关 */ public class WaresMsgConstants { @@ -86,7 +82,6 @@ public class WaresMsgConstants { public static final String SORT_IS_NOT_NULL = "MSG_WARES_018"; - /** * 极差明细不能为空 -- 极差明细不能为空 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/context/SecurityContextHolder.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/context/SecurityContextHolder.java index 1d83eca..9532eb2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/context/SecurityContextHolder.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/context/SecurityContextHolder.java @@ -11,8 +11,6 @@ import com.hzs.common.core.utils.StringUtils; /** * 获取当前线程变量中的 用户id、用户名称、Token等信息 * 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取 - * - * @author hzs */ public class SecurityContextHolder { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java index 17a0bb9..597d479 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 货币种类 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -39,50 +37,6 @@ public enum EAccount { */ RECOIL_INTEGRAL(14, "复消积分", EnumsPrefixConstants.ACCOUNT + "14"), -// /** -// * 现金账户 -// */ -// CASH(2, "现金", EnumsPrefixConstants.ACCOUNT + "2"), -// -// /** -// * 重消账户 -// */ -// REPEAT(5, "重消", EnumsPrefixConstants.ACCOUNT + "5"), -// -// /** -// * 积分账户 -// */ -// INTEGRAL(6, "积分", EnumsPrefixConstants.ACCOUNT + "6"), -// -// /** -// * 鼓励账户 -// */ -// ENCOURAGE(7, "鼓励", EnumsPrefixConstants.ACCOUNT + "7"), -// -// /** -// * 复购券账户 -// */ -// REPURCHASE(8, "复购券", EnumsPrefixConstants.ACCOUNT + "8"), -// -// /** -// * 全球积分 -// */ -// GLOBAL_POINTS(9, "全球积分", EnumsPrefixConstants.ACCOUNT + "9"), -// -// /** -// * 车奖积分 -// */ -// CAR_AWARD_POINTS(10, "车奖积分", EnumsPrefixConstants.ACCOUNT + "10"), -// -// /** -// * 直播代金券 -// */ -// LIVE_CASH_COUPON(11, "直播代金券", EnumsPrefixConstants.ACCOUNT + "11"), -// -// /** -// * 代金券 -// */ -// CASH_COUPON(12, "乐学代金券", EnumsPrefixConstants.ACCOUNT + "12"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountBonusType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountBonusType.java index c7bc4c0..152ec7c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountBonusType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountBonusType.java @@ -5,12 +5,6 @@ import lombok.Getter; /** * 奖金账户操作类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/3/27 15:45 - * @Classname: EAccountBonusType - * @Package_name: com.hzs.common.core.enums */ @Getter @AllArgsConstructor diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountProperty.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountProperty.java index 3537e3c..2435ceb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountProperty.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountProperty.java @@ -5,8 +5,6 @@ import lombok.Getter; /** * 货币属性 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountStatus.java index 73162e1..7d98099 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccountStatus.java @@ -6,33 +6,31 @@ import lombok.Getter; /** * 账户状态（会员登录账号状态） - * - * @author: hzs */ @AllArgsConstructor @Getter public enum EAccountStatus { /** - *正常 + * 正常 */ NORMAL(0, "正常", 0, EnumsPrefixConstants.ACCOUNT_STATUS + "0"), /** - *限制登录 + * 限制登录 */ FROZEN(1, "限制登录", 0, EnumsPrefixConstants.ACCOUNT_STATUS + "1"), /** - *禁止登录 + * 禁止登录 */ SHUT_DOWN(2, "禁止登录", 0, EnumsPrefixConstants.ACCOUNT_STATUS + "2"), /** - *停止收益 + * 停止收益 */ STOP_PROFIT(3, "停止收益", 0, EnumsPrefixConstants.ACCOUNT_STATUS + "3"), /** - *停算收益 + * 停算收益 */ STOP_INCOME(4, "停算收益", 0, EnumsPrefixConstants.ACCOUNT_STATUS + "4"), ; @@ -55,9 +53,9 @@ public enum EAccountStatus { private final String key; - public static EAccountStatus getEAccountStatus(Integer value){ + public static EAccountStatus getEAccountStatus(Integer value) { for (EAccountStatus as : EAccountStatus.values()) { - if (as.value == value){ + if (as.value == value) { return as; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAchievementType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAchievementType.java index 7dbf1be..c3d9468 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAchievementType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAchievementType.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 业绩类型 - *zhangjing - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActDrawGiftType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActDrawGiftType.java index 9455d05..a38f2ba 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActDrawGiftType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActDrawGiftType.java @@ -5,12 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 抽奖活动抽奖奖品类型 - * @author: sui q - * @time: 2023/4/22 14:02 - * @classname: EActDrawGiftType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 抽奖活动抽奖奖品类型 */ @AllArgsConstructor @Getter @@ -45,9 +40,9 @@ public enum EActDrawGiftType { */ private final String key; - public static String getActDrawGiftType(Integer value){ + public static String getActDrawGiftType(Integer value) { for (EActDrawGiftType eActDrawGiftType : EActDrawGiftType.values()) { - if (eActDrawGiftType.getValue() == value){ + if (eActDrawGiftType.getValue() == value) { return eActDrawGiftType.getLabel(); } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActModule.java index d2f9f4d..fe62c22 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActModule.java @@ -5,12 +5,6 @@ import lombok.Getter; /** * 活动模块 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/26 19:20 - * @Classname: EActModule - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java index 49b5dc1..425bf4a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java @@ -9,12 +9,6 @@ import java.util.List; /** * 活动类型 - * - * @author: sui q - * @time: 2022/8/27 10:54 - * @description: - * @classname: EActType - * @package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActivityStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActivityStatus.java index 72107aa..0a2c2b4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActivityStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActivityStatus.java @@ -5,28 +5,24 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 活动状态 - * @Author: yuhui - * @Time: 2023/4/20 15:20 - * @Classname: EActivityStatus - * @PackageName: com.hzs.common.core.enums + * 活动状态 */ @AllArgsConstructor @Getter public enum EActivityStatus { /** - *未开始 + * 未开始 */ NOT_STARTED(0, "即将开始", 0, EnumsPrefixConstants.ACTIVITY_STATUS + "0"), /** - *进行中 + * 进行中 */ IN_PROGRESS(1, "进行中", 0, EnumsPrefixConstants.ACTIVITY_STATUS + "1"), /** - *已失效 + * 已失效 */ EXPIRED(2, "已结束", 0, EnumsPrefixConstants.ACTIVITY_STATUS + "2"); @@ -46,9 +42,9 @@ public enum EActivityStatus { private final String key; - public static EActivityStatus getEActivityStatus(Integer value){ + public static EActivityStatus getEActivityStatus(Integer value) { for (EActivityStatus as : EActivityStatus.values()) { - if (as.value == value){ + if (as.value == value) { return as; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentApprovalStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentApprovalStatus.java index 09c6d7c..af54b1d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentApprovalStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentApprovalStatus.java @@ -5,8 +5,6 @@ import lombok.Getter; /** * 代付审核状态 - * - * @author hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentBiz.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentBiz.java deleted file mode 100644 index 1305d46..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentBiz.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.common.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 代付账户类型 - * - * @author hzs - */ -@AllArgsConstructor -@Getter -public enum EAgentBiz { - - EMPTY("", ""), - - /** - * B2B - */ - B2B("B2B", "对公"), - - /** - * B2C - */ - B2C("B2C", "对私"), - - ; - - /** - * 实际值 - */ - private final String value; - /** - * 显示标签 - */ - private final String label; - - /** - * 根据枚举值，获取枚举 - * - * @param value - * @return - */ - public static EAgentBiz getEnumByValue(String value) { - for (EAgentBiz enums : EAgentBiz.values()) { - if (enums.getValue().equals(value)) { - return enums; - } - } - return EMPTY; - } - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentGrade.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentGrade.java index 8742df7..a26c208 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentGrade.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentGrade.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 代理等级 - * @Author: sui q - * @Time: 2022/8/31 16:08 - * @Classname: EAgentGrade - * @PackageName: com.hzs.common.core.enums + * 代理等级 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentStatus.java deleted file mode 100644 index ee1a748..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentStatus.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.common.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 代付提现状态 - * - * @author hzs - */ -@AllArgsConstructor -@Getter -public enum EAgentStatus { - - /** - * 未提现 - */ - UNRECEIVED(0, "未提现"), - - /** - * 提现成功 - */ - RECEIVED(1, "提现成功"), - - /** - * 提现失败 - */ - ERROR(2, "提现失败"), - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - - /** - * 根据枚举值，获取枚举 - * - * @param value - * @return - */ - public static EAgentStatus getEnumByValue(int value) { - for (EAgentStatus enums : EAgentStatus.values()) { - if (enums.getValue() == value) { - return enums; - } - } - return UNRECEIVED; - } - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentType.java index d5dc0bd..7c9a81a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAgentType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 代理类型, 目前设置代理商跟店铺公用一张表，通过字段区分 - * @Author: sui q - * @Time: 2022/8/31 16:04 - * @Classname: EAgentType - * @PackageName: com.hzs.common.core.enums + * 代理类型, 目前设置代理商跟店铺公用一张表，通过字段区分 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAlgebra.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAlgebra.java index c5d0c54..4db3c19 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAlgebra.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAlgebra.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 代数枚举（复购直推） - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -75,9 +73,9 @@ public enum EAlgebra { */ private final String key; - public static String getALGEBRA(int value){ + public static String getALGEBRA(int value) { for (EAlgebra ALGEBRA : EAlgebra.values()) { - if (ALGEBRA.getValue() == value){ + if (ALGEBRA.getValue() == value) { return ALGEBRA.getLabel(); } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java index 7fe85f7..47328eb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 审批业务类型 - * Author: jiang chao - * Time: 2022/9/20 10:33 - * Classname: EApprovalBusiness - * PackageName: com.hzs.common.core.enums + * 审批业务类型 */ @AllArgsConstructor @Getter @@ -301,62 +297,6 @@ public enum EApprovalBusiness { */ RECOIL_GIVE_REMOVE(743, "复消币赠送删除", EnumsPrefixConstants.APPROVAL_BUSINESS + "743"), - - /** - * 有关供应链的放在8 开头的 采购订单审核 - */ - PO_ORDER_APPROVE(800, "采购订单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "800"), - - /** - * 采购入库审核 - */ - IC_PURCHASE_APPROVE(801, "采购入库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "801"), - - /** - * 其他入库审核 - */ - IC_GENERAL_IN_APPROVE(802, "其他入库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "802"), - - /** - * 其他出库审核 - */ - IC_GENERAL_OUT_APPROVE(803, "其他出库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "803"), - - /** - * 调拨订单 - */ - TRANSFER_ORDER_APPROVE(804, "调拨订单", EnumsPrefixConstants.APPROVAL_BUSINESS + "804"), - - /** - * 调拨入库 - */ - TRANSFER_IN_APPROVE(805, "调拨入库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "805"), - - /** - * 调拨出库 - */ - TRANSFER_OUT_APPROVE(806, "调拨出库审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "806"), - - /** - * 库存盘点 - */ - INVENTORY_ORDER_APPROVE(807, "库存盘点单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "807"), - - /** - * 销售退货单 - */ - BACK_SALE_OUT_APPROVE(808, "销售退货单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "808"), - - /** - * 采购退货单 - */ - BACK_PURCHASE_APPROVE(809, "采购退货单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "809"), - - /** - * 业务领用订单 - */ - IO_ORDER_APPROVE(810, "业务领用订单审核", EnumsPrefixConstants.APPROVAL_BUSINESS + "810"), - /** * K值风控设置添加 */ @@ -372,7 +312,6 @@ public enum EApprovalBusiness { */ MEMBER_RISK_REMOVE(905, "K值风控设置删除", EnumsPrefixConstants.APPROVAL_BUSINESS + "905"), - ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java index 68765e5..3427ee5 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalType.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 需要审批业务类型大类 - * @Author: sui q - * @Time: 2022/10/21 15:09 - * @Classname: EApprovalType - * @PackageName: com.hzs.common.core.enums + * 需要审批业务类型大类 */ @AllArgsConstructor @Getter @@ -49,11 +45,6 @@ public enum EApprovalType { */ ACTIVITY_BUSINESS(7, "活动相关处理"), - /** - * 供应链相关处理 - */ - SCM_BUSINESS(8, "供应链相关处理"), - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java index e0940fe..5795da2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java @@ -6,16 +6,10 @@ import lombok.Getter; /** * 充值页面 审核状态 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/28 16:34 - * @Classname: EApproveRechargeStatus - * @Package_name: com.hzs.common.core.enums */ @Getter @AllArgsConstructor -public enum EApproveRechargeStatus { +public enum EApproveRechargeStatus { /** * 待提交 @@ -52,9 +46,9 @@ public enum EApproveRechargeStatus { private final String key; - public static EApproveRechargeStatus getApproveRechargeStatus(int value ){ + public static EApproveRechargeStatus getApproveRechargeStatus(int value) { for (EApproveRechargeStatus approveRechargeStatus : EApproveRechargeStatus.values()) { - if (approveRechargeStatus.getValue() == value){ + if (approveRechargeStatus.getValue() == value) { return approveRechargeStatus; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveStatus.java index aa1112c..6ff8412 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 审批状态 - * Author: sui q - * Time: 2022/9/1 9:06 - * Classname: EApproveStatus - * PackageName: com.hzs.common.core.enums + * 审批状态 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAreaType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAreaType.java index af936a2..495deb0 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAreaType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAreaType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 区域类型枚举 - * Author: zhangjing - * Time: 2022/9/1 9:06 - * Classname: EModifyName - * PackageName: com.hzs.common.core.enums + * 区域类型枚举 */ @AllArgsConstructor @Getter @@ -28,8 +24,6 @@ public enum EAreaType { */ COUNTY(3, "区/县", 0, EnumsPrefixConstants.EAREA_TYPE + "3"), - - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.java index 20bc72d..a806d2d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 考核状态 - * @Author: sui q - * @Time: 2022/11/9 13:33 - * @Classname: EAssessStatus - * @PackageName: com.hzs.common.core.enums + * 考核状态 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java index 9b737d5..be63ce9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 考核类型 - * @Author: sui q - * @Time: 2022/10/28 17:07 - * @Classname: EAssessmentType - * @PackageName: com.hzs.common.core.enums + * 考核类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java index 3284039..85ef6d0 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 奖衔枚举 - * @Author: sui q - * @Time: 2022/9/1 17:39 - * @Classname: EAwards - * @PackageName: com.hzs.common.core.enums + * 奖衔枚举 */ @AllArgsConstructor @Getter @@ -18,57 +14,57 @@ public enum EAwards { /** * V0 */ - MEMBER(1,0, "会员", 0, EnumsPrefixConstants.AWARDS + 0), + MEMBER(1, 0, "会员", 0, EnumsPrefixConstants.AWARDS + 0), /** * V1 */ - HEADER(2,5, "一级", 0, EnumsPrefixConstants.AWARDS + 5), + HEADER(2, 5, "一级", 0, EnumsPrefixConstants.AWARDS + 5), /** * V2 */ - MANAGER(3,10, "二级", 0, EnumsPrefixConstants.AWARDS + 10), + MANAGER(3, 10, "二级", 0, EnumsPrefixConstants.AWARDS + 10), /** * V3 */ - HIGH_MANAGER(4,15, "三级", 0, EnumsPrefixConstants.AWARDS + 15), + HIGH_MANAGER(4, 15, "三级", 0, EnumsPrefixConstants.AWARDS + 15), /** * V4 */ - SENIOR_MANAGER(5,20, "四级", 0, EnumsPrefixConstants.AWARDS + 20), + SENIOR_MANAGER(5, 20, "四级", 0, EnumsPrefixConstants.AWARDS + 20), /** * V5 */ - CHIEF(6,25, "五级", 0, EnumsPrefixConstants.AWARDS + 25), + CHIEF(6, 25, "五级", 0, EnumsPrefixConstants.AWARDS + 25), /** * V6 */ - HIGH_CHIEF(7,30, "六级", 0, EnumsPrefixConstants.AWARDS + 30), + HIGH_CHIEF(7, 30, "六级", 0, EnumsPrefixConstants.AWARDS + 30), /** * V7 */ - SENIOR_CHIEF(8,35, "七级", 0, EnumsPrefixConstants.AWARDS + 35), + SENIOR_CHIEF(8, 35, "七级", 0, EnumsPrefixConstants.AWARDS + 35), /** * V8 */ - CHAIRMAN(9,40, "八级", 0, EnumsPrefixConstants.AWARDS + 40), + CHAIRMAN(9, 40, "八级", 0, EnumsPrefixConstants.AWARDS + 40), /** * V9 */ - HONOR_CHAIRMAN(10,45, "九级", 0, EnumsPrefixConstants.AWARDS + 45), + HONOR_CHAIRMAN(10, 45, "九级", 0, EnumsPrefixConstants.AWARDS + 45), /** * v10 */ - GLOBAL_CHAIRMAN(11,50, "十级", 0, EnumsPrefixConstants.AWARDS + 50), + GLOBAL_CHAIRMAN(11, 50, "十级", 0, EnumsPrefixConstants.AWARDS + 50), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java index 61c190f..410f970 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java @@ -5,12 +5,6 @@ import lombok.Getter; /** * 银行卡默认状态 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/9 15:14 - * @Classname: EBankCardStatus - * @Package_name: com.hzs.common.core.enums */ @Getter @AllArgsConstructor diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardType.java index 082d9f8..2d38f70 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardType.java @@ -5,8 +5,6 @@ import lombok.Getter; /** * 绑定标记枚举类 - * - * @author hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBarcodeStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBarcodeStatus.java index 9438e5a..a28df2b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBarcodeStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBarcodeStatus.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 条码状态枚举 - * - * @author: sui q - * @time: 2022/8/27 10:46 - * @description: - * @classname: EBarcodeStatus - * @package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBatchType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBatchType.java index 3855f9b..415f20a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBatchType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBatchType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 批量单个枚举 - * @author: zhang jing - * @date: 2023/4/8 9:49 - * @param: - * @return: + * 批量单个枚举 **/ @Getter @AllArgsConstructor diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBindStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBindStatus.java deleted file mode 100644 index 080f776..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBindStatus.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.common.core.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 绑定标记枚举类 - * - * @author hzs - */ -@AllArgsConstructor -@Getter -public enum EBindStatus { - - /** - * 未绑定 - */ - UN_BIND(0, "未绑定"), - - /** - * 已绑定 - */ - BIND(1, "已绑定"), - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusDeduct.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusDeduct.java index 381c35d..6d63941 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusDeduct.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusDeduct.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 奖金扣项枚举 - * @Author: yuhui - * @Time: 2022/11/4 11:31 - * @Classname: EBonusDeduct - * @PackageName: com.hzs.common.core.enums + * 奖金扣项枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java index 9f81f61..78c7a3a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java @@ -5,18 +5,14 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 奖金收益状态 奖金明细表 - * @Author: sui q - * @Time: 2022/11/10 16:03 - * @Classname: EBonusIncomeStatus - * @PackageName: com.hzs.common.core.enums + * 奖金收益状态 奖金明细表 */ @AllArgsConstructor @Getter public enum EBonusIncomeStatus { /** - *正常 + * 正常 */ NORMAL(0, "正常", 0, EnumsPrefixConstants.BONUS_INCOME_STATUS + "0"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java index 5fb6e04..2b763a1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 奖项配置枚举 - * @Author: zhangjing - * @Time: 2022/9/1 17:39 - * @Classname: ESettlementCycle - * @PackageName: com.hzs.common.core.enums + * 奖项配置枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusType.java index 28161be..bfb6d3c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @author: sui q - * @time: 2022/8/27 10:35 - * @description: 推荐类型枚举 - * @classname: ERangeType - * @package_name: com.hzs.common.core.enums + * 推荐类型枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java index 9113061..b2496ac 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 交易配置 业务类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/8/18 10:01 - * @Classname: EBusinessModule - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessType.java index 7d60daf..c727562 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessType.java @@ -3,13 +3,6 @@ package com.hzs.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/9 15:53 - * @Classname: ERedisType - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum EBusinessType { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EButtonType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EButtonType.java index 1b676d6..2467704 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EButtonType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EButtonType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 基础业务办理-按钮类型枚举 - * Author: zhangjing - * Time: 2022/9/1 9:06 - * Classname: EButtonType - * PackageName: com.hzs.common.core.enums + * 基础业务办理-按钮类型枚举 */ @AllArgsConstructor @Getter @@ -29,7 +25,6 @@ public enum EButtonType { IMPORT(3, "输入框", 0, EnumsPrefixConstants.EBUTTON_TYPE + "3"), - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECalType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECalType.java index 2a7a043..c41a516 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECalType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECalType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 计算类型 - * - * @author: sui q - * @time: 2022/8/25 15:09 - * @description: - * @classname: ECalType - * @package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECallbackStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECallbackStatus.java deleted file mode 100644 index 7fe4910..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECallbackStatus.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 回调业务状态 - * - * @author: hzs - */ -@AllArgsConstructor -@Getter -public enum ECallbackStatus { - - /** - * 未回调 - */ - NO(0, "未回调", 0, EnumsPrefixConstants.CALLBACK_STATUS + "0"), - - /** - * 回调成功 - */ - SUCCESS(1, "回调成功", 0, EnumsPrefixConstants.CALLBACK_STATUS + "1"), - - /** - * 回调失败 - */ - FAIL(2, "回调失败", 0, EnumsPrefixConstants.CALLBACK_STATUS + "2"), - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java index f769057..30816ca 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 撤销订单类型 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java index a108586..8e8ce3f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 证件类型枚举 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -26,7 +24,7 @@ public enum ECardType { /** * 学生证 */ - STUDENT (3, "学生证", 0, EnumsPrefixConstants.CARD_TYPE + "3"), + STUDENT(3, "学生证", 0, EnumsPrefixConstants.CARD_TYPE + "3"), /** * 驾驶证 @@ -58,9 +56,9 @@ public enum ECardType { */ private final String key; - public static String getCardType(int value){ + public static String getCardType(int value) { for (ECardType eCardType : ECardType.values()) { - if (eCardType.getValue() == value){ + if (eCardType.getValue() == value) { return eCardType.getLabel(); } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java index 5943fee..b7ed665 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 用户类型分类 - * Author: sui q - * Time: 2022/9/8 16:39 - * Classname: ECategory - * PackageName: com.hzs.common.core.enums + * 用户类型分类 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java index d33b223..1a9ff36 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChangeType.java @@ -4,13 +4,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: 变化类型，考核业绩变化明细表 - * @Author: sui q - * @Time: 2022/10/28 17:03 - * @Classname: EChangeType - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum EChangeType { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java index bb1af0e..1d71b15 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java @@ -4,13 +4,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: 邮费设置表 收费方式枚举 - * @Author: yuhui - * @Time: 2022/10/27 9:42 - * @Classname: EChargeType - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum EChargeType { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECheckType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECheckType.java index 5288576..80a0c42 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECheckType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECheckType.java @@ -3,13 +3,6 @@ package com.hzs.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/10/18 16:29 - * @Classname: ECheckType - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum ECheckType { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECondition.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECondition.java index a2a74d2..9794042 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECondition.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECondition.java @@ -1,23 +1,9 @@ -package com.hzs.common.core.enums;/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/21 11:56 - * @Classname: ECondition - * @PackageName: com.hzs.common.core.enums - */ +package com.hzs.common.core.enums; import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.common.core.enums - *@Author: yh - *@CreateTime: 2023-04-21 11:56 - *@Description: TODO - *@Version: 1.0 - */ @AllArgsConstructor @Getter public enum ECondition { @@ -44,9 +30,9 @@ public enum ECondition { */ private final int enable; - public static ECondition getCondition(int value){ + public static ECondition getCondition(int value) { for (ECondition condition : ECondition.values()) { - if (condition.getValue() == value){ + if (condition.getValue() == value) { return condition; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EConsumeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EConsumeType.java index 7607af1..673ce30 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EConsumeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EConsumeType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 消费类型 - * @Author: sui q - * @Time: 2023/3/24 9:47 - * @Classname: EConsumeType - * @PackageName: com.hzs.common.core.enums + * 消费类型 */ @AllArgsConstructor @Getter @@ -51,8 +47,7 @@ public enum EConsumeType { /** * 4=转账回退 */ - BACK_TRANSFER(8, "撤销转账", 0, EnumsPrefixConstants.CON_TYPE + "4") - ; + BACK_TRANSFER(8, "撤销转账", 0, EnumsPrefixConstants.CON_TYPE + "4"); /** * 实际值 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EControlType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EControlType.java index 8955797..91fc3ce 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EControlType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EControlType.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 操作类型 用于区别增删改操作 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -16,19 +14,17 @@ public enum EControlType { /** * 新增 */ - SAVE(1, "新增", EnumsPrefixConstants.CONTROL_TYPE + "1" ), + SAVE(1, "新增", EnumsPrefixConstants.CONTROL_TYPE + "1"), /** * 修改 */ - MODIFY(2, "修改", EnumsPrefixConstants.CONTROL_TYPE + "2" ), + MODIFY(2, "修改", EnumsPrefixConstants.CONTROL_TYPE + "2"), /** * 删除 */ - DELETE(3, "删除", EnumsPrefixConstants.CONTROL_TYPE + "3") - - ; + DELETE(3, "删除", EnumsPrefixConstants.CONTROL_TYPE + "3"); /** * 实际值 @@ -44,13 +40,13 @@ public enum EControlType { private final String key; public static EApprovalBusiness getStoreBusiness(int value) { - if (value == EControlType.MODIFY.value) { - return EApprovalBusiness.CU_STORE_MODIFY; - }else if(value == EControlType.DELETE.value){ - return EApprovalBusiness.CU_STORE_DELETE; - }else{ - return EApprovalBusiness.CU_STORE_SAVE; - } + if (value == EControlType.MODIFY.value) { + return EApprovalBusiness.CU_STORE_MODIFY; + } else if (value == EControlType.DELETE.value) { + return EApprovalBusiness.CU_STORE_DELETE; + } else { + return EApprovalBusiness.CU_STORE_SAVE; + } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECurrencyType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECurrencyType.java index 9296434..701c506 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECurrencyType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECurrencyType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 币种种类枚举 币种展示 - * @author: zhang jing - * @date: 2023/9/5 11:21 - * @param: - * @return: + * 币种种类枚举 币种展示 **/ @Getter @AllArgsConstructor @@ -17,12 +13,12 @@ public enum ECurrencyType { /** * 人民币 */ - RMB(1, "人民币",EnumsPrefixConstants.CURRENCY_TYPE + "1"), + RMB(1, "人民币", EnumsPrefixConstants.CURRENCY_TYPE + "1"), /** * 美元 */ - DOLLAR(2, "美元",EnumsPrefixConstants.CURRENCY_TYPE + "2"), + DOLLAR(2, "美元", EnumsPrefixConstants.CURRENCY_TYPE + "2"), ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECustomerType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECustomerType.java index ce14264..83dd6b4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECustomerType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECustomerType.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 会员类型 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -51,9 +49,9 @@ public enum ECustomerType { */ private final String key; - public static ECustomerType getCustomerType(int value){ + public static ECustomerType getCustomerType(int value) { for (ECustomerType customerType : ECustomerType.values()) { - if (customerType.getValue() == value){ + if (customerType.getValue() == value) { return customerType; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java index 6b51280..4f15154 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECycle.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 提现周期枚举类 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -16,32 +14,32 @@ public enum ECycle { /** * 周一 */ - MONDAY( 1, "周一", EnumsPrefixConstants.CYCLE + "1"), + MONDAY(1, "周一", EnumsPrefixConstants.CYCLE + "1"), /** * 周二 */ - TUESDAY( 2, "周二", EnumsPrefixConstants.CYCLE + "2"), + TUESDAY(2, "周二", EnumsPrefixConstants.CYCLE + "2"), /** * 周三 */ - WEDNESDAY( 3, "周三", EnumsPrefixConstants.CYCLE + "3"), + WEDNESDAY(3, "周三", EnumsPrefixConstants.CYCLE + "3"), /** * 周四 */ - THURSDAY( 4, "周四", EnumsPrefixConstants.CYCLE + "4"), + THURSDAY(4, "周四", EnumsPrefixConstants.CYCLE + "4"), /** * 周五 */ - FRIDAY( 5, "周五", EnumsPrefixConstants.CYCLE + "5"), + FRIDAY(5, "周五", EnumsPrefixConstants.CYCLE + "5"), /** * 周六 */ - SATURDAY( 6, "周六", EnumsPrefixConstants.CYCLE + "6"), + SATURDAY(6, "周六", EnumsPrefixConstants.CYCLE + "6"), /** * 周日 */ - SUNDAY( 7, "周日", EnumsPrefixConstants.CYCLE + "7"), + SUNDAY(7, "周日", EnumsPrefixConstants.CYCLE + "7"), ; @@ -60,5 +58,4 @@ public enum ECycle { private final String key; - } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDadaType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDadaType.java index 112d27e..c070b1f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDadaType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDadaType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 业绩查询数据类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/24 17:59 - * @Classname: EDadaType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter @@ -25,7 +19,7 @@ public enum EDadaType { */ FIRST_PURCHASE(2, "首购", 0, EnumsPrefixConstants.DADA_TYPE + "2"), /** - *复购 + * 复购 */ REPURCHASE(3, "复购", 0, EnumsPrefixConstants.DADA_TYPE + "3"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDataSource.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDataSource.java index c443ca4..6756e5b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDataSource.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDataSource.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 数据来源枚举类 - * - * @author hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDayType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDayType.java index 5d7af8d..46a49dc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDayType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDayType.java @@ -5,13 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * description: 日期下拉的查询条件 - * - * @author: sui q - * @time: 2023/4/7 15:29 - * @classname: EDayType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 日期下拉的查询条件 */ @AllArgsConstructor @Getter @@ -20,12 +14,12 @@ public enum EDayType { /** * 近7日 */ - LAST_SEVEN_DAY(1, "近7日", 7,0, EnumsPrefixConstants.DAY_TYPE + 1), + LAST_SEVEN_DAY(1, "近7日", 7, 0, EnumsPrefixConstants.DAY_TYPE + 1), /** * 近15日 */ - LAST_FIFTEEN_DAY(2, "近15日", 15,0, EnumsPrefixConstants.DAY_TYPE + 2), + LAST_FIFTEEN_DAY(2, "近15日", 15, 0, EnumsPrefixConstants.DAY_TYPE + 2), /** * 近30日 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDealerYesNo.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDealerYesNo.java index dbfd893..56b271c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDealerYesNo.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDealerYesNo.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 是否举类 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -16,12 +14,12 @@ public enum EDealerYesNo { /** * 是 */ - YES(0, "是", EnumsPrefixConstants.DEALER_YES_NO + "0"), + YES(0, "是", EnumsPrefixConstants.DEALER_YES_NO + "0"), /** * 否 */ - NO(1, "否", EnumsPrefixConstants.DEALER_YES_NO + "1"), + NO(1, "否", EnumsPrefixConstants.DEALER_YES_NO + "1"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDefault.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDefault.java index a2fd696..5a4d4f9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDefault.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDefault.java @@ -4,13 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 是否默认 - * @Author: ljc - * @Time: 2022/9/27 10:31 - * @Classname: EDefault - * @Package_name: com.hzs.common.core.enums + * 是否默认 */ - @AllArgsConstructor @Getter public enum EDefault { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java index c5e155d..57c02ad 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 删除标记枚举类 - * - * @author hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelayBusType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelayBusType.java index 3cd0424..84f7bbb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelayBusType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelayBusType.java @@ -3,13 +3,6 @@ package com.hzs.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/9 15:53 - * @Classname: ERedisType - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum EDelayBusType { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java index 27b56a9..408e267 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java @@ -4,13 +4,8 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; - /** - * @Description: 发货方式 - * @Author: sui q - * @Time: 2022/8/31 9:07 - * @Classname: EDelivery - * @PackageName: com.hzs.common.core.enums + * 发货方式 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDeliveryStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDeliveryStatus.java index 4a0819b..dc2aa53 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDeliveryStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDeliveryStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 发货状态 - * @Author: sui q - * @Time: 2022/8/31 10:49 - * @Classname: EDeliveryStatus - * @PackageName: com.hzs.common.core.enums + * 发货状态 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDirectPushMode.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDirectPushMode.java index dbb5898..2b6040c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDirectPushMode.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDirectPushMode.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 直推方式枚举 - * @author: zhang jing - * @date: 2024/4/7 11:03 - * @param: - * @return: + * 直推方式枚举 **/ @AllArgsConstructor @Getter @@ -19,11 +15,11 @@ public enum EDirectPushMode { /** * 个人直推 */ - PERSONAL_PUSH(1, "个人", 0,EnumsPrefixConstants.DIRECT_PUSH_MODE + "1"), + PERSONAL_PUSH(1, "个人", 0, EnumsPrefixConstants.DIRECT_PUSH_MODE + "1"), /** * 伞下直推 */ - UMBRELLA_PUSH(2, "血缘", 0,EnumsPrefixConstants.DIRECT_PUSH_MODE + "2"), + UMBRELLA_PUSH(2, "血缘", 0, EnumsPrefixConstants.DIRECT_PUSH_MODE + "2"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EExemptType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EExemptType.java index 3d59310..5810dfc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EExemptType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EExemptType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 免考类型 - * @Author: sui q - * @Time: 2022/10/28 17:31 - * @Classname: EExemptType - * @PackageName: com.hzs.common.core.enums + * 免考类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreezeOperationType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreezeOperationType.java index dceaa26..5bd2746 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreezeOperationType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreezeOperationType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 冻结操作类型 - * @Author: ljc - * @Time: 2022/9/13 14:02 - * @Classname: ERechargeType - * @Package_name: com.hzs.common.core.enums + * 冻结操作类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGiftType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGiftType.java index 3f839bc..ec74a50 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGiftType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGiftType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 赠送类型 - * - * @author: sui q - * @time: 2022/8/27 11:31 - * @description: - * @classname: EGiftType - * @package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java index 6e48dc3..f6ee3cb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java @@ -6,11 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 等级设置 - * @Author: sui q - * @Time: 2022/8/30 10:45 - * @Classname: EGrade - * @PackageName: com.hzs.common.core.enums + * 等级设置 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantStatus.java index a936f39..6567357 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 发放状态 - * @Author: sui q - * @Time: 2023/2/22 15:21 - * @Classname: EGrantStatus - * @PackageName: com.hzs.common.core.enums + * 发放状态 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java index c6cfb0c..c7f99e7 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java @@ -4,13 +4,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/15 10:57 - * @Classname: EGrantWay - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum EGrantWay { @@ -47,9 +40,9 @@ public enum EGrantWay { */ private final String key; - public static String getEGrantWay(Integer value){ + public static String getEGrantWay(Integer value) { for (EGrantWay grantWay : EGrantWay.values()) { - if (grantWay.getValue() == value){ + if (grantWay.getValue() == value) { return grantWay.getLabel(); } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EHoProductDetailsType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EHoProductDetailsType.java index 5d6bea8..52b80b1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EHoProductDetailsType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EHoProductDetailsType.java @@ -5,8 +5,6 @@ import lombok.Getter; /** * 首页banner类型枚举类 - * - * @author hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EHomeBannerType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EHomeBannerType.java deleted file mode 100644 index 0d46c48..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EHomeBannerType.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 首页banner类型枚举类 - * - * @author hzs - */ -@AllArgsConstructor -@Getter -public enum EHomeBannerType { - - /** - * 商品展示 - */ - TYPE_1(1, "商品展示", 0, EnumsPrefixConstants.HOME_BANNER_TYPE + "1"), - - /** - * 关于我们 - */ - TYPE_2(2, "关于我们", 0, EnumsPrefixConstants.HOME_BANNER_TYPE + "2"), - /** - * 大事记-资质荣誉 - */ - TYPE_3(3, "大事记-资质荣誉", 0, EnumsPrefixConstants.HOME_BANNER_TYPE + "3"), - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java index 1893309..ad92f4a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java @@ -6,14 +6,7 @@ import lombok.Getter; /** * 证件类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/17 14:36 - * @Classname: EIdType - * @Package_name: com.hzs.common.core.enums */ - @AllArgsConstructor @Getter public enum EIdType { @@ -40,9 +33,9 @@ public enum EIdType { */ private final String key; - public static String getLabel(int value){ + public static String getLabel(int value) { for (EIdType eIdType : EIdType.values()) { - if (eIdType.getValue() == value){ + if (eIdType.getValue() == value) { return eIdType.getLabel(); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIncomeStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIncomeStatus.java index 4814081..28bbb61 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIncomeStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIncomeStatus.java @@ -5,17 +5,13 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 会员收益状态 会员表，会员网体表，奖金汇总表 - * @Author: sui q - * @Time: 2022/11/4 11:03 - * @Classname: EIncomeStatus - * @PackageName: com.hzs.common.core.enums + * 会员收益状态 会员表，会员网体表，奖金汇总表 */ @AllArgsConstructor @Getter public enum EIncomeStatus { /** - *正常 + * 正常 */ NORMAL(0, "正常", 0, EnumsPrefixConstants.INCOME_STATUS + "0"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java index ba4008e..ac5fbb7 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 注水方式 - * @Author: zhangjing - * @Time: 2022/9/13 14:02 - * @Classname: ERechargeType - * @Package_name: com.hzs.common.core.enums + * 注水方式 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMachineState.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMachineState.java deleted file mode 100644 index eeb8692..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMachineState.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * （机器状态）设备状态 - * - * @author: hzs - */ -@AllArgsConstructor -@Getter -public enum EMachineState { - - /** - * 离线 - */ - OFFLINE(0, "离线", 0, EnumsPrefixConstants.MACHINE_STATE + "0"), - - /** - * 待机 - */ - STANDBY(1, "待机", 0, EnumsPrefixConstants.MACHINE_STATE + "1"), - - /** - * 运行 使用中 - */ - WORKING(2, "使用中", 0, EnumsPrefixConstants.MACHINE_STATE + "2"), - - /** - * 停用 - */ - DEACTIVATE(3, "停用", 0, EnumsPrefixConstants.MACHINE_STATE + "3"), - - /** - * 未激活 - */ - NOT_ACTIVE(6, "未激活", 0, EnumsPrefixConstants.MACHINE_STATE + "6"), - - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMailType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMailType.java deleted file mode 100644 index 3e4abd7..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMailType.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * Created with IntelliJ IDEA. - * Author: yuhui - * Description: 邮件发送类型 - */ -@AllArgsConstructor -@Getter -public enum EMailType { - - /** - * 欢迎邮件 - */ - WELCOME_EMAIL(0, "欢迎邮件", 0, EnumsPrefixConstants.MAIL_TYPE + "0"), - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeState.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeState.java index 247b2a0..b248513 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeState.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeState.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 公告状态 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/2 11:35 - * @Classname: ENoticeType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeType.java index 027ce94..827bdda 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 公告发布的类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/2 11:35 - * @Classname: ENoticeType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeWebsiteType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeWebsiteType.java index 978f8b3..3fa3092 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeWebsiteType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeWebsiteType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 公告网站的类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/2 11:35 - * @Classname: ENoticeType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationType.java index 19d5d65..1fbbdde 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationType.java @@ -5,12 +5,6 @@ import lombok.Getter; /** * 操作类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/3/1 14:04 - * @Classname: EOperationType - * @Package_name: com.hzs.common.core.enums */ @Getter @AllArgsConstructor diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java index 5c25b4b..c417500 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java @@ -10,8 +10,6 @@ import java.util.List; /** * 伞下直推新增业绩订单类型枚举 - * - * @author hzs */ @AllArgsConstructor @Getter @@ -100,7 +98,7 @@ public enum EOrderBusiness { return apiList; } - public static List getOrderTypeList(Integer value) { + public static List getOrderTypeList(Integer value) { List orderTypeList = new ArrayList<>(); if (null == value || EOrderBusiness.WHOLE.getValue() == value) { orderTypeList.add(EOrderType.REGISTER_ORDER.getValue()); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderOperateStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderOperateStatus.java index bfa0119..83ebc99 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderOperateStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderOperateStatus.java @@ -3,15 +3,8 @@ package com.hzs.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; - /** * 订单操作状态 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/27 11:14 - * @Classname: EOrderOperateStatus - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPayType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPayType.java index bbf92e4..731cce9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPayType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPayType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 订单支付方式 - * @Author: jiang chao - * @Time: 2022/11/4 14:11 - * @Classname: EOrderPayType - * @PackageName: com.hzs.common.core.enums + * 订单支付方式 */ @AllArgsConstructor @Getter @@ -18,16 +14,16 @@ public enum EOrderPayType { /** * 钱包 */ - WALLET(0, "钱包", 0,EnumsPrefixConstants.ORDER_PAY_TYPE + "0"), + WALLET(0, "钱包", 0, EnumsPrefixConstants.ORDER_PAY_TYPE + "0"), /** * 在线 */ - ONLINE(1, "在线", 0,EnumsPrefixConstants.ORDER_PAY_TYPE + "1"), + ONLINE(1, "在线", 0, EnumsPrefixConstants.ORDER_PAY_TYPE + "1"), /** * 线下 */ - OFFLINE(2, "线下", 0,EnumsPrefixConstants.ORDER_PAY_TYPE + "2"), + OFFLINE(2, "线下", 0, EnumsPrefixConstants.ORDER_PAY_TYPE + "2"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java index 85d8c96..e8d1f26 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java @@ -4,12 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 订单前缀 - * Author: sui q - * Time: 2022/9/8 11:09 - * Classname: EOrderPrefix - * PackageName: com.hzs.common.core.enums - * @author sshcode + * 订单前缀 */ @AllArgsConstructor @Getter @@ -129,7 +124,7 @@ public enum EOrderPrefix { /** * 在线支付 */ - ON_LINE("OL","非订单在线支付"), + ON_LINE("OL", "非订单在线支付"), /** * 修改安置 @@ -173,9 +168,7 @@ public enum EOrderPrefix { /** * 兑换年金 */ - MEMBER_ANNUITY("MA", "兑换年金") - - ; + MEMBER_ANNUITY("MA", "兑换年金"); /** * 实际值 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderSource.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderSource.java index 754fdfa..cf81444 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderSource.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderSource.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 订单来源枚举 - * @Author: sui q - * @Time: 2022/10/28 11:18 - * @Classname: EOrderSource - * @PackageName: com.hzs.common.core.enums + * 订单来源枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderStatus.java index e95c576..0def30b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderStatus.java @@ -8,11 +8,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 订单状态 - * @Author: sui q - * @Time: 2022/8/31 9:14 - * @Classname: EOrderStatus - * @PackageName: com.hzs.common.core.enums + * 订单状态 */ @AllArgsConstructor @Getter @@ -88,9 +84,9 @@ public enum EOrderStatus { return apiList; } - public static EOrderStatus getEOrderStatus(int value){ + public static EOrderStatus getEOrderStatus(int value) { for (EOrderStatus eOrderStatus : EOrderStatus.values()) { - if (eOrderStatus.value == value){ + if (eOrderStatus.value == value) { return eOrderStatus; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPayStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPayStatus.java index 39299ae..675c73b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPayStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPayStatus.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 支付状态 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPayType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPayType.java deleted file mode 100644 index d427c24..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPayType.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 支付类型 - * - * @author: hzs - */ -@AllArgsConstructor -@Getter -public enum EPayType { - - /** - * 支付宝 - */ - ALIPAY(1, "支付宝", 0, EnumsPrefixConstants.PAY_TYPE + "1"), - - /** - * 微信 - */ - WECHAT(2, "微信", 0, EnumsPrefixConstants.PAY_TYPE + "2"), - - /** - * 银行卡 - */ - BANK_CARD(3, "银行卡", 0, EnumsPrefixConstants.PAY_TYPE + "3"), - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - - /** - * 根据值获取枚举 - * - * @param value - * @return - */ - public static EPayType getEnumByValue(int value) { - for (EPayType enums : EPayType.values()) { - if (enums.getValue() == value) { - return enums; - } - } - return null; - } - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java index 42471d5..ea808da 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java @@ -6,11 +6,6 @@ import lombok.Getter; /** * 专区权限类型 - * author: sui q - * time: 2022/8/25 14:01 - * description: - * classname: EPermissionType - * package_name: com.hzs.common.core.enums */ @Getter @AllArgsConstructor diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceStatus.java index 53a25e9..99eb615 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceStatus.java @@ -4,13 +4,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: yuhui - * @Time: 2024/1/24 14:42 - * @Classname: EPersonalServiceStatus - * @PackageName: com.hzs.common.core.enums - */ @Getter @AllArgsConstructor public enum EPersonalServiceStatus { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceType.java index 59d5f54..a3e900f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPersonalServiceType.java @@ -1,23 +1,9 @@ -package com.hzs.common.core.enums;/** - * @Description: - * @Author: yuhui - * @Time: 2024/1/24 14:54 - * @Classname: EPersonalServiceType - * @PackageName: com.hzs.common.core.enums - */ +package com.hzs.common.core.enums; import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - *@BelongsProject: hzs_java_cloud_africa - *@BelongsPackage: com.hzs.common.core.enums - *@Author: yh - *@CreateTime: 2024-01-24 14:54 - *@Description: TODO - *@Version: 1.0 - */ @Getter @AllArgsConstructor public enum EPersonalServiceType { @@ -28,21 +14,21 @@ public enum EPersonalServiceType { /** * 更改个人信息 */ - UPDATE_INFO(1, "更改个人信息", 0,EnumsPrefixConstants.PERSONAL_TYPE + "1"), + UPDATE_INFO(1, "更改个人信息", 0, EnumsPrefixConstants.PERSONAL_TYPE + "1"), /** * 更改国籍 */ - UPDATE_COUNTRY(2, "更改国籍", 0,EnumsPrefixConstants.PERSONAL_TYPE + "2"), + UPDATE_COUNTRY(2, "更改国籍", 0, EnumsPrefixConstants.PERSONAL_TYPE + "2"), /** * 调整网络 */ - UPDATE_NETWORK(3, "调整网络", 0,EnumsPrefixConstants.PERSONAL_TYPE + "3"), + UPDATE_NETWORK(3, "调整网络", 0, EnumsPrefixConstants.PERSONAL_TYPE + "3"), /** * 删除订单 */ - REMOVE_ORDER(4, "删除订单", 0,EnumsPrefixConstants.PERSONAL_TYPE + "4"); + REMOVE_ORDER(4, "删除订单", 0, EnumsPrefixConstants.PERSONAL_TYPE + "4"); /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java index 304c133..4d1dbc9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 提货商品类型 - * @Author: jiang chao - * @Time: 2023/4/24 10:13 - * @Classname: EPickType - * @PackageName: com.hzs.common.core.enums + * 提货商品类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickUpType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickUpType.java index 7aea4d5..93e5948 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickUpType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickUpType.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 提货方式类型 - * @Author: jiang chao - * @Time: 2023/4/24 14:32 - * @Classname: EPickUpType - * @PackageName: com.hzs.common.core.enums + * 提货方式类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java index 51cf19c..5897402 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 安置部门 - * @Author: sui q - * @Time: 2022/8/31 11:50 - * @Classname: EPlaceDept - * @PackageName: com.hzs.common.core.enums + * 安置部门 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlanState.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlanState.java index 4a1406d..1057d92 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlanState.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlanState.java @@ -5,8 +5,6 @@ import lombok.Getter; /** * 选择枚举 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -15,7 +13,7 @@ public enum EPlanState { /** * 未选择 */ - NOT_SELECTED (0, "未选择"), + NOT_SELECTED(0, "未选择"), /** * 已选择 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPointStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPointStatus.java index dd4d7f2..20ac663 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPointStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPointStatus.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 点位状态 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPopupType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPopupType.java index 740f915..1e0822b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPopupType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPopupType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 弹窗类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/2 11:35 - * @Classname: ENoticeType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPosition.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPosition.java deleted file mode 100644 index d85293f..0000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPosition.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @description: 发布位置 广告 banner 位置 - * @author: zhang jing - * @date: 2022/12/8 17:41 - * @param: - * @return: - **/ -@AllArgsConstructor -@Getter -public enum EPosition { - - /** - * 位置一 - */ - POSITION_ONE(1, "商品展示", 0, EnumsPrefixConstants.POSITION + "1"), - - /** - * 位置二 - */ - POSITION_TWO(2, "关于我们", 0, EnumsPrefixConstants.POSITION + "2"), - - - - ; - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPositionTwo.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPositionTwo.java index 45c08e2..c97f0f4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPositionTwo.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPositionTwo.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 发布位置 - * @author: zhang jing - * @date: 2022/12/8 17:41 - * @param: - * @return: + * 发布位置 **/ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPublishDate.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPublishDate.java index 1b67fce..cdeecf4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPublishDate.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPublishDate.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 公布日期、发布日期、可提现日期 枚举 - * @Author: zhangjing - * @Time: 2022/9/1 17:39 - * @Classname: EPublishDate - * @PackageName: com.hzs.common.core.enums + * 公布日期、发布日期、可提现日期 枚举 */ @AllArgsConstructor @Getter @@ -35,7 +31,6 @@ public enum EPublishDate { FOUR(4, "11日", 0, EnumsPrefixConstants.PUBLISH_DATE + 4), - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERechargeOperationType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERechargeOperationType.java index 738ec57..b51ab60 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERechargeOperationType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERechargeOperationType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 充值操作类型 - * @Author: ljc - * @Time: 2022/9/13 14:02 - * @Classname: ERechargeType - * @Package_name: com.hzs.common.core.enums + * 充值操作类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERecommend.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERecommend.java index 1a849fe..5138573 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERecommend.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERecommend.java @@ -1,23 +1,9 @@ -package com.hzs.common.core.enums;/** - * @Description: - * @Author: yuhui - * @Time: 2023/9/10 10:30 - * @Classname: ERecommend - * @PackageName: com.hzs.common.core.enums - */ +package com.hzs.common.core.enums; import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.common.core.enums - *@Author: yh - *@CreateTime: 2023-09-10 10:30 - *@Description: TODO - *@Version: 1.0 - */ @AllArgsConstructor @Getter public enum ERecommend { @@ -34,7 +20,6 @@ public enum ERecommend { ; - /** * 实际值 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERedeemType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERedeemType.java index 388820d..4e57e90 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERedeemType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERedeemType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 兑换类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/10/14 13:58 - * @Classname: ERedeemType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERegionType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERegionType.java index efb3f1f..919ac85 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERegionType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERegionType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 区域类型枚举 - * Author: zhangjing - * Time: 2022/9/1 9:06 - * Classname: EModifyName - * PackageName: com.hzs.common.core.enums + * 区域类型枚举 */ @AllArgsConstructor @Getter @@ -33,7 +29,6 @@ public enum ERegionType { PROVINCE(4, "省", 0, EnumsPrefixConstants.EREGION_TYPE + "4"), - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetBank.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetBank.java index c845e0a..b9e2400 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetBank.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetBank.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 重置银行信息枚举 - * Author: zhangjing - * Time: 2022/9/1 9:06 - * Classname: EModifyName - * PackageName: com.hzs.common.core.enums + * 重置银行信息枚举 */ @AllArgsConstructor @Getter @@ -20,8 +16,6 @@ public enum EResetBank { */ RESET_BANK(1, "重置银行", 0, EnumsPrefixConstants.ERESET_BANK + "1"), - - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetType.java index 296b203..27c3a56 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetType.java @@ -5,21 +5,16 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 订单编号重置规则 - * @author: sui q - * @time: 2024/2/21 14:03 - * @classname: EResetType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 订单编号重置规则 */ @AllArgsConstructor @Getter public enum EResetType { - /** - * 0=按照日 + /** + * 0=按照日 */ - DAY(0, "按照日", 0,EnumsPrefixConstants.ORDER_STATUS + "0"), + DAY(0, "按照日", 0, EnumsPrefixConstants.ORDER_STATUS + "0"), /** * 1=按照月 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERoleDataScope.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERoleDataScope.java index 914f026..d36b6b2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERoleDataScope.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERoleDataScope.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 角色数据范围枚举类 - * - * @author hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java index 6a811c1..fe0e698 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 销售类型枚举 - * @Author: jiang chao - * @Time: 2023/3/21 14:46 - * @Classname: ESaleType - * @PackageName: com.hzs.common.core.enums + * 销售类型枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java index e2af38d..f615028 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmOrderType.java @@ -5,12 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 进销存订单类型 - * @author: sui q - * @time: 2023/11/17 15:34 - * @classname: EScmOrderType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 进销存订单类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java index 5a46efa..a7f639f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EScmTransferType.java @@ -5,12 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 调拨方式 - * @author: sui q - * @time: 2023/12/8 10:12 - * @classname: EScmTransferType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 调拨方式 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignInState.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignInState.java index 7cc6559..94e5684 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignInState.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignInState.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 修改登录状态枚举 - * Author: zhangjing - * Time: 2022/9/1 9:06 - * Classname: ESignInState - * PackageName: com.hzs.common.core.enums + * 修改登录状态枚举 */ @AllArgsConstructor @Getter @@ -29,7 +25,6 @@ public enum ESignInState { PROHIBIT(2, "禁止登录", 0, EnumsPrefixConstants.ESIGN_IN_STATE + "2"), - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java index adde1f8..2362ee5 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 签呈来源 - * @Author: jiang chao - * @Time: 2023/4/10 14:09 - * @Classname: EApprovalSource - * @PackageName: com.hzs.common.core.enums + * 签呈来源 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStandard.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStandard.java index 66f21dd..2abb2dd 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStandard.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStandard.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 车奖旅游奖达标状态 - * @author: zhang jing - * @date: 2024/6/7 11:31 - * @param: - * @return: + * 车奖旅游奖达标状态 **/ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatisticalValue.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatisticalValue.java index dfdf209..1445989 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatisticalValue.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatisticalValue.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @author: sui q - * @time: 2022/8/25 14:18 - * @description: 统计类型枚举 - * @classname: EStatisticalValue - * @package_name: com.hzs.common.core.enums + * 统计类型枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatus.java index add2b2f..b6eceda 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatus.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 系统成功/失败枚举类 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStoreStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStoreStatus.java index a1b0be4..7c414d6 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStoreStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStoreStatus.java @@ -5,12 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 店铺状态 - * @author: sui q - * @time: 2023/11/16 14:29 - * @classname: ECustType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 店铺状态 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStructureType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStructureType.java index 73ccc36..f0e714d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStructureType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStructureType.java @@ -4,13 +4,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/7/17 17:21 - * @Classname: EStructureType - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum EStructureType { @@ -22,16 +15,16 @@ public enum EStructureType { /** * 架构二 */ - JG2( "架构二",2), + JG2("架构二", 2), /** * 架构三 */ - JG3("架构三",3 ), + JG3("架构三", 3), /** * 架构四 */ - JG4("架构四",4 ); + JG4("架构四", 4); /** * 实际值 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESubmitType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESubmitType.java index a874348..29a8be7 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESubmitType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESubmitType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 提交类型 - * @Author: yuhui - * @Time: 2022/11/11 16:06 - * @Classname: ESubmitType - * @PackageName: com.hzs.common.core.enums + * 提交类型 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplierType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplierType.java index 6013528..cf5ff9e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplierType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplierType.java @@ -5,12 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 客商类型 - * @author: sui q - * @time: 2023/11/16 14:29 - * @classname: ECustType - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 客商类型 */ @AllArgsConstructor @Getter @@ -27,8 +22,7 @@ public enum ESupplierType { OUT_CUSTOMER(4, "外部客户", 0, EnumsPrefixConstants.SUPPLIER_TYPE + 4), - MEMBER_CUSTOMER(5, "人员客户", 0, EnumsPrefixConstants.SUPPLIER_TYPE + 5) - ; + MEMBER_CUSTOMER(5, "人员客户", 0, EnumsPrefixConstants.SUPPLIER_TYPE + 5); /** * 实际值 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplyWay.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplyWay.java index 5d333f6..60344e1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplyWay.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplyWay.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 供应方式 - * @Author: jiang chao - * @Time: 2022/11/4 11:58 - * @Classname: ESupplyWay - * @PackageName: com.hzs.common.core.enums + * 供应方式 */ @AllArgsConstructor @Getter @@ -44,9 +40,9 @@ public enum ESupplyWay { */ private final String key; - public static ESupplyWay getESupplyWay(int value){ + public static ESupplyWay getESupplyWay(int value) { for (ESupplyWay eSupplyWay : ESupplyWay.values()) { - if (eSupplyWay.value == value){ + if (eSupplyWay.value == value) { return eSupplyWay; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystem.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystem.java index 716d022..59c8a78 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystem.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystem.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 所属系统 - * @Author: jiang chao - * @Time: 2024/4/15 10:47 - * @Classname: ESystem - * @PackageName: com.hzs.common.core.enums + * 所属系统 */ @AllArgsConstructor @Getter @@ -16,12 +12,10 @@ public enum ESystem { AFRICA("africa", "非洲"), - EUROPE("europe", "欧洲"), - - ASIA("asia", "亚洲"), ; private final String value; + private final String label; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java index 3cec56d..816061f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java @@ -8,11 +8,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 系统配置参数初始化，该点不需要翻译 - * @Author: sui q - * @Time: 2022/9/6 19:49 - * @Classname: ESystemConfig - * @PackageName: com.hzs.common.core.enums + * 系统配置参数初始化，该点不需要翻译 */ @AllArgsConstructor @Getter @@ -36,7 +32,7 @@ public enum ESystemConfig { /** * 安置位置 1=任意 2=左 3=右 安置校验的 */ - PLACE_POSITION("0","安置位置", 0, "PLACE_3"), + PLACE_POSITION("0", "安置位置", 0, "PLACE_3"), /** * 注册等级 参照等级 @@ -145,8 +141,8 @@ public enum ESystemConfig { * 专区时间 * @return */ - public static List getPayMentTimeList(){ - List list =new ArrayList<>(); + public static List getPayMentTimeList() { + List list = new ArrayList<>(); list.add(REGISTER_ORDER_TIME); list.add(UPGRADE_ORDER_TIME); list.add(REPURCHASE_ORDER_TIME); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETakeValueType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETakeValueType.java index d349e3d..96b40b6 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETakeValueType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETakeValueType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 直推配置取值类型枚举 - * @author: zhang jing - * @date: 2023/6/2 16:24 - * @param: - * @return: + * 直推配置取值类型枚举 **/ @AllArgsConstructor @Getter @@ -17,7 +13,7 @@ public enum ETakeValueType { /** * 比例 */ - ORIGINAL (1, "原值", 0, EnumsPrefixConstants.TAKE_VALUE_TYPE + "1"), + ORIGINAL(1, "原值", 0, EnumsPrefixConstants.TAKE_VALUE_TYPE + "1"), LEAST(2, "最小", 0, EnumsPrefixConstants.TAKE_VALUE_TYPE + "2"), @@ -40,9 +36,9 @@ public enum ETakeValueType { */ private final String key; - public static ETakeValueType getETakeValueType(int value){ + public static ETakeValueType getETakeValueType(int value) { for (ETakeValueType eTakeValueType : ETakeValueType.values()) { - if (eTakeValueType.value == value){ + if (eTakeValueType.value == value) { return eTakeValueType; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETheLable.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETheLable.java index f1c6eea..6b3e691 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETheLable.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETheLable.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 列表显示隐藏控制枚举 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -15,122 +13,116 @@ public enum ETheLable { /** * 会员编号 */ - TITEL_1(1, "会员编号", "memberCode","true", EnumsPrefixConstants.THELABLE + "1"), + TITEL_1(1, "会员编号", "memberCode", "true", EnumsPrefixConstants.THELABLE + "1"), /** * 会员姓名 */ - TITEL_2(2, "会员姓名", "memberName","true", EnumsPrefixConstants.THELABLE + "2"), + TITEL_2(2, "会员姓名", "memberName", "true", EnumsPrefixConstants.THELABLE + "2"), /** * 联系方式 */ - TITEL_3(3, "联系方式", "phone","true", EnumsPrefixConstants.THELABLE + "3"), + TITEL_3(3, "联系方式", "phone", "true", EnumsPrefixConstants.THELABLE + "3"), /** * 推荐编号 */ - TITEL_4(4, "推荐编号", "parMemberCode","false", EnumsPrefixConstants.THELABLE + "4"), + TITEL_4(4, "推荐编号", "parMemberCode", "false", EnumsPrefixConstants.THELABLE + "4"), /** * 推荐姓名 */ - TITEL_5(5, "推荐姓名", "parMemberName", "false",EnumsPrefixConstants.THELABLE + "5"), + TITEL_5(5, "推荐姓名", "parMemberName", "false", EnumsPrefixConstants.THELABLE + "5"), /** * 安置编号 */ - TITEL_6(6, "安置编号", "placeMemberCode", "false",EnumsPrefixConstants.THELABLE + "6"), + TITEL_6(6, "安置编号", "placeMemberCode", "false", EnumsPrefixConstants.THELABLE + "6"), /** * 安置姓名 */ - TITEL_7(7, "安置姓名", "placeMemberName", "false",EnumsPrefixConstants.THELABLE + "7"), + TITEL_7(7, "安置姓名", "placeMemberName", "false", EnumsPrefixConstants.THELABLE + "7"), /** * 真实奖衔 */ - TITEL_8(8, "真实奖衔", "pkAwardsVal", "true",EnumsPrefixConstants.THELABLE + "8"), + TITEL_8(8, "真实奖衔", "pkAwardsVal", "true", EnumsPrefixConstants.THELABLE + "8"), /** * 订单状态 */ - TITEL_9(9, "订单状态", "orderSourceVal", "true",EnumsPrefixConstants.THELABLE + "9"), + TITEL_9(9, "订单状态", "orderSourceVal", "true", EnumsPrefixConstants.THELABLE + "9"), /** * 服务中心编号 */ - TITEL_10(10, "服务中心编号", "centerMemberCode", "false",EnumsPrefixConstants.THELABLE + "10"), + TITEL_10(10, "服务中心编号", "centerMemberCode", "false", EnumsPrefixConstants.THELABLE + "10"), /** * 服务中心姓名 */ - TITEL_11(11, "服务中心姓名", "centerMemberName", "false",EnumsPrefixConstants.THELABLE + "11"), + TITEL_11(11, "服务中心姓名", "centerMemberName", "false", EnumsPrefixConstants.THELABLE + "11"), /** * 注册等级 */ - TITEL_12(12, "注册等级", "registerName", "false",EnumsPrefixConstants.THELABLE + "12"), + TITEL_12(12, "注册等级", "registerName", "false", EnumsPrefixConstants.THELABLE + "12"), /** * 结算等级 */ - TITEL_13(13, "结算等级", "settleName", "false",EnumsPrefixConstants.THELABLE + "13"), + TITEL_13(13, "结算等级", "settleName", "false", EnumsPrefixConstants.THELABLE + "13"), /** * 注册金额 */ - TITEL_14(14, "注册金额", "consumeMoney", "false",EnumsPrefixConstants.THELABLE + "14"), + TITEL_14(14, "注册金额", "consumeMoney", "false", EnumsPrefixConstants.THELABLE + "14"), /** * 注册业绩 */ - TITEL_15(15, "注册业绩", "consumeAchieve", "false",EnumsPrefixConstants.THELABLE + "15"), + TITEL_15(15, "注册业绩", "consumeAchieve", "false", EnumsPrefixConstants.THELABLE + "15"), /** * 隶属体系 */ - TITEL_16(16, "隶属体系", "vertexName", "false",EnumsPrefixConstants.THELABLE + "16"), + TITEL_16(16, "隶属体系", "vertexName", "false", EnumsPrefixConstants.THELABLE + "16"), /** * 隶属团队 */ - TITEL_17(17, "隶属团队", "teamName", "false",EnumsPrefixConstants.THELABLE + "17"), + TITEL_17(17, "隶属团队", "teamName", "false", EnumsPrefixConstants.THELABLE + "17"), /** * 注册权限 */ - TITEL_18(18, "注册权限", "registerAuthorityVal", "false",EnumsPrefixConstants.THELABLE + "18"), + TITEL_18(18, "注册权限", "registerAuthorityVal", "false", EnumsPrefixConstants.THELABLE + "18"), /** * 实名认证 */ - TITEL_19(19, "实名认证", "isRealNameVal", "false",EnumsPrefixConstants.THELABLE + "19"), + TITEL_19(19, "实名认证", "isRealNameVal", "false", EnumsPrefixConstants.THELABLE + "19"), /** * 营业执照 */ - TITEL_20(20, "营业执照", "isBusLicenseVal","false", EnumsPrefixConstants.THELABLE + "20"), + TITEL_20(20, "营业执照", "isBusLicenseVal", "false", EnumsPrefixConstants.THELABLE + "20"), /** * 创客空间 */ - TITEL_21(21, "创客空间", "isMakerSpaceVal", "false",EnumsPrefixConstants.THELABLE + "12"), + TITEL_21(21, "创客空间", "isMakerSpaceVal", "false", EnumsPrefixConstants.THELABLE + "12"), /** * 账户状态 */ - TITEL_22(22, "账户状态", "accountStatusVal","false", EnumsPrefixConstants.THELABLE + "22"), + TITEL_22(22, "账户状态", "accountStatusVal", "false", EnumsPrefixConstants.THELABLE + "22"), /** * 钱包状态 */ - TITEL_23(23, "钱包状态", "walletStatusVal","false", EnumsPrefixConstants.THELABLE + "23"), + TITEL_23(23, "钱包状态", "walletStatusVal", "false", EnumsPrefixConstants.THELABLE + "23"), /** * 收益状态 */ - TITEL_24(24, "收益状态", "incomeStatusVal", "false",EnumsPrefixConstants.THELABLE + "24"), + TITEL_24(24, "收益状态", "incomeStatusVal", "false", EnumsPrefixConstants.THELABLE + "24"), /** * 创建时间 */ - TITEL_25(25, "创建时间", "creationTime", "true",EnumsPrefixConstants.THELABLE + "25"), + TITEL_25(25, "创建时间", "creationTime", "true", EnumsPrefixConstants.THELABLE + "25"), /** * 支付时间 */ - TITEL_26(26, "支付时间", "payTime", "true",EnumsPrefixConstants.THELABLE + "26"), + TITEL_26(26, "支付时间", "payTime", "true", EnumsPrefixConstants.THELABLE + "26"), /** * 变更次数 */ - TITEL_27(27, "变更次数", "changeNumber", "true",EnumsPrefixConstants.THELABLE + "27"), + TITEL_27(27, "变更次数", "changeNumber", "true", EnumsPrefixConstants.THELABLE + "27"), /** * 修改直推次数 */ - TITEL_28(28, "修改直推次数", "editNumber", "true",EnumsPrefixConstants.THELABLE + "28"), - - - - - - + TITEL_28(28, "修改直推次数", "editNumber", "true", EnumsPrefixConstants.THELABLE + "28"), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeIncomeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeIncomeType.java index 8ffeabe..ec213fe 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeIncomeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeIncomeType.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 升级收益方式 - * @Author: sui q - * @Time: 2022/11/10 19:16 - * @Classname: EUpgradeIncomeType - * @PackageName: com.hzs.common.core.enums + * 升级收益方式 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNo.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNo.java index def509c..2061351 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNo.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNo.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 系统是否枚举类 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoAttestation.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoAttestation.java index 008cb91..1d7241d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoAttestation.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoAttestation.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 是否认证 - * @Author: sui q - * @Time: 2022/10/28 15:22 - * @Classname: EYesNoAttestation - * @PackageName: com.hzs.common.core.enums + * 是否认证 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java index 94f2e4d..e9f9456 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 是否上传 - * @Author: sui q - * @Time: 2022/10/28 15:20 - * @Classname: EYesNoBusLicense - * @PackageName: com.hzs.common.core.enums + * 是否上传 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/HonorWallType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/HonorWallType.java index bea2523..51c6135 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/HonorWallType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/HonorWallType.java @@ -3,13 +3,6 @@ package com.hzs.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/26 19:36 - * @Classname: honorWallType - * @PackageName: com.hzs.common.core.enums - */ @AllArgsConstructor @Getter public enum HonorWallType { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/service/RedisService.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/service/RedisService.java index 84a79eb..a1d003c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/service/RedisService.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/service/RedisService.java @@ -14,8 +14,6 @@ import java.util.concurrent.TimeUnit; /** * spring redis 工具类 - * - * @author hzs **/ @SuppressWarnings(value = {"unchecked", "rawtypes"}) @Component diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberAchieve.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberAchieve.java index 55859c5..8027718 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberAchieve.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberAchieve.java @@ -10,12 +10,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - *

* 会员业绩记录 - *

- * - * @author hzs - * @since 2022-10-26 */ @Data public class CuMemberAchieve implements Serializable { diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthAchieve.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthAchieve.java index 9274721..07ecd70 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthAchieve.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthAchieve.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员月数据 - *

- * - * @author hzs - * @since 2023-06-06 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java index 9b2cfbe..260b0f9 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员团队配置 - *

- * - * @author hzs - * @since 2022-09-01 */ @Data @EqualsAndHashCode(callSuper = true) @@ -63,8 +58,4 @@ public class CuMemberTeam extends BaseEntity { private Integer pkTransaction; - - - - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAwards.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAwards.java index c00bf5d..1bc3bcf 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAwards.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAwards.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员信息-奖衔升级记录 - *

- * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuHonorWallExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuHonorWallExt.java index 413ce31..f4973bc 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuHonorWallExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuHonorWallExt.java @@ -1,10 +1,4 @@ -package com.hzs.common.domain.member.ext;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/11 14:51 - * @Classname: CuHonorWallExt - * @PackageName: com.hzs.common.domain.member.ext - */ +package com.hzs.common.domain.member.ext; import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.domain.member.honor.CuHonorWall; @@ -12,21 +6,13 @@ import lombok.Data; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.common.domain.member.ext - *@Author: yh - *@CreateTime: 2023-05-11 14:51 - *@Description: TODO - *@Version: 1.0 - */ @Data public class CuHonorWallExt extends CuHonorWall { /** * 备注 */ - private String remarks ; + private String remarks; /** * 0 拥有 1 未拥有 diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberMonthAchieveExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberMonthAchieveExt.java index a98a419..650ea4e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberMonthAchieveExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberMonthAchieveExt.java @@ -7,12 +7,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * @description: 月业绩统计扩展表 - * @author: sui q - * @time: 2023/6/7 14:47 - * @classname: CuMemberMonthAchieveExt - * @package_name: com.hzs.common.domain.member.ext - * version 1.0.0 + * 月业绩统计扩展表 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuHonorWall.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuHonorWall.java index 24534e5..0134bd8 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuHonorWall.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuHonorWall.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 荣誉墙 - *

- * - * @author hzs - * @since 2023-04-26 */ @Data @EqualsAndHashCode(callSuper = true) @@ -33,7 +28,7 @@ public class CuHonorWall extends BaseEntity { private Long pkId; /** - * 类型 1 等级 2 奖衔 3 时长 4 推荐月 5 推荐季度 6 推荐年 7 抗衰月 8 抗衰季度 9 抗衰年 + * 类型 1 等级 2 奖衔 3 时长 4 推荐月 5 推荐季度 6 推荐年 7 抗衰月 8 抗衰季度 9 抗衰年 */ @TableField("TYPE") private Integer type; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuMemberHonorWall.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuMemberHonorWall.java index 89c63ef..e3d21a6 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuMemberHonorWall.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/honor/CuMemberHonorWall.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员荣誉墙关联表 - *

- * - * @author hzs - * @since 2023-04-26 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliver.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliver.java index 5582026..c1a34c1 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliver.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliver.java @@ -2,7 +2,9 @@ package com.hzs.common.domain.sale.deliver; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -12,9 +14,6 @@ import lombok.experimental.Accessors; /** * 销售订单-发货单 - * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = true) @@ -111,7 +110,7 @@ public class SaDeliver extends BaseEntity { @TableField("REC_ADDRESS") private String recAddress; - /** + /** * 运输方式 */ @TableField("TRAN_TYPE") diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java index 7e7dab5..1e76929 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java @@ -10,9 +10,6 @@ import lombok.experimental.Accessors; /** * 发货单明细表 - * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverExt.java index 988610a..fa30f8f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverExt.java @@ -7,12 +7,7 @@ import lombok.EqualsAndHashCode; import java.util.List; /** - * @description: 发货单主表扩展类 - * @author: sui q - * @time: 2023/11/29 16:56 - * @classname: SaDeliverExt - * @package_name: com.hzs.common.domain.sale.ext - * version 1.0.0 + * 发货单主表扩展类 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverItemsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverItemsExt.java index 64d958b..2748721 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverItemsExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaDeliverItemsExt.java @@ -5,11 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * @Description: 发货单明细扩展 - * @Author: jiang chao - * @Time: 2022/11/1 18:22 - * @Classname: SaDeliverItemsExt - * @PackageName: com.hzs.common.domain.sale.ext + * 发货单明细扩展 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java index 9ac1156..6bb7e55 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java @@ -10,11 +10,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 订单详情扩展 - * @Author: jiang chao - * @Time: 2022/10/19 16:46 - * @Classname: SaOrderItemExt - * @PackageName: com.hzs.common.domain.sale.ext + * 订单详情扩展 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/modifyRecord/BdModifyRecord.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/modifyRecord/BdModifyRecord.java index 097fe71..7ba914d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/modifyRecord/BdModifyRecord.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/modifyRecord/BdModifyRecord.java @@ -10,12 +10,7 @@ import lombok.experimental.Accessors; import java.util.Date; /** - *

* 修改记录 - *

- * - * @author hzs - * @since 2023-02-27 */ @Data @EqualsAndHashCode(callSuper = false) @@ -25,7 +20,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -public class BdModifyRecord { +public class BdModifyRecord { private static final long serialVersionUID = 1L; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java index 826f1d5..c70c37a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java @@ -11,12 +11,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

* 销售订单-明细表 - *

- * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = false) @@ -157,13 +152,13 @@ public class SaOrderItems extends BaseEntity { private String logisticsCompany; /** - * 是否创客礼包 + * 是否创客礼包 */ @TableField("IS_MAKER_GIFT") private Integer isMakerGift; /** - * 消费配置主键 + * 消费配置主键 */ @TableField("PK_SPECIAL_CURRENCY") private Integer pkSpecialCurrency; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java index 9589a55..976133a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java @@ -4,9 +4,12 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import com.hzs.common.core.web.domain.BaseEntity; @@ -15,12 +18,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

- * 邮费详情设置 - *

- * - * @author hzs - * @since 2022-09-01 + * 产品详情 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java index f957c97..5e6d7b6 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 商品发布明细表 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java index 9bf2a26..5960c20 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 商品发布扩展表 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) @@ -83,7 +78,7 @@ public class BdWaresExtend extends BaseEntity { /** * 海运邮费 */ - @TableField( "PK_OCEAN_POSTAGE") + @TableField("PK_OCEAN_POSTAGE") private Integer pkOceanPostage; /** @@ -160,13 +155,13 @@ public class BdWaresExtend extends BaseEntity { /** - * 是否创客礼包 + * 是否创客礼包 */ @TableField("IS_MAKER_GIFT") private Integer isMakerGift; /** - * 消费配置主键 + * 消费配置主键 */ @TableField("PK_SPECIAL_CURRENCY") private Integer pkSpecialCurrency; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java index dde3de9..91b9668 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java @@ -13,12 +13,7 @@ import java.math.BigDecimal; import java.util.List; /** - *

* 可用量 - *

- * - * @author hzs - * @since 2023-12-09 */ @Data @EqualsAndHashCode(callSuper = true) @@ -80,12 +75,12 @@ public class IcAvailableNum extends BaseEntity { @TableField("AVAILABLE_NUM") private BigDecimal availableNum; - @TableField(exist=false) + @TableField(exist = false) private List scmItemSpecsList; /** * 预售状态 */ - @TableField(exist=false) + @TableField(exist = false) private Integer preSaleStatus; } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java index dfeaeae..3501296 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableSpecs.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 可用量规格明细 - *

- * - * @author hzs - * @since 2023-12-11 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java index 87b3b21..e72c19f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandNum.java @@ -15,12 +15,7 @@ import java.util.Date; import java.util.List; /** - *

* 现存量 - *

- * - * @author hzs - * @since 2023-11-21 */ @Data @EqualsAndHashCode(callSuper = true) @@ -102,6 +97,6 @@ public class IcOnHandNum extends BaseEntity { @TableField("PK_BATCH_CODE") private Long pkBatchCode; - @TableField(exist=false) + @TableField(exist = false) private List scmItemSpecsList; } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java index edc34b5..6c6618c 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcOnHandSpecs.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 现存量规格明细 - *

- * - * @author hzs - * @since 2023-11-21 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java index 12f936f..e2b4beb 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/ext/IcAvailableNumExt.java @@ -7,12 +7,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * @description: 可用量扩展表 - * @author: sui q - * @time: 2023/12/18 15:11 - * @classname: IcAvailableNumExt - * @package_name: com.hzs.common.domain.scm.ic.ext - * version 1.0.0 + * 可用量扩展表 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java index 0a07486..677c728 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/no/ScmBillNo.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 订单编号规则设置 - *

- * - * @author hzs - * @since 2024-02-21 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java index 65c9117..abffc15 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmItemSpecs.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 订单规格明细 - *

- * - * @author hzs - * @since 2023-11-21 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java index 6a52636..e6a220e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/pub/ScmOrderApproveLog.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 供应链单据审批记录 - *

- * - * @author hzs - * @since 2023-11-24 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java index 9f55d39..41cf1b2 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcDelSaleLog.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 发货单生成销售出库日志 - *

- * - * @author hzs - * @since 2023-12-01 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java index 4a93548..ee45e38 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/sale/IcSaleoutH.java @@ -12,12 +12,7 @@ import java.math.BigDecimal; import java.util.Date; /** - *

* 销售出库单表头 - *

- * - * @author hzs - * @since 2023-11-29 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java index 94b6122..a9357e8 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java @@ -11,12 +11,7 @@ import lombok.Data; import lombok.experimental.Accessors; /** - *

* 国家表 - *

- * - * @author hzs - * @since 2022-08-03 */ @Data @Accessors(chain = true) @@ -55,7 +50,6 @@ public class BdCountry implements Serializable { private String codeThree; - /** * 国旗 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouse.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouse.java index afba042..03eaa89 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouse.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouse.java @@ -10,12 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - *

- *仓库信息实体类 - *

- * - * @author hzs - * @since 2022-08-02 + * 仓库信息实体类 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAccount.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAccount.java index d6d4626..e2695d8 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAccount.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAccount.java @@ -18,12 +18,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 币种配置表 - *

- * - * @author zhangjing - * @since 2022-08-25 */ @Data @EqualsAndHashCode(callSuper = false) @@ -40,7 +35,7 @@ public class BdAccount extends BaseEntity { /** * 账户名称 */ - @Excel(name = "账户名称",sort = 1) + @Excel(name = "账户名称", sort = 1) @TableField("ACCOUNT_NAME") private String accountName; @@ -66,7 +61,7 @@ public class BdAccount extends BaseEntity { /** * 账户属性 */ - @Excel(name = "账户属性",sort = 2) + @Excel(name = "账户属性", sort = 2) @TableField(exist = false) private String fieldValueVal; @@ -85,7 +80,7 @@ public class BdAccount extends BaseEntity { /** * 转账 */ - @Excel(name = "转账",sort = 6) + @Excel(name = "转账", sort = 6) @TableField(exist = false) private String isTransferVal; @@ -98,7 +93,7 @@ public class BdAccount extends BaseEntity { /** * 提现 */ - @Excel(name = "提现",sort = 7) + @Excel(name = "提现", sort = 7) @TableField(exist = false) private String isWithdrawalVal; @@ -111,7 +106,7 @@ public class BdAccount extends BaseEntity { /** * 是否固定 */ - @Excel(name = "固定",sort = 4) + @Excel(name = "固定", sort = 4) @TableField(exist = false) private String isRegularVal; @@ -124,7 +119,7 @@ public class BdAccount extends BaseEntity { /** * 邮费 */ - @Excel(name = "邮费",sort = 5) + @Excel(name = "邮费", sort = 5) @TableField(exist = false) private String isPostageVal; @@ -137,7 +132,7 @@ public class BdAccount extends BaseEntity { /** * 充值 */ - @Excel(name = "充值",sort = 8) + @Excel(name = "充值", sort = 8) @TableField(exist = false) private String isRechargeVal; @@ -151,7 +146,7 @@ public class BdAccount extends BaseEntity { /** * 转化币种 */ - @Excel(name = "转化币种",sort = 3) + @Excel(name = "转化币种", sort = 3) @TableField(exist = false) private String pkBdAccountVal; @@ -159,7 +154,7 @@ public class BdAccount extends BaseEntity { /** * 生效日期 */ - @Excel(name = "生效日期",sort = 9) + @Excel(name = "生效日期", sort = 9) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("EFFECTIVE_DATE") private Date effectiveDate; @@ -180,7 +175,7 @@ public class BdAccount extends BaseEntity { /** * 是否在线充值0=是,1=否） -- 来源EYesNo */ - @Excel(name = "是否在线充值",sort = 10) + @Excel(name = "是否在线充值", sort = 10) @TableField(exist = false) private String onLineRechargeVal; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrency.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrency.java index 21b10cd..f69a2d0 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrency.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrency.java @@ -16,12 +16,7 @@ import lombok.experimental.Accessors; import java.util.Date; /** - *

* 消费配置表 - *

- * - * @author zhangjing - * @since 2022-08-26 */ @Data @EqualsAndHashCode(callSuper = false) @@ -54,5 +49,4 @@ public class BdAreaCurrency extends BaseEntity { private Date effectiveDate; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrencyDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrencyDetail.java index b2d456a..6a7fd49 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrencyDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrencyDetail.java @@ -15,12 +15,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - *

* 消费配置详情表 - *

- * - * @author zhangjing - * @since 2022-08-26 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java index 1dddfb2..0092bea 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAwards.java @@ -14,12 +14,7 @@ import org.apache.ibatis.type.JdbcType; import java.math.BigDecimal; /** - *

* 奖衔配置类 - *

- * - * @author zhangjing - * @since 2022-09-08 */ @Data @EqualsAndHashCode(callSuper = true) @@ -36,7 +31,7 @@ public class BdAwards extends BaseEntity { /** * 奖衔名称 */ - @Excel(name = "奖衔名称",sort = 1) + @Excel(name = "奖衔名称", sort = 1) @TableField("AWARDS_NAME") private String awardsName; /** @@ -60,7 +55,7 @@ public class BdAwards extends BaseEntity { /** * 安置小区考核PV (万为单位) */ - @Excel(name = "小区业绩PV",sort = 2) + @Excel(name = "小区业绩PV", sort = 2) @TableField("COMMUNITY_CHECK") private BigDecimal communityCheck; @@ -73,14 +68,14 @@ public class BdAwards extends BaseEntity { /** * 复购考核 */ - @Excel(name = "复购考核PV",sort = 3) + @Excel(name = "复购考核PV", sort = 3) @TableField("PURCHASE_CHECK") private BigDecimal purchaseCheck; /** * 分红考核 */ - @Excel(name = "分红考核BV",sort = 4) + @Excel(name = "分红考核BV", sort = 4) @TableField("SHARE_CHECK") private BigDecimal shareCheck; @@ -92,29 +87,29 @@ public class BdAwards extends BaseEntity { /** * 车奖积分（车奖比例） */ - @TableField(value = "CAR_AWARD_POINTS",jdbcType = JdbcType.NUMERIC,updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "CAR_AWARD_POINTS", jdbcType = JdbcType.NUMERIC, updateStrategy = FieldStrategy.IGNORED) private BigDecimal carAwardPoints; /** * 左区奖衔 */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - @Excel(name = "左区奖衔",sort = 5) - @TableField(value = "PK_CHECK_AWARDS_LEFT", jdbcType = JdbcType.NUMERIC,updateStrategy = FieldStrategy.IGNORED) + @Excel(name = "左区奖衔", sort = 5) + @TableField(value = "PK_CHECK_AWARDS_LEFT", jdbcType = JdbcType.NUMERIC, updateStrategy = FieldStrategy.IGNORED) private Integer pkCheckAwardsLeft; /** * 右区奖衔 */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - @Excel(name = "右区奖衔",sort = 6) - @TableField(value="PK_CHECK_AWARDS_RIGHT",jdbcType = JdbcType.NUMERIC,updateStrategy = FieldStrategy.IGNORED) + @Excel(name = "右区奖衔", sort = 6) + @TableField(value = "PK_CHECK_AWARDS_RIGHT", jdbcType = JdbcType.NUMERIC, updateStrategy = FieldStrategy.IGNORED) private Integer pkCheckAwardsRight; /** * 考核类型 来源于枚举 */ - @TableField(value="RELATION_TYPE",jdbcType = JdbcType.NUMERIC,updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "RELATION_TYPE", jdbcType = JdbcType.NUMERIC, updateStrategy = FieldStrategy.IGNORED) private Integer relationType; /** diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusItems.java index 8ced6e1..68e08ba 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusItems.java @@ -14,12 +14,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 奖项配置 - *

- * - * @author zhangjing - * @since 2022-11-09 */ @Data @EqualsAndHashCode(callSuper = true) @@ -36,7 +31,7 @@ public class BdBonusItems extends BaseEntity { /** * 奖金名称 */ - @Excel(name = "奖金名称",sort=1) + @Excel(name = "奖金名称", sort = 1) @TableField("BONUS_NAME") private String bonusName; @@ -68,7 +63,7 @@ public class BdBonusItems extends BaseEntity { /** * 公布时间 */ - @Excel(name = "公布时间",sort=3) + @Excel(name = "公布时间", sort = 3) @TableField("PUBLISH_TIME") private String publishTime; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java index a7d2b63..063b207 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java @@ -12,12 +12,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

* 自动提现明细表 - *

- * - * @author zhangjing - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = true) @@ -47,5 +42,4 @@ public class BdWithdrawalAuto extends BaseEntity { private Integer withdrawalCycle; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalSpecial.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalSpecial.java index 7164695..1b20e51 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalSpecial.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalSpecial.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 提现设置特殊配置 - *

- * - * @author zhangjing - * @since 2022-09-06 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java index 6281b26..678892e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAwardsExt.java @@ -1,24 +1,14 @@ package com.hzs.common.domain.system.config.ext; -import com.baomidou.mybatisplus.annotation.TableId; 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.domain.system.config.BdAwards; -import com.hzs.common.domain.system.config.BdAwardsDetail; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; import java.util.List; /** - *

* 奖衔配置类 - *

- * - * @author zhangjing - * @since 2022-09-08 */ @EqualsAndHashCode(callSuper = true) @Data @@ -28,7 +18,7 @@ public class BdAwardsExt extends BdAwards { /** * 关系类型名称 */ - @Excel(name = "考核",sort = 7) + @Excel(name = "考核", sort = 7) private String relationTypeVal; /** * 辅导分红集合 @@ -59,5 +49,4 @@ public class BdAwardsExt extends BdAwards { private String awardsValueVal; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdStoreLevelExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdStoreLevelExt.java index 64b5a2a..927b66b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdStoreLevelExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdStoreLevelExt.java @@ -3,17 +3,14 @@ package com.hzs.common.domain.system.config.ext; import com.hzs.common.domain.system.config.BdStoreLevel; import com.hzs.common.domain.system.config.BdStoreLevelDetail; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; /** - * @description: 店铺等级扩展表 - * @author: sui q - * @time: 2023/5/8 16:03 - * @classname: BdStoreLevelExt - * @package_name: com.hzs.common.domain.system.config.ext - * version 1.0.0 + * 店铺等级扩展表 */ +@EqualsAndHashCode(callSuper = true) @Data public class BdStoreLevelExt extends BdStoreLevel { diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java index 1d6ed50..5d2eb50 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java @@ -16,26 +16,14 @@ import java.util.Date; import java.util.List; /** - *

* 个税明细表 - *

- * - * @author zhangjing - * @since 2022-09-06 */ +@EqualsAndHashCode(callSuper = true) @Data public class BdWithdrawalTaxExt extends BdWithdrawalTax { private static final long serialVersionUID = 1L; - private List withdrawalTaxDetailsList; - - - - - - - } diff --git a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/interceptor/HeaderInterceptor.java b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/interceptor/HeaderInterceptor.java index f5cb674..4ddfca3 100644 --- a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/interceptor/HeaderInterceptor.java +++ b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/interceptor/HeaderInterceptor.java @@ -19,8 +19,6 @@ import com.hzs.system.sys.dto.LoginUser; /** * 自定义请求头拦截器，将Header数据封装到线程变量中方便获取 * 注意：此拦截器会同时验证当前用户有效期自动刷新有效期 - * - * @author hzs */ public class HeaderInterceptor implements AsyncHandlerInterceptor { @@ -48,7 +46,7 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor { SecurityContextHolder.setUserCountry(loginUser.getDataCountry().toString()); } } else { - // 会员、分享会员、生态科技仓小程序游客 处理 + // 会员、分享会员 处理 LoginMember loginMember = AuthMemberUtil.getLoginMember(token); if (StringUtils.isNotNull(loginMember)) { AuthMemberUtil.verifyLoginMemberExpire(loginMember); diff --git a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java index 26c8c75..ede4eb1 100644 --- a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java +++ b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java @@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit; /** * token验证处理 - * - * @author hzs */ @Component public class MemberTokenService { diff --git a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/UserTokenService.java b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/UserTokenService.java index 5699fbb..e309b1d 100644 --- a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/UserTokenService.java +++ b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/UserTokenService.java @@ -21,8 +21,6 @@ import com.hzs.system.sys.dto.LoginUser; /** * token验证处理 - * - * @author hzs */ @Component public class UserTokenService { diff --git a/bd-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java b/bd-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java index 3258b6e..41e2b67 100644 --- a/bd-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java +++ b/bd-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java @@ -22,8 +22,6 @@ import reactor.core.publisher.Mono; /** * 网关鉴权 - * - * @author hzs */ @Slf4j @Component diff --git a/bd-third/pom.xml b/bd-third/pom.xml index 36a39ca..31a64f4 100644 --- a/bd-third/pom.xml +++ b/bd-third/pom.xml @@ -118,11 +118,6 @@ bd-business-common - - com.bd.africa - bd-api-scm - - diff --git a/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java b/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java index 3fa5de4..4fbdf05 100644 --- a/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java @@ -120,4 +120,5 @@ public class BonusSettleJob { log.info("开始进行会员业绩计算"); iMemberSettleBonusApi.insertCuMemberAchieveByEveryDay(); } + } diff --git a/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java b/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java index 6638ebb..bcac0ee 100644 --- a/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java @@ -29,7 +29,6 @@ public class CuMemberJob { /** * 自动提现 */ - // @Scheduled(cron = "00 43 16 * * ?") @XxlJob("automaticWithdrawal") public void automaticWithdrawal() { iMemberJobServiceApi.automaticWithdrawal(); diff --git a/bd-third/src/main/java/com/hzs/third/job/ScmJob.java b/bd-third/src/main/java/com/hzs/third/job/ScmJob.java deleted file mode 100644 index f1abe73..0000000 --- a/bd-third/src/main/java/com/hzs/third/job/ScmJob.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.third.job; - -import com.hzs.scm.pub.IScmBillServiceApi; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; - -/** - * 供应链定时任务 - */ -@Slf4j -@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true") -@Component -public class ScmJob { - - @DubboReference - IScmBillServiceApi iScmBillServiceApi; - - /** - * 更新单据号初始化值 - */ -// @Scheduled(cron = "0 54 15 * * ?") - @XxlJob("updateBillNo") - public void updateBillNo() { - iScmBillServiceApi.updateScmBillNoNextValue(); - } - -} diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/config/DelayRabbitConfig.java b/bd-third/src/main/java/com/hzs/third/mqcall/config/DelayRabbitConfig.java index 20c21e4..8d299b7 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/config/DelayRabbitConfig.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/config/DelayRabbitConfig.java @@ -10,11 +10,7 @@ import java.util.HashMap; import java.util.Map; /** - * @Description: 配置队列 - * @Author: sui q - * @Time: 2023/3/9 15:26 - * @Classname: DelayRabbitConfig - * @PackageName: com.hzs.third.mqcall.config + * 配置队列 */ @Configuration @Slf4j @@ -45,12 +41,14 @@ public class DelayRabbitConfig { * 需要将一个队列绑定到交换机上，要求该消息与一个特定的路由键完全匹配。 * 这是一个完整的匹配。如果一个队列绑定到该交换机上要求路由键 “dog”，则只有被标记为“dog”的消息才被转发， * 不会转发dog.puppy，也不会转发dog.guard，只会转发dog。 + * * @return DirectExchange */ @Bean public DirectExchange orderDelayExchange() { return new DirectExchange(RabbitMqConstants.DELAY_EXCHANGE); } + @Bean public Binding dlxBinding() { return BindingBuilder.bind(delayOrderQueue()).to(orderDelayExchange()).with(RabbitMqConstants.DELAY_ROUTING_KEY); @@ -60,6 +58,7 @@ public class DelayRabbitConfig { public Queue effectQueue() { return new Queue(RabbitMqConstants.EFFECT_QUEUE_NAME, true); } + /** * 将路由键和某模式进行匹配。此时队列需要绑定要一个模式上。 * 符号“#”匹配一个或多个词，符号“*”匹配不多不少一个词。因此“audit.#”能够匹配到“audit.irs.corporate”，但是“audit.*” 只会匹配到“audit.irs”。 diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityBackListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityBackListener.java index 69916f7..688fa69 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityBackListener.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityBackListener.java @@ -14,19 +14,14 @@ import org.springframework.messaging.Message; import org.springframework.stereotype.Component; /** - * @description: 撤销订单，回退活活动公共的监听方法, 用于处理活动 - * @author: sui q - * @time: 2023/5/9 10:13 - * @classname: ActivityBackListener - * @package_name: com.hzs.third.mqcall.listener - * version 1.0.0 + * 撤销订单，回退活活动公共的监听方法, 用于处理活动 */ @Slf4j @Component public class ActivityBackListener { @DubboReference - private IActivityServiceApi activityServiceApi; + IActivityServiceApi iActivityServiceApi; @RabbitListener(bindings = @QueueBinding( exchange = @Exchange(value = RabbitMqConstants.ACTIVITY_BACK_EXCHANGE, type = "topic"), @@ -40,19 +35,16 @@ public class ActivityBackListener { Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); channel.basicAck(deliveryTag, false); - log.info("撤单活动MQ异步处理 third：{}" , saOrderExt); + log.info("撤单活动MQ异步处理 third：{}", saOrderExt); - activityServiceApi.backGiveMemberDrawNum(saOrderExt); + iActivityServiceApi.backGiveMemberDrawNum(saOrderExt); if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { // 注册订单处理 // 直推赠送政策币 - R backOrderPolicyR = activityServiceApi.backGiveOrderPolicy(saOrderExt); + R backOrderPolicyR = iActivityServiceApi.backGiveOrderPolicy(saOrderExt); if (!backOrderPolicyR.isSuccess()) { log.error(backOrderPolicyR.getMsg()); } - -// // 直推升级活动 -// activityServiceApi.invokeRecommendUpgrade(AcRecommendUpgradeDTO.builder().saOrderExt(saOrderExt).orderOperateStatus(EOrderOperateStatus.CANCEL).build()); } } catch (Exception e) { log.error(e.getMessage()); diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityListener.java index fb8d417..c1178de 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityListener.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityListener.java @@ -14,19 +14,14 @@ import org.springframework.messaging.Message; import org.springframework.stereotype.Component; /** - * @description: 活动公共的监听方法, 用于处理活动 - * @author: sui q - * @time: 2023/4/28 11:21 - * @classname: ActivityListener - * @package_name: com.hzs.third.mqcall.listener - * version 1.0.0 + * 活动公共的监听方法, 用于处理活动 */ @Slf4j @Component public class ActivityListener { @DubboReference - private IActivityServiceApi activityServiceApi; + IActivityServiceApi iActivityServiceApi; @RabbitListener(bindings = @QueueBinding( exchange = @Exchange(value = RabbitMqConstants.ACTIVITY_EXCHANGE, type = "topic"), @@ -41,7 +36,7 @@ public class ActivityListener { Thread.sleep(1000); Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); channel.basicAck(deliveryTag, false); - R resultR = activityServiceApi.handleActivity(saOrderExt); + R resultR = iActivityServiceApi.handleActivity(saOrderExt); if (!resultR.isSuccess()) { log.error("处理活动异常 {}", resultR.getMsg()); } diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityRecoilGiveListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityRecoilGiveListener.java index 7d40620..7db2145 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityRecoilGiveListener.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityRecoilGiveListener.java @@ -15,18 +15,14 @@ import org.springframework.messaging.Message; import org.springframework.stereotype.Component; /** - * @Description: 复消币赠送活动MQ处理 - * @Author: jiang chao - * @Time: 2024/7/19 10:06 - * @Classname: ActivityRecoilGiveListener - * @PackageName: com.hzs.third.mqcall.listener + * 复消币赠送活动MQ处理 */ @Slf4j @Component public class ActivityRecoilGiveListener { @DubboReference - private IActivityServiceApi iActivityServiceApi; + IActivityServiceApi iActivityServiceApi; /** * 复消币赠送活动MQ处理 diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ConsumeUpgradeListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ConsumeUpgradeListener.java index 7ac5782..38ebd9d 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/ConsumeUpgradeListener.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/listener/ConsumeUpgradeListener.java @@ -23,23 +23,18 @@ import java.math.BigDecimal; import java.util.List; /** - * @Description: 会员消费升级监听器 - * @Author: jiang chao - * @Time: 2023/10/16 17:28 - * @Classname: ConsumeUpgradeListener - * @PackageName: com.hzs.third.mqcall.listener + * 会员消费升级监听器 */ @Slf4j @Component public class ConsumeUpgradeListener { @DubboReference - private IGradeServiceApi iGradeServiceApi; + IGradeServiceApi iGradeServiceApi; @DubboReference - private IMemberServiceApi iMemberServiceApi; + IMemberServiceApi iMemberServiceApi; @DubboReference - private ISaOrderServiceApi iSaOrderServiceApi; - + ISaOrderServiceApi iSaOrderServiceApi; /** * 会员消费升级监听处理 diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/DelayedMessageListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/DelayedMessageListener.java index 3e0a0bb..e7282e0 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/DelayedMessageListener.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/listener/DelayedMessageListener.java @@ -2,7 +2,6 @@ package com.hzs.third.mqcall.listener; import com.hzs.common.core.constant.RabbitMqConstants; import com.hzs.common.core.enums.EBusinessType; -import com.hzs.common.core.enums.EDelayBusType; import com.hzs.common.core.service.RedisService; import com.hzs.system.base.ICountryServiceApi; import com.hzs.third.mq.dto.DelayedMessageDTO; @@ -16,26 +15,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.Message; import org.springframework.stereotype.Component; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/9 16:02 - * @Classname: DelayedMessageListener - * @PackageName: com.hzs.third.mqcall.listener - */ @Slf4j @Component public class DelayedMessageListener { + @Autowired private RedisService redisService; @DubboReference - private ICountryServiceApi countryServiceApi; + ICountryServiceApi iCountryServiceApi; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } @RabbitListener(queues = {RabbitMqConstants.EFFECT_QUEUE_NAME}) @RabbitHandler @@ -44,14 +33,11 @@ public class DelayedMessageListener { Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); channel.basicAck(deliveryTag, false); DelayedMessageDTO delayedMessageDTO = message.getPayload(); - for(String key : delayedMessageDTO.getKeyList()) { + for (String key : delayedMessageDTO.getKeyList()) { redisService.deleteObjectByKey(key); } - if(EBusinessType.REDIS_KEY.getValue() == delayedMessageDTO.getType()){ - countryServiceApi.updateConfigEffectById(delayedMessageDTO.getBusinessType(), delayedMessageDTO.getPkId()); - }else{ - // todo 处理订单 + if (EBusinessType.REDIS_KEY.getValue() == delayedMessageDTO.getType()) { + iCountryServiceApi.updateConfigEffectById(delayedMessageDTO.getBusinessType(), delayedMessageDTO.getPkId()); } - log.info("###########################################"); } } diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumBackListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumBackListener.java deleted file mode 100644 index d1acac1..0000000 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumBackListener.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.third.mqcall.listener; - -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.scm.pub.IScmBillServiceApi; -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.messaging.Message; -import org.springframework.stereotype.Component; - -/** - * @description: 更新可用量,回退可用量 - * @author: sui q - * @time: 2024/4/17 10:55 - * @classname: IcAvailableNumBackListener - * @package_name: com.hzs.third.mqcall.listener - * version 1.0.0 - */ -@Slf4j -@Component -public class IcAvailableNumBackListener { - @DubboReference - private IScmBillServiceApi scmBillServiceApi; - - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.AVAILABLE_NMU_BACK_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.AVAILABLE_NMU_BACK_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.AVAILABLE_NMU_BACK_KEY)) - @RabbitHandler - public void onMessage(Message message, Channel channel) throws Exception { - SaOrderExt saOrderExt = message.getPayload(); - log.info("开始更新可用量，接收到的参数：{}", JSONUtil.toJsonStr(saOrderExt)); - try { - Thread.sleep(1000); - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - scmBillServiceApi.backSaOrderAvailable(saOrderExt); - } catch (Exception e) { - log.error(e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumListener.java deleted file mode 100644 index 623c772..0000000 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/IcAvailableNumListener.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.third.mqcall.listener; - -import cn.hutool.json.JSONUtil; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt; -import com.hzs.scm.pub.IScmBillServiceApi; -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.messaging.Message; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @description: 更新可用量 - * @author: sui q - * @time: 2023/12/18 09:22 - * @classname: IcAvailableNumJob - * @package_name: com.hzs.third.job - * version 1.0.0 - */ -@Slf4j -@Component -public class IcAvailableNumListener { - - @DubboReference - private IScmBillServiceApi scmBillServiceApi; - - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.AVAILABLE_NMU_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.AVAILABLE_NMU_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.AVAILABLE_NMU_KEY)) - @RabbitHandler - public void onMessage(Message> message, Channel channel) throws Exception { - List availableNumList = message.getPayload(); - log.info("开始更新可用量，接收到的参数：{}", JSONUtil.toJsonStr(availableNumList)); - try { - Thread.sleep(1000); - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - scmBillServiceApi.updateDeductIcAvailableNumByList(availableNumList); - } catch (Exception e) { - log.error(e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/TransactionListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/TransactionListener.java index f436590..0b36756 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/TransactionListener.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/listener/TransactionListener.java @@ -35,7 +35,7 @@ public class TransactionListener { private ITranslateService iTranslateService; @DubboReference - private ITransactionServiceApi iTransactionServiceApi; + ITransactionServiceApi iTransactionServiceApi; /** * 国际化全量翻译监听处理 diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/provider/DelayedMessageProvider.java b/bd-third/src/main/java/com/hzs/third/mqcall/provider/DelayedMessageProvider.java index f557b2d..63224f5 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/provider/DelayedMessageProvider.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/provider/DelayedMessageProvider.java @@ -7,13 +7,6 @@ import com.hzs.third.mqcall.service.IDelayedMessageService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/9 15:22 - * @Classname: DelayedMessageProvider - * @PackageName: com.hzs.third.mqcall.provider - */ @DubboService public class DelayedMessageProvider implements IDelayedMessageApi { diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/service/IDelayedMessageService.java b/bd-third/src/main/java/com/hzs/third/mqcall/service/IDelayedMessageService.java index a83715a..3df7be1 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/service/IDelayedMessageService.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/service/IDelayedMessageService.java @@ -3,20 +3,14 @@ package com.hzs.third.mqcall.service; import com.hzs.third.mq.dto.DelayedMessageDTO; /** - * @Description: 延时队列入口类 - * @Author: sui q - * @Time: 2023/3/9 15:16 - * @Classname: IDelaydeMessageService - * @PackageName: com.hzs.third.mqcall.service + * 延时队列入口类 */ public interface IDelayedMessageService { /** - * 发送延时队列消息 + * 发送延时队列消息 + * * @param delayedMessageDTO 内容 - * @return: void - * @Author: sui q - * @Date: 2023/3/9 15:18 - */ + */ void sendDelayedMessage(DelayedMessageDTO delayedMessageDTO); } diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/service/impl/DelayedMessageServiceImpl.java b/bd-third/src/main/java/com/hzs/third/mqcall/service/impl/DelayedMessageServiceImpl.java index be66b6e..2b27c50 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/service/impl/DelayedMessageServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/service/impl/DelayedMessageServiceImpl.java @@ -9,11 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * @Description: 延时队列实现类 - * @Author: sui q - * @Time: 2023/3/9 15:20 - * @Classname: DelayedMessageImpl - * @PackageName: com.hzs.third.mqcall.service.impl + * 延时队列实现类 */ @Service public class DelayedMessageServiceImpl implements IDelayedMessageService { @@ -23,7 +19,7 @@ public class DelayedMessageServiceImpl implements IDelayedMessageService { @Override public void sendDelayedMessage(DelayedMessageDTO delayedMessageDTO) { - if(DateUtils.compareDateTimeAfter(delayedMessageDTO.getEffectDate(), DateUtils.currentDateTime())) { + if (DateUtils.compareDateTimeAfter(delayedMessageDTO.getEffectDate(), DateUtils.currentDateTime())) { // 计算延时时间 long second = DateUtils.betweenSecond(delayedMessageDTO.getEffectDate()) * 1000; rabbitTemplate.convertAndSend(RabbitMqConstants.DELAY_EXCHANGE, RabbitMqConstants.DELAY_ROUTING_KEY, diff --git a/bd-third/src/main/resources/bootstrap.yml b/bd-third/src/main/resources/bootstrap.yml index 95d6295..8924241 100644 --- a/bd-third/src/main/resources/bootstrap.yml +++ b/bd-third/src/main/resources/bootstrap.yml @@ -82,7 +82,7 @@ dubbo: port: -1 cloud: ## 订阅服务 - subscribed-services: bd-third, bd-system, bd-member, bd-sale, bd-bonus, bd-scm + subscribed-services: bd-third, bd-system, bd-member, bd-sale, bd-bonus scan: # dubbo 服务扫描包（开启之后才会对外提供服务） base-packages: com.hzs.third diff --git a/pom.xml b/pom.xml index adf7ede..491d9ea 100644 --- a/pom.xml +++ b/pom.xml @@ -228,12 +228,6 @@ ${hzs.version} - - - com.bd.africa - bd-api-scm - ${hzs.version} - com.bd.africa @@ -437,7 +431,7 @@ 127.0.0.1:8848 - Africa + 047fc3a6-b973-4123-a10f-ee7b6c2f6611 DEFAULT_GROUP