diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java index eb099107..b57f406e 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java @@ -21,11 +21,4 @@ public interface IMemberJobServiceApi { */ R deleteAccountDetailByMonth(); - /** - * 自动提现 - * - * @return - */ - R automaticWithdrawal(); - } diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java index b69094b2..f656fcfd 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java @@ -3,8 +3,6 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdWithdrawal; -import java.util.List; - /** * 根据国家查询提现配置明细列表api **/ @@ -15,8 +13,4 @@ public interface IWithdrawalServiceApi { **/ R queryWithdrawal(Integer pkCountry, Integer pkAccount); - /** - * 查询所有自动提现的配置 - **/ - R> queryWithdrawalByIsAuto(); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java index b7bfb1a5..2d4a7d80 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java @@ -292,12 +292,6 @@ public class ApiCuMemberWithdrawController extends BaseController { return balance; } - @PostMapping("/auto") - public AjaxResult autoWithdrawInfo() { - iCuMemberWithdrawService.autoWithdraw(); - return AjaxResult.success(); - } - /** * 是否为整数值 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java index 0efdc726..4f06986b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/MemberAccountAudit.java @@ -10,11 +10,7 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 用户账户审核信息 - * @Author: ljc - * @Time: 2022/9/20 16:20 - * @Classname: MemberAccountAudit - * @Package_name: com.hzs.member.account.dto + * 用户账户审核信息 */ @Data @Accessors(chain = true) @@ -22,8 +18,8 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor public class MemberAccountAudit implements Serializable { - private static final long serialVersionUID = -4475012780690337432L; + private static final long serialVersionUID = -4475012780690337432L; /** * 审核状态(1=待提交,2=已提交,3=审核中,4=已驳回,5=已完成,6=已归档) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java index 95c45108..9b6bff2d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java @@ -28,7 +28,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryMemberAccountByCondition(CuMemberAccount cuMemberAccount); - /** * 根据会员编码获取余额 * @@ -45,15 +44,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ Integer updateMemberAccount(CuMemberAccount cuMemberAccount); - - /** - * 根据国家查询余额与银行卡信息 - * - * @param pkCountry 国家ID - * @return List - */ - List queryMemberAccountByPkCountry(@Param("pkCountry") Integer pkCountry); - /** * 根据用户编号查询账户余额 （行转列） * @@ -75,7 +65,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ Boolean updateBatchMemberAccountByPkmember(@Param("batch") String batch, @Param("pkModified") Long pkModified, @Param("type") int type); - /** * 根据用户编号集查询余额（余额字段） * @@ -101,7 +90,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List selectMemberAccountList(CuMemberWalletDetailVO memberWalletDetailVO); - /** * 查询默认钱包明细（不包括血缘代数，安置层数） * @@ -110,7 +98,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List selectDefaultMemberAccountList(CuMemberWalletDetailVO memberWalletDetailVO); - /** * 根据用户编号查询用户ID * @@ -128,7 +115,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ Integer updateFrozenAmountInfo(CuMemberAccountExt cuMemberAccount); - /** * 根据用户ID集查询余额 * @@ -137,7 +123,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryMemberAccountByPkMember(@Param(value = "pkMembers") List pkMembers); - /** * 批量更新账户余额（不同账户同一账户） * @@ -174,14 +159,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List selectMemberAccountByPkMember(@Param(value = "pkMembers") List pkMembers); - /** - * 查询会员账户以及会员信息 - * - * @param memberIdList 会员ID列表 - * @return - */ - List queryAccountAndMemberInfo(@Param("memberIdList") List memberIdList); - /** * 根据用户ID查询钱包余额 * @@ -190,7 +167,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryWalletBalanceByPkMember(@Param("pkMember") Long pkMember); - /** * 根据会员姓名与会员编号查询账户信息 * @@ -199,33 +175,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryMemberAccountByMemberCodeAndName(CuMemberAccountVO cuMemberAccountVO); - /** - * 奖金发放，根据期间发放奖金，更新奖金余额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountGrantByPeriod(@Param("pkCountry") Integer pkCountry, @Param("startPeriod") Integer startPeriod, - @Param("endPeriod") Integer endPeriod); - - /** - * 奖金可提现，根据期间更新可提现金额，减少可消费金额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountWithdrawalByPeriod(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("pkCountry") Integer pkCountry); - - /** - * 批量更新奖金账号 - * - * @param bonusList 奖金账号参数 - * @param operateType 操作类型 - * @param operateType 修改人 - * @return Boolean - */ - Boolean batchUpdateBonusAccountByPkMember(@Param("bonusList") List bonusList, - @Param("operateType") int operateType, - @Param("pkModified") Long pkModified); - /** * 根据来源单号查询奖金账号信息 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java index 1e384468..5cae4d1a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 会员提现表 Mapper 接口 - * - * @author hzs - * @since 2022-09-06 */ public interface CuMemberWithdrawMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java index 2e67782b..c23c724e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java @@ -3,7 +3,6 @@ package com.hzs.member.account.provider; import com.hzs.common.core.domain.R; import com.hzs.member.account.IMemberJobServiceApi; import com.hzs.member.account.service.ICuMemberAccountDetailService; -import com.hzs.member.account.service.ICuMemberWithdrawService; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +16,6 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { @Autowired private ICuMemberAccountDetailService iCuMemberAccountDetailService; - @Autowired - private ICuMemberWithdrawService iCuMemberWithdrawService; @Override public R insertAccountDetail() { @@ -42,15 +39,4 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { return R.ok(); } - @Override - public R automaticWithdrawal() { - try { - iCuMemberWithdrawService.autoWithdraw(); - } catch (Exception e) { - log.info("自动提现报错：", e); - return R.fail(e.getMessage()); - } - return R.ok(); - } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java index 1f26196b..87d3c1b7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java @@ -33,7 +33,6 @@ public interface ICuMemberAccountService extends IService { */ BigDecimal selectBalanceByMemberCode(Long pkMember, Integer accountType); - /** * 更新用户余额 * @@ -91,14 +90,6 @@ public interface ICuMemberAccountService extends IService { */ List selectAccountDetail(Long pkMember, Integer pkCountry); - /** - * 根据国家查询余额与银行卡信息 - * - * @param pkCountry 国家ID - * @return List - */ - List queryMemberAccountByPkcountry(Integer pkCountry); - /** * 根据用户编号查询账户余额 （行转列） * @@ -137,7 +128,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountByMemberCodes(List memberCodes, List memberCodeStrs); - /** * 根据用户编号集查询余额(所有字段) * @@ -146,7 +136,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountAllByMemberCodes(List memberCodes, Integer pkCountry); - /** * 查询钱包明细 * @@ -155,7 +144,6 @@ public interface ICuMemberAccountService extends IService { */ Object[] selectMemberAccountList(CuMemberWalletDetailVO memberWalletDetailVO); - /** * 根据用户编号查询用户ID * @@ -189,7 +177,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountByPkMember(List pkMembers); - /** * 批量更新账户余额（不同用户相同账户） * @@ -199,7 +186,6 @@ public interface ICuMemberAccountService extends IService { */ Boolean batchUpdateMemberAccountByPkmember(List pkMemberList, int pkAccount, Integer isWithdraw); - /** * 更新账户余额（不同用户不同账户） * @@ -209,7 +195,6 @@ public interface ICuMemberAccountService extends IService { */ Boolean batchUpdateMemberAccountByPkMemberCountry(List pkMemberList, Integer isWithdraw); - /** * 批理更新会员的钱包状态 * @@ -228,14 +213,6 @@ public interface ICuMemberAccountService extends IService { */ List selectMemberAccountByPkMember(List pkMembers); - /** - * 查询会员账户以及会员信息 - * - * @param memberIdList 会员ID列表 - * @return - */ - List queryAccountAndMemberInfo(List memberIdList); - /** * 根据会员姓名与会员编号查询账户信息 * @@ -247,20 +224,6 @@ public interface ICuMemberAccountService extends IService { List selectFrozenAmountExport(CuMemberAccountVO cuMemberAccountVO); - /** - * 奖金发放，根据期间发放奖金，更新奖金余额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountGrantByPeriod(Integer pkCountry, Integer startPeriod, Integer endPeriod); - - /** - * 奖金可提现，根据期间更新可提现金额，减少可消费金额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountWithdrawalByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry); - /** * 根据用户ID查询账户余额信息 * @@ -270,16 +233,6 @@ public interface ICuMemberAccountService extends IService { */ CuMemberRechargeAccountParam findMemberBalanceById(Integer pkAccount, Long pkMember); - /** - * 批量更新奖金账号 - * - * @param bonusList 奖金账号参数 - * @param operateType 操作类型 - * @param operateType 修改人 - * @return Boolean - */ - Boolean batchUpdateBonusAccountByPkMember(List bonusList, int operateType, Long pkModified); - /** * 根据来源单号查询奖金账号信息 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java index 615fbe09..8bfca73c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java @@ -119,11 +119,6 @@ public interface ICuMemberWithdrawService extends IService { */ BigDecimal computeRounding(BdWithdrawal bdWithdrawal, BigDecimal cashAmount); - /** - * 自动提现 - */ - void autoWithdraw(); - /** * 获取账户余额 * @@ -195,6 +190,7 @@ public interface ICuMemberWithdrawService extends IService { /** * 提现驳回 + * * @param param */ void withdrawReject(CuMemberWithdrawRejectParam param); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java index 48d27424..207b7797 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java @@ -4,12 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; import com.hzs.common.core.utils.CommonUtil; @@ -324,11 +323,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl queryMemberAccountByPkcountry(Integer pkCountry) { - return baseMapper.queryMemberAccountByPkCountry(pkCountry); - } - @Override public List queryMemberAccountByMemberCode(String memberCode, List accountTypes, Integer pkCountry) { List pkAccounts = new ArrayList<>(); @@ -382,7 +376,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl cuMemberAccountExts; @@ -397,7 +390,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl submit = iApprovalServiceApi.submit(approvalSubmitDTO, cuMemberFrozenParam.getLoginUser()); if (!submit.isSuccess()) { - log.error("====" + submit.getData()); throw new RuntimeException(submit.getMsg()); } } - /** * 获取充值用户主键信息 * @@ -589,7 +577,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl pkMemberList, int pkAccount, Integer isWithdraw) { return baseMapper.batchUpdateMemberAccountByPkMember(pkMemberList, pkAccount, isWithdraw); @@ -610,12 +597,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl queryAccountAndMemberInfo(List memberIdList) { - return baseMapper.queryAccountAndMemberInfo(memberIdList); - } - @Override public Object[] queryMemberAccountByMemberCodeAndName(CuMemberAccountVO cuMemberAccountVO) { CuMemberAccountExtVO cuMemberAccountExtVO; @@ -662,7 +643,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl cuMemberRechargeAccountParams = baseMapper.queryMemberAccountByMemberCode(null, Collections.singletonList(pkAccount), pkMember); return CollUtil.isNotEmpty(cuMemberRechargeAccountParams) ? cuMemberRechargeAccountParams.get(0) : null; } - - @Override - public Boolean batchUpdateBonusAccountByPkMember(List bonusList, int operateType, Long pkModified) { - return baseMapper.batchUpdateBonusAccountByPkMember(bonusList, operateType, pkModified); - } - @Override public List selectMemberBonusAccountBySourceCode(String sourceCode) { return baseMapper.selectMemberBonusAccountBySourceCode(sourceCode); @@ -813,11 +776,11 @@ public class CuMemberAccountServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkApprove); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, currentDateTime); - updateWrapper.eq(MemberFieldConstants.PK_MEMBER, pkMember); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(CuMemberAccount::getDelFlag, EYesNo.NO.getIntValue()); + updateWrapper.set(CuMemberAccount::getPkModified, pkApprove); + updateWrapper.set(CuMemberAccount::getModifiedTime, currentDateTime); + updateWrapper.eq(CuMemberAccount::getPkMember, pkMember); update(updateWrapper); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java index fa556b48..3cce116d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java @@ -17,8 +17,6 @@ import com.hzs.common.domain.member.account.CuMemberAccount; import com.hzs.common.domain.member.account.CuMemberTrade; import com.hzs.common.domain.member.account.CuMemberWithdraw; import com.hzs.common.domain.member.account.CuMemberWithdrawExt; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; import com.hzs.common.domain.system.config.*; import com.hzs.common.domain.system.config.ext.BdWithdrawalTaxExt; import com.hzs.common.security.utils.SecurityUtils; @@ -28,15 +26,12 @@ import com.hzs.member.account.dto.MemberAccountAudit; import com.hzs.member.account.mapper.CuMemberWithdrawMapper; import com.hzs.member.account.param.CuMemberWithdrawRejectParam; import com.hzs.member.account.service.*; -import com.hzs.member.account.vo.CuMemberBankVO; import com.hzs.member.account.vo.CuMemberPetitionVO; import com.hzs.member.account.vo.CuMemberTradeVO; import com.hzs.member.account.vo.CuMemberWithdrawVO; -import com.hzs.member.base.service.ICuMemberService; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IWithdrawalAutoServiceApi; import com.hzs.system.config.IWithdrawalProcessServiceApi; -import com.hzs.system.config.IWithdrawalServiceApi; import com.hzs.system.config.IWithdrawalTaxServiceApi; import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalSubmitDTO; @@ -52,7 +47,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.DayOfWeek; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -70,10 +64,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl withdrawalConfigs = iWithdrawalServiceApi.queryWithdrawalByIsAuto().getData(); - if (CollUtil.isNotEmpty(withdrawalConfigs)) { - for (BdWithdrawal withdrawal : withdrawalConfigs) { - Integer pkCountry = withdrawal.getPkCountry(); - if (Boolean.TRUE.equals(isWithdrawalCycle(pkCountry))) { - //查询提现到的币种 - List bdAccounts = iCuMemberBaseService.getAccountByCountry(EAccountProperty.IS_WITHDRAWAL.getValue(), pkCountry); - Integer accountsType = bdAccounts.get(0).getFieldValue(); - //查询会员币种余额、锁定金额 - List cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByPkcountry(pkCountry); - memberWithDrawal(withdrawal, cuMemberAccountExts, bdAccounts, accountsType, pkCountry); - } - } - } - } - - /** - * 会员提现 - * - * @param withdrawal 提现配置信息 - * @param cuMemberAccountExts 会员币种表 - * @param bdAccounts 币种信息 - * @param accountsType 配置的提现币种 - * @param pkCountry 国家ID - */ - public void memberWithDrawal(BdWithdrawal withdrawal, List cuMemberAccountExts, List bdAccounts, Integer accountsType, Integer pkCountry) { - //会员ID 银行卡ID - Long pkMember; - Long pkBank; - //余额 锁定金额 - BigDecimal balance; - //最高自动提现金额 - BigDecimal upperBound = withdrawal.getUpperBound(); - //最低自动提现金额 - BigDecimal lowerBound = withdrawal.getLowerBound(); - //配置文件中的提现次数 - Integer withdrawalNumber = withdrawal.getWithdrawalNumber(); - if (CollUtil.isNotEmpty(cuMemberAccountExts)) { - //查询每个会员正在参与审核的次数 - List withdrawTimesByPkCountry = baseMapper.getWithdrawTimesByPkCountry(pkCountry); - Map withdrawTimes = withdrawTimesByPkCountry.stream().collect(Collectors.toMap(CuMemberWithdrawExt::getPkMember, CuMemberWithdrawExt::getTimes)); - //汇率 - CurrencyDTO currencyDTO = iCuMemberBaseService.getCurrency(pkCountry); - for (CuMemberAccountExt cuMemberAccountExt : cuMemberAccountExts) { - pkBank = cuMemberAccountExt.getPkBank(); - //是否绑定银行卡 - CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank); - if (null != memberBank) { - pkMember = cuMemberAccountExt.getPkMember(); - //获取余额 - balance = getAvailableBalance(accountsType, cuMemberAccountExt); - //是否取整 - balance = computeRounding(withdrawal, balance); - // 提现金额在配置金额之间 - if (balance.compareTo(lowerBound) > 0 && balance.compareTo(upperBound) < 0) { - int times = withdrawTimes.get(pkMember) == null ? 0 : withdrawTimes.get(pkMember); - //比较正在提现次数与配置的最大提现次数 - if (times <= withdrawalNumber) { - //本次应缴个税 - BigDecimal payIncomeTax = computeIncomeTaxValue(pkMember, balance, pkCountry, lowerBound); - //手续费金额 - BigDecimal serviceChargeAmount = computeServiceCharge(pkCountry, balance); - BigDecimal issuedAmount = balance.subtract(payIncomeTax).subtract(serviceChargeAmount); - String code = CommonUtil.createSerialNumber(EOrderPrefix.WITHDRAWAL_CODE.getValue()); - CuMember member = iCuMemberService.getMember(pkMember); - String remarks = member.getMemberCode() + "自动申请提现" + balance; - CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder().pkMember(pkMember) - .pkAccount(bdAccounts.get(0).getPkId()).pkBank(pkBank) - .pkRate(currencyDTO.getPkId()).cashAmount(balance) - .serviceCharge(serviceChargeAmount).incomeTax(payIncomeTax) - .issuedAmount(issuedAmount).withdrawCode(code).remarks(remarks).build(); - cuMemberWithdraw.setApproveState(EApproveStatus.WAIT_SUBMIT.getValue()); - cuMemberWithdraw.setDelFlag(EDelFlag.UN_DELETE.getValue()); - cuMemberWithdraw.setPkCountry(pkCountry); - cuMemberWithdraw.setPkCreator(pkMember); - //保存提现、交易流水、余额信息 - baseMapper.insert(cuMemberWithdraw); - this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT); - } - } - } - } - } - } - /** * 获取余额 * @@ -733,13 +632,13 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); @@ -752,7 +651,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl cuMemberWithdrawList = baseMapper.selectList(wrapper); Integer pkCountry = SecurityUtils.getPkCountry(); - if(CollUtil.isNotEmpty(cuMemberWithdrawList)){ + if (CollUtil.isNotEmpty(cuMemberWithdrawList)) { for (CuMemberWithdraw cuMemberWithdraw : cuMemberWithdrawList) { BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder() .tradeCode(cuMemberWithdraw.getWithdrawCode()).pkCountry(pkCountry) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java index afcaece0..feee6d40 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBankVO.java @@ -7,22 +7,17 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; + import java.io.Serializable; /** * 会员银行卡VO - * @Description: - * @Author: ljc - * @Time: 2023/2/9 15:31 - * @Classname: CuMemberBankVO - * @Package_name: com.hzs.member.account.vo */ @Data @AllArgsConstructor @NoArgsConstructor public class CuMemberBankVO implements Serializable { - /** * 银行主键 */ @@ -66,5 +61,5 @@ public class CuMemberBankVO implements Serializable { /** * logo图片 */ - private String logo; + private String logo; } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml index 0f88925c..68ef0e40 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml @@ -235,19 +235,6 @@ - - - select a.pk_member, @@ -1062,25 +1002,6 @@ - - - - - - MERGE INTO cu_member_account m - USING - ( - - select #{item.pkMember} pk_member, - - #{item.account4} account4, - #{item.consumeAccount4} consumeAccount4, - - - #{item.account4} account4, - #{item.withdrawAccount4} withdrawAccount4, - - - #{item.account4} account4, - #{item.consumeAccount4} consumeAccount4, - #{item.withdrawAccount4} withdrawAccount4, - - FROM DUAL - - ) t - ON ( t.pk_member=m.pk_member and m.pk_member in - - #{item.pkMember} - ) - WHEN MATCHED THEN - UPDATE SET - - m.account4 = NVL(t.account4, 0) + m.account4, - m.consume_account4 = NVL(t.consumeAccount4, 0) + m.consume_account4, - - - m.account4 = NVL(t.account4, 0) + m.account4, - m.withdraw_account4 = NVL(t.withdrawAccount4, 0) + m.withdraw_account4, - - - m.account4 = NVL(t.account4, 0) + m.account4, - m.consume_account4 = NVL(t.consumeAccount4, 0) + m.consume_account4, - m.withdraw_account4 = NVL(t.withdrawAccount4, 0) + m.withdraw_account4, - - m.MODIFIED_TIME = sysdate,m.pk_modified = #{pkModified} - - -