diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/bonus/detail/ICuRegionAssessApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/bonus/detail/ICuRegionAssessApi.java deleted file mode 100644 index ca2ad6d7..00000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/bonus/detail/ICuRegionAssessApi.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.bonus.detail; - -import com.hzs.common.core.domain.R; - -import java.util.Date; -import java.util.List; - -/** - * @description: 新零售会员区域考核dubbo服务 - * @author: zhang jing - * @date: 2025/3/7 10:36 - * @param: - * @return: - **/ -public interface ICuRegionAssessApi { - - - /** - * @description: 定时处理会员收益区域（处理前三天） - * @author: zhang jing - * @date: 2025/3/7 10:45 - * @param: [startDate] - * @return: com.hzs.common.core.domain.R - **/ - R validateHandAreaAssess(Date startDate,Date endDate); - - - -} diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java index bd8c4b03..47f14e32 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java @@ -7,14 +7,9 @@ import java.util.Date; /** * 会员模块定时任务 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/12 10:38 - * @Classname: IMemberJobServiceApi - * @Package_name: com.hzs.member.account */ public interface IMemberJobServiceApi { + /** * 定时插入账户详情数据 * @@ -22,30 +17,14 @@ public interface IMemberJobServiceApi { */ R insertAccountDetail(); - - /** - * 自动提现 - * - * @return - */ - R automaticWithdrawal(); - - /** - * 查询充值金额总和 - * - * @param startDate 开始时暗 - * @param endDate 结速时间 - * @return R - */ - R selectRechargeTotalAmount(Date startDate, Date endDate); - - /** * 自动清理垃圾数据 - * CU_MEMBER_AWARDS - * CU_MEMBER_LEVEL - * CU_MEMBER_GRADE + * CU_MEMBER_AWARDS + * CU_MEMBER_LEVEL + * CU_MEMBER_GRADE + * * @return */ R autoDeleteGarbageData(); + } diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/retail/member/IMemberRetailApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/retail/member/IMemberRetailApi.java index e994f225..8c9ed6f9 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/retail/member/IMemberRetailApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/retail/member/IMemberRetailApi.java @@ -9,13 +9,6 @@ import java.util.List; */ public interface IMemberRetailApi { - /** - * 定时处理收益区域 - * - * @return - */ - R checkRegion(); - /** * 取消收益区域 * diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java index 4fae7ec8..f656fcfd 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalServiceApi.java @@ -3,32 +3,14 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdWithdrawal; -import java.util.List; - /** - * @description: 根据国家查询提现配置明细列表api - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: - * @return: + * 根据国家查询提现配置明细列表api **/ public interface IWithdrawalServiceApi { /** - * @description: 根据国家查询提现配置明细列表 - * @author: zhang jing - * @date: 2022/9/27 15:14 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询提现配置明细列表 **/ - R queryWithdrawal(Integer pkCountry,Integer pkAccount); + R queryWithdrawal(Integer pkCountry, Integer pkAccount); - /** - * @description: 查询所有自动提现的配置 - * @author: zhang jing - * @date: 2022/11/1 19:44 - * @param: [] - * @return: com.hzs.common.core.domain.R> - **/ - R> queryWithdrawalByIsAuto(); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuRegionAssessMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuRegionAssessMapper.java index 005d38f5..7c407304 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuRegionAssessMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuRegionAssessMapper.java @@ -52,13 +52,4 @@ public interface CuRegionAssessMapper extends BaseMapper { **/ List queryCuMemberRetailRegion(@Param("startDate") Date startDate, @Param("endDate") Date endDate); - /* - * 查询到期日期是上个月的区域 - **/ - List queryDueCuMemberRetailRegion(@Param("startDate") Date startDate, @Param("endDate") Date endDate); - - /* - * 查询手动设置考核的近6个月考核记录 - **/ - List queryRegionAssessByDate(@Param("memberRetailRegionList") List memberRetailRegionList, @Param("startDate") Date startDate, @Param("endDate") Date endDate); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/provider/CuRegionAssessProvider.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/provider/CuRegionAssessProvider.java deleted file mode 100644 index adb6dfd1..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/provider/CuRegionAssessProvider.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.bonus.detail.provider; - -import com.hzs.bonus.detail.ICuRegionAssessApi; -import com.hzs.bonus.detail.service.ICuRegionAssessService; -import com.hzs.common.core.domain.R; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; - -/** - * @Description: 新零售会员dubbo服务 - * @Author: jiang chao - * @Time: 2024/12/31 13:40 - * @Classname: MemberRetailProvider - * @PackageName: com.hzs.retail.member.provider - */ -@Slf4j -@DubboService -public class CuRegionAssessProvider implements ICuRegionAssessApi { - - @Autowired - private ICuRegionAssessService iCuRegionAssessService; - - - /** - * @description: 定时处理会员收益区域（处理前三天） - * @author: zhang jing - * @date: 2025/3/7 10:45 - * @param: [startDate] - * @return: com.hzs.common.core.domain.R - **/ - @Override - public R validateHandAreaAssess(Date startDate,Date endDate) { - try { - iCuRegionAssessService.validateHandAreaAssess(startDate,endDate); - return R.ok(); - } catch (Exception e) { - log.error("定时任务处理前3天收益区域异常", e); - return R.fail(e.getMessage()); - } - } - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuRegionAssessService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuRegionAssessService.java index 29a77c3d..44be6d2d 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuRegionAssessService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuRegionAssessService.java @@ -19,13 +19,6 @@ public interface ICuRegionAssessService extends IService { **/ void assessRegionByEveryMonth(String settleDate, String rangeTableName); - /** - * 定时处理会员收益区域（处理前三天） - * - * @return: void - **/ - void validateHandAreaAssess(Date startDate, Date endDate); - /* * 考核开始日期 **/ diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuRegionAssessServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuRegionAssessServiceImpl.java index 7addfb78..14885c12 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuRegionAssessServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuRegionAssessServiceImpl.java @@ -178,35 +178,6 @@ public class CuRegionAssessServiceImpl extends ServiceImpl cancelRegionList = new ArrayList<>(); - List dueRetailRegionList = baseMapper.queryDueCuMemberRetailRegion(startDate, endDate); - if (dueRetailRegionList.size() > 0) { - Date assessDate = DateUtils.currentMonthFirstDate(startDate); - // 查询期初日期 beforeMonthFirstDate startDate 考核期间结束日期 - Date assMonthStartDate = DateUtils.beforeMonthFirstDate(5, assessDate); - // assessDate assessDate 查询考核记录 - Map regionAssessExtMap = new HashMap<>(); - List cuRegionAssessExtList = baseMapper.queryRegionAssessByDate(dueRetailRegionList, assMonthStartDate, assessDate); - cuRegionAssessExtList.forEach(cuRegionAssessExt -> regionAssessExtMap.put(cuRegionAssessExt.getPkMember(), cuRegionAssessExt)); - for (CuMemberRetailRegion cuMemberRetailRegion : dueRetailRegionList) { - if (regionAssessExtMap.containsKey(cuMemberRetailRegion.getPkMember())) { - CuRegionAssessExt cuRegionAssessExt = regionAssessExtMap.get(cuMemberRetailRegion.getPkMember()); - if (cuRegionAssessExt.getPkId() >= 3) { - continue; - } - } - cancelRegionList.add(cuMemberRetailRegion.getPkId()); - } - } - if (cancelRegionList.size() > 0) { - if (!iMemberRetailApi.cancelRegion(cancelRegionList).isSuccess()) { - throw new RuntimeException("区域更新失败"); - } - } - } - private void saveCuRegionAssess(Map regionAssessMap, List regionAssessDetailList) { List longs = baseMapper.batchQueryCuRegionAssessSeq(regionAssessMap.size()); int i = 0; diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml index 94f79635..740c60cc 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml @@ -161,26 +161,5 @@ and cm.member_name = #{regionAssessParam.memberName} - - diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java index 28296633..44b469c1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java @@ -42,9 +42,6 @@ import java.util.List; /** * 会员提现表 前端控制器 - * - * @author hzs - * @since 2022-09-06 */ @RestController @RequestMapping("/api/withdraw") @@ -286,14 +283,6 @@ public class ApiCuMemberWithdrawController extends BaseController { return balance; } - - @PostMapping("/auto") - public AjaxResult autoWithdrawInfo() { - cuMemberWithdrawService.autoWithdraw(); - return AjaxResult.success(); - } - - /** * 是否为整数值 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java index 918e9f9d..f2936c8c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java @@ -35,30 +35,23 @@ import java.util.*; /** * 会员提现表 前端控制器 - * - * @author hzs - * @since 2022-09-06 */ @RestController @RequestMapping("/manager/withdraw") public class CuMemberWithdrawController extends BaseController { - @Autowired private UserTokenService userTokenService; + @Autowired + private ICuMemberBaseService iCuMemberBaseService; + @Autowired + private ICuMemberWithdrawService iCuMemberWithdrawService; @Autowired - private ICuMemberBaseService baseService; - - @Autowired - ICuMemberWithdrawService cuMemberWithdrawService; - - @Autowired - ITransactionCommonService iTransactionCommonService; + private ITransactionCommonService iTransactionCommonService; @DubboReference - IMenuColumnServiceApi menuColumnServiceApi; - + IMenuColumnServiceApi iMenuColumnServiceApi; /** * 发起签呈显示 @@ -72,11 +65,11 @@ public class CuMemberWithdrawController extends BaseController { if (CollUtil.isEmpty(pkIds)) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_INITIATING_SIGNATURE_RECORD)); } - List cuMemberWithdrawList = cuMemberWithdrawService.checkWithdrawPetitionByState(pkIds, EApproveStatus.WAIT_SUBMIT.getValue()); + List cuMemberWithdrawList = iCuMemberWithdrawService.checkWithdrawPetitionByState(pkIds, EApproveStatus.WAIT_SUBMIT.getValue()); if (CollUtil.isNotEmpty(cuMemberWithdrawList)) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECTED_RECORD_DUPLICATE_SIGNATURE_RECORD)); } - return AjaxResult.success(cuMemberWithdrawService.showMemberWithdrawPetition(pkIds, null)); + return AjaxResult.success(iCuMemberWithdrawService.showMemberWithdrawPetition(pkIds, null)); } /** @@ -91,10 +84,9 @@ public class CuMemberWithdrawController extends BaseController { LoginUser loginUser = userTokenService.getLoginUser(); cuMemberPetitionVO.setLoginUser(loginUser); cuMemberPetitionVO.setPkCreat(SecurityUtils.getUserId()); - return AjaxResult.success(cuMemberWithdrawService.confirmWithdrawPetition(cuMemberPetitionVO)); + return AjaxResult.success(iCuMemberWithdrawService.confirmWithdrawPetition(cuMemberPetitionVO)); } - /** * 查询列表 * @@ -117,14 +109,13 @@ public class CuMemberWithdrawController extends BaseController { } } startPage(); - Object[] objects = cuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO); + Object[] objects = iCuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO); //处理分页 TableDataInfo tableDataInfo = getDataTable((List) objects[0]); tableDataInfo.setRows((List) objects[1]); return tableDataInfo; } - /** * 充值明细列表导出 * @@ -137,18 +128,18 @@ public class CuMemberWithdrawController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); cuMemberWithdrawVO.setPkCountry(pkCountry); cuMemberWithdrawVO.setSystemType(SecurityUtils.getSystemType()); - List cuMemberWithdrawList = (List) cuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO)[1]; + List cuMemberWithdrawList = (List) iCuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO)[1]; //枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values(), EWithdrawStatus.values()); + Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values()); if (CollUtil.isNotEmpty(cuMemberWithdrawList)) { for (CuMemberWithdrawVO memberWithdraw : cuMemberWithdrawList) { Integer pkAccount = memberWithdraw.getPkAccount(); - memberWithdraw.setPkAccountVal(baseService.getAccountTranslateFromDataBase(pkAccount)); + memberWithdraw.setPkAccountVal(iCuMemberBaseService.getAccountTranslateFromDataBase(pkAccount)); memberWithdraw.setApproveStateVal(transactionMap.get(EnumsPrefixConstants.APPROVE_STATUS + memberWithdraw.getApproveState())); - memberWithdraw.setStatusVal(transactionMap.get(EnumsPrefixConstants.ENU_WITHDRAW_STATUS + memberWithdraw.getStatus())); + memberWithdraw.setStatusVal(EWithdrawStatus.getLabelByValue(memberWithdraw.getStatus())); } } - ExcelUtil util = new ExcelUtil<>(CuMemberWithdrawVO.class, menuColumnServiceApi.queryMenuColumn("CashDetails", SecurityUtils.getUserId()).getData()); + ExcelUtil util = new ExcelUtil<>(CuMemberWithdrawVO.class, iMenuColumnServiceApi.queryMenuColumn("CashDetails", SecurityUtils.getUserId()).getData()); util.exportExcel(response, cuMemberWithdrawList, TransactionUtils.getContent(FinanceMsgConstants.WITHDRAWAL_DETAILS_EXPORT)); } @@ -162,11 +153,10 @@ public class CuMemberWithdrawController extends BaseController { @GetMapping("/details") public AjaxResult findWithdrawDetails(Long pkId) { Assert.notNull(pkId, TransactionUtils.getContent(FinanceMsgConstants.SELECT_WITHDRAWAL_RECORD)); - CuMemberWithdrawVO cuMemberRechargeDetailVO = cuMemberWithdrawService.queryCuMemberWithdrawDetail(pkId); + CuMemberWithdrawVO cuMemberRechargeDetailVO = iCuMemberWithdrawService.queryCuMemberWithdrawDetail(pkId); return AjaxResult.success(cuMemberRechargeDetailVO); } - /** * 打款 * @@ -178,7 +168,7 @@ public class CuMemberWithdrawController extends BaseController { public AjaxResult withdrawPayment(@RequestBody CuMemberWithdrawVO memberWithdrawVO) { List pkIds = memberWithdrawVO.getPkIds(); Assert.notNull(pkIds, TransactionUtils.getContent(FinanceMsgConstants.SELECT_PAID_RECORD)); - List withdrawApproveStateByIds = cuMemberWithdrawService.getWithdrawApproveStateByIds(pkIds, EApproveStatus.FINISH.getValue()); + List withdrawApproveStateByIds = iCuMemberWithdrawService.getWithdrawApproveStateByIds(pkIds, EApproveStatus.FINISH.getValue()); if (CollUtil.isNotEmpty(withdrawApproveStateByIds)) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.DATA_UNAPPROVED_DATA)); } @@ -188,10 +178,9 @@ public class CuMemberWithdrawController extends BaseController { memberWithdrawVO.setPayer(pkMember); memberWithdrawVO.setPaymentTime(new Date()); memberWithdrawVO.setPkModified(pkMember); - return toAjax(cuMemberWithdrawService.withdrawPaymentByPkId(memberWithdrawVO)); + return toAjax(iCuMemberWithdrawService.withdrawPaymentByPkId(memberWithdrawVO)); } - /** * 打款充正 * @@ -207,13 +196,13 @@ public class CuMemberWithdrawController extends BaseController { memberWithdrawVO.setPayer(SecurityUtils.getUserId()); memberWithdrawVO.setPayerRemarks(memberWithdrawVO.getPayerRemarks()); memberWithdrawVO.setPaymentTime(new Date()); - return toAjax(cuMemberWithdrawService.withdrawPaymentPositiveByPkId(memberWithdrawVO)); + return toAjax(iCuMemberWithdrawService.withdrawPaymentPositiveByPkId(memberWithdrawVO)); } @Log(module = EOperationModule.WITHDRAWAL_DETAIL, business = EOperationBusiness.WITHDRAWAL_DETAIL, method = EOperationMethod.REJECT) @PostMapping("/reject") public AjaxResult reject(@RequestBody CuMemberWithdrawRejectParam param) { - cuMemberWithdrawService.withdrawReject(param); + iCuMemberWithdrawService.withdrawReject(param); return AjaxResult.success(); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java index 4f7091ba..949eb029 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBonusAccountParam.java @@ -10,12 +10,6 @@ import java.math.BigDecimal; /** * 奖金账户操作参数 - * - * @Description: - * @Author: ljc - * @Time: 2023/3/25 13:56 - * @Classname: CuMemberAccountParam - * @Package_name: com.hzs.member.account.dto */ @Data @Builder diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java index 2319e26a..1fb3f621 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.account.CuMemberAccount; import com.hzs.common.domain.member.account.CuMemberAccountRechargeExt; import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.member.account.dto.CuMemberBonusAccountParam; import com.hzs.member.account.dto.CuMemberRechargeAccountParam; import com.hzs.member.account.dto.MemberAmountDTO; import com.hzs.member.account.vo.CuMemberAccountVO; @@ -28,7 +27,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryMemberAccountByCondition(CuMemberAccount cuMemberAccount); - /** * 根据会员编码获取余额 * @@ -45,15 +43,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ Integer updateMemberAccount(CuMemberAccount cuMemberAccount); - - /** - * 根据国家查询余额与银行卡信息 - * - * @param pkCountry 国家ID - * @return List - */ - List queryMemberAccountByPkCountry(@Param("pkCountry") Integer pkCountry); - /** * 根据用户编号查询账户余额 （行转列） * @@ -75,7 +64,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ Boolean updateBatchMemberAccountByPkmember(@Param("batch") String batch, @Param("pkModified") Long pkModified, @Param("type") int type); - /** * 根据用户编号集查询余额（余额字段） * @@ -85,7 +73,6 @@ public interface CuMemberAccountMapper extends BaseMapper { List queryMemberAccountByMemberCodes(@Param(value = "memberCodes") List memberCodes, @Param(value = "memberCodeStrs") List memberCodeStrs); - /** * 根据用户编号集查询用户账户的全部字段信息 * @@ -102,7 +89,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List selectMemberAccountList(CuMemberWalletDetailVO memberWalletDetailVO); - /** * 查询默认钱包明细（不包括血缘代数，安置层数） * @@ -111,7 +97,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List selectDefaultMemberAccountList(CuMemberWalletDetailVO memberWalletDetailVO); - /** * 根据用户编号查询用户ID * @@ -129,7 +114,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ Integer updateFrozenAmountInfo(CuMemberAccountExt cuMemberAccount); - /** * 根据用户ID集查询余额 * @@ -138,7 +122,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryMemberAccountByPkMember(@Param(value = "pkMembers") List pkMembers); - /** * 批量更新账户余额（不同账户同一账户） * @@ -157,7 +140,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ Boolean batchUpdateMemberAccountByPkMemberCountry(@Param("pkMemberList") List pkMemberList, @Param("isWithdraw") Integer isWithdraw); - /** * 批理更新会员的钱包状态 * @@ -176,14 +158,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List selectMemberAccountByPkMember(@Param(value = "pkMembers") List pkMembers); - /** - * 查询会员账户以及会员信息 - * - * @param memberIdList 会员ID列表 - * @return - */ - List queryAccountAndMemberInfo(@Param("memberIdList") List memberIdList); - /** * 根据用户ID查询钱包余额 * @@ -192,7 +166,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryWalletBalanceByPkMember(@Param("pkMember") Long pkMember); - /** * 根据会员姓名与会员编号查询账户信息 * @@ -201,33 +174,6 @@ public interface CuMemberAccountMapper extends BaseMapper { */ List queryMemberAccountByMemberCodeAndName(CuMemberAccountVO cuMemberAccountVO); - /** - * 奖金发放，根据期间发放奖金，更新奖金余额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountGrantByPeriod(@Param("pkCountry") Integer pkCountry, @Param("startPeriod") Integer startPeriod, - @Param("endPeriod") Integer endPeriod); - - /** - * 奖金可提现，根据期间更新可提现金额，减少可消费金额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountWithdrawalByPeriod(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("pkCountry") Integer pkCountry); - - /** - * 批量更新奖金账号 - * - * @param bonusList 奖金账号参数 - * @param operateType 操作类型 - * @param operateType 修改人 - * @return Boolean - */ - Boolean batchUpdateBonusAccountByPkMember(@Param("bonusList") List bonusList, - @Param("operateType") int operateType, - @Param("pkModified") Long pkModified); - /** * 根据来源单号查询奖金账号信息 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java index 694a88ea..2b3610ab 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberWithdrawMapper.java @@ -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,12 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员提现表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-09-06 */ public interface CuMemberWithdrawMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java index 9d6ed75e..306211af 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java @@ -1,49 +1,30 @@ package com.hzs.member.account.provider; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.member.account.CuMemberRecharge; import com.hzs.member.account.IMemberJobServiceApi; import com.hzs.member.account.service.ICuMemberAccountDetailService; -import com.hzs.member.account.service.ICuMemberRechargeService; -import com.hzs.member.account.service.ICuMemberWithdrawService; import com.hzs.member.base.mapper.DeleteGarbageDataMapper; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Date; - /** * 会员模块定时任务服务提供 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/12 10:40 - * @Classname: IMemberJobServiceProvider - * @Package_name: com.hzs.member.account.provider */ - @Slf4j @DubboService public class IMemberJobServiceProvider implements IMemberJobServiceApi { @Autowired - private ICuMemberAccountDetailService memberAccountDetailService; - - @Autowired - private ICuMemberWithdrawService memberWithdrawService; - - @Autowired - private ICuMemberRechargeService memberRechargeService; + private ICuMemberAccountDetailService iCuMemberAccountDetailService; @Autowired private DeleteGarbageDataMapper deleteGarbageDataMapper; - @Override public R insertAccountDetail() { try { - memberAccountDetailService.insertAccountDetail(); + iCuMemberAccountDetailService.insertAccountDetail(); } catch (Exception e) { log.info("定时插入账户详情数据失败：", e); return R.fail(e.getMessage()); @@ -51,24 +32,6 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { return R.ok(); } - - @Override - public R automaticWithdrawal() { - try { - memberWithdrawService.autoWithdraw(); - } catch (Exception e) { - log.info("自动提现报错：", e); - return R.fail(e.getMessage()); - } - return R.ok(); - } - - - @Override - public R selectRechargeTotalAmount(Date startDate, Date endDate) { - return R.ok(memberRechargeService.selectRechargeTotalAmount(startDate, endDate)); - } - @Override public R autoDeleteGarbageData() { deleteGarbageDataMapper.deleteMemberAwards(30); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java index e869194c..a61bc22f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java @@ -24,7 +24,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountByCondition(CuMemberAccount cuMemberAccount); - /** * 根据会员编码获取余额 * @@ -34,7 +33,6 @@ public interface ICuMemberAccountService extends IService { */ BigDecimal selectBalanceByMemberCode(Long pkMember, Integer accountType); - /** * 更新用户余额 * @@ -92,14 +90,6 @@ public interface ICuMemberAccountService extends IService { */ List selectAccountDetail(Long pkMember, Integer pkCountry); - /** - * 根据国家查询余额与银行卡信息 - * - * @param pkCountry 国家ID - * @return List - */ - List queryMemberAccountByPkcountry(Integer pkCountry); - /** * 根据用户编号查询账户余额 （行转列） * @@ -138,7 +128,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountByMemberCodes(List memberCodes, List memberCodeStrs); - /** * 根据用户编号集查询余额(所有字段) * @@ -147,7 +136,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountAllByMemberCodes(List memberCodes, Integer pkCountry); - /** * 查询钱包明细 * @@ -156,7 +144,6 @@ public interface ICuMemberAccountService extends IService { */ Object[] selectMemberAccountList(CuMemberWalletDetailVO memberWalletDetailVO); - /** * 根据用户编号查询用户ID * @@ -190,7 +177,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountByPkMember(List pkMembers); - /** * 批量更新账户余额（不同用户相同账户） * @@ -200,7 +186,6 @@ public interface ICuMemberAccountService extends IService { */ Boolean batchUpdateMemberAccountByPkmember(List pkMemberList, int pkAccount, Integer isWithdraw); - /** * 更新账户余额（不同用户不同账户） * @@ -210,7 +195,6 @@ public interface ICuMemberAccountService extends IService { */ Boolean batchUpdateMemberAccountByPkMemberCountry(List pkMemberList, Integer isWithdraw); - /** * 批理更新会员的钱包状态 * @@ -229,14 +213,6 @@ public interface ICuMemberAccountService extends IService { */ List selectMemberAccountByPkMember(List pkMembers); - /** - * 查询会员账户以及会员信息 - * - * @param memberIdList 会员ID列表 - * @return - */ - List queryAccountAndMemberInfo(List memberIdList); - /** * 根据会员姓名与会员编号查询账户信息 * @@ -245,23 +221,8 @@ public interface ICuMemberAccountService extends IService { */ Object[] queryMemberAccountByMemberCodeAndName(CuMemberAccountVO cuMemberAccountVO); - List selectFrozenAmountExport(CuMemberAccountVO cuMemberAccountVO); - /** - * 奖金发放，根据期间发放奖金，更新奖金余额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountGrantByPeriod(Integer pkCountry, Integer startPeriod, Integer endPeriod); - - /** - * 奖金可提现，根据期间更新可提现金额，减少可消费金额 - * - * @param startPeriod 期间 - */ - void updateMemberAccountWithdrawalByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry); - /** * 根据用户ID查询账户余额信息 * @@ -271,18 +232,6 @@ public interface ICuMemberAccountService extends IService { */ CuMemberRechargeAccountParam findMemberBalanceById(Integer pkAccount, Long pkMember); - - /** - * 批量更新奖金账号 - * - * @param bonusList 奖金账号参数 - * @param operateType 操作类型 - * @param operateType 修改人 - * @return Boolean - */ - Boolean batchUpdateBonusAccountByPkMember(List bonusList, int operateType, Long pkModified); - - /** * 根据来源单号查询奖金账号信息 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java index 2b957eb8..530ae4ca 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java @@ -1,6 +1,5 @@ package com.hzs.member.account.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.core.enums.EApproveOperation; import com.hzs.common.domain.member.account.CuMemberAccountRechargeExt; @@ -14,21 +13,14 @@ import com.hzs.member.account.vo.CuMemberRechargeDetailVO; import com.hzs.member.account.vo.CuMemberRechargeVO; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import java.math.BigDecimal; import java.util.Date; import java.util.List; /** - *

* 会员充值表 服务类 - *

- * - * @author hzs - * @since 2022-09-08 */ public interface ICuMemberRechargeService extends IService { - /** * 根据批次查询充值信息 * @@ -37,7 +29,6 @@ public interface ICuMemberRechargeService extends IService { */ List selectRechargeByBatch(String batch); - /** * 会员批量充值 * @@ -46,7 +37,6 @@ public interface ICuMemberRechargeService extends IService { */ Integer saveBatchMemberRecharge(CuMemberBatchRechargeParam batchRechargeParam); - /** * 根据充值单号更新审核状态信息 * @@ -63,7 +53,6 @@ public interface ICuMemberRechargeService extends IService { */ Integer submitAuditMemberRecharge(MemberAccountAudit memberAccountAudit); - /** * 审核通过后插入交易明细和用户余额表 * @@ -107,7 +96,6 @@ public interface ICuMemberRechargeService extends IService { */ Boolean preCharge(String rechargeAmount, Integer pkCountry, Long pkMember, String rechargeCode, Long pkCreator); - /** * 会员端在线支付更新审批状态 * @@ -126,7 +114,6 @@ public interface ICuMemberRechargeService extends IService { */ CuMemberRecharge getCuMemberRechargeByRechargeCode(String rechargeCode); - /** * 根据充值单号与用户ID查询充值信息 * @@ -143,7 +130,6 @@ public interface ICuMemberRechargeService extends IService { */ void saveMemberTradeDetailAndBonus(List memberAccountList, Integer rechargeMethod, String businessCode); - /** * 根据会员编号查询提交审核的用户 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java index f1cabfab..b931d439 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java @@ -25,14 +25,6 @@ public interface ICuMemberWithdrawService extends IService { */ List getWithdrawTimes(Long pkMember); - /** - * 根据申请单号查询提现信息 - * - * @param code 单号 - * @return CuMemberWithdraw - */ - CuMemberWithdraw selectWithdrawByCode(String code); - /** * 根据批次号查询审核记录 * @@ -41,7 +33,6 @@ public interface ICuMemberWithdrawService extends IService { */ List selectWithdrawByBatch(String batchNO); - /** * 保存提现 * @@ -90,15 +81,6 @@ public interface ICuMemberWithdrawService extends IService { */ Integer withdrawPaymentPositiveByPkId(CuMemberWithdrawVO memberWithdrawVO); - /** - * 获取余额 - * - * @param pkMember 用户ID - * @param pkCountry 国家ID - * @return BigDecimal - */ - BigDecimal getBalance(Long pkMember, Integer pkCountry, Integer accountsType); - /** * 计算本次提现应该交的个税 * @@ -128,11 +110,6 @@ public interface ICuMemberWithdrawService extends IService { */ BigDecimal computeRounding(BdWithdrawal bdWithdrawal, BigDecimal cashAmount); - /** - * 自动提现 - */ - void autoWithdraw(); - /** * 获取账户余额 * @@ -142,7 +119,6 @@ public interface ICuMemberWithdrawService extends IService { */ BigDecimal getAccountBalance(Integer accountsType, CuMemberAccount cuMemberAccount); - /** * @param pkIds 主键集合 * @param approveState 审核状态 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java index 48d27424..380b3304 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java @@ -233,7 +233,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl queryMemberAccountByPkcountry(Integer pkCountry) { - return baseMapper.queryMemberAccountByPkCountry(pkCountry); - } - @Override public List queryMemberAccountByMemberCode(String memberCode, List accountTypes, Integer pkCountry) { List pkAccounts = new ArrayList<>(); @@ -382,7 +376,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl cuMemberAccountExts; @@ -397,7 +390,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl map) { @@ -494,7 +485,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl pkMemberList, int pkAccount, Integer isWithdraw) { return baseMapper.batchUpdateMemberAccountByPkMember(pkMemberList, pkAccount, isWithdraw); @@ -610,12 +597,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl queryAccountAndMemberInfo(List memberIdList) { - return baseMapper.queryAccountAndMemberInfo(memberIdList); - } - @Override public Object[] queryMemberAccountByMemberCodeAndName(CuMemberAccountVO cuMemberAccountVO) { CuMemberAccountExtVO cuMemberAccountExtVO; @@ -662,7 +643,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl cuMemberRechargeAccountParams = baseMapper.queryMemberAccountByMemberCode(null, Collections.singletonList(pkAccount), pkMember); return CollUtil.isNotEmpty(cuMemberRechargeAccountParams) ? cuMemberRechargeAccountParams.get(0) : null; } - - @Override - public Boolean batchUpdateBonusAccountByPkMember(List bonusList, int operateType, Long pkModified) { - return baseMapper.batchUpdateBonusAccountByPkMember(bonusList, operateType, pkModified); - } - @Override public List selectMemberBonusAccountBySourceCode(String sourceCode) { return baseMapper.selectMemberBonusAccountBySourceCode(sourceCode); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java index 7288bb72..e07972bc 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java @@ -59,65 +59,37 @@ import java.util.*; import java.util.stream.Collectors; /** - *

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

- * - * @author hzs - * @since 2022-09-06 */ @Service @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; - + IWithdrawalProcessServiceApi iWithdrawalProcessServiceApi; @DubboReference - IWithdrawalProcessServiceApi withdrawalProcessServiceApi; - - - @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) { //根据单号查询充值信息 @@ -126,7 +98,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl withdrawalConfigs = withdrawalServiceApi.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); - Integer accountsType = bdAccounts.get(0).getFieldValue(); - //查询会员币种余额、锁定金额 - List cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByPkcountry(pkCountry); - memberWithDrawal(withdrawal, cuMemberAccountExts, bdAccounts, accountsType, pkCountry); - } - } - } - } - /** * 会员提现 * @@ -386,7 +331,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); + CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank); log.info("----------是否绑定银行卡"); if (null != memberBank) { log.info("----------绑定银行卡"); @@ -414,7 +359,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) { //本次应缴个税 @@ -423,7 +368,7 @@ 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)) { return true; } - } return false; } - @Override - public BigDecimal getBalance(Long pkMember, Integer pkCountry, Integer accountsType) { - //提现账户 - if (null == accountsType) { - List bdAccounts = cuMemberBaseService.getAccountByCountry(EAccountProperty.IS_WITHDRAWAL.getValue(), pkCountry); - accountsType = bdAccounts.get(0).getFieldValue(); - } - //查询账户余额 - return cuMemberAccountService.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; @@ -557,7 +489,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(); @@ -603,7 +532,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl checkWithdrawPetitionByState(List pkIds, Integer approveState) { return BeanUtil.copyToList(baseMapper.showMemberWithdrawPetition(pkIds, approveState), CuMemberWithdrawVO.class); @@ -627,7 +555,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(); //提交提现用户 @@ -640,7 +568,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()); } @@ -676,7 +604,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); @@ -709,18 +637,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) @@ -744,11 +672,11 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); @@ -793,13 +721,13 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl cuMemberWithdrawList = baseMapper.selectList(wrapper); Integer pkCountry = SecurityUtils.getPkCountry(); - if(CollUtil.isNotEmpty(cuMemberWithdrawList)){ + if (CollUtil.isNotEmpty(cuMemberWithdrawList)) { for (CuMemberWithdraw cuMemberWithdraw : cuMemberWithdrawList) { BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder() .tradeCode(cuMemberWithdraw.getWithdrawCode()).pkCountry(pkCountry) .tradeType(EApprovalBusiness.WITHDRAWAL.getValue()) .pkCreator(SecurityUtils.getUserId()).build(); - cuMemberTradeService.businessCommissionReject(businessCommissionDTO); + iCuMemberTradeService.businessCommissionReject(businessCommissionDTO); } } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java index cc3cc670..a44b50df 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java @@ -13,15 +13,8 @@ import java.util.Date; import java.util.List; /** - *

* 会员提现表 - *

- * - * @author hzs - * @since 2022-09-06 */ - - @EqualsAndHashCode(callSuper = true) @Data @Builder @@ -227,7 +220,6 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO { /** * 状态（0=未打款，1=已打款，2=已充正，3=撤消） */ - @Transaction(transactionKey = EnumsPrefixConstants.ENU_WITHDRAW_STATUS) private Integer status; @Excel(name = "打款状态") @@ -317,7 +309,7 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO { /** * 查询状态 */ - private Integer queryStatus; + private Integer queryStatus; /** * 会员编号集合 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java index 9b8436ad..ec91e4a4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java @@ -15,6 +15,7 @@ import java.util.List; * Mapper 接口 */ public interface CuMemberRetailRangeMapper extends BaseMapper { + /** * 查询会员直推会员 * @@ -23,65 +24,6 @@ public interface CuMemberRetailRangeMapper extends BaseMapper selectDirectPushByPkMember(@Param("pkMember") Long pkMember, @Param("systemType") Integer systemType); - /** - * 查询大区用户信息 - * - * @param cuMemberAchieveVO - * @return - */ - CuMemberRetailAchieveVO selectBigAreaByPkMember(CuMemberRetailAchieveVO cuMemberAchieveVO); - - /** - * 查询表名是否存在 - * - * @param tableNames 表名 - * @return List - */ - List selectTableNameIsExist(@Param("tableNames") List tableNames); - - /** - * 查询会员当天是否下订单 - * - * @param pkMember 会员 - * @return Integer - */ - CuMemberRetailAchieveVO selectMemberOrderByPkMember(@Param("pkMember") Long pkMember); - - - /** - * 查询会员的极差业绩 - * - * @param cuMemberAchieveVO 入参 - * @return CuMemberAchieveVO - */ - List selectMemberParentByPkMember(CuMemberRetailAchieveVO cuMemberAchieveVO); - - /** - * 查询会员没有注水的大区盒数 - * - * @param cuMemberAchieveVO 入参 - * @return CuMemberRetailAchieveVO - */ - BigDecimal selectMemberBoxNoWaterInjection(CuMemberRetailAchieveVO cuMemberAchieveVO); - - - /** - * 查询会员注水的大区盒数 - * - * @param cuMemberAchieveVO 入参 - * @return CuMemberRetailAchieveVO - */ - BigDecimal selectMemberBoxWaterInjection(CuMemberRetailAchieveVO cuMemberAchieveVO); - - - /** - * 查询会员最大盒数 - * - * @param cuMemberAchieveVO 入参 - * @return CuMemberRetailAchieveVO - */ - BigDecimal selectMemberTotalBox(CuMemberRetailAchieveVO cuMemberAchieveVO); - /** * 查询会员业绩 * @@ -130,22 +72,6 @@ public interface CuMemberRetailRangeMapper extends BaseMapper */ @@ -172,6 +91,7 @@ public interface CuMemberRetailRangeMapper extends BaseMapper selectMemberSmallBoxList(CuMemberRetailAchieveVO param); - List selectSubMemberIdByRootMember(@Param("pkMember") Long pkMember, @Param("systemType") Integer systemType); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java index 011c58ac..253d1bec 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java @@ -48,19 +48,11 @@ public interface CuMemberRetailRegionMapper extends BaseMapper unboundAreaList(@Param("pkCountry") Integer pkCountry, @Param("systemType") Integer systemType); - /** * 查询会员收益区域 **/ List memberretailRegList(CuMemberRetailRegionExt mrrExt); - /** - * 重新判断收益区域数据 - * - * @return - */ - List listCheckRegionMember(); - /** * 会员购买订单数量 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java index 8e78ffa0..540a0fb8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java @@ -19,17 +19,6 @@ public class MemberRetailProvider implements IMemberRetailApi { @Autowired private ICuMemberRetailRegionService iCuMemberRetailRegionService; - @Override - public R checkRegion() { - try { - iCuMemberRetailRegionService.checkRegion(); - return R.ok(); - } catch (Exception e) { - log.error("定时任务处理收益区域异常", e); - return R.fail(e.getMessage()); - } - } - @Override public R cancelRegion(List pkIdList) { try { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java index 464ed89e..7de3d550 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java @@ -7,18 +7,9 @@ import com.hzs.retail.member.utils.PageResult; import com.hzs.retail.member.vo.*; import java.util.List; -import java.util.Map; public interface ICuMemberRetailAchieveService extends IService { - /** - * 查询会员盒数 - * - * @param pkMember 会员ID - * @return CuMemberRetailAchieveVO - */ - CuMemberRetailAchieveVO selectMemberSmallBox(Long pkMember, Integer pkCountry, Integer systemType); - /** * 查询会员大小区业绩 * @@ -78,15 +69,6 @@ public interface ICuMemberRetailAchieveService extends IService memberretailRegList(CuMemberRetailRegionExt mrrExt); - /** - * 定时处理收益区域 - */ - void checkRegion(); - /** * 取消收益区域 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java index 549489da..b99e094e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.achieve.CuMemberRetailRange; @@ -21,10 +20,7 @@ import com.hzs.retail.member.service.ICuMemberRetailAchieveService; import com.hzs.retail.member.utils.DataStatisticsUtil; import com.hzs.retail.member.utils.PageResult; import com.hzs.retail.member.vo.*; -import com.hzs.system.config.IGradeServiceApi; -import com.hzs.system.config.dto.GradeDTO; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -51,64 +47,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType); - CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable) - .memberRetailSTable(getTableSName()).memberCode(cuMember.getMemberCode()) - .pkMember(pkMember).pkMemberList(pkMemberList).build(); - - //查询会员是否激活 - // Integer enableStatus = baseMapper.selectMemberActiveState(memberAchieveVO); - Integer enableStatus = cuMember.getIsActivate(); - if (null != enableStatus && enableStatus.equals(EYesNo.YES.getIntValue())) { - //查询总盒数 - BigDecimal totalBox = baseMapper.selectMemberTotalBox(memberAchieveVO); - if (null != totalBox) { - BigDecimal maxBox = BigDecimal.ZERO; - //查询是否配置注水 - Integer total = baseMapper.selectWaterInjection(cuMember.getMemberCode()); - if (null != total && total > 0) { - //查询注水最大盒数 - maxBox = baseMapper.selectMemberBoxWaterInjection(memberAchieveVO); - } else { - //查询无注水最大盒数 - maxBox = baseMapper.selectMemberBoxNoWaterInjection(memberAchieveVO); - } -// memberRetailAchieveVO = CuMemberRetailAchieveVO.builder().totalBox(totalBox).smallAreaBox(totalBox - maxBox).build(); - memberRetailAchieveVO = CuMemberRetailAchieveVO.builder().totalBox(totalBox).smallAreaBox(totalBox.subtract(maxBox)).build(); - //总盒数大于2800的时候显示2800 - GradeDTO lastGrate = gradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), pkCountry).getData(); - //配置中的总盒数 - BigDecimal totalBoxConfig = lastGrate.getBoxTotal(); -// BigDecimal totalBoxMax = memberRetailAchieveVO.getTotalBox() > totalBoxConfig ? totalBoxConfig : memberRetailAchieveVO.getTotalBox(); - BigDecimal totalBoxMax = memberRetailAchieveVO.getTotalBox().compareTo(totalBoxConfig) > 0 ? totalBoxConfig : memberRetailAchieveVO.getTotalBox(); - memberRetailAchieveVO.setTotalBox(totalBoxMax); - } else { - memberRetailAchieveVO = CuMemberRetailAchieveVO.builder().totalBox(BigDecimal.ZERO).smallAreaBox(BigDecimal.ZERO).build(); - } - } else { - memberRetailAchieveVO = CuMemberRetailAchieveVO.builder().totalBox(BigDecimal.ZERO).smallAreaBox(BigDecimal.ZERO).build(); - } - return memberRetailAchieveVO; - } - - @Override public CuMemberRetailAchieveVO selectMemberAchieve(Long pkMember, Integer pkCountry, Integer systemType) { //查询会员昨日业绩 @@ -143,18 +81,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl memberAchieveList, BigDecimal rate) { //查询最大业绩 - if(ObjectUtil.isEmpty(memberAchieveList)){ + if (ObjectUtil.isEmpty(memberAchieveList)) { return null; } for (CuMemberRetailAchieveVO cuMemberRetailAchieveVO : memberAchieveList) { - if(ObjectUtil.isEmpty(cuMemberRetailAchieveVO.getArealPv())){ + if (ObjectUtil.isEmpty(cuMemberRetailAchieveVO.getArealPv())) { cuMemberRetailAchieveVO.setArealPv(BigDecimal.ZERO); } } @@ -286,19 +208,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl pkMemberList, String memberRangeTable) { - CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRangeTable).pkMemberList(pkMemberList).build(); - return baseMapper.selectBigAreaByPkMember(memberAchieveVO); - } - - /** * 查询会员直推业绩 * @@ -317,62 +226,49 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl selectTableNameIsExist(List tableNames) { - return baseMapper.selectTableNameIsExist(tableNames); - } - - /** * 转化万单位、汇率换算 * @@ -422,7 +311,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType); - // 2025年6月11日 取伞下 + 自己的ID -// List pkMemberList = baseMapper.selectSubMemberIdByRootMember(pkMember, systemType); - //根据国家查汇率 - BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate(); - //查询自己业绩 - List memberSelfAchieveList = new ArrayList<>(); - - //会员业绩 - CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMember(pkMember).systemType(systemType).build(); - CuMemberRetailAchieveVO orderAchieveVO = baseMapper.selectMemberOrderSumAchieveByPkMember(memberAchieveVO); - if (null != orderAchieveVO && orderAchieveVO.getArealPv().compareTo(BigDecimal.ZERO) > 0) { - orderAchieveVO.setPkMember(pkMember); - memberSelfAchieveList.add(orderAchieveVO); - } - //查询伞下业绩 - if (CollUtil.isNotEmpty(pkMemberList)) { - List memberPushAchieveList = getMemberPushSumAchieve(pkMemberList, memberRetailTable, memberSecondTable, systemType); - if (CollUtil.isNotEmpty(memberPushAchieveList)) { - memberSelfAchieveList.addAll(memberPushAchieveList); - } - } - if (CollUtil.isEmpty(memberSelfAchieveList)) { - return CuMemberRetailAchieveVO.builder().smallAreaPv(BigDecimal.ZERO).bigArealPv(BigDecimal.ZERO).build(); - } - return getMemberBigAndSmallAchieve(memberSelfAchieveList, rate); - } - - /** * 查询会员直推业绩(累计) * * @param pkMemberList 直推会员ID * @return CuMemberAchieveVO */ - private List getMemberPushSumAchieve(List pkMemberList, String memberRangeTable,String memberSecondTable, Integer systemType) { + private List getMemberPushSumAchieve(List pkMemberList, String memberRangeTable, String memberSecondTable, Integer systemType) { CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder() .memberRetailTable(memberRangeTable) .memberRetailSTable(memberSecondTable) @@ -505,7 +350,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType); - if(CollUtil.isEmpty(pkMemberList)){ + if (CollUtil.isEmpty(pkMemberList)) { return new PageResult(0, new ArrayList<>()); } param.setPkIdList(pkMemberList); @@ -716,7 +556,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl implements ICuMemberRetailRegionService { - @Autowired - private ICuMemberRetailAchieveService iCuMemberRetailAchieveService; - @Autowired private RedisService redisService; @@ -99,80 +94,6 @@ public class CuMemberRetailRegionServiceImpl extends ServiceImpl memberList = baseMapper.listCheckRegionMember(); - - if (CollectionUtil.isNotEmpty(memberList)) { - memberList.parallelStream().forEach(tmpMember -> { - if (ENoticeWebsiteType.ADMIN.getValue() == tmpMember.getSource()) { - log.info("定时任务区域有效， 会员 {} 后台配置，不取消收益区域", tmpMember.getPkId()); - return; - } - - // 当前时间 - Date nowDate = new Date(); - - if (tmpMember.getGradeValue() < EGrade.S_VIP.getValue()) { - // 会员等级不足V5，需要关掉收益区域 - log.info("定时任务区域有效， 会员 {} 等级 {} 不足取消收益区域", tmpMember.getPkId(), tmpMember.getGradeValue()); - this.update(Wrappers.lambdaUpdate() - .eq(CuMemberRetailRegion::getPkMember, tmpMember.getPkId()) - .eq(CuMemberRetailRegion::getEffective, EYesNo.YES.getIntValue()) - .set(CuMemberRetailRegion::getEffective, EYesNo.NO.getIntValue()) - .set(CuMemberRetailRegion::getPkModified, tmpMember.getPkId()) - .set(CuMemberRetailRegion::getModifiedTime, nowDate) - ); - } else { -// // 获取小市场业绩 -// CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(tmpMember.getPkId(), CountryConstants.CHINA_COUNTRY, tmpMember.getSystemType()); -// if (retailAchieve.getSmallAreaPv().compareTo(BigDecimal.ZERO) <= 0) { -// // 正常有区域业绩肯定达标，由2万突然变0基本不可能，此处暂时不处理 -// log.info("定时任务区域有效， 会员 {} 小市场业绩归0，暂时不取消收益区域", tmpMember.getPkId()); -// return; -// } -// // 2025.02.07 确认需求，如果是历史已经升上去的，还是走老逻辑只校验小市场 -// String checkDate = "2025-02-10 00:00:00"; -// if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { -// checkDate = "2025-02-07 00:00:00"; -// } -// if (tmpMember.getCreationTime().compareTo(DateUtils.parseDateOne(checkDate, DateUtils.YYYY_MM_DD_HH_MM_SS)) > 0) { -// if (retailAchieve.getSmallAreaPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) < 0 -// || retailAchieve.getBigArealPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) < 0 -// ) { -// // 大市场、小市场业绩小于2万，需要取消收益区域 -// log.info("2.定时任务区域有效， 会员 {} 小市场业绩 {} 取消收益区域", tmpMember.getPkId(), retailAchieve.getSmallAreaPv()); -// if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { -// this.update(Wrappers.lambdaUpdate() -// .eq(CuMemberRetailRegion::getPkMember, tmpMember.getPkId()) -// .eq(CuMemberRetailRegion::getEffective, EYesNo.YES.getIntValue()) -// .set(CuMemberRetailRegion::getEffective, EYesNo.NO.getIntValue()) -// .set(CuMemberRetailRegion::getPkModified, tmpMember.getPkId()) -// .set(CuMemberRetailRegion::getModifiedTime, nowDate) -// ); -// } -// } -// } else { -// if (retailAchieve.getSmallAreaPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) < 0) { -// // 小市场业绩小于2万，需要取消收益区域 -// log.info("1.定时任务区域有效， 会员 {} 小市场业绩 {} 取消收益区域", tmpMember.getPkId(), retailAchieve.getSmallAreaPv()); -// if (EEnv.TEST.getValue().equals(HzsConfig.getEnv())) { -// this.update(Wrappers.lambdaUpdate() -// .eq(CuMemberRetailRegion::getPkMember, tmpMember.getPkId()) -// .eq(CuMemberRetailRegion::getEffective, EYesNo.YES.getIntValue()) -// .set(CuMemberRetailRegion::getEffective, EYesNo.NO.getIntValue()) -// .set(CuMemberRetailRegion::getPkModified, tmpMember.getPkId()) -// .set(CuMemberRetailRegion::getModifiedTime, nowDate) -// ); -// } -// } -// } - } - }); - } - } - @Override public void cancelRegion(List pkIdList) { this.update(Wrappers.lambdaUpdate() diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml index 5c02d7bc..eddfcfe6 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml @@ -116,7 +116,6 @@ - - UPDATE CU_MEMBER_ACCOUNT SET @@ -235,19 +233,6 @@ - - - select a.pk_member, @@ -1064,25 +1001,6 @@ - - - - - - MERGE INTO cu_member_account m - USING - ( - - select #{item.pkMember} pk_member, - - #{item.account4} account4, - #{item.consumeAccount4} consumeAccount4, - - - #{item.account4} account4, - #{item.withdrawAccount4} withdrawAccount4, - - - #{item.account4} account4, - #{item.consumeAccount4} consumeAccount4, - #{item.withdrawAccount4} withdrawAccount4, - - FROM DUAL - - ) t - ON ( t.pk_member=m.pk_member and m.pk_member in - - #{item.pkMember} - ) - WHEN MATCHED THEN - UPDATE SET - - m.account4 = NVL(t.account4, 0) + m.account4, - m.consume_account4 = NVL(t.consumeAccount4, 0) + m.consume_account4, - - - m.account4 = NVL(t.account4, 0) + m.account4, - m.withdraw_account4 = NVL(t.withdrawAccount4, 0) + m.withdraw_account4, - - - m.account4 = NVL(t.account4, 0) + m.account4, - m.consume_account4 = NVL(t.consumeAccount4, 0) + m.consume_account4, - m.withdraw_account4 = NVL(t.withdrawAccount4, 0) + m.withdraw_account4, - - m.MODIFIED_TIME = sysdate,m.pk_modified = #{pkModified} - - - SELECT m.pk_id from cu_member m @@ -10,14 +11,6 @@ AND m.pk_parent = #{pkMember} - - SELECT SUM(t1.arealPv) arealPv ,#{pkMember} pkMember @@ -68,138 +61,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT SUM(t1.arealPv) arealPv ,#{pkMember} pkMember @@ -492,6 +313,7 @@ AND t0.category = 0)) t1 + SELECT SUM(t1.arealPv) arealPv ,#{pkMember} pkMember @@ -510,14 +332,10 @@ - - - - SELECT cm.member_code, cm.member_name,cm.nick_name, t3.yesterdayBox, t3.realTimeBox, t3.monthBox,t3.upMonthBox,cm.pk_id @@ -793,7 +614,6 @@ on cm.pk_awards = ba.pk_id - - - + + diff --git a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml index a5adb271..db09db9c 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml @@ -208,18 +208,6 @@ order by CRR.CREATION_TIME desc - - -