From 869ea72afdca9ad0f83a6f09659e4a4478012606 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 04 Apr 2023 10:59:41 +0800
Subject: [PATCH] 关于积分凭证
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 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 99cccf7..f6248e1 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
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.enumerates.GreenScoreEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.*;
@@ -175,24 +176,36 @@
}
Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
- MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
+// 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("提现失败，请稍后查看错误信息一览");
+// 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);
+ if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
}
return new FebsResponse().success();
@@ -221,6 +234,9 @@
//用户佣金增加对应的余额
iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ if(AppContants.MEMBER_WITHDRAW_VOUCHER.equals(mallMemberWithdraw.getRemark())){
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmountFee(),mallMemberWithdraw.getMemberId(),"voucher_cnt");
+ }
return new FebsResponse().success();
}
@@ -632,6 +648,8 @@
if(ObjectUtil.isNotEmpty(mallMemberBank)){
adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
+ adminMallMemberPaymentVo.setDigitalNo(mallMemberBank.getDigitalNo());
+ adminMallMemberPaymentVo.setBank(mallMemberBank.getBankName());
}
return adminMallMemberPaymentVo;
}
--
Gitblit v1.9.1