## 去掉不需要的dubbo接口等；
This commit is contained in:
parent
baafa0eb29
commit
2991c6f45a
|
|
@ -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<List<CuMemberTradeRecoil>> queryCuMemberTradeRecoil(Date settleDate);
|
||||
|
||||
|
|
|
|||
|
|
@ -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<java.lang.Boolean>
|
||||
* 业务办理扣费提交
|
||||
**/
|
||||
R<Boolean> businessCommissionSubmit(BusinessCommissionDTO businessCommissionDTO);
|
||||
|
||||
/**
|
||||
* @description: 业务办理扣费驳回
|
||||
* @author: zhang jing
|
||||
* @date: 2023/7/29 11:55
|
||||
* @param: [businessCommissionDTO]
|
||||
* @return: com.hzs.common.core.domain.R<java.lang.Boolean>
|
||||
* 业务办理扣费驳回
|
||||
**/
|
||||
R<Boolean> businessCommissionReject(BusinessCommissionDTO businessCommissionDTO);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<CuMemberAccountExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/5 11:57
|
||||
*/
|
||||
R<List<CuMemberAccountExt>> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount);
|
||||
|
||||
|
|
@ -33,9 +26,6 @@ public interface IMemberAccountServiceApi {
|
|||
* 根据会员id 列表查询账户信息
|
||||
*
|
||||
* @param pkMemberList 列表
|
||||
* @return: List<CuMemberAccount>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/25 16:28
|
||||
*/
|
||||
R<List<CuMemberAccount>> queryCuMemberAccountByPkMembers(List<Long> pkMemberList);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import java.util.Date;
|
|||
* 会员模块定时任务
|
||||
*/
|
||||
public interface IMemberJobServiceApi {
|
||||
|
||||
/**
|
||||
* 定时插入账户详情数据
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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<com.hzs.common.domain.member.achieve.CuMemberSettlePeriod>
|
||||
* 根据日期获得日期对应的期间
|
||||
**/
|
||||
R<CuMemberSettlePeriod> getCuMemberSettlePeriodByDate(String date);
|
||||
|
||||
|
|
|
|||
|
|
@ -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<CuMember> queryCuMemberAchieveByPkMember(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
@ -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 {
|
||||
|
||||
|
||||
/**
|
||||
* 解析注水业绩诉求信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -95,20 +95,6 @@ public interface IMemberServiceApi {
|
|||
*/
|
||||
R<CuMemberExt> queryPlaceSponsorLastLeft(Long memberId, Integer placeDept);
|
||||
|
||||
/**
|
||||
* 查找血缘伞上，推荐人
|
||||
*
|
||||
* @param memberId 推荐人编号
|
||||
*/
|
||||
R<List<CuMemberExt>> queryBloodKinshipOnUmbrella(Long memberId);
|
||||
|
||||
/**
|
||||
* 查找血缘伞下，推荐人
|
||||
*
|
||||
* @param memberId 推荐人编号
|
||||
*/
|
||||
R<List<CuMemberExt>> queryBloodKinshipUnderUmbrella(Long memberId);
|
||||
|
||||
/**
|
||||
* 获取会员缓存
|
||||
*
|
||||
|
|
@ -258,16 +244,6 @@ public interface IMemberServiceApi {
|
|||
**/
|
||||
R<CuMemberUpgrade> queryCuMemberUpgradeByCondition(Integer pkCountry, Long pkMember);
|
||||
|
||||
/**
|
||||
* 更新用户等级
|
||||
*
|
||||
* @param cuMember 用户信息
|
||||
* @param saOrder 订单信息
|
||||
* @param pkOldLevel 原等级
|
||||
* @return R<Boolean>
|
||||
*/
|
||||
R<Boolean> updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel);
|
||||
|
||||
/**
|
||||
* 更新用户等级
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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<java.util.List < com.hzs.common.domain.system.config.BdAwards>>
|
||||
* 根据国家查询隶属团队配置列表
|
||||
**/
|
||||
R<List<CuMemberTeamExt>> queryCuMemberTeam(Integer pkCountry);
|
||||
|
||||
|
|
@ -34,10 +26,7 @@ public interface IMemberTeamServiceApi {
|
|||
R<Boolean> checkVertex(Integer pkVertex);
|
||||
|
||||
/*
|
||||
* @description: 根据主键获得所属团队
|
||||
* @author: sui q
|
||||
* @date: 2023/4/25 9:17
|
||||
* @param: null null
|
||||
* 根据主键获得所属团队
|
||||
**/
|
||||
R<CuMemberTeamExt> getCuMemberTeamById(Long pkMember);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,12 +13,7 @@ import java.math.BigDecimal;
|
|||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 真实奖衔控制表DTO
|
||||
* </p>
|
||||
*
|
||||
* @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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 修改政策币表DTO
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-08-22
|
||||
*/
|
||||
@Data
|
||||
public class UpPolicyCurrencyDTO implements Serializable {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<CuMemberServiceLog>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/13 18:51
|
||||
*/
|
||||
List<CuMemberServiceLog> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> 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<CuMemberServiceLog> selectByBusinessNo(String businessNo);
|
||||
|
||||
/**
|
||||
* 根据业务单号修改信息
|
||||
*
|
||||
* @param memberLog
|
||||
* @return
|
||||
*/
|
||||
R<Boolean> updateByBusinessNo(CuMemberServiceLog memberLog);
|
||||
|
||||
/**
|
||||
* @description: 根据业务单号查询业务日志
|
||||
* @author: zhang jing
|
||||
* @date: 2023/7/29 11:15
|
||||
* @param: [businessNo]
|
||||
* @return: com.hzs.common.core.domain.R<java.util.List<com.hzs.common.domain.member.detail.CuMemberServiceLog>>
|
||||
**/
|
||||
R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 自助服务日志表VO
|
||||
* </p>
|
||||
*
|
||||
* @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<MemberAmountDTO> memberAmountDTOList;
|
||||
/**
|
||||
* 错误信息
|
||||
*/
|
||||
private String errorMsg;
|
||||
/**
|
||||
* 业务涉及会员ID列表 -- 提交审核必传
|
||||
*/
|
||||
private Set<Long> 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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<StoreDto> getMemberStore(Long pkMember, Integer pkCountry);
|
||||
|
||||
/**
|
||||
* @description: 根据业务编号查询会员店铺信息
|
||||
* @author: zhang jing
|
||||
* @date: 2024/4/3 15:09
|
||||
* @param: [analysisBusinessAppealParam]
|
||||
* @return: com.hzs.common.core.domain.R<com.hzs.member.store.dto.StoreDto>
|
||||
* 根据业务编号查询会员店铺信息
|
||||
**/
|
||||
R<StoreDto> getCuStoreByBusinessNo(AnalysisBusinessAppealParam analysisBusinessAppealParam);
|
||||
|
||||
/*
|
||||
* @description: 查询所有国家的店铺
|
||||
* @author: sui q
|
||||
* @date: 2024/4/3 10:16
|
||||
* @param: null null
|
||||
* 查询所有国家的店铺
|
||||
**/
|
||||
R<List<StoreDto>> queryAllMemberStore();
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
package com.hzs.report.dto;
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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<List<SaDeliverExt>> queryDeliverList(List<Long> idList, Integer pkCountry);
|
||||
|
||||
}
|
||||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<List<SaOrderExt>> queryDeliverySaOrderByDay(Date startDate, Date endDate);
|
||||
|
||||
/*
|
||||
* 查询订单编号
|
||||
**/
|
||||
R<SaOrderExt> querySaOrderByDay(Date startDate, Date endDate, String orderCode);
|
||||
|
||||
/*
|
||||
* 计算店铺奖金，查询订单
|
||||
**/
|
||||
R<List<SaOrderExt>> querySaOrderByTimeForStore(Date startDate, Date endDate);
|
||||
|
||||
/**
|
||||
* 查询出所有有极差的，海外的计算方式
|
||||
*
|
||||
* @param saOrderList 订单列表
|
||||
*/
|
||||
R<Map<String, List<SaOrderRangeDto>>> queryOrderRangeVO(List<?> saOrderList);
|
||||
|
||||
/**
|
||||
* 根据订单ID查询订单详细列表
|
||||
*
|
||||
* @param pkOrderList 订单ID列表 -- 必传
|
||||
* @param pkCountry 国家ID -- 非必传
|
||||
* @return
|
||||
*/
|
||||
R<List<SaOrderItemsExt>> queryOrderItemsListByOrderId(List<Long> pkOrderList, Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 空单注册审核通过
|
||||
*
|
||||
|
|
@ -132,11 +103,6 @@ public interface ISaOrderServiceApi {
|
|||
*/
|
||||
R saveOrderBatch(List<SaOrder> orderList, List<SaOrderItems> orderItemsList);
|
||||
|
||||
/* 保存销售订单
|
||||
*
|
||||
**/
|
||||
R saveOrder(SaOrderExt saOrderExt);
|
||||
|
||||
/**
|
||||
* 批量插入虚拟订单数据
|
||||
**/
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<ProductDTO> getProduct(Integer productId);
|
||||
|
||||
/*
|
||||
* @description: 根据产品id查询产品
|
||||
* @author: sui q
|
||||
* @date: 2023/5/29 16:07
|
||||
* @param: null null
|
||||
**/
|
||||
R<List<ProductDTO>> queryProductDtoById(Set<Integer> productIdSet, Integer pkCountry, Integer repurchaseType);
|
||||
|
||||
/*
|
||||
* @description: 根据规格、主键查询产品
|
||||
* @author: sui q
|
||||
* @date: 2023/11/27 15:52
|
||||
* @param: null null
|
||||
* 根据规格、主键查询产品
|
||||
**/
|
||||
R<List<BdProductExt>> queryProductDtoById(List<BdProductSpecs> productSpecsList, Integer pkCountry);
|
||||
|
||||
|
|
@ -53,28 +31,9 @@ public interface IProductServiceApi {
|
|||
*/
|
||||
R<ProductDTO> getProduct(String productCode);
|
||||
|
||||
/**
|
||||
* 批量查询产品数据
|
||||
*
|
||||
* @param productIdList 产品ID列表
|
||||
* @param pkCountry 所属国家（可为空）
|
||||
* @return
|
||||
*/
|
||||
R<Map<Integer, BdProduct>> getProductMap(Collection<Integer> productIdList, Integer pkCountry);
|
||||
|
||||
|
||||
/*
|
||||
* @description: 根据主键List查询规格
|
||||
* @author: sui q
|
||||
* @date: 2023/11/30 15:18
|
||||
* @param: null null
|
||||
* 根据主键List查询规格
|
||||
**/
|
||||
R<List<BdSpecs>> queryBdSpecsByIdList(List<Integer> idList);
|
||||
|
||||
/**
|
||||
* 根据产品主键修改所关联商品是下架/预售
|
||||
* @param productDTOList
|
||||
* @return
|
||||
*/
|
||||
R<Boolean> updateWaresPreSaleStatus(List<ProductDTO> productDTOList);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Boolean> approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO);
|
||||
|
||||
|
|
|
|||
|
|
@ -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<WaresSkuChangeDTO> skuList;
|
||||
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>com.bd.africa</groupId>
|
||||
<artifactId>bd-api</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>bd-api-scm</artifactId>
|
||||
|
||||
<description>
|
||||
bd-api-scm进销存服务
|
||||
</description>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.bd.africa</groupId>
|
||||
<artifactId>bd-api-system</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.bd.africa</groupId>
|
||||
<artifactId>bd-common-domain</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
@ -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<Boolean> saveAll(List<BdProductBasSpecs> productBasSpecsList);
|
||||
|
||||
/**
|
||||
* 删除 （根据pkProductBas删除）
|
||||
* @param pkProductBasList
|
||||
* @return
|
||||
*/
|
||||
R<Boolean> removeByPkProductBasList(List<Integer> pkProductBasList);
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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<BdProductBas> save(BdProductBas productBas);
|
||||
|
||||
/**
|
||||
* 根据id 修改
|
||||
*/
|
||||
R<Boolean> updateById(BdProductBas productBas);
|
||||
|
||||
/**
|
||||
* 根据id 查询
|
||||
* @return
|
||||
*/
|
||||
R<ProductBasDTO> getProductBasById(Integer pkId);
|
||||
|
||||
/**
|
||||
* 根据产品编号 查询
|
||||
* @return
|
||||
*/
|
||||
R<ProductBasDTO> getProductBasByProductCode(String productCode);
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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<Boolean> approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO);
|
||||
|
||||
/*
|
||||
* 查询单据信息
|
||||
**/
|
||||
R<List<BillDTO>> queryBillDtoByCondition(EApprovalBusiness eApprovalBusiness, String businessCode);
|
||||
|
||||
/*
|
||||
* 下单时验证可用量
|
||||
**/
|
||||
R<List<IcAvailableNumExt>> queryAvailableNumByProduct(List<IcAvailableNum> availableNumList);
|
||||
|
||||
/*
|
||||
* 更新可用量
|
||||
**/
|
||||
R<Boolean> updateDeductIcAvailableNumByList(List<IcAvailableNumExt> availableNumList);
|
||||
|
||||
/*
|
||||
* 查询可用量
|
||||
**/
|
||||
R<IcAvailableNum> queryAvailableNumByCondition(Integer pkCountry, Integer pkProduct, List<Integer> speceIdList);
|
||||
|
||||
/*
|
||||
* 更新单据号规则
|
||||
**/
|
||||
R<Boolean> updateScmBillNoNextValue();
|
||||
|
||||
/*
|
||||
* 撤单、退单回退可用量
|
||||
**/
|
||||
R<Boolean> backSaOrderAvailable(SaOrderExt saOrderExt);
|
||||
}
|
||||
|
|
@ -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<BillItemDTO> billDtoList;
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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<Long> deliverIdList;
|
||||
|
||||
/**
|
||||
* 登录用户
|
||||
*/
|
||||
private LoginUser loginUser;
|
||||
|
||||
}
|
||||
|
|
@ -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<ApprovalPushInfoDTO> approvalPushInfoDTOList);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Map<Integer, BdCountry>> getAllCountryMap();
|
||||
|
||||
/**
|
||||
* 根据业务类型更新
|
||||
*
|
||||
* @param businessType 业务类型
|
||||
* @param pkId 主键
|
||||
* @return: R<Boolean>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/10 15:14
|
||||
*/
|
||||
* @param pkId 主键
|
||||
*/
|
||||
R<Boolean> updateConfigEffectById(Integer businessType, Integer pkId);
|
||||
|
||||
/*
|
||||
* @description: 根据国家查询对应的仓库
|
||||
* @author: sui q
|
||||
* @date: 2024/1/18 10:47
|
||||
* @param: null null
|
||||
* 根据国家查询对应的仓库
|
||||
**/
|
||||
R<BdStorehouse> queryBdStorehouseByCountry(Integer pkCountry);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<CurrencyDTO> getCurrency(Integer pkCountry);
|
||||
|
||||
|
|
@ -39,10 +28,7 @@ public interface ICurrencyServiceApi {
|
|||
R<List<CurrencyDTO>> getCurrencyByPkCountryList(Set<Integer> pkCountryList);
|
||||
|
||||
/*
|
||||
* @description: 查询需要的所有汇率
|
||||
* @author: sui q
|
||||
* @date: 2023/5/11 14:58
|
||||
* @param: null null
|
||||
* 查询需要的所有汇率
|
||||
**/
|
||||
R<List<CurrencyDTO>> getCurrencyById(Set<Integer> currencyIdSet);
|
||||
|
||||
|
|
@ -55,10 +41,7 @@ public interface ICurrencyServiceApi {
|
|||
R<CurrencyDTO> getCurrencyByPkId(Integer currencyId);
|
||||
|
||||
/*
|
||||
* @description: 根据省查询对应的发货仓库
|
||||
* @author: sui q
|
||||
* @date: 2023/5/8 14:22
|
||||
* @param: null null
|
||||
* 根据省查询对应的发货仓库
|
||||
**/
|
||||
R<BdStorehouse> queryBdStorehouseByProvince(Integer province, Integer... type);
|
||||
|
||||
|
|
@ -83,42 +66,23 @@ public interface ICurrencyServiceApi {
|
|||
R<List<CurrencyDTO>> findAll();
|
||||
|
||||
/*
|
||||
* @description: 提供查询供应商的dubbo调用
|
||||
* @author: sui q
|
||||
* @date: 2023/11/20 16:45
|
||||
* @param: null null
|
||||
* 提供查询供应商的dubbo调用
|
||||
**/
|
||||
R<BdCubasdocExt> queryBdCubasdocById(Integer pkId, Integer pkCountry);
|
||||
|
||||
/*
|
||||
* @description: 提供查询供应商的dubbo调用
|
||||
* @author: sui q
|
||||
* @date: 2023/11/20 16:45
|
||||
* @param: null null
|
||||
* 提供查询供应商的dubbo调用
|
||||
**/
|
||||
R<BdCubasdocExt> queryBdCustomerById(Integer pkId, Integer pkCountry);
|
||||
|
||||
/*
|
||||
* @description: 提供查询采购组织的dubbo调用
|
||||
* @author: sui q
|
||||
* @date: 2023/11/20 17:47
|
||||
* @param: null null
|
||||
* 提供查询采购组织的dubbo调用
|
||||
**/
|
||||
R<SysCorp> querySysCorp(Integer pkId, Integer pkCountry);
|
||||
|
||||
/*
|
||||
* @description: 根据仓库主键查询仓库
|
||||
* @author: sui q
|
||||
* @date: 2023/11/20 17:54
|
||||
* @param: null null
|
||||
* 根据仓库主键查询仓库
|
||||
**/
|
||||
R<List<BdStorehouse>> queryStorehouseByIds(Set<Integer> storehouseIdSet, Integer pkCountry, Integer pkCorp);
|
||||
|
||||
/*
|
||||
* @description: 根据省查询对应的发货仓库
|
||||
* @author: sui q
|
||||
* @date: 2023/5/8 14:22
|
||||
* @param: null null
|
||||
**/
|
||||
R<BdStorehouse> queryBdStorehouseById(Integer pkId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<String> getBonusSystemConfig(Integer pkCountry, String key);
|
||||
|
||||
|
|
@ -39,27 +31,17 @@ public interface ISystemConfigServiceApi {
|
|||
* 批量查询系统参数
|
||||
*
|
||||
* @param pkCountry 国家
|
||||
* @return: R<Map < String, String>>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/11/10 14:03
|
||||
*/
|
||||
R<Map<String, String>> getBonusSystemConfig(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 批量查询所有国家的系统参数
|
||||
*
|
||||
* @return: R<Map < String, String>>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/11/10 14:04
|
||||
*/
|
||||
R<Map<String, String>> getBonusSystemConfig();
|
||||
|
||||
/**
|
||||
* 批量查询所有国家的订单参数
|
||||
*
|
||||
* @return: R<Map < String, String>>
|
||||
* @Author: yh
|
||||
* @Date: 2022/11/10 14:04
|
||||
*/
|
||||
R<Map<String, String>> getSystemConfig();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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<java.util.List < com.hzs.common.domain.system.config.BdAccount>>
|
||||
* 根据币种属性查询币种类型（账户类型）
|
||||
**/
|
||||
R<List<BdAccount>> queryAccountByType(Integer accountProperty, Integer pkCountry);
|
||||
|
||||
|
|
@ -35,20 +27,12 @@ public interface IAccountServiceApi {
|
|||
R<List<BdAccount>> queryAccountByType(Integer accountType, Collection<Integer> pkCountryList);
|
||||
|
||||
/**
|
||||
* @description: 根据pkid查询币种信息
|
||||
* @author: zhang jing
|
||||
* @date: 2022/10/11 17:44
|
||||
* @param: [pkId]
|
||||
* @return: com.hzs.common.core.domain.R<com.hzs.common.domain.system.config.BdAccount>
|
||||
* 根据pkid查询币种信息
|
||||
**/
|
||||
R<BdAccount> getAccount(Integer pkId);
|
||||
|
||||
/**
|
||||
* @description: 根据币种值查询币种
|
||||
* @author: zhang jing
|
||||
* @date: 2023/3/17 11:11
|
||||
* @param: [fieldValue]
|
||||
* @return: com.hzs.common.core.domain.R<com.hzs.common.domain.system.config.BdAccount>
|
||||
* 根据币种值查询币种
|
||||
**/
|
||||
R<BdAccount> getBdAccountByFieldValue(Integer pkCountry, Integer fieldValue);
|
||||
|
||||
|
|
@ -80,38 +64,17 @@ public interface IAccountServiceApi {
|
|||
* 查出国家默认在线充值入的币种
|
||||
*
|
||||
* @param pkCountry 国家
|
||||
* @return: R<BdAccount>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/15 19:02
|
||||
*/
|
||||
R<BdAccount> queryAccountByCondition(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* @description: 查询币种转换
|
||||
* @author: zhang jing
|
||||
* @date: 2023/3/16 11:53
|
||||
* @param: [pkId]
|
||||
* @return: com.hzs.common.core.domain.R<java.lang.Integer>
|
||||
* 查询币种转换
|
||||
**/
|
||||
R<Integer> getPkAccount(Integer pkId);
|
||||
|
||||
/**
|
||||
* 查询邮费扣除币种
|
||||
*
|
||||
* @param pkCountry 所属国家
|
||||
* @return
|
||||
*/
|
||||
R<BdAccount> queryPostageAccount(Integer pkCountry);
|
||||
|
||||
|
||||
/**
|
||||
* @description: 会员端账户查询
|
||||
* @author: zhang jing
|
||||
* @date: 2023/4/7 15:33
|
||||
* @param: [pkCountry]
|
||||
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.system.config.BdAccount>>
|
||||
* 会员端账户查询
|
||||
**/
|
||||
R<List<BdAccount>> memberAccountByType(Integer pkCountry);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<List<AreaCurrencyDTO>>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/6 10:37
|
||||
*/
|
||||
R<List<AreaCurrencyDTO>> queryAreaCurrencyByPkCountry(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 根据条件查找对应的币种配置
|
||||
*
|
||||
* @param specialArea 所属专区
|
||||
* @param pkCountry 国家
|
||||
* @return: R<List<AreaCurrencyDTO>>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/6 10:37
|
||||
* @param pkCountry 国家
|
||||
*/
|
||||
R<List<AreaCurrencyDTO>> queryAreaCurrencyByCondition(Integer specialArea, Integer pkCountry);
|
||||
|
||||
/*
|
||||
* @description: 根据条件查找对应的币种配置
|
||||
* @author: sui q
|
||||
* @date: 2023/7/19 14:18
|
||||
* @param: null null
|
||||
* 根据条件查找对应的币种配置
|
||||
**/
|
||||
R<List<AreaCurrencyDTO>> queryAreaCurrencyByCondition(Integer pkSpecialAccount);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<java.util.List<com.hzs.common.domain.system.config.BdAwards>>
|
||||
**/
|
||||
R<List<BdAwards>> queryAwards(Integer pkCountry);
|
||||
/**
|
||||
* @description: 根据PKID查询奖衔信息
|
||||
* @author: zhang jing
|
||||
* @date: 2022/10/10 11:49
|
||||
* @param: [pkId]
|
||||
* @return: com.hzs.common.core.domain.R<com.hzs.common.domain.system.config.BdAwards>
|
||||
**/
|
||||
R<BdAwards> getAwardsOne(Integer pkId);
|
||||
/**
|
||||
* 根据国家查询奖衔配置列表
|
||||
**/
|
||||
R<List<BdAwards>> queryAwards(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 根据国家获取该国家的奖衔
|
||||
* @return: R<List<BdAwards>>
|
||||
* @throws
|
||||
* @Author: sui q
|
||||
* @Date: 2022/11/4 16:38
|
||||
/**
|
||||
* 根据PKID查询奖衔信息
|
||||
**/
|
||||
R<BdAwards> getAwardsOne(Integer pkId);
|
||||
|
||||
/**
|
||||
* 根据国家获取该国家的奖衔
|
||||
*/
|
||||
R<Map<String, BdAwards>> getAwards();
|
||||
R<Map<String, BdAwards>> getAwards();
|
||||
|
||||
/**
|
||||
* @description: 根据国家查询辅导分红
|
||||
* @author: zhang jing
|
||||
* @date: 2022/11/11 14:14
|
||||
* @param: [pkCountry]
|
||||
* @return: com.hzs.common.core.domain.R<java.util.List<com.hzs.common.domain.system.config.ext.BdAwardsExt>>
|
||||
**/
|
||||
R<List<BdAwardsExt>> coachBonusList(Integer pkCountry);
|
||||
/**
|
||||
* 根据所属国家查询奖衔
|
||||
*
|
||||
* @param pkCountry
|
||||
* @return
|
||||
*/
|
||||
R<List<BdAwards>> queryByPkCountryAwards(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 根据所属国家查询奖衔
|
||||
* @param pkCountry
|
||||
* @return
|
||||
*/
|
||||
R<List<BdAwards>> queryByPkCountryAwards(Integer pkCountry);
|
||||
/**
|
||||
* 根据所属国家查询奖衔
|
||||
* @param countryList
|
||||
* @return
|
||||
*/
|
||||
/**
|
||||
* 根据所属国家查询奖衔
|
||||
*
|
||||
* @param countryList
|
||||
* @return
|
||||
*/
|
||||
R<List<BdAwards>> queryAwardsByIdList(List<Integer> countryList);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<com.hzs.common.domain.system.config.BdAccount>
|
||||
**/
|
||||
R<BdAreaCurrencyExt> queryAreaCurrency();
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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<java.util.List<com.hzs.common.domain.system.config.BdAwards>>
|
||||
**/
|
||||
R<List<BdBonusItemsExt>> queryBonusItems(Integer pkCountry);
|
||||
/**
|
||||
* 根据国家查询奖项配置列表
|
||||
**/
|
||||
R<List<BdBonusItemsExt>> queryBonusItems(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 查询存在车奖、全球积分的国家
|
||||
* @param bonusValueList 奖金值
|
||||
* @return: R<List<BdBonusItemsExt>>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/14 10:06
|
||||
/**
|
||||
* 查询奖金项
|
||||
*
|
||||
* @param pkCountry 国家
|
||||
* @param pkBonusItems 奖金项
|
||||
*/
|
||||
R<List<BdBonusItems>> queryExistsBonusItems(List<Integer> bonusValueList);
|
||||
R<BdBonusItems> queryBonusItems(Integer pkCountry, Integer pkBonusItems);
|
||||
|
||||
/**
|
||||
* 查询奖金项
|
||||
* @param pkCountry 国家
|
||||
* @param pkBonusItems 奖金项
|
||||
* @return: R<BdBonusItemsExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/7 18:05
|
||||
/**
|
||||
* 查询国家的推荐奖金参数
|
||||
*/
|
||||
R<BdBonusItems> queryBonusItems(Integer pkCountry, Integer pkBonusItems);
|
||||
|
||||
/**
|
||||
* 查询国家的推荐奖金参数
|
||||
* @return: R<BonusConfigDTO>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/11/14 16:35
|
||||
*/
|
||||
R<BonusConfigDTO> queryBonusConfigDTO();
|
||||
R<BonusConfigDTO> queryBonusConfigDTO();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<List<GradeDTO>> selectGradeAll(Integer dataCountry);
|
||||
|
||||
/*
|
||||
* 查询店铺等级
|
||||
**/
|
||||
R<List<BdStoreLevelExt>> queryStoreLevel();
|
||||
|
||||
/**
|
||||
* 根据国家查询等级配置列表
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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查询标签信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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<java.util.List<com.hzs.common.domain.system.config.BdAwards>>
|
||||
**/
|
||||
R<List<BdRangeExt>> queryRange(Integer pkCountry);
|
||||
/**
|
||||
* 根据国家查询极差配置列表
|
||||
**/
|
||||
R<List<BdRangeExt>> queryRange(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 查询各个国家极差的配置 键为 国家+极差类型+等级主键
|
||||
* @return: Map<String,RangeDTO>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/1/3 14:00
|
||||
*/
|
||||
R<Map<String, RangeDTO>> queryRangeDto();
|
||||
/**
|
||||
* 查询各个国家极差的配置 键为 国家+极差类型+等级主键
|
||||
*/
|
||||
R<Map<String, RangeDTO>> queryRangeDto();
|
||||
|
||||
/**
|
||||
* 查询各个国家极差的配置 键为 国家+极差类型+等级主键
|
||||
* @param pkCountry 国家
|
||||
* @param rangeType 极差类型
|
||||
* @param pkLevel 等级
|
||||
* @return: Map<String,RangeDTO>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/1/3 14:00
|
||||
*/
|
||||
R<RangeDTO> queryRangeDtoByCondition(Integer pkCountry, Integer rangeType, Integer pkLevel);
|
||||
/**
|
||||
* 查询各个国家极差的配置 键为 国家+极差类型+等级主键
|
||||
*
|
||||
* @param pkCountry 国家
|
||||
* @param rangeType 极差类型
|
||||
* @param pkLevel 等级
|
||||
*/
|
||||
R<RangeDTO> queryRangeDtoByCondition(Integer pkCountry, Integer rangeType, Integer pkLevel);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<com.hzs.system.config.dto.ServiceChargeDTO>
|
||||
* 根据业务类型查询扣款
|
||||
**/
|
||||
R<ServiceChargeDTO> getServiceChargeByType(ServiceChargeDTO serviceChargeDTO);
|
||||
|
||||
|
|
|
|||
|
|
@ -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<java.util.List<com.hzs.common.domain.system.config.BdAwards>>
|
||||
**/
|
||||
R<List<BdShopExt>> queryShop(Integer pkCountry);
|
||||
/**
|
||||
* 根据国家查询奖项配置列表
|
||||
**/
|
||||
R<List<BdShopExt>> queryShop(Integer pkCountry);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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<java.util.List<com.hzs.common.domain.system.config.BdTransfer>>
|
||||
* 根据国家查询转账配置列表
|
||||
**/
|
||||
R<BdTransfer> queryTransfer(Integer pkCountry);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<List<VertexDTO>> findAll();
|
||||
|
||||
/**
|
||||
* 查询所有体系配置(根据国家)
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
R<List<VertexDTO>> findAllByPkCountry(Integer pkCountry);
|
||||
|
|
|
|||
|
|
@ -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<java.util.List<com.hzs.common.domain.system.config.BdWithdrawalAuto>>
|
||||
* 根据国家查询自动提现明细列表
|
||||
**/
|
||||
R<List<BdWithdrawalAuto>> queryWithdrawalAuto(Integer pkCountry);
|
||||
R<List<BdWithdrawalAuto>> queryWithdrawalAuto(Integer pkCountry);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<java.util.List < com.hzs.common.domain.system.config.BdWithdrawal>>
|
||||
* 根据国家查询提现手续费配置列表
|
||||
**/
|
||||
R<BdWithdrawalProcess> queryBdWithdrawalProcess(Integer pkCountry);
|
||||
|
||||
|
|
|
|||
|
|
@ -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<java.util.List < com.hzs.common.domain.system.config.BdWithdrawal>>
|
||||
* 根据国家查询提现配置明细列表
|
||||
**/
|
||||
R<BdWithdrawal> queryWithdrawal(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* @description: 查询所有自动提现的配置
|
||||
* @author: zhang jing
|
||||
* @date: 2022/11/1 19:44
|
||||
* @param: []
|
||||
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.system.config.BdWithdrawal>>
|
||||
* 查询所有自动提现的配置
|
||||
**/
|
||||
R<List<BdWithdrawal>> queryWithdrawalByIsAuto();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<java.util.List<com.hzs.common.domain.system.config.BdWithdrawalSpecial>>
|
||||
**/
|
||||
R<List<BdWithdrawalSpecial>> queryWithdrawalSpecial(Integer pkCountry);
|
||||
/**
|
||||
* @description: 根据国家会员编号查询提现设置特殊配置
|
||||
* @author: zhang jing
|
||||
* @date: 2022/9/27 16:27
|
||||
* @param: [pkCountry, memberCode]
|
||||
* @return: com.hzs.common.core.domain.R<com.hzs.common.domain.system.config.BdWithdrawalSpecial>
|
||||
**/
|
||||
R<BdWithdrawalSpecial> getWithdrawalSpecial(Integer pkCountry,String memberCode);
|
||||
|
||||
}
|
||||
|
|
@ -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<BdWithdrawalTaxExt> queryWithdrawalTax(Integer pkCountry);
|
||||
|
||||
/**
|
||||
* @description: 根据国家查询个税明细
|
||||
* @author: zhang jing
|
||||
* @date: 2022/9/27 16:13
|
||||
* @param: [pkCountry]
|
||||
* @return: com.hzs.common.core.domain.R<java.util.List<com.hzs.common.domain.system.config.BdWithdrawalTax>>
|
||||
**/
|
||||
R<BdWithdrawalTaxExt> queryWithdrawalTax(Integer pkCountry);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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<ThaliConfigDTO> getLastThaliConfig();
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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<Boolean> sendDelayedMessage(DelayedMessageDTO delayedMessageDTO);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -34,7 +34,6 @@
|
|||
<module>bd-api-sale</module>
|
||||
<module>bd-api-system</module>
|
||||
<module>bd-api-third</module>
|
||||
<module>bd-api-scm</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -8,30 +8,19 @@ import org.apache.ibatis.annotations.Param;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员月数据 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-06-06
|
||||
*/
|
||||
public interface CuMemberMonthAchieveMapper extends BaseMapper<CuMemberMonthAchieve> {
|
||||
|
||||
/*
|
||||
* @description: 根据时间查询月业绩
|
||||
* @author: sui q
|
||||
* @date: 2023/6/7 14:37
|
||||
* @param: null null
|
||||
* 根据时间查询月业绩
|
||||
**/
|
||||
List<CuMemberMonthAchieveExt> 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,36 +6,22 @@ import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve;
|
|||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员月数据 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-06-06
|
||||
*/
|
||||
public interface ICuMemberMonthAchieveService extends IService<CuMemberMonthAchieve> {
|
||||
|
||||
/*
|
||||
* @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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.*;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员月数据 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-06-06
|
||||
*/
|
||||
@Service
|
||||
public class CuMemberMonthAchieveServiceImpl extends ServiceImpl<CuMemberMonthAchieveMapper, CuMemberMonthAchieve> implements ICuMemberMonthAchieveService {
|
||||
|
|
@ -38,10 +25,6 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl<CuMemberMonthAc
|
|||
@Autowired
|
||||
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
|
||||
@Autowired
|
||||
private ICuHonorWallService cuHonorWallService;
|
||||
@Autowired
|
||||
private ICuMemberHonorWallService cuMemberHonorWallService;
|
||||
@Autowired
|
||||
private ICuMemberTreeService cuMemberTreeService;
|
||||
@Autowired
|
||||
private ICuMemberAchieveService cuMemberAchieveService;
|
||||
|
|
@ -77,44 +60,6 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl<CuMemberMonthAc
|
|||
// 计算当前月
|
||||
String settleMonth = DateUtils.getMonth(currentMonthDate);
|
||||
baseMapper.insertCuMemberMonthAchieve(table, cuMemberSettlePeriod.getPkId(), settleMonth);
|
||||
// 每月7号发放徽章,发放上个月的
|
||||
if (day == 7) {
|
||||
// 查询徽章
|
||||
List<CuHonorWall> cuHonorWallList = cuHonorWallService.queryCuHonorWall();
|
||||
Map<String, CuHonorWall> honorWallMap = new HashMap<>();
|
||||
cuHonorWallList.forEach(cuHonorWall -> {
|
||||
String key = cuHonorWall.getPkCountry().toString() + cuHonorWall.getType() + cuHonorWall.getValue();
|
||||
honorWallMap.put(key, cuHonorWall);
|
||||
});
|
||||
List<CuMemberHonorWall> 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<CuMemberMonthAc
|
|||
cuMemberAchieveService.mergeCuMemberMonth(0, DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate));
|
||||
}
|
||||
|
||||
private void grantHonorWall(Integer startPeriod, Integer endPeriod, String settleMonth, Integer recommend,
|
||||
Map<String, CuHonorWall> honorWallMap, List<CuMemberHonorWall> cuMemberHonorWallList) {
|
||||
// 先发月徽章 查询值，查询前3名
|
||||
List<CuMemberMonthAchieveExt> cuMemberMonthAchieveList = baseMapper.queryCuMemberMonthAchieveByDate(startPeriod, endPeriod, recommend);
|
||||
if (CollectionUtil.isNotEmpty(cuMemberMonthAchieveList)) {
|
||||
Map<Integer, List<CuMemberMonthAchieveExt>> monthAchieveMap = new HashMap<>();
|
||||
cuMemberMonthAchieveList.forEach(cuMemberMonthAchieve -> {
|
||||
if (monthAchieveMap.containsKey(cuMemberMonthAchieve.getWallType())) {
|
||||
monthAchieveMap.get(cuMemberMonthAchieve.getWallType()).add(cuMemberMonthAchieve);
|
||||
} else {
|
||||
List<CuMemberMonthAchieveExt> 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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 荣誉墙 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-04-26
|
||||
*/
|
||||
public interface CuHonorWallMapper extends BaseMapper<CuHonorWall> {
|
||||
/**
|
||||
* 查询荣誉墙全量信息
|
||||
* @param pkCountry
|
||||
* @return
|
||||
*/
|
||||
List<CuHonorWallExt> queryAll(@Param("pkCountry") Integer pkCountry, @Param("pkMember") Long pkMember);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||
import com.hzs.common.domain.member.honor.CuMemberHonorWall;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员荣誉墙关联表 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-04-26
|
||||
*/
|
||||
public interface CuMemberHonorWallMapper extends BaseMapper<CuMemberHonorWall> {
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 荣誉墙 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-04-26
|
||||
*/
|
||||
public interface ICuHonorWallService extends IService<CuHonorWall> {
|
||||
|
||||
/*
|
||||
* @description: 查询所有的徽章
|
||||
* @author: sui q
|
||||
* @date: 2023/6/7 14:30
|
||||
* @param: null null
|
||||
**/
|
||||
List<CuHonorWall> queryCuHonorWall();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
import com.hzs.common.domain.member.honor.CuMemberHonorWall;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员荣誉墙关联表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-04-26
|
||||
*/
|
||||
public interface ICuMemberHonorWallService extends IService<CuMemberHonorWall> {
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 荣誉墙 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-04-26
|
||||
*/
|
||||
@Service
|
||||
public class CuHonorWallServiceImpl extends ServiceImpl<CuHonorWallMapper, CuHonorWall> implements ICuHonorWallService {
|
||||
|
||||
@Override
|
||||
public List<CuHonorWall> queryCuHonorWall() {
|
||||
QueryWrapper<CuHonorWall> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.select("pk_id,PK_COUNTRY,TYPE,VALUE,IMG");
|
||||
return baseMapper.selectList(queryWrapper);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue