From 83c56b01c49a766ebb480d5701c3638ce58f14c2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 22 Dec 2023 15:07:53 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 6bd1809..7a91557 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -16,6 +16,8 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.pay.model.MemberWithdrawalDto;
+import cc.mrbird.febs.pay.service.IXcxPayService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -64,11 +66,21 @@
private final MallShopApplyMapper mallShopApplyMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final MallTeamLeaderMapper mallTeamLeaderMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember);
+ if(CollUtil.isNotEmpty(mallMembers.getRecords())){
+ for(MallMember mallMemberTeam : mallMembers.getRecords()){
+ String inviteId = mallMemberTeam.getInviteId();
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCodeAndOrderBycreateTime(inviteId);
+ if(ObjectUtil.isNotEmpty(mallTeamLeader)){
+ mallMemberTeam.setLeaderState(mallTeamLeader.getState() == null ? 0 : mallTeamLeader.getState());
+ }
+ }
+ }
return mallMembers;
}
@@ -141,6 +153,8 @@
return adminMoneyChargeListVos;
}
+ private final IXcxPayService iXcxPayService;
+
@Override
@Transactional
public FebsResponse chargeAgree(Long id) {
@@ -152,16 +166,26 @@
if(1 != mallMemberWithdraw.getStatus()){
return new FebsResponse().fail().message("当前状态不是提现中");
}
- mallMemberWithdraw.setStatus(2);
- mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
objectQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
+ Long memberId = mallMemberWithdraw.getMemberId();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ MemberWithdrawalDto memberWithdrawalDto = new MemberWithdrawalDto();
+ memberWithdrawalDto.setDesc("余额提现");
+ memberWithdrawalDto.setOpenid(mallMember.getOpenId());
+ memberWithdrawalDto.setTotalFee(mallMemberWithdraw.getAmount());
+ memberWithdrawalDto.setOutTradeNo(mallMoneyFlow.getOrderNo());
+ Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto);
+ if(!aBoolean){
+ return new FebsResponse().fail().message("微信提现失败，请查看微信商户状态");
+ }
+ mallMemberWithdraw.setStatus(2);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
mallMoneyFlow.setStatus(2);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
-
return new FebsResponse().success();
}
--
Gitblit v1.9.1