From 734ad1d9b578ddcc37fa2cb31fd320a65ad59e06 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 22 Apr 2025 13:26:00 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8F=90=E7=8E=B0=E4=B8=AA=E7=A8=8E?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/IWithdrawalTaxServiceApi.java | 19 +- .../bonus/service/IBonusGrantService.java | 22 +-- .../impl/BdWaresBonusItemsServiceImpl.java | 15 +- .../service/impl/BonusGrantServiceImpl.java | 19 +- .../api/ApiCuMemberWithdrawController.java | 1 + .../mapper/CuMemberWithdrawMapper.java | 14 -- .../service/ICuMemberWithdrawService.java | 13 +- .../impl/CuMemberWithdrawServiceImpl.java | 158 +++++++---------- .../member/account/CuMemberWithdrawMapper.xml | 34 ++-- .../WithdrawalTaxServiceProvider.java | 16 +- .../service/IBdWithdrawalTaxService.java | 7 - .../impl/BdWithdrawalTaxServiceImpl.java | 167 +++++++----------- .../common/core/enums/EExpandCapMethod.java | 7 +- .../domain/system/config/BdWithdrawalTax.java | 8 - .../system/config/ext/BdWithdrawalTaxExt.java | 19 +- .../com/hzs/third/job/BonusSettleJob.java | 48 +---- 16 files changed, 175 insertions(+), 392 deletions(-) diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java b/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java index 3ac8992a..55db1c74 100644 --- a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java +++ b/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IWithdrawalTaxServiceApi.java @@ -1,27 +1,16 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdWithdrawalTax; import com.hzs.common.domain.system.config.ext.BdWithdrawalTaxExt; -import java.util.List; - /** * @description: 个税明细api - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: - * @return: **/ public interface IWithdrawalTaxServiceApi { + /** + * @description: 根据国家查询个税明细 + **/ + R queryWithdrawalTax(Integer pkCountry); - /** - * @description: 根据国家查询个税明细 - * @author: zhang jing - * @date: 2022/9/27 16:13 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R queryWithdrawalTax(Integer pkCountry); } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java index e9faa10f..d6a9dd1e 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusGrantService.java @@ -1,20 +1,12 @@ package com.hzs.bonus.bonus.service; /** - * @Description: 奖金发放 - * @Author: sui q - * @Time: 2023/3/20 17:04 - * @Classname: IBonusGrantService - * @PackageName: com.hzs.member.bonus.service + * 奖金发放 */ public interface IBonusGrantService { /** * 每天公布奖金,定时任务 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/20 17:06 */ void publishBonusByPeriodEveryDay(); @@ -24,9 +16,6 @@ public interface IBonusGrantService { * 手动公布奖金 * * @param settleDate 日期 - * @return: void - * @Author: sui q - * @Date: 2023/3/20 17:06 */ void publishBonusByPeriod(Integer pkCountry, String settleDate); @@ -34,9 +23,6 @@ public interface IBonusGrantService { * 手动不公布奖金 * * @param settleDate 日期 - * @return: void - * @Author: sui q - * @Date: 2023/3/20 17:06 */ void noPublishBonusByPeriod(Integer pkCountry, String settleDate); @@ -44,9 +30,6 @@ public interface IBonusGrantService { * 每天发放奖金 * * @param settleDate 日期 - * @return: void - * @Author: sui q - * @Date: 2023/3/20 17:06 */ Boolean grantBonusByPeriod(Integer pkCountry, String settleDate); @@ -56,9 +39,6 @@ public interface IBonusGrantService { * 每天奖金提现 * * @param settleDate 日期 - * @return: void - * @Author: sui q - * @Date: 2023/3/20 17:07 */ void withdrawalBonusByPeriod(Integer pkCountry, String settleDate); diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java index 93c086a3..51c419b0 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java @@ -1,10 +1,9 @@ package com.hzs.bonus.bonus.service.impl; -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.bonus.bonus.mapper.BdWaresBonusItemsMapper; import com.hzs.bonus.bonus.service.IBdWaresBonusItemsService; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.bonus.BdWaresBonusItems; @@ -39,15 +38,15 @@ public class BdWaresBonusItemsServiceImpl extends ServiceImpl waresBonusItemsList, Long pkWaresBonus, Long userId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); if (waresBonusItemsList != null && waresBonusItemsList.size() > 0) { Set itemIdList = waresBonusItemsList.stream().map(BdWaresBonusItems::getPkId).collect(Collectors.toSet()); - updateWrapper.notIn(SystemFieldConstants.PK_ID, itemIdList); + updateWrapper.notIn(BdWaresBonusItems::getPkId, itemIdList); } - updateWrapper.eq("PK_WARES_BONUS", pkWaresBonus); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); + updateWrapper.eq(BdWaresBonusItems::getPkWaresBonus, pkWaresBonus); + updateWrapper.set(BdWaresBonusItems::getDelFlag, EDelFlag.DELETE.getValue()); + updateWrapper.set(BdWaresBonusItems::getPkModified, userId); + updateWrapper.set(BdWaresBonusItems::getModifiedTime, DateUtils.currentDateTime()); update(updateWrapper); } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java index ec57d886..b22ec9ce 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java @@ -38,11 +38,7 @@ import java.time.temporal.ChronoUnit; import java.util.*; /** - * @Description: 奖金发放实现类 - * @Author: sui q - * @Time: 2023/3/20 17:05 - * @Classname: BonusGrantServiceImpl - * @PackageName: com.hzs.member.bonus.service.impl + * 奖金发放实现类 */ @Slf4j @Service @@ -95,28 +91,29 @@ public class BonusGrantServiceImpl implements IBonusGrantService { Map integerBdCountryMap = iCountryServiceApi.getAllCountryMap().getData(); if (integerBdCountryMap.size() > 0) { for (Integer pkCountry : integerBdCountryMap.keySet()) { + // 先发放奖金，验证是否是周结，周结发放上周的，直接变为可提现 Date grantDay = DateUtils.beforeDate(7, ChronoUnit.DAYS, DateUtils.currentDate()); String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, grantDay); grantBonusByPeriod(pkCountry, settleDate); + // 周奖发放上周的奖金 CuMemberSettlePeriodExt cuMemberSettlePeriod = getCuMemberSettlePeriod(pkCountry, settleDate); Date withdrawDay = DateUtils.beforeDate(7, ChronoUnit.DAYS, grantDay); - if (EExpandCapMethod.WEEK_SETTLE.getValue() == cuMemberSettlePeriod.getSettleCycle() || - !CountryConstants.CHINA_COUNTRY.equals(pkCountry)) { + if (EExpandCapMethod.WEEK_SETTLE.getValue() == cuMemberSettlePeriod.getSettleCycle() + || !CountryConstants.CHINA_COUNTRY.equals(pkCountry)) { withdrawDay = grantDay; } - withdrawalBonusByPeriod(pkCountry, DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, withdrawDay)); + // 设置奖金可以提现 + withdrawalBonusByPeriod(pkCountry, DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, withdrawDay)); + } } } /* * @description: 公布奖金 - * @author: sui q - * @date: 2023/4/24 14:19 - * @param: null null **/ private void publishBonus(CuMemberSettlePeriodExt cuMemberSettlePeriod) { if (EYesNo.YES.getIntValue() == cuMemberSettlePeriod.getIsPublish()) { diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java index 034f4d22..13b89202 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java @@ -194,6 +194,7 @@ public class ApiCuMemberWithdrawController extends BaseController { if (null == minAmount || null == maxAmount) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.CONFIGURE_WITHDRAWAL_AMOUNT_LIMIT)); } + // 提现金额 BigDecimal cashAmount = cuMemberWithdrawParam.getCashAmount(); if (null == cashAmount) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.ENTER_WITHDRAWAL_AMOUNT)); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java index 694a88ea..1e384468 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java @@ -1,6 +1,5 @@ package com.hzs.member.account.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.account.CuMemberWithdraw; import com.hzs.common.domain.member.account.CuMemberWithdrawExt; @@ -10,9 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员提现表 Mapper 接口 - *

* * @author hzs * @since 2022-09-06 @@ -64,15 +61,6 @@ public interface CuMemberWithdrawMapper extends BaseMapper { */ CuMemberWithdrawExt selectMemberWithdrawListTotal(CuMemberWithdrawVO cuMemberWithdrawVO); - - /** - * 根据条件查询提现总金额、个税 - * - * @param cuMemberWithdrawVO - * @return CuMemberWithdrawExt - */ - CuMemberWithdrawExt selectMemberWithdrawListCount(CuMemberWithdrawVO cuMemberWithdrawVO); - /** * 查询提现信息详情 * @@ -81,7 +69,6 @@ public interface CuMemberWithdrawMapper extends BaseMapper { */ CuMemberWithdrawExt queryCuMemberWithdrawDetail(@Param("pkId") Long pkId); - /** * 打款 * @@ -97,7 +84,6 @@ public interface CuMemberWithdrawMapper extends BaseMapper { */ List getWithdrawApproveStateByIds(@Param("pkIds") List pkIds, @Param("approveState") Integer approveState); - /** * 提现签呈显示 * diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java index ff557251..3d9a2ff0 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java @@ -1,6 +1,5 @@ package com.hzs.member.account.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.account.CuMemberAccount; import com.hzs.common.domain.member.account.CuMemberWithdraw; @@ -13,9 +12,7 @@ import java.math.BigDecimal; import java.util.List; /** - *

* 会员提现表 服务类 - *

* * @author hzs * @since 2022-09-06 @@ -29,14 +26,6 @@ public interface ICuMemberWithdrawService extends IService { */ List getWithdrawTimes(Long pkMember); - /** - * 根据申请单号查询提现信息 - * - * @param code 单号 - * @return CuMemberWithdraw - */ - CuMemberWithdraw selectWithdrawByCode(String code); - /** * 根据批次号查询审核记录 * @@ -112,7 +101,7 @@ public interface ICuMemberWithdrawService extends IService { * @param pkMember 用户ID * @param cashAmount 提现金额 * @param pkCountry 国家ID - * @param minAmount 最低提现金额 + * @param minAmount 个税下限 * @return BigDecimal */ BigDecimal computeIncomeTaxValue(Long pkMember, BigDecimal cashAmount, Integer pkCountry, BigDecimal minAmount); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java index 4510fb29..4e773aa6 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java @@ -3,7 +3,7 @@ package com.hzs.member.account.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.MemberFieldConstants; import com.hzs.common.core.domain.R; @@ -46,16 +46,11 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.DayOfWeek; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** - *

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

* * @author hzs * @since 2022-09-06 @@ -64,64 +59,42 @@ import java.util.stream.Collectors; @Slf4j public class CuMemberWithdrawServiceImpl extends ServiceImpl implements ICuMemberWithdrawService { + @Autowired + private ICuMemberTradeService iCuMemberTradeService; + @Autowired + private ICuMemberAccountService iCuMemberAccountService; + @Autowired + private ICuMemberBaseService iCuMemberBaseService; + @Autowired + private ICuMemberBankService iCuMemberBankService; + @Autowired + private ICuMemberService iCuMemberService; @DubboReference - IWithdrawalTaxServiceApi withdrawalTaxServiceApi; - - @Autowired - ICuMemberTradeService cuMemberTradeService; - - @Autowired - ICuMemberAccountService cuMemberAccountService; - - @Autowired - ICuMemberBaseService cuMemberBaseService; - - @Autowired - ICuMemberBankService cuMemberBankService; - - @Autowired - ICuMemberService cuMemberService; - + IWithdrawalTaxServiceApi iWithdrawalTaxServiceApi; @DubboReference - IWithdrawalAutoServiceApi withdrawalAutoServiceApi; - + IWithdrawalAutoServiceApi iWithdrawalAutoServiceApi; @DubboReference - IWithdrawalServiceApi withdrawalServiceApi; - + IWithdrawalServiceApi iWithdrawalServiceApi; @DubboReference - IWithdrawalProcessServiceApi withdrawalProcessServiceApi; - - + IWithdrawalProcessServiceApi iWithdrawalProcessServiceApi; @DubboReference - IApprovalServiceApi approvalServiceApi; - + IApprovalServiceApi iApprovalServiceApi; @Override public List getWithdrawTimes(Long pkMember) { return baseMapper.getWithdrawTimes(pkMember); } - @Override - public CuMemberWithdraw selectWithdrawByCode(String code) { - //根据单号查询充值信息 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("WITHDRAW_CODE", code); - queryWrapper.eq("DEL_FLAG", EDelFlag.UN_DELETE.getValue()); - return getOne(queryWrapper); - } - - @Override public List selectWithdrawByBatch(String batchNO) { //根据单号查询充值信息 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("BATCH", batchNO); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberWithdraw::getBatch, batchNO); return baseMapper.selectList(queryWrapper); } - - private BigDecimal getIncomeTax(BdWithdrawalTaxExt withdrawalTax, Integer pkCountry, BigDecimal curCashAmount) { + private BigDecimal getIncomeTax(BdWithdrawalTaxExt withdrawalTax, BigDecimal curCashAmount, Map taxAmountMap) { //个税比例 BigDecimal incomeTax = BigDecimal.ZERO; //计算类型 @@ -135,6 +108,8 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl= 0) { incomeTax = ratio; + // 个税下限 + taxAmountMap.put("tax", lowerBound); break; } } @@ -160,10 +135,10 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl withdrawalConfigs = withdrawalServiceApi.queryWithdrawalByIsAuto().getData(); + List withdrawalConfigs = iWithdrawalServiceApi.queryWithdrawalByIsAuto().getData(); if (CollUtil.isNotEmpty(withdrawalConfigs)) { for (BdWithdrawal withdrawal : withdrawalConfigs) { Integer pkCountry = withdrawal.getPkCountry(); if (Boolean.TRUE.equals(isWithdrawalCycle(pkCountry))) { //查询提现到的币种 - List bdAccounts = cuMemberBaseService.getAccountByCountry(EAccountProperty.IS_WITHDRAWAL.getValue(), pkCountry); + List bdAccounts = iCuMemberBaseService.getAccountByCountry(EAccountProperty.IS_WITHDRAWAL.getValue(), pkCountry); Integer accountsType = bdAccounts.get(0).getFieldValue(); //查询会员币种余额、锁定金额 - List cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByPkcountry(pkCountry); + List cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByPkcountry(pkCountry); memberWithDrawal(withdrawal, cuMemberAccountExts, bdAccounts, accountsType, pkCountry); } } @@ -370,7 +344,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl withdrawTimesByPkCountry = baseMapper.getWithdrawTimesByPkCountry(pkCountry); Map withdrawTimes = withdrawTimesByPkCountry.stream().collect(Collectors.toMap(CuMemberWithdrawExt::getPkMember, CuMemberWithdrawExt::getTimes)); //汇率 - CurrencyDTO currencyDTO = cuMemberBaseService.getCurrency(pkCountry); + CurrencyDTO currencyDTO = iCuMemberBaseService.getCurrency(pkCountry); for (CuMemberAccountExt cuMemberAccountExt : cuMemberAccountExts) { pkBank = cuMemberAccountExt.getPkBank(); //是否绑定银行卡 - CuMemberBankVO memberBank = cuMemberBankService.selectCuMemberBankById(pkBank); - log.info("----------是否绑定银行卡"); + CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank); if (null != memberBank) { - log.info("----------绑定银行卡"); pkMember = cuMemberAccountExt.getPkMember(); //获取余额 balance = getAvailableBalance(accountsType, cuMemberAccountExt); @@ -398,7 +370,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl 0 && balance.compareTo(upperBound) < 0) { log.info("----------提现开始"); - Integer times = withdrawTimes.get(pkMember) == null ? 0 : withdrawTimes.get(pkMember); + int times = withdrawTimes.get(pkMember) == null ? 0 : withdrawTimes.get(pkMember); //比较正在提现次数与配置的最大提现次数 if (times <= withdrawalNumber) { //本次应缴个税 @@ -407,8 +379,8 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl listR = withdrawalAutoServiceApi.queryWithdrawalAuto(pkCountry).getData(); + List listR = iWithdrawalAutoServiceApi.queryWithdrawalAuto(pkCountry).getData(); for (BdWithdrawalAuto withdrawalAuto : listR) { Integer withdrawalCycle = withdrawalAuto.getWithdrawalCycle(); if (dayOfWeekNum.equals(withdrawalCycle)) { @@ -498,21 +470,22 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl bdAccounts = cuMemberBaseService.getAccountByCountry(EAccountProperty.IS_WITHDRAWAL.getValue(), pkCountry); + List bdAccounts = iCuMemberBaseService.getAccountByCountry(EAccountProperty.IS_WITHDRAWAL.getValue(), pkCountry); accountsType = bdAccounts.get(0).getFieldValue(); } //查询账户余额 - return cuMemberAccountService.selectBalanceByMemberCode(pkMember, accountsType); + return iCuMemberAccountService.selectBalanceByMemberCode(pkMember, accountsType); } @Override public BigDecimal computeIncomeTaxValue(Long pkMember, BigDecimal cashAmount, Integer pkCountry, BigDecimal minAmount) { //获取个税配置 - R bdWithdrawalTaxExtR = withdrawalTaxServiceApi.queryWithdrawalTax(pkCountry); + R bdWithdrawalTaxExtR = iWithdrawalTaxServiceApi.queryWithdrawalTax(pkCountry); BdWithdrawalTaxExt withdrawalTax = bdWithdrawalTaxExtR.getData(); if (null == withdrawalTax) { return BigDecimal.ZERO; } + // 提现个税周期 Integer cycle = withdrawalTax.getTaxCycle(); BigDecimal monthCashAmount = BigDecimal.ZERO; @@ -525,11 +498,19 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl taxAmountMap = new HashMap<>(); //个税比例 - BigDecimal incomeTax = getIncomeTax(withdrawalTax, pkCountry, curCashAmount); + BigDecimal incomeTax = getIncomeTax(withdrawalTax, curCashAmount, taxAmountMap); + // 个税下限 + BigDecimal taxAmount = taxAmountMap.get("tax"); + if (null == taxAmount) { + // 如果没有个税，保留原有逻辑，使用提现下限 + taxAmount = minAmount; + } - //参加提税的金额(总提税金额-最低提现金额) - BigDecimal taxCashAmount = curCashAmount.subtract(minAmount); + //参加提税的金额(总提税金额-个税下限) + BigDecimal taxCashAmount = curCashAmount.subtract(taxAmount); //当月总个税 = 当前提现金额*个税比例 BigDecimal totalTax = taxCashAmount.multiply(incomeTax).setScale(4, BigDecimal.ROUND_HALF_UP); //当总所得税小于当月已缴所得税时，本交不交所得税 @@ -542,7 +523,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl getWithdrawApproveStateByIds(List pkIds, Integer approveState) { return baseMapper.getWithdrawApproveStateByIds(pkIds, approveState); } - @Override public CuMemberPetitionVO showMemberWithdrawPetition(List pkIds, Integer approveState) { CuMemberPetitionVO memberPetitionVo = new CuMemberPetitionVO(); @@ -612,7 +590,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl withdrawCodeList = cuMemberWithdrawExts.stream().map(CuMemberWithdrawExt::getWithdrawCode).collect(Collectors.toList()); CuMemberTradeVO memberTradeVO = CuMemberTradeVO.builder().sourceCode(businessNo) .tradeCodes(withdrawCodeList).pkModified(loginUser.getUserId()).build(); - cuMemberTradeService.updateSourceCodeByTradeCode(memberTradeVO); + iCuMemberTradeService.updateSourceCodeByTradeCode(memberTradeVO); List memberWithdrawList = memberPetitionVo.getMemberWithdrawList(); //提交提现用户 @@ -625,7 +603,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { throw new RuntimeException(submit.getMsg()); } @@ -661,7 +639,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl cuMemberWithdrawList = baseMapper.selectMemberWithdrawListByPkMember(pkMember, pkCountry); if (CollUtil.isNotEmpty(cuMemberWithdrawList)) { //查询币种值 - List allAccounts = cuMemberBaseService.getAccountByCountryId(pkCountry); + List allAccounts = iCuMemberBaseService.getAccountByCountryId(pkCountry); Map map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o)); for (CuMemberWithdrawExt ext : cuMemberWithdrawList) { cuMemberWithdrawVO = BeanUtil.copyProperties(ext, CuMemberWithdrawVO.class); @@ -694,18 +672,18 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl 0) { //插入交易明细表 - cuMemberTradeService.save(getCuMemberTradeInfo(cuMemberWithdraw)); + iCuMemberTradeService.save(getCuMemberTradeInfo(cuMemberWithdraw)); //更新余额表 CuMemberAccount cuMemberAccount = this.getCuMemberAccount(cuMemberWithdraw, backAmount); cuMemberAccount.setPkCountry(cuMemberWithdraw.getPkCountry()); - cuMemberAccountService.updateMemberAccount(cuMemberAccount, pkModified); + iCuMemberAccountService.updateMemberAccount(cuMemberAccount, pkModified); } return baseMapper.updateWithdrawStatusByPkId(pkId, pkModified); } private CuMemberAccount getCuMemberAccount(CuMemberWithdraw cuMemberWithdraw, BigDecimal backAmount) { Integer pkAccount = cuMemberWithdraw.getPkAccount(); - BdAccount account = cuMemberBaseService.getAccount(pkAccount); + BdAccount account = iCuMemberBaseService.getAccount(pkAccount); if (account.getFieldValue().equals(EAccount.BONUS.getValue())) { return CuMemberAccount.builder() .account4(backAmount) @@ -729,11 +707,11 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl @@ -294,23 +294,11 @@ group by c.in_exchange_rate - - - update cu_member_withdraw diff --git a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java index b65736df..ba6cc1d3 100644 --- a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java +++ b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalTaxServiceProvider.java @@ -1,37 +1,27 @@ package com.hzs.system.config.provider; 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 com.hzs.system.config.IWithdrawalTaxServiceApi; import com.hzs.system.config.service.IBdWithdrawalTaxService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; - /** * @Description: 提现配置的dubbo服务类 - * @Author: zhang jing - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider */ @DubboService public class WithdrawalTaxServiceProvider implements IWithdrawalTaxServiceApi { @Autowired - private IBdWithdrawalTaxService withdrawalTaxService; + private IBdWithdrawalTaxService iBdWithdrawalTaxService; /** * @description: 根据国家查询个税明细 - * @author: zhang jing - * @date: 2022/9/27 16:14 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> **/ @Override public R queryWithdrawalTax(Integer pkCountry) { - return R.ok(withdrawalTaxService.queryWithdrawalTax(pkCountry)); + return R.ok(iBdWithdrawalTaxService.queryWithdrawalTax(pkCountry)); } + } diff --git a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalTaxService.java b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalTaxService.java index 9e2e204e..9835a3c0 100644 --- a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalTaxService.java +++ b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalTaxService.java @@ -1,6 +1,5 @@ package com.hzs.system.config.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdWithdrawalTax; import com.hzs.common.domain.system.config.ext.BdWithdrawalTaxExt; @@ -8,9 +7,7 @@ import com.hzs.common.domain.system.config.ext.BdWithdrawalTaxExt; import java.util.List; /** - *

* 个税明细表 服务类 - *

* * @author zhangjing * @since 2022-09-06 @@ -19,10 +16,6 @@ public interface IBdWithdrawalTaxService extends IService { /** * @description: 根据国家查询个税明细 - * @author: zhang jing - * @date: 2022/9/27 16:12 - * @param: [pkCountry] - * @return: java.util.List **/ BdWithdrawalTaxExt queryWithdrawalTax(Integer pkCountry); diff --git a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalTaxServiceImpl.java b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalTaxServiceImpl.java index 8fcbefce..54714d68 100644 --- a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalTaxServiceImpl.java +++ b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalTaxServiceImpl.java @@ -2,8 +2,8 @@ package com.hzs.system.config.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.enums.EDelFlag; @@ -25,103 +25,80 @@ import java.util.Date; import java.util.List; /** - *

* 个税明细表 服务实现类 - *

- * - * @author zhangjing - * @since 2022-09-06 */ @Service public class BdWithdrawalTaxServiceImpl extends ServiceImpl implements IBdWithdrawalTaxService { + @Autowired private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - - @Autowired - private IBdWithdrawalTaxDetailsService withdrawalTaxDetailsService; - + private IBdWithdrawalTaxDetailsService iBdWithdrawalTaxDetailsService; /** * @description: 根据国家查询个税明细 - * @author: zhang jing - * @date: 2022/9/27 16:04 - * @param: [pkCountry] - * @return: java.util.List **/ @Override public BdWithdrawalTaxExt queryWithdrawalTax(Integer pkCountry) { BdWithdrawalTaxExt withdrawalTaxExt = redisService.getCacheObject(CacheConstants.BD_WITHDRAWAL_TAX + pkCountry); - if(StringUtils.isNull(withdrawalTaxExt)){ - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", pkCountry); - queryWrapper.le("EFFECTIVE_DATE",new Date()); - queryWrapper.orderByDesc("CREATION_TIME"); + if (StringUtils.isNull(withdrawalTaxExt)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdWithdrawalTax::getPkCountry, pkCountry); + queryWrapper.le(BdWithdrawalTax::getEffectiveDate, new Date()); + queryWrapper.orderByDesc(BdWithdrawalTax::getCreationTime); BdWithdrawalTax bwt = baseMapper.selectOne(queryWrapper); BdWithdrawalTaxExt bwtExt = BeanUtil.copyProperties(bwt, BdWithdrawalTaxExt.class); - if(StringUtils.isNotNull(bwtExt)&&StringUtils.isNotNull(bwt)){ - QueryWrapper queryWrapperDetails = new QueryWrapper(); - queryWrapperDetails.eq("PK_COUNTRY",pkCountry); - queryWrapperDetails.eq("PK_WITHDRAWAL_TAX",bwtExt.getPkId()); - List bwtdList =withdrawalTaxDetailsService.list(queryWrapperDetails); - if(CollectionUtil.isNotEmpty(bwtdList)){ - bwtExt.setWithdrawalTaxDetailsList(bwtdList); - }else{ - bwtdList=new ArrayList<>(); + if (StringUtils.isNotNull(bwtExt) && StringUtils.isNotNull(bwt)) { + LambdaQueryWrapper queryWrapperDetails = new LambdaQueryWrapper<>(); + queryWrapperDetails.eq(BdWithdrawalTaxDetails::getPkCountry, pkCountry); + queryWrapperDetails.eq(BdWithdrawalTaxDetails::getPkWithdrawalTax, bwtExt.getPkId()); + List bwtdList = iBdWithdrawalTaxDetailsService.list(queryWrapperDetails); + if (CollectionUtil.isNotEmpty(bwtdList)) { bwtExt.setWithdrawalTaxDetailsList(bwtdList); + } else { + bwtExt.setWithdrawalTaxDetailsList(new ArrayList<>()); } - withdrawalTaxExt=bwtExt; - }else{ - bwtExt=new BdWithdrawalTaxExt(); - List bwtdList=new ArrayList<>(); - bwtExt.setWithdrawalTaxDetailsList(bwtdList); - withdrawalTaxExt=bwtExt; - } - if(null != withdrawalTaxExt){ - redisService.setCacheObject(CacheConstants.BD_WITHDRAWAL_TAX + pkCountry, withdrawalTaxExt); + withdrawalTaxExt = bwtExt; + } else { + bwtExt = new BdWithdrawalTaxExt(); + bwtExt.setWithdrawalTaxDetailsList(new ArrayList<>()); + withdrawalTaxExt = bwtExt; } + redisService.setCacheObject(CacheConstants.BD_WITHDRAWAL_TAX + pkCountry, withdrawalTaxExt); } return withdrawalTaxExt; } /** * @description: 添加或修改提现个税 - * @author: zhang jing - * @date: 2022/11/9 9:26 - * @param: [withdrawalTaxExt] - * @return: boolean **/ @Override @Transactional(rollbackFor = Exception.class) public boolean saveWithdrawalTax(BdWithdrawalTaxExt withdrawalTaxExt) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY",withdrawalTaxExt.getPkCountry()); - BdWithdrawalTax bdWithdrawalTax= baseMapper.selectOne(queryWrapper); - if(StringUtils.isNotNull(bdWithdrawalTax)){ - UpdateWrapper updateWrapperWt = new UpdateWrapper(); - updateWrapperWt.eq("PK_COUNTRY",withdrawalTaxExt.getPkCountry()); - updateWrapperWt.eq("DEL_FLAG", EDelFlag.UN_DELETE.getValue()); - updateWrapperWt.set("SERVICE_TYPE",withdrawalTaxExt.getServiceType()); - updateWrapperWt.set("TAX_CYCLE",withdrawalTaxExt.getTaxCycle()); - updateWrapperWt.set("EFFECTIVE_DATE",withdrawalTaxExt.getEffectiveDate()); - baseMapper.update(null,updateWrapperWt); - for(BdWithdrawalTaxDetails bwtd:withdrawalTaxExt.getWithdrawalTaxDetailsList()){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdWithdrawalTax::getPkCountry, withdrawalTaxExt.getPkCountry()); + BdWithdrawalTax bdWithdrawalTax = baseMapper.selectOne(queryWrapper); + if (StringUtils.isNotNull(bdWithdrawalTax)) { + LambdaUpdateWrapper updateWrapperWt = new LambdaUpdateWrapper<>(); + updateWrapperWt.eq(BdWithdrawalTax::getPkCountry, withdrawalTaxExt.getPkCountry()); + updateWrapperWt.eq(BdWithdrawalTax::getDelFlag, EDelFlag.UN_DELETE.getValue()); + updateWrapperWt.set(BdWithdrawalTax::getServiceType, withdrawalTaxExt.getServiceType()); + updateWrapperWt.set(BdWithdrawalTax::getTaxCycle, withdrawalTaxExt.getTaxCycle()); + updateWrapperWt.set(BdWithdrawalTax::getEffectiveDate, withdrawalTaxExt.getEffectiveDate()); + baseMapper.update(null, updateWrapperWt); + for (BdWithdrawalTaxDetails bwtd : withdrawalTaxExt.getWithdrawalTaxDetailsList()) { bwtd.setPkWithdrawalTax(bdWithdrawalTax.getPkId()); - if(StringUtils.isNotNull(bwtd.getPkId())){ - withdrawalTaxDetailsService.updateById(bwtd); - }else{ - withdrawalTaxDetailsService.save(bwtd); + if (StringUtils.isNotNull(bwtd.getPkId())) { + iBdWithdrawalTaxDetailsService.updateById(bwtd); + } else { + iBdWithdrawalTaxDetailsService.save(bwtd); } } - }else{ + } else { baseMapper.insert(withdrawalTaxExt); - for(BdWithdrawalTaxDetails bwtd:withdrawalTaxExt.getWithdrawalTaxDetailsList()){ + for (BdWithdrawalTaxDetails bwtd : withdrawalTaxExt.getWithdrawalTaxDetailsList()) { bwtd.setPkWithdrawalTax(withdrawalTaxExt.getPkId()); - withdrawalTaxDetailsService.save(bwtd); + iBdWithdrawalTaxDetailsService.save(bwtd); } } redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_TAX + SecurityUtils.getPkCountry()); @@ -130,35 +107,31 @@ public class BdWithdrawalTaxServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_ID",pkId); - BdWithdrawalTaxDetails withdrawalTaxDetails = withdrawalTaxDetailsService.getOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdWithdrawalTaxDetails::getPkId, pkId); + BdWithdrawalTaxDetails withdrawalTaxDetails = iBdWithdrawalTaxDetailsService.getOne(queryWrapper); - UpdateWrapper updateWrapperDetails = new UpdateWrapper<>(); - updateWrapperDetails.eq("PK_ID", pkId); - updateWrapperDetails.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapperDetails.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapperDetails.set("MODIFIED_TIME", new Date()); - withdrawalTaxDetailsService.update(updateWrapperDetails); + LambdaUpdateWrapper updateWrapperDetails = new LambdaUpdateWrapper<>(); + updateWrapperDetails.eq(BdWithdrawalTaxDetails::getPkId, pkId); + updateWrapperDetails.set(BdWithdrawalTaxDetails::getDelFlag, EDelFlag.DELETE.getValue()); + updateWrapperDetails.set(BdWithdrawalTaxDetails::getPkModified, SecurityUtils.getUserId()); + updateWrapperDetails.set(BdWithdrawalTaxDetails::getModifiedTime, new Date()); + iBdWithdrawalTaxDetailsService.update(updateWrapperDetails); - QueryWrapper queryWrapperList = new QueryWrapper(); - queryWrapperList.eq("PK_WITHDRAWAL_TAX",withdrawalTaxDetails.getPkWithdrawalTax()); - List bwtdList = withdrawalTaxDetailsService.list(queryWrapperList); - if(CollectionUtil.isEmpty(bwtdList)){ - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", withdrawalTaxDetails.getPkWithdrawalTax()); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - baseMapper.update(null,updateWrapper); + LambdaQueryWrapper queryWrapperList = new LambdaQueryWrapper<>(); + queryWrapperList.eq(BdWithdrawalTaxDetails::getPkWithdrawalTax, withdrawalTaxDetails.getPkWithdrawalTax()); + List bwtdList = iBdWithdrawalTaxDetailsService.list(queryWrapperList); + if (CollectionUtil.isEmpty(bwtdList)) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(BdWithdrawalTax::getPkId, withdrawalTaxDetails.getPkWithdrawalTax()); + updateWrapper.set(BdWithdrawalTax::getDelFlag, EDelFlag.DELETE.getValue()); + updateWrapper.set(BdWithdrawalTax::getPkModified, SecurityUtils.getUserId()); + updateWrapper.set(BdWithdrawalTax::getModifiedTime, new Date()); + baseMapper.update(null, updateWrapper); } redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_TAX + SecurityUtils.getPkCountry()); return true; @@ -166,21 +139,17 @@ public class BdWithdrawalTaxServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_ID",pkId); - List withdrawalTaxDetailsList = withdrawalTaxDetailsService.list(queryWrapper); - QueryWrapper queryWrapperbwt = new QueryWrapper(); - queryWrapperbwt.eq("PK_ID", withdrawalTaxDetailsList.get(0).getPkWithdrawalTax()); - queryWrapperbwt.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdWithdrawalTaxDetails::getPkId, pkId); + List withdrawalTaxDetailsList = iBdWithdrawalTaxDetailsService.list(queryWrapper); + LambdaQueryWrapper queryWrapperbwt = new LambdaQueryWrapper<>(); + queryWrapperbwt.eq(BdWithdrawalTax::getPkId, withdrawalTaxDetailsList.get(0).getPkWithdrawalTax()); + queryWrapperbwt.eq(BdWithdrawalTax::getPkCountry, SecurityUtils.getPkCountry()); BdWithdrawalTax bwt = baseMapper.selectOne(queryWrapperbwt); - BdWithdrawalTaxExt bdWithdrawalTaxExt =BeanUtil.copyProperties(bwt, BdWithdrawalTaxExt.class); + BdWithdrawalTaxExt bdWithdrawalTaxExt = BeanUtil.copyProperties(bwt, BdWithdrawalTaxExt.class); bdWithdrawalTaxExt.setWithdrawalTaxDetailsList(withdrawalTaxDetailsList); return bdWithdrawalTaxExt; } diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EExpandCapMethod.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EExpandCapMethod.java index 15bfd12a..cccc048e 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EExpandCapMethod.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EExpandCapMethod.java @@ -4,12 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @description: 封顶方式 - * @author: sui q - * @time: 2023/7/15 15:08 - * @classname: ExpandCapMethod - * @package_name: com.hzs.common.core.enums - * version 1.0.0 + * 封顶方式 */ @AllArgsConstructor @Getter diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalTax.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalTax.java index 81e7f464..e2b53623 100644 --- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalTax.java +++ b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalTax.java @@ -13,9 +13,7 @@ import lombok.experimental.Accessors; import java.util.Date; /** - *

* 个税明细表 - *

* * @author zhangjing * @since 2022-09-06 @@ -55,10 +53,4 @@ public class BdWithdrawalTax extends BaseEntity { private Date effectiveDate; - - - - - - } diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java index 1d6ed502..eeac0ac6 100644 --- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java +++ b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdWithdrawalTaxExt.java @@ -1,41 +1,24 @@ package com.hzs.common.domain.system.config.ext; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseEntity; import com.hzs.common.domain.system.config.BdWithdrawalTax; import com.hzs.common.domain.system.config.BdWithdrawalTaxDetails; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import java.util.Date; import java.util.List; /** - *

* 个税明细表 - *

* * @author zhangjing * @since 2022-09-06 */ +@EqualsAndHashCode(callSuper = true) @Data public class BdWithdrawalTaxExt extends BdWithdrawalTax { private static final long serialVersionUID = 1L; - private List withdrawalTaxDetailsList; - - - - - - - } diff --git a/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java b/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java index 42dd4518..91664d9e 100644 --- a/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java +++ b/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java @@ -12,12 +12,7 @@ import java.time.temporal.ChronoUnit; import java.util.Date; /** - * @description: 每日奖金计算定时任务 - * @author: sui q - * @time: 2023/4/10 14:19 - * @classname: BonusSettleJob - * @package_name: com.hzs.third.job - * version 1.0.0 + * 每日奖金计算定时任务 */ @Component @Slf4j @@ -29,10 +24,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("backSettleBonus") public void backupsSettleBonusEveryday() { @@ -42,10 +33,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus") public void autoSettleBonusEveryday() { @@ -56,10 +43,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus1") public void autoSettleBonusEveryday1() { @@ -70,10 +53,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus2") public void autoSettleBonusEveryday2() { @@ -84,10 +63,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus3") public void autoSettleBonusEveryday3() { @@ -98,10 +73,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus4") public void autoSettleBonusEveryday4() { @@ -112,10 +83,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus5") public void autoSettleBonusEveryday5() { @@ -126,10 +93,6 @@ public class BonusSettleJob { /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus6") public void autoSettleBonusEveryday6() { @@ -140,9 +103,6 @@ public class BonusSettleJob { /* * @description: 自动公布奖金 - * @author: sui q - * @date: 2023/4/24 14:26 - * @param: null null **/ @XxlJob("autoPublishBonus") public void autoPublishBonusEveryday() { @@ -153,9 +113,6 @@ public class BonusSettleJob { /* * @description: 自动发放奖金 - * @author: sui q - * @date: 2023/4/24 14:26 - * @param: null null **/ @XxlJob("autoGrantBonus") public void autoGrantBonusEveryday() { @@ -166,9 +123,6 @@ public class BonusSettleJob { /* * @description: 自动结算每日业绩，每月业绩，用于统计分析 - * @author: sui q - * @date: 2023/9/1 9:53 - * @param: null null **/ @XxlJob("autoSettleMember") public void autoSettleMemberAchieveEveryday() {