From b87c5549fe471167882192944db3f2d6b729476c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 15 Mar 2024 14:13:55 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 186 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 144 insertions(+), 42 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 f6248e1..10801e2 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
@@ -2,10 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.GreenScoreEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -15,10 +12,13 @@
import cc.mrbird.febs.mall.entity.MallNewsInfo;
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.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.pay.model.NBYHResponse;
import cc.mrbird.febs.pay.model.SinglePayDto;
+import cc.mrbird.febs.pay.service.NBYHService;
import cc.mrbird.febs.pay.service.UnipayService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -32,6 +32,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.xmlbeans.impl.store.Query;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +56,9 @@
private final MallMemberWalletMapper mallMemberWalletMapper;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
+ private final IMallMoneyFlowService mallMemberService;
+ private final IApiMallMemberService iApiMallMemberService;
+ private final IApiMallMemberService apiMallMemberService;
private final MallMemberPaymentMapper mallMemberPaymentMapper;
@@ -73,6 +77,7 @@
private final MallMemberBankMapper mallMemberBankMapper;
private final MallScoreRecordMapper mallScoreRecordMapper;
private final MallScoreAchieveReleaseMapper mallScoreAchieveReleaseMapper;
+ private final NBYHService nbyhService;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -175,40 +180,30 @@
return new FebsResponse().fail().message("当前状态不是提现中");
}
- Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
-// MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
- /**
- * 调用汇聚代付
- */
-// SinglePayDto singlePayDto = new SinglePayDto();
-// singlePayDto.setMerchantOrderNo(mallMemberWithdraw.getWithdrawNo());
-// singlePayDto.setReceiverAccountNoEncBankNo(mallMemberBank.getBankNo());
-// singlePayDto.setReceiverAccountNoEncName(mallMemberBank.getName());
-// singlePayDto.setReceiverAccountType("201");
-// BigDecimal paidAmount = mallMemberWithdraw.getAmount().subtract(mallMemberWithdraw.getAmountFee()).setScale(2, BigDecimal.ROUND_DOWN);
-// singlePayDto.setPaidAmount(paidAmount);
-// singlePayDto.setCurrency("201");
-// singlePayDto.setIsChecked("202");
-// singlePayDto.setPaidDesc("用户提现");
-// singlePayDto.setPaidUse("202");
-// String singlePayRep = unipayService.singlePay(singlePayDto);
-// if(!mallMemberWithdraw.getWithdrawNo().equals(singlePayRep)){
-// return new FebsResponse().fail().message("提现失败，请稍后查看错误信息一览");
-// }
-
mallMemberWithdraw.setStatus(2);
mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
-
- QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>();
- flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
- flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper);
+ QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
+ objectQueryWrapper.eq("type",MoneyFlowTypeNewEnum.RANK_BONUS.getValue());
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
- mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setStatus(3);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ }else{
+ //用户佣金增加对应的余额
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ iApiMallMemberService.addMoneyFlow(
+ mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription(),
+ null,
+ null,
+ 3,
+ FlowTypeEnum.BALANCE.getValue());
}
-
- return new FebsResponse().success();
+ return new FebsResponse().success().message("操作成功");
}
@Override
@@ -227,16 +222,26 @@
QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
- objectQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ objectQueryWrapper.eq("type",MoneyFlowTypeNewEnum.RANK_BONUS.getValue());
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
- mallMoneyFlow.setStatus(3);
- mallMoneyFlowMapper.updateById(mallMoneyFlow);
-
- //用户佣金增加对应的余额
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
- if(AppContants.MEMBER_WITHDRAW_VOUCHER.equals(mallMemberWithdraw.getRemark())){
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmountFee(),mallMemberWithdraw.getMemberId(),"voucher_cnt");
+ if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
+ mallMoneyFlow.setStatus(3);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ //用户佣金增加对应的余额
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ }else{
+ iApiMallMemberService.addMoneyFlow(
+ mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription(),
+ null,
+ null,
+ 3,
+ FlowTypeEnum.BALANCE.getValue());
}
+
return new FebsResponse().success();
}
@@ -433,7 +438,17 @@
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
- mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
+ String orderNo = MallUtils.getOrderNum("C");
+ apiMallMemberService.addMoneyFlow(
+ memberId,
+ bigDecimal,
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(),
+ orderNo,
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription(),
+ null,
+ null,
+ 2,
+ FlowTypeEnum.BALANCE.getValue());
return new FebsResponse().success();
}
@@ -649,7 +664,11 @@
adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
adminMallMemberPaymentVo.setDigitalNo(mallMemberBank.getDigitalNo());
+ adminMallMemberPaymentVo.setSubbranchName(mallMemberBank.getSubbranchName());
adminMallMemberPaymentVo.setBank(mallMemberBank.getBankName());
+ adminMallMemberPaymentVo.setIdCardNum(mallMemberBank.getIdCardNum());
+ adminMallMemberPaymentVo.setPhone(mallMemberBank.getPhone());
+ adminMallMemberPaymentVo.setName(mallMemberBank.getName());
}
return adminMallMemberPaymentVo;
}
@@ -736,6 +755,89 @@
return mallMoneyFlowIPage;
}
+ @Override
+ public FebsResponse insideWithType(Long id, int i) {
+ MallMember mallMember = mallMemberMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMember)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ mallMember.setInsideWith(i);
+ mallMemberMapper.updateById(mallMember);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse searchInfo(Long id) {
+ NBYHResponse nbyhResponse1 = nbyhService.transferResultInfoQuery(id);
+ return new FebsResponse().success().message(nbyhResponse1.getMsg());
+ }
+
+ @Override
+ public FebsResponse accountInfo(Long id) {
+ boolean b = nbyhService.accountInfoQuery(id);
+ if(!b){
+ return new FebsResponse().fail().message("银行账户余额不足");
+ }
+ return new FebsResponse().success().message("可以转账");
+ }
+
+ @Override
+ public FebsResponse outsideWithType(Long id, int i) {
+ MallMember mallMember = mallMemberMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMember)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ mallMember.setOutsideWith(i);
+ mallMemberMapper.updateById(mallMember);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse chargeAgreeWithType(MallMemberWithdraw mallMemberWithdrawInfo) {
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(mallMemberWithdrawInfo.getId());
+
+ if(ObjectUtil.isEmpty(mallMemberWithdraw)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
+ }
+ if(1 != mallMemberWithdraw.getStatus()){
+ return new FebsResponse().fail().message("当前状态不是提现中");
+ }
+
+ Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
+ MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
+ if(ObjectUtil.isEmpty(mallMemberBank)){
+ return new FebsResponse().fail().message("提现银行卡已删除");
+ }
+ mallMemberWithdraw.setStatus(2);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+
+ QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>();
+ flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
+ flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper);
+ if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ }
+ if(MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription().equals(mallMemberWithdraw.getRemark())){
+ //用户佣金增加对应的余额
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ iApiMallMemberService.addMoneyFlow(
+ mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription(),
+ null,
+ null,
+ 2,
+ FlowTypeEnum.BALANCE.getValue());
+ }
+ return new FebsResponse().success();
+
+ }
+
private String refererIds(String parentId) {
boolean flag = false;
if (StrUtil.isBlank(parentId)) {
--
Gitblit v1.9.1