From 517db4dbbe706e0796ed94aeff94c2ad63729237 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 25 Jul 2024 11:00:59 +0800
Subject: [PATCH] 后台
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 c8a4184..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;
@@ -122,10 +120,17 @@
}
mallMemberWithdraw.setStatus(3);
mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberWithdraw.getMemberId());
+ mallMemberWallet.setBalance(mallMemberWallet.getBalance().add(mallMemberWithdraw.getAmount().abs()));
+ mallMemberWalletMapper.updateBalanceWithVersion(mallMemberWallet);
- MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMemberWithdraw.getMemberId());
- mallMemberAmount.setFcmCntAva(mallMemberAmount.getFcmCntAva().add(mallMemberWithdraw.getAmount()));
- mallMemberAmountMapper.updateFcmCntAvaById(mallMemberAmount);
+ mallMoneyFlowService.addMoneyFlow(
+ mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount().abs(),
+ GameFlowTypeEnum.PLAYER_WITHDRAW_NO.getValue(),
+ MallUtils.getOrderNum("TX"),
+ GameFlowTypeEnum.PLAYER_WITHDRAW_NO.getDescrition());
+
}
return new FebsResponse().success();
}
@@ -145,15 +150,15 @@
mallMemberWithdraw.setStatus(2);
mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
- String orderNo = MallUtils.getOrderNum("BF");
mallMoneyFlowService.addMoneyFlow(
mallMemberWithdraw.getMemberId(),
mallMemberWithdraw.getAmount(),
- MoneyFlowTypeNewEnum.FCM_INSIDE_OUT.getValue(),
- orderNo,
- mallMemberWithdraw.getId(),
- FlowTypeNewEnum.FCM_COIN.getValue(),
- MoneyFlowTypeNewEnum.FCM_INSIDE_OUT.getDescrition());
+ GameFlowTypeEnum.PLAYER_WITHDRAW.getValue(),
+ MallUtils.getOrderNum("TX"),
+ StrUtil.format(
+ GameFlowTypeEnum.PLAYER_WITHDRAW.getDescrition(),
+ mallMemberWithdraw.getRemark(),
+ mallMemberWithdraw.getAmountFee()));
}
return new FebsResponse().success();
}
@@ -461,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);
}
/**
@@ -646,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