diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java index 3d094320..68967ee8 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java @@ -2,113 +2,17 @@ package com.hzs.bonus.account.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.ext.CuMemberAccountExt; import org.apache.ibatis.annotations.Param; -import java.math.BigDecimal; -import java.util.List; - /** * 会员账户信息 Mapper 接口 - * - * @author hzs - * @since 2022-08-11 */ public interface CuMemberAccountMapper extends BaseMapper { - /** - * 查询会员账户状态,账户信息 - * - * @param cuMemberAccount 会员账户条件信息 - * @return: List - * @Author: sui q - * @Date: 2022/9/5 11:57 - */ - List queryMemberAccountByCondition(CuMemberAccount cuMemberAccount); - - - /** - * 根据会员编码获取余额 - * - * @param pkMember 会员编号 - * @param accountType 账户类型 - * @return BigDecimal - */ - BigDecimal selectBalanceByMemberCode(@Param("pkMember") Long pkMember, @Param("accountType") Integer accountType); - - /** - * 更新账户余额 - * - * @param cuMemberAccount 会员账户表 - * @return: Integer - * @Author: sui q - * @Date: 2022/9/21 21:42 - */ - Integer updateMemberAccount(CuMemberAccount cuMemberAccount); - - /** - * 根据用户ID集合查询用户余额 - * - * @param pkMembers 用户ID集合 - * @return List - */ - List selectMemberAccountByPkMember(@Param(value = "pkMembers") List pkMembers); - - - /** - * 根据国家查询余额与银行卡信息 - * - * @param pkCountry 国家ID - * @return List - */ - List queryMemberAccountByPkCountry(@Param("pkCountry") Integer pkCountry); - - /** - * 获得更新账户余额 奖金账户、可提现账户、可消费账户 - * 奖金账户 = 可提现账户+可消费账户 - * 奖金账户操作时 :入的金额 进可消费账户 出的金额 进可提现账户 - *

- * 根据用户batch 批量更新余额 - * - * @param batch 批次号 - * @param type 操作类型(1:转入、2:转出) - * @return Boolean - */ - Boolean updateBatchMemberAccountByPkmember(@Param("batch") String batch, @Param("pkModified") Long pkModified, @Param("type") int type); - - - /** - * 根据用户编号集查询用户账户的全部字段信息 - * - * @param memberCodes 用户编号 - * @return List - */ - List queryMemberAccountAllByMemberCodes(@Param(value = "memberCodes") List memberCodes); - - /** - * 根据用户编号查询用户ID - * - * @param memberCodes 用户编号 - * @param pkCountry 国家 - * @return List - */ - List selectPkMembersByMemberCode(@Param("memberCodes") List memberCodes, @Param("pkCountry") Integer pkCountry); - - /** - * 更新冻结账户信息 - * - * @param cuMemberAccount - * @return Integer - */ - Integer updateFrozenAmountInfo(CuMemberAccountExt cuMemberAccount); - /** * 奖金发放,根据期间发放奖金,更新奖金余额 * * @param startPeriod 期间 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 14:12 */ void updateMemberAccountGrantByPeriod(@Param("pkCountry") Integer pkCountry, @Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod); @@ -117,18 +21,7 @@ public interface CuMemberAccountMapper extends BaseMapper { * 奖金可提现,根据期间更新可提现金额,减少可消费金额 * * @param startPeriod 期间 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 14:12 */ void updateMemberAccountWithdrawalByPeriod(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("pkCountry") Integer pkCountry); - /** - * 根据来源单号查询奖金账号信息 - * - * @param sourceCode 来源单号 - * @return List - */ - List selectMemberBonusAccountBySourceCode(String sourceCode); - } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java index 3ac789db..59475c27 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.account.CuMemberTradeBonus; /** - *

* 会员已发放奖金交易明细表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-03-24 */ public interface CuMemberTradeBonusMapper extends BaseMapper { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java index d63955a6..9c7ac411 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java @@ -1,19 +1,13 @@ package com.hzs.bonus.account.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.account.CuMemberTradeBonus; import com.hzs.common.domain.member.account.CuMemberTradeDetail; import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* Mapper 接口 - *

- * - * @author hzs - * @since 2023-03-21 */ public interface CuMemberTradeDetailMapper extends BaseMapper { @@ -21,9 +15,6 @@ public interface CuMemberTradeDetailMapper extends BaseMapper cuMemberTradeDetailList); @@ -31,55 +22,7 @@ public interface CuMemberTradeDetailMapper extends BaseMapper - * @Author: sui q - * @Date: 2023/3/24 16:05 - */ - List queryCuMemberTradeDetail(Long pkMember); - - /** - * 批量更新会员奖金发放明细 - * - * @param cuMemberTradeDetailList 会员奖金发放明细 - * @return: void - * @Author: sui q - * @Date: 2023/3/24 17:41 - */ - void updateCuMemberTradeDetail(@Param("cuMemberTradeDetailList") List cuMemberTradeDetailList); - - /** - * 批量更新会员奖金发放明细 - * - * @param cuMemberTradeDetailList 会员奖金发放明细 - * @return: void - * @Author: sui q - * @Date: 2023/3/24 17:41 - */ - void updateAddCuMemberTradeDetail(@Param("cuMemberTradeDetailList") List cuMemberTradeDetailList); - - /** - * 根据交易流水信息 批量插入会员奖金发放 - * - * @param sourceCode 单号 - * @return Integer - */ - Integer batchInsertMemberTradeDetailFromTrade(@Param("sourceCode") String sourceCode, @Param("period") Integer period); - - /** - * 根据用户ID查询用户扣款金额 - * - * @param pkMember 用户ID - * @return List - */ - List selectMemberTradeDetailByPkMember(@Param("pkMember") Long pkMember); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java index b984af21..b0af0d6f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java @@ -7,12 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

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

- * - * @author hzs - * @since 2022-09-06 */ public interface CuMemberTradeMapper extends BaseMapper { @@ -20,9 +15,6 @@ public interface CuMemberTradeMapper extends BaseMapper { * 批量获取cuMemberBonus主键 * * @param rowNum 数量 - * @return: List - * @Author: sui q - * @Date: 2022/12/13 13:47 */ List batchQueryCuMemberTradeSeq(Integer rowNum); @@ -30,9 +22,6 @@ public interface CuMemberTradeMapper extends BaseMapper { * 批量插入会员交易流水,用于奖金发放插入流水 * * @param cuMemberTradeList 交易流水 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 11:45 */ void batchInsertCuMemberTrade(@Param("cuMemberTradeList") List cuMemberTradeList); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java index 806ca641..d1b26123 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java @@ -3,42 +3,15 @@ package com.hzs.bonus.account.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.account.CuMemberAccount; -import java.util.List; - /** * 会员账户信息 服务类 - * - * @author hzs - * @since 2022-08-11 */ public interface ICuMemberAccountService extends IService { - /** - * 更新账户余额 - * - * @param cuMemberAccount 会员账户表 - * @param pkModified 修改人 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/21 21:42 - */ - Boolean updateMemberAccount(CuMemberAccount cuMemberAccount, Long pkModified); - - /** - * 根据用户ID集合查询用户余额 - * - * @param pkMembers 用户ID集合 - * @return List - */ - List selectMemberAccountByPkMember(List pkMembers); - /** * 奖金发放,根据期间发放奖金,更新奖金余额 * * @param startPeriod 期间 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 14:12 */ void updateMemberAccountGrantByPeriod(Integer pkCountry, Integer startPeriod, Integer endPeriod); @@ -46,9 +19,6 @@ public interface ICuMemberAccountService extends IService { * 奖金可提现,根据期间更新可提现金额,减少可消费金额 * * @param startPeriod 期间 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 14:12 */ void updateMemberAccountWithdrawalByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java index 5c2b57c0..02f52be4 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.account.CuMemberTradeBonus; /** - *

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

- * - * @author hzs - * @since 2023-03-24 */ public interface ICuMemberTradeBonusService extends IService { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java index 86ced42c..e209af0b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java @@ -1,18 +1,12 @@ package com.hzs.bonus.account.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.account.CuMemberTradeBonus; import com.hzs.common.domain.member.account.CuMemberTradeDetail; import java.util.List; /** - *

* 服务类 - *

- * - * @author hzs - * @since 2023-03-21 */ public interface ICuMemberTradeDetailService extends IService { @@ -20,9 +14,6 @@ public interface ICuMemberTradeDetailService extends IService cuMemberTradeDetailList); @@ -30,57 +21,7 @@ public interface ICuMemberTradeDetailService extends IService - * @Author: sui q - * @Date: 2023/3/24 16:05 - */ - List queryCuMemberTradeDetail(Long pkMember); - - /** - * 批量更新会员奖金发放明细 - * - * @param cuMemberTradeDetailList 会员奖金发放明细 - * @return: void - * @Author: sui q - * @Date: 2023/3/24 17:41 - */ - void updateCuMemberTradeDetail(List cuMemberTradeDetailList); - - /** - * 批量更新会员奖金发放明细 - * - * @param cuMemberTradeDetailList 会员奖金发放明细 - * @return: void - * @Author: sui q - * @Date: 2023/3/24 17:41 - */ - void updateAddCuMemberTradeDetail(List cuMemberTradeDetailList); - - /** - * 根据交易流水信息 批量插入会员奖金发放 - * - * @param sourceCode 单号 - * @param period 期间 - * @return Integer - */ - Integer batchInsertMemberTradeDetailFromTrade(String sourceCode, Integer period); - - /** - * 根据用户ID查询用户扣款金额 - * - * @param pkMember 用户ID - * @return List - */ - List selectMemberTradeDetailByPkMember(Long pkMember); + void updateCuMemberTradeDetailByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java index c7905ae9..173319fd 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java @@ -7,12 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员交易明细 服务类 - *

- * - * @author hzs - * @since 2022-09-06 */ public interface ICuMemberTradeService extends IService { @@ -20,9 +15,6 @@ public interface ICuMemberTradeService extends IService { * 批量获取cuMemberBonus主键 * * @param rowNum 数量 - * @return: List - * @Author: sui q - * @Date: 2022/12/13 13:47 */ List batchQueryCuMemberTradeSeq(Integer rowNum); @@ -30,9 +22,6 @@ public interface ICuMemberTradeService extends IService { * 批量插入会员交易流水,用于奖金发放插入流水 * * @param cuMemberTradeList 交易流水 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 11:45 */ void batchInsertCuMemberTrade(@Param("cuMemberTradeList") List cuMemberTradeList); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java index 9be103ff..269ad502 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java @@ -7,29 +7,13 @@ import com.hzs.bonus.account.mapper.CuMemberAccountMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; - /** * 会员账户信息 服务实现类 - * - * @author hzs - * @since 2022-08-11 */ @Service @Slf4j public class CuMemberAccountServiceImpl extends ServiceImpl implements ICuMemberAccountService { - @Override - public Boolean updateMemberAccount(CuMemberAccount cuMemberAccount, Long pkModified) { - cuMemberAccount.setPkModified(pkModified); - return baseMapper.updateMemberAccount(cuMemberAccount) > 0; - } - - @Override - public List selectMemberAccountByPkMember(List pkMembers) { - return baseMapper.selectMemberAccountByPkMember(pkMembers); - } - @Override public void updateMemberAccountGrantByPeriod(Integer pkCountry, Integer startPeriod, Integer endPeriod) { baseMapper.updateMemberAccountGrantByPeriod(pkCountry, startPeriod, endPeriod); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java index 85b9742a..92fdd49f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java @@ -7,12 +7,7 @@ import com.hzs.common.domain.member.account.CuMemberTradeBonus; import org.springframework.stereotype.Service; /** - *

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

- * - * @author hzs - * @since 2023-03-24 */ @Service public class CuMemberTradeBonusServiceImpl extends ServiceImpl implements ICuMemberTradeBonusService { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java index 69af1178..7d9097c9 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java @@ -11,28 +11,19 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

- * 服务实现类 - *

- * - * @author hzs - * @since 2023-03-21 + * 服务实现类 */ @Service public class CuMemberTradeDetailServiceImpl extends ServiceImpl implements ICuMemberTradeDetailService { - private CuMemberBonusSettle cuMemberBonusSettle; - @Autowired - public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) { - this.cuMemberBonusSettle = cuMemberBonusSettle; - } + private CuMemberBonusSettle cuMemberBonusSettle; @Override public void batchInsertCuMemberTradeDetail(List cuMemberTradeDetailList) { List> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList); cutList.forEach(memberTradeDetailList -> - baseMapper.batchInsertCuMemberTradeDetail(memberTradeDetailList)); + baseMapper.batchInsertCuMemberTradeDetail(memberTradeDetailList)); } @Override @@ -40,41 +31,4 @@ public class CuMemberTradeDetailServiceImpl extends ServiceImpl queryCuMemberTradeDetail(Long pkMember) { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.eq(MemberFieldConstants.PK_MEMBER, pkMember) -// .gt(MemberFieldConstants.CONSUME_MONEY, 0); -// queryWrapper.orderByAsc(MemberFieldConstants.PERIOD); -// return baseMapper.selectList(queryWrapper); - return baseMapper.queryCuMemberTradeDetail(pkMember); - } - - @Override - public void updateCuMemberTradeDetail(List cuMemberTradeDetailList) { - if (cuMemberTradeDetailList.size() > 0) { - List> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList); - cutList.forEach(memberTradeDetailList -> - baseMapper.updateCuMemberTradeDetail(memberTradeDetailList)); - } - } - - @Override - public void updateAddCuMemberTradeDetail(List cuMemberTradeDetailList) { - if (cuMemberTradeDetailList.size() > 0) { - List> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList); - cutList.forEach(memberTradeDetailList -> - baseMapper.updateAddCuMemberTradeDetail(memberTradeDetailList)); - } - } - - @Override - public Integer batchInsertMemberTradeDetailFromTrade(String sourceCode, Integer period){ - return baseMapper.batchInsertMemberTradeDetailFromTrade(sourceCode,period); - } - - @Override - public List selectMemberTradeDetailByPkMember(Long pkMember){ - return baseMapper.selectMemberTradeDetailByPkMember(pkMember); - } } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java index 3b1e6349..dca33ec1 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java @@ -1,11 +1,9 @@ package com.hzs.bonus.account.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.bonus.account.service.ICuMemberAccountService; import com.hzs.bonus.account.service.ICuMemberTradeService; import com.hzs.bonus.achieve.service.impl.CuMemberBonusSettle; import com.hzs.common.domain.member.account.CuMemberTrade; -import com.hzs.common.service.ITransactionCommonService; import com.hzs.bonus.account.mapper.CuMemberTradeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,29 +11,14 @@ import org.springframework.stereotype.Service; import java.util.*; /** - *

* 会员交易明细 服务实现类 - *

- * - * @author hzs - * @since 2022-09-06 */ @Service public class CuMemberTradeServiceImpl extends ServiceImpl implements ICuMemberTradeService { @Autowired - ICuMemberAccountService cuMemberAccountService; - - @Autowired - ITransactionCommonService iTransactionCommonService; - private CuMemberBonusSettle cuMemberBonusSettle; - @Autowired - public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) { - this.cuMemberBonusSettle = cuMemberBonusSettle; - } - @Override public List batchQueryCuMemberTradeSeq(Integer rowNum) { return baseMapper.batchQueryCuMemberTradeSeq(rowNum); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java index 15065b21..9230ba0d 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java @@ -5,20 +5,12 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriodDetail; import com.hzs.common.domain.member.achieve.ext.CuMemberSettlePeriodExt; /** - *

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

- * - * @author hzs - * @since 2023-07-27 */ public interface ICuMemberSettlePeriodDetailService extends IService { - /* - * @description: 更新明细表 - * @author: sui q - * @date: 2023/7/28 17:43 - * @param: null null - **/ + /** + * 更新明细表 + */ boolean updateCuMemberSettlePeriodDetailByPeriod(CuMemberSettlePeriodExt cuMemberSettlePeriodExt); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java index 15845af9..f0a75a87 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java @@ -2,11 +2,8 @@ package com.hzs.bonus.achieve.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.achieve.CuMemberTree; -import com.hzs.common.domain.member.ext.CuMemberSettleExt; import java.util.Date; -import java.util.List; -import java.util.Set; /** * 会员网体历史记录 服务类 @@ -57,30 +54,6 @@ public interface ICuMemberTreeService extends IService { */ void updateCuMemberRetailRangeInitAward(String rangeTableName); - /** - * 根据订单,查询出网体中记录的会员数据,推荐人、安置人 - * - * @param settleTableName 结算表 - * @param serviceMemberSet 会员编号 - */ - List batchQueryMemberSettleByMemberPk(String settleTableName, Set serviceMemberSet); - - /** - * 根据订单,查询出网体中记录的会员数据及推荐人 - * - * @param settleTableName 结算表 - * @param serviceMemberSet 会员编号 - */ - List batchQueryMemberSettleParentByMemberPk(String settleTableName, Set serviceMemberSet); - - /** - * 批量根据量奖信息查询会员结算表中的父级血缘数据 - * - * @param settleTableName 结算表 - * @param expandMemberSet 有量奖的会员 - */ - List batchQueryCuMemberSettleParent(String settleTableName, Set expandMemberSet); - /** * 删除日表数据 * diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java index 823aa6ee..3eb97515 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; import com.hzs.bonus.achieve.service.ICuMemberTreeService; -import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.TableNameConstants; import com.hzs.common.core.enums.EAwardsType; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.achieve.CuMemberTree; -import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.bonus.achieve.mapper.CuMemberTreeMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -30,8 +28,6 @@ public class CuMemberTreeServiceImpl extends ServiceImpl getCuMemberSettleExtList(String settleTableName, Set serviceMemberSet) { - List cuMemberSettleExtList = new ArrayList<>(); - if (serviceMemberSet.size() > 0) { - List memberPkList = Arrays.asList(serviceMemberSet.toArray(new Long[]{})); - List> listList = cuMemberBonusSettle.handleCutList(memberPkList); - listList.forEach(list -> - cuMemberSettleExtList.addAll(baseMapper.queryMemberSettleBySaOrder(settleTableName, list))); - } - return cuMemberSettleExtList; - } - - @Override - public List batchQueryMemberSettleByMemberPk(String settleTableName, Set serviceMemberSet) { - return getCuMemberSettleExtList(settleTableName, serviceMemberSet); - } - - @Override - public List batchQueryMemberSettleParentByMemberPk(String settleTableName, Set serviceMemberSet) { - List cuMemberSettleExtList = new ArrayList<>(); - if (serviceMemberSet.size() > 0) { - List memberPkList = Arrays.asList(serviceMemberSet.toArray(new Long[]{})); - List> listList = cuMemberBonusSettle.handleCutList(memberPkList); - listList.forEach(list -> - cuMemberSettleExtList.addAll(baseMapper.batchQueryMemberSettleParentByMemberPk(settleTableName, list))); - } - return cuMemberSettleExtList; - } - - @Override - public List batchQueryCuMemberSettleParent(String settleTableName, Set expandMemberSet) { - List cuMemberSettleExtList = new ArrayList<>(); - if (expandMemberSet == null || expandMemberSet.size() == 0) { - return cuMemberSettleExtList; - } - List memberPkList = Arrays.asList(expandMemberSet.toArray(new Long[]{})); - List> listList = cuMemberBonusSettle.handleCutList(memberPkList, MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM); - listList.forEach(list -> - cuMemberSettleExtList.addAll(baseMapper.batchQueryCuMemberSettleParent(settleTableName, list))); - return cuMemberSettleExtList; - } - - private List> setUpdCuMemberTreeLists(Map cuMemberTreeMap) { - List cuMemberTreeList = new ArrayList<>(); - cuMemberTreeMap.forEach((key, value) -> cuMemberTreeList.add(value)); - return cuMemberBonusSettle.handleCutList(cuMemberTreeList); - } - @Override public void truncateCuMemberTreeTable(String tableName) { baseMapper.truncateCuMemberTreeTable(tableName); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java index 12831c60..ff95a4d9 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java @@ -27,14 +27,23 @@ public interface CuMemberMapper extends BaseMapper { /** * 更新会员奖衔根据临时表 */ - Integer updateCuMemberRetailAwardsByPeriod(@Param("period") Integer period, @Param("awardType") Integer awardType); + int updateCuMemberRetailAwardsByPeriod(@Param("period") Integer period, @Param("awardType") Integer awardType); + + /** + * 更新会员最高奖衔 + * + * @param period + * @param awardType + * @return + */ + int updateCuMemberMaxAwardsByPeriod(@Param("period") Integer period, @Param("awardType") Integer awardType); /** * 更新会员奖衔根据临时表 * * @param cuMemberAwardsList 修改奖衔的会员 */ - Integer updateCuMemberRetailRangeByList(@Param("cuMemberAwardsList") List cuMemberAwardsList, + int updateCuMemberRetailRangeByList(@Param("cuMemberAwardsList") List cuMemberAwardsList, @Param("period") Integer period, @Param("awardType") Integer awardType); @@ -43,7 +52,7 @@ public interface CuMemberMapper extends BaseMapper { * * @param cuMemberGradeList 修改奖衔的会员 */ - Integer updateCuMemberMinGradeByList(@Param("cuMemberGradeList") List cuMemberGradeList, @Param("period") Integer period); + int updateCuMemberMinGradeByList(@Param("cuMemberGradeList") List cuMemberGradeList, @Param("period") Integer period); /** * 更新会员的等级 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java index e2609617..7b112435 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java @@ -23,11 +23,9 @@ public interface ICuMemberService extends IService { CuMemberExt getMemberByCode(String memberCode); /** - * 更新会员奖衔根据临时表 - * - * @param cuMemberAwardsList 修改奖衔的会员 + * 更新会员奖衔根据临时表 -- 日结 */ - void updateCuMemberRetailRangeByPeriod(List cuMemberAwardsList, Integer period); + void updateCuMemberRetailRangeByPeriod(Integer period); /** * 更新会员奖衔根据临时表 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java index 82f9708b..28c23a76 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java @@ -25,9 +25,11 @@ public class CuMemberServiceImpl extends ServiceImpl i } @Override - public void updateCuMemberRetailRangeByPeriod(List cuMemberAwardsList, Integer period) { + public void updateCuMemberRetailRangeByPeriod(Integer period) { baseMapper.updateCuMemberRetailAwardsByPeriod(period, EAwardsType.RANGE_TYPE.getValue()); baseMapper.updateCuMemberRetailAwardsByPeriod(period, EAwardsType.SHARE_TYPE.getValue()); + // 更新会员最高奖衔 + baseMapper.updateCuMemberMaxAwardsByPeriod(period, EAwardsType.RANGE_TYPE.getValue()); } @Override diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/component/BonusSettleTimer.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/component/BonusSettleTimer.java deleted file mode 100644 index 5c1c5912..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/component/BonusSettleTimer.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.bonus.bonus.component; - -import lombok.extern.slf4j.Slf4j; - -/** - * @Description: 奖金结算发放定时任务 - * @Author: sui q - * @Time: 2023/3/4 13:47 - * @Classname: BonusSettleTimer - * @PackageName: com.hzs.member.bonus.component - */ -//@Component -@Slf4j -public class BonusSettleTimer { - -// @DubboReference -// private ISystemConfigServiceApi systemConfigServiceApi; -// -// @DubboReference -// private ISaOrderServiceApi saOrderServiceApi; -// -// @DubboReference -// private IRangeServiceApi rangeServiceApi; -// -// private IBonusSettleService bonusSettleService; -// -// private ICuMemberTreeService cuMemberTreeService; -// -// @Autowired -// public void setBonusSettleService(IBonusSettleService bonusSettleService) { -// this.bonusSettleService = bonusSettleService; -// } -// -// @Autowired -// public void setCuMemberTreeService(ICuMemberTreeService cuMemberTreeService) { -// this.cuMemberTreeService = cuMemberTreeService; -// } -// -// /** -// * 奖金每天自动结算,计算前一天奖金 -// * @return: void -// * @Author: sui q -// * @Date: 2023/3/4 13:48 -// */ -//// @Scheduled(cron = "0 0 0 * * ?") -//// @Scheduled(cron = "* */1 * * * ?") -// public void autoSettleBonusEveryday(){ -// log.info("开始进行奖金结算"); -// Date currentDate = DateUtils.currentDate(); -// Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, currentDate); -// String settleDate = DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, startDate); -// // 自动初始化表 -// cuMemberTreeService.createCuMemberTree(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startDate)); -// log.info("初始化表完成"); -// // 奖金结算 -// List saOrderExtList = saOrderServiceApi.querySaOrderByDay(startDate, currentDate).getData(); -// Map systemConfigMap = systemConfigServiceApi.getBonusSystemConfig().getData(); -// Map rangeDtoMap = rangeServiceApi.queryRangeDto().getData(); -// bonusSettleService.calculateCuMemberBonus(systemConfigMap, rangeDtoMap, settleDate, saOrderExtList); -// } -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java index c75a3b40..635f9d5f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java @@ -19,9 +19,6 @@ import java.math.BigDecimal; /** * 特殊商品分配奖金 前端控制器 - * - * @author hzs - * @since 2024-10-30 */ @RestController @RequestMapping("/wares-bonus/special") diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java index dce37735..8a459488 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java @@ -8,28 +8,17 @@ import com.hzs.common.domain.member.ext.BdWaresBonusExt; import java.util.List; /** - *

* 特殊商品分配奖金 Mapper 接口 - *

- * - * @author hzs - * @since 2024-10-30 */ public interface BdWaresBonusMapper extends BaseMapper { /* - * @description: 查询特殊品奖金配置 - * @author: sui q - * @date: 2024/10/30 10:55 - * @param: null null + * 查询特殊品奖金配置 **/ List querySpecialWaresBonus(BdWaresBonusParam waresBonusParam); /* - * @description: 查询能设置奖金的特殊品 - * @author: sui q - * @date: 2024/11/8 10:19 - * @param: null null + * 查询能设置奖金的特殊品 **/ List queryAllSpecialWaresBonus(); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java index 85363daa..5992ff3e 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java @@ -8,52 +8,32 @@ import com.hzs.common.domain.member.ext.BdWaresBonusExt; import java.util.List; /** - *

* 特殊商品分配奖金 服务类 - *

- * - * @author hzs - * @since 2024-10-30 */ public interface IBdWaresBonusService extends IService { /* - * @description: 查询特殊品奖金配置 - * @author: sui q - * @date: 2024/10/30 10:55 - * @param: null null + * 查询特殊品奖金配置 **/ List querySpecialWaresBonus(BdWaresBonusParam waresBonusParam); /* - * @description: 根据主键删除特殊商品奖金配置 - * @author: sui q - * @date: 2024/11/8 9:58 - * @param: null null + * 根据主键删除特殊商品奖金配置 **/ void deleteSpecialWaresBonus(Long pkId, Long userId); /* - * @description: 根据商品id查询是否已经存在数据 - * @author: sui q - * @date: 2024/11/7 15:51 - * @param: null null + * 根据商品id查询是否已经存在数据 **/ BdWaresBonus queryWaresBonusById(BdWaresBonusParam waresBonusParam); /* - * @description: 插入商品奖金根据参数 - * @author: sui q - * @date: 2024/11/7 13:47 - * @param: null null + * 插入商品奖金根据参数 **/ void insertOrUpdateBdWaresBonusByParam(BdWaresBonusParam bdWaresBonusParam, Long userId); /* - * @description: 查询能设置奖金的特殊品 - * @author: sui q - * @date: 2024/11/8 10:19 - * @param: null null + * 查询能设置奖金的特殊品 **/ List querySpecialWaresBonus(); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java index 71f16396..cbc2708f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java @@ -23,12 +23,7 @@ import java.util.Date; import java.util.List; /** - *

* 特殊商品分配奖金 服务实现类 - *

- * - * @author hzs - * @since 2024-10-30 */ @Service public class BdWaresBonusServiceImpl extends ServiceImpl implements IBdWaresBonusService { @@ -58,7 +53,7 @@ public class BdWaresBonusServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq(SystemFieldConstants.PK_WARES, waresBonusParam.getPkWares()); - if(waresBonusParam.getPkId() != null){ + if (waresBonusParam.getPkId() != null) { queryWrapper.ne(SystemFieldConstants.PK_ID, waresBonusParam.getPkId()); } return baseMapper.selectOne(queryWrapper); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index 5c71b068..f06c436f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -585,7 +585,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 批量插入会员奖衔记录 iCuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); // 更新会员表奖衔数据 - iCuMemberService.updateCuMemberRetailRangeByPeriod(cuMemberAwardsList, period); + iCuMemberService.updateCuMemberRetailRangeByPeriod(period); } if (cuMemberGradeList.size() > 0) { // 批量插入会员等级记录 @@ -1777,7 +1777,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } if (secondAwardsRetailRangeList.size() > 0) { + // 月度分红平均收益 = 订单总业绩 乘 分红平均比例 除 奖衔人数 BigDecimal benefitAvgIncome = ComputeUtil.computeDivide(ComputeUtil.computeBonusMultiply(totalMonthConsumePv, secondBenefitAvgRatio), BigDecimal.valueOf(secondAwardsRetailRangeList.size())); + // 月度分红加权总收益 = 订单总业绩 乘 分红加权比例 BigDecimal benefitShareIncome = ComputeUtil.computeBonusMultiply(totalMonthConsumePv, secondBenefitShareRatio); for (CuMemberRetailRangeExt cuMemberRetailRangeExt : secondAwardsRetailRangeList) { if (ECategory.NORMAL.getValue() != cuMemberRetailRangeExt.getCategory() diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberAccountMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberAccountMapper.xml index ad1497f9..f370d744 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberAccountMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberAccountMapper.xml @@ -69,564 +69,6 @@ - - - - - - - - - UPDATE CU_MEMBER_ACCOUNT - SET - - account1 = account1 + #{account1}, - - - account2 = account2 + #{account2}, - - - account3 = account3 + #{account3}, - - - account4 = account4 + #{account4}, - - - account5 = account5 + #{account5}, - - - account6 = account6 + #{account6}, - - - account7 = account7 + #{account7}, - - - account8 = account8 + #{account8}, - - - account9 = account9 + #{account9}, - - - account10 = account10 + #{account10}, - - - account11 = account11 + #{account11}, - - - account12 = account12 + #{account12}, - - - account13 = account13 + #{account13}, - - - account14 = account14 + #{account14}, - - - account15 = account15 + #{account15}, - - - account16 = account16 + #{account16}, - - - account17 = account17 + #{account17}, - - - account18 = account18 + #{account18}, - - - account19 = account19 + #{account19}, - - - account20 = account20 + #{account20}, - - - lock_account1 = #{lockAccount1}, - - - lock_account2 = #{lockAccount2}, - - - lock_account4 = #{lockAccount4}, - - - withdraw_account4 = withdraw_account4 + #{withdrawAccount4}, - - - consume_account4 = consume_account4 + #{consumeAccount4}, - - - lock_account13 = #{lockAccount13}, - - pk_modified = #{pkModified}, - modified_time = sysdate - WHERE pk_member = #{pkMember} and pk_country = #{pkCountry} and del_flag=0 - - - - - - MERGE INTO cu_member_account m - USING (select * - from (select a.field_value, - r.recharge_amount, - pk_member, - r.recharge_method - from cu_member_recharge r - left join bd_account a - on r.pk_account = a.pk_id - where r.del_flag = 0 - and r.batch = #{batch}) tt pivot(sum(recharge_amount) - for field_value in('1' as account1, - '2' as account2, - '3' as account3, - '4' as account4, - '5' as account5, - '6' as account6, - '7' as account7, - '8' as account8, - '9' as account9, - '10' as account10, - '12' as account12, - '13' as account13))) t - ON (m.pk_member = t.pk_member) - WHEN MATCHED THEN - update - set m.account1 = NVL(t.account1, 0) + m.account1, - m.account2 = NVL(t.account2, 0) + m.account2, - m.account3 = NVL(t.account3, 0) + m.account3, - m.account4 = NVL(t.account4, 0) + m.account4, - m.WITHDRAW_ACCOUNT4 = case - when NVL(t.account4, 0) < 0 and m.WITHDRAW_ACCOUNT4 + NVL(t.account4, 0) >= 0 then - NVL(t.account4, 0) + m.WITHDRAW_ACCOUNT4 - when NVL(t.account4, 0) < 0 and m.WITHDRAW_ACCOUNT4 + NVL(t.account4, 0) < 0 then - 0 - else - m.WITHDRAW_ACCOUNT4 - end, - m.CONSUME_ACCOUNT4 = case - when NVL(t.account4, 0) < 0 and m.WITHDRAW_ACCOUNT4 + NVL(t.account4, 0) < 0 then - m.WITHDRAW_ACCOUNT4 + t.account4 + m.CONSUME_ACCOUNT4 - else - NVL(t.account4, 0) + m.CONSUME_ACCOUNT4 - end, - m.account5 = NVL(t.account5, 0) + m.account5, - m.account6 = NVL(t.account6, 0) + m.account6, - m.account7 = NVL(t.account7, 0) + m.account7, - m.account8 = NVL(t.account8, 0) + m.account8, - m.account9 = NVL(t.account9, 0) + m.account9, - m.account10 = NVL(t.account10, 0) + m.account10, - m.account12 = NVL(t.account12, 0) + m.account12, - m.account13 = NVL(t.account13, 0) + m.account13, - m.MODIFIED_TIME = sysdate, - m.PK_MODIFIED = #{pkModified} - - - - - - - with t1 as - (select u.member_code, - u.member_name, - u.pk_id, - u.pk_vertex vertex_id, - u.pk_team_code team_id, - v.vertex_name, - v.pk_member, - u.pk_place_parent, - u.pk_parent, - t.team_name - from cu_member u - left join bd_vertex v - on u.pk_vertex = v.pk_id - and v.del_flag = 0 - left join cu_member_team t - on u.pk_team_code = t.pk_id - and t.del_flag = 0 - where u.del_flag = 0 - and u.pk_settle_country = #{pkCountry}) - select ss.memberCode, - ss.memberName, - ss.pk_id pkId, - ss.vertexId, - ss.teamId, - ss.vertexName, - ss.pk_member, - ss.pk_place_parent, - ss.pk_parent, - ss.teamName, - ss.slevel, - pp.plevel, - account1, - lock_account1, - lock_transfer_account1, - account2, - lock_account2, - lock_transfer_account2, - account3, - lock_account3, - lock_transfer_account3, - account4, - lock_account4, - lock_transfer_account4, - lock_withdraw_account4, - withdraw_account4, - consume_account4, - account5, - lock_account5, - lock_transfer_account5, - account6, - lock_account6, - lock_transfer_account6, - account7, - lock_account7, - lock_transfer_account7, - account8, - lock_account8, - lock_transfer_account8, - account9, - lock_account9, - lock_transfer_account9, - account10, - lock_account10, - account11, - lock_transfer_account10, - account12, - account13, - lock_account13 - from (select member_code memberCode, - member_name memberName, - pk_id, - vertex_id vertexId, - team_id teamId, - vertex_name vertexName, - pk_member, - pk_place_parent, - pk_parent, - team_name teamName, - level slevel - from t1 - - start with pk_id = - - (select cm.pk_id - from cu_member cm - where cm.member_code = #{memberCode}) - - - pk_member - - connect by prior pk_id = pk_place_parent) ss, - (select pk_id, level plevel - from t1 - - start with pk_id = - - (select cm.pk_id - from cu_member cm - where cm.member_code = #{memberCode}) - - - pk_member - - connect by prior pk_id = pk_parent) pp, - cu_member_account a - - - - - - 1=1 - - and member_name like #{memberName} || '%' - - - and vertex_name like #{memberName} || '%' - - - and team_name like #{teamName} || '%' - - - and team_id = #{teamId} - - - and vertex_id = #{vertexId} - - - and level <= #{slevel} - - - - - - - - 1=1 - - and member_name like #{memberName} || '%' - - - and vertex_name like #{memberName} || '%' - - - and team_name like #{teamName} || '%' - - - and team_id = #{teamId} - - - and vertex_id = #{vertexId} - - - - and level <= #{plevel} - - - - - - - ss.pk_id = pp.pk_id - and ss.pk_id = a.pk_member - and a.del_flag = 0 - and a.pk_country = #{pkCountry} - - - - - - - ss.pk_id = pp.pk_id - and ss.pk_id = a.pk_member - and a.del_flag = 0 - and a.pk_country = #{pkCountry} - and ss.pk_id in - - #{item} - - - - - - - - - - update cu_member_account a - set - - a.lock_account1 = #{lockAccount1}, - - - a.lock_transfer_account1 = #{lockTransferAccount1}, - - - a.account1_remarks = #{account1Remarks}, - - - - a.lock_account2 = #{lockAccount2}, - - - a.lock_transfer_account2 = #{lockTransferAccount2}, - - - a.account2_remarks = #{account2Remarks}, - - - - a.lock_account3 = #{lockAccount3}, - - - a.lock_transfer_account3 = #{lockTransferAccount3}, - - - a.account3_remarks = #{account3Remarks}, - - - - a.lock_account4 = #{lockAccount4}, - - - a.lock_transfer_account4 = #{lockTransferAccount4}, - - - a.lock_withdraw_account4 = #{lockWithdrawAccount4}, - - - a.account4_remarks = #{account4Remarks}, - - - - a.lock_account5 = #{lockAccount5}, - - - a.lock_transfer_account5 = #{lockTransferAccount5}, - - - a.account5_remarks = #{account5Remarks}, - - - - a.lock_account6 = #{lockAccount6}, - - - a.lock_transfer_account6 = #{lockTransferAccount6}, - - - a.account6_remarks = #{account6Remarks}, - - - - a.lock_account7 = #{lockAccount7}, - - - a.lock_transfer_account7 = #{lockTransferAccount7}, - - - a.account7_remarks = #{account7Remarks}, - - - - a.lock_account8 = #{lockAccount8}, - - - a.lock_transfer_account8 = #{lockTransferAccount8}, - - - a.account8_remarks = #{account8Remarks}, - - - - a.lock_account9 = #{lockAccount9}, - - - a.lock_transfer_account9 = #{lockTransferAccount9}, - - - a.account9_remarks = #{account9Remarks}, - - - - a.lock_account10 = #{lockAccount10}, - - - a.lock_transfer_account10 = #{lockTransferAccount10}, - - - a.account10_remarks = #{account10Remarks}, - - a.pk_modified = #{pkModified}, - a.modified_time = sysdate - WHERE a.pk_member in - - #{item} - - - merge into cu_member_account a using (select pk_member, @@ -651,6 +93,7 @@ a.account5 = a.account5 + b.account5, a.account8 = a.account8 + b.account8 + merge into cu_member_account a using ( @@ -675,44 +118,4 @@ a.consume_account4 = a.consume_account4 - b.consume_money - - - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeDetailMapper.xml index 8ae28f60..87232da1 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeDetailMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeDetailMapper.xml @@ -4,21 +4,22 @@ - - - - - - - - - - - + + + + + + + + + + + + insert ALL - + into CU_MEMBER_TRADE_DETAIL(period,pk_member_trade,consume_money,pk_country,creation_time,pk_creator) values ( #{item.period},#{item.pkMemberTrade},#{item.consumeMoney,jdbcType=NUMERIC},#{item.pkCountry}, @@ -27,89 +28,23 @@ SELECT 1 FROM dual + merge into cu_member_trade_detail a - using ( - select cd.pk_id,cd.consume_money from cu_member_trade ct - inner join cu_member_trade_detail cd - on cd.pk_member_trade = ct.pk_id - where cd.del_flag=0 and ct.del_flag=0 and cd.trade_statue=1 - and cd.period between #{startPeriod} and #{endPeriod} and ct.pk_country = #{pkCountry} - )b - on (a.pk_id = b.pk_id) - when matched then - update set a.consume_money = 0,modified_time=sysdate + using ( + select cd.pk_id, cd.consume_money + from cu_member_trade ct + inner join cu_member_trade_detail cd + on cd.pk_member_trade = ct.pk_id + where cd.del_flag = 0 + and ct.del_flag = 0 + and cd.trade_statue = 1 + and cd.period between #{startPeriod} and #{endPeriod} + and ct.pk_country = #{pkCountry} + ) b + on (a.pk_id = b.pk_id) + when matched then + update set a.consume_money = 0,modified_time = sysdate - - merge into cu_member_trade_detail a - using ( - - select #{item.pkId} pk_id,#{item.grantMoney,jdbcType=NUMERIC} grant_money,#{item.consumeMoney,jdbcType=NUMERIC} consume_money from dual - - ) b - on (a.pk_id = b.pk_id) - when matched then - update set a.grant_money = b.grant_money, - a.consume_money = b.consume_money - - - - merge into cu_member_trade_detail a - using ( - - select #{item.pkId} pk_id,#{item.grantMoney,jdbcType=NUMERIC} grant_money,#{item.consumeMoney,jdbcType=NUMERIC} consume_money from dual - - ) b - on (a.pk_id = b.pk_id) - when matched then - update set a.grant_money = a.grant_money + b.grant_money, - a.consume_money = a.consume_money + b.consume_money - - - - - - merge into cu_member_trade_detail d - using (select t.pk_id, t.trade_amount, t.pk_country, t.pk_creator - from cu_member_trade t - left join bd_account a - on t.pk_account = a.pk_id - and a.del_flag = 0 - where t.del_flag = 0 - and a.field_value = 4 - and t.trade_amount > 0 - and t.source_code = #{sourceCode}) tt - on (1 = 0) - when not matched then - insert - (d.period, - d.pk_member_trade, - d.consume_money, - d.pk_country, - d.pk_creator) - values - (#{period},tt.pk_id, tt.trade_amount, tt.pk_country, tt.pk_creator) - - - - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeMapper.xml index 5f66ad9e..a797606d 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/account/CuMemberTradeMapper.xml @@ -25,62 +25,6 @@ - - select t.*, m.member_code as memberCode, m.member_name as memberName - from cu_member_trade t - left join cu_member m - on t.pk_member = m.pk_id - - - - - t.del_flag='0' - and t.pk_id in - - #{item} - - - - - - - t.del_flag='0' - - and m.member_name like #{memberName} || '%' - - - and m.member_code like #{memberCode} || '%' - - - and t.TRADE_AMOUNT = #{tradeAmount} - - - and m.REMARKS like #{remarks} || '%' - - - and t.PK_ACCOUNT = #{pkAccount} - - - and t.TRADE_TYPE = #{tradeType} - - - and t.SOURCE_CODE = #{sourceCode} - - - and t.pk_country = #{pkCountry} - - - and t.TRADE_CLASSIFY = #{tradeClassify} - - - and t.CREATION_TIME >= to_date(#{startDate}, 'yyyy-mm-dd') - - - and t.CREATION_TIME <= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') - - - - merge into cu_member_trade a using ( diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml index 5724d651..c297f892 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml @@ -106,6 +106,23 @@ a.modified_time = sysdate + + merge into cu_member a + using (select c1.* + from (select pk_member, max(new_level) pk_awards + from cu_member_awards + where period = #{period} + and award_type = #{awardType} + and del_flag = 0 + group by pk_member) c1 + inner join cu_member c2 + on c1.pk_member = c2.pk_id + and c1.pk_awards > c2.pk_max_awards) b + on (a.pk_id = b.pk_member) + when matched then + update set a.pk_max_awards = b.pk_awards, a.modified_time = sysdate + + merge into cu_member a using ( diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusMapper.xml index be3096c0..9231fac3 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusMapper.xml @@ -4,22 +4,23 @@ - - - - - - - - - - + + + + + + + + + + - - - + + + + +