From 0fb3a76c8f7c161daeee597075ef1dfebc67badc Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 25 Jul 2024 11:20:50 +0800 Subject: [PATCH] 后台 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 81 +++++++++++++++++++++++++++++++++++----- 1 files changed, 70 insertions(+), 11 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java index d260e6b..c1ef80b 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java @@ -4,9 +4,7 @@ import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; -import cc.mrbird.febs.common.enumerates.FlowTypeNewEnum; -import cc.mrbird.febs.common.enumerates.MoneyFlowTypeNewEnum; -import cc.mrbird.febs.common.enumerates.ProductEnum; +import cc.mrbird.febs.common.enumerates.*; import cc.mrbird.febs.common.utils.MallUtils; import cc.mrbird.febs.common.utils.ShareCodeUtil; import cc.mrbird.febs.common.utils.excl.ExcelSheetPO; @@ -15,10 +13,7 @@ import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil; import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.*; -import cc.mrbird.febs.mall.mapper.MallMemberAmountMapper; -import cc.mrbird.febs.mall.mapper.MallMemberChargeMapper; -import cc.mrbird.febs.mall.mapper.MallMemberMapper; -import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper; +import cc.mrbird.febs.mall.mapper.*; import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.service.IMallMoneyFlowService; @@ -60,6 +55,7 @@ private final IApiMallMemberService apiMallMemberService; private final MallMemberChargeMapper mallMemberChargeMapper; private final IMallMoneyFlowService mallMoneyFlowService; + private final MallMemberWithdrawMapper mallMemberWithdrawMapper; @GetMapping("confirmOrder") @@ -111,6 +107,62 @@ return new FebsResponse().success(); } + @GetMapping("confirmCancelWithdraw") + @ControllerEndpoint(operation = "批量提现取消", exceptionMessage = "操作失败") + public FebsResponse confirmCancelWithdraw(MemberChargrDto memberChargrDto){ + String orderIds = memberChargrDto.getOrderIds(); + List<String> ids = StrUtil.splitTrim(orderIds, ","); + for(String id : ids){ + long orderId = Long.parseLong(id); + MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(orderId); + if(1 != mallMemberWithdraw.getStatus()){ + continue; + } + mallMemberWithdraw.setStatus(3); + mallMemberWithdrawMapper.updateById(mallMemberWithdraw); + MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberWithdraw.getMemberId()); + mallMemberWallet.setBalance(mallMemberWallet.getBalance().add(mallMemberWithdraw.getAmount().abs())); + mallMemberWalletMapper.updateBalanceWithVersion(mallMemberWallet); + + mallMoneyFlowService.addMoneyFlow( + mallMemberWithdraw.getMemberId(), + mallMemberWithdraw.getAmount().abs(), + GameFlowTypeEnum.PLAYER_WITHDRAW_NO.getValue(), + MallUtils.getOrderNum("TX"), + GameFlowTypeEnum.PLAYER_WITHDRAW_NO.getDescrition()); + + } + return new FebsResponse().success(); + } + + + @GetMapping("confirmWithdraw") + @ControllerEndpoint(operation = "批量同意", exceptionMessage = "操作失败") + public FebsResponse confirmWithdraw(MemberChargrDto memberChargrDto){ + String orderIds = memberChargrDto.getOrderIds(); + List<String> ids = StrUtil.splitTrim(orderIds, ","); + for(String id : ids){ + long orderId = Long.parseLong(id); + MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(orderId); + if(1 != mallMemberWithdraw.getStatus()){ + continue; + } + mallMemberWithdraw.setStatus(2); + mallMemberWithdrawMapper.updateById(mallMemberWithdraw); + + mallMoneyFlowService.addMoneyFlow( + mallMemberWithdraw.getMemberId(), + mallMemberWithdraw.getAmount(), + GameFlowTypeEnum.PLAYER_WITHDRAW.getValue(), + MallUtils.getOrderNum("TX"), + StrUtil.format( + GameFlowTypeEnum.PLAYER_WITHDRAW.getDescrition(), + mallMemberWithdraw.getRemark(), + mallMemberWithdraw.getAmountFee())); + } + return new FebsResponse().success(); + } + /** * 充值列表 @@ -118,6 +170,16 @@ @GetMapping("memberChargeList") public FebsResponse memberChargeList(MoneyChargeListDto moneyChargeListDto, QueryRequest request) { Map<String, Object> data = getDataTable(mallMemberService.memberChargeList(moneyChargeListDto, request)); + return new FebsResponse().success().data(data); + } + + + /** + * 提现列表 + */ + @GetMapping("memberWithDrawList") + public FebsResponse memberWithDrawList(MoneyChargeListDto moneyChargeListDto, QueryRequest request) { + Map<String, Object> data = getDataTable(mallMemberService.memberWithDrawList(moneyChargeListDto, request)); return new FebsResponse().success().data(data); } @@ -404,8 +466,7 @@ */ @GetMapping("getAgentList") public FebsResponse getAgentList(AgentDto agentDto, QueryRequest request) { - Map<String, Object> data = getDataTable(mallMemberService.getAgentList(agentDto, request)); - return new FebsResponse().success().data(data); + return mallMemberService.getAgentList(agentDto, request); } /** @@ -589,9 +650,7 @@ String account = new StringBuilder().append("bbsz").append(ShareCodeUtil.toSerialNumberCode(selectCount)).toString(); String key = ShareCodeUtil.toSerialNumberCode(selectCount); registerDto.setAccountLogin(account); - registerDto.setUserKey(key); registerDto.setPassword("a123456"); - registerDto.setTradePassword("123456"); registerDto.setInviteId(member.getInviteId()); apiMallMemberService.register(registerDto); return new FebsResponse().success(); -- Gitblit v1.9.1