From a710f1e57abece1ed7c38954f3f13c56fbe4eefe Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Sep 2022 18:20:31 +0800
Subject: [PATCH] 20220822
---
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 15 +++++++++++++++
2 files changed, 17 insertions(+), 2 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..4fbce7a 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;
@@ -141,6 +143,8 @@
return adminMoneyChargeListVos;
}
+ private final IXcxPayService iXcxPayService;
+
@Override
@Transactional
public FebsResponse chargeAgree(Long id) {
@@ -162,6 +166,17 @@
mallMoneyFlow.setStatus(2);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ 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("微信提现失败，请查看微信商户状态");
+ }
return new FebsResponse().success();
}
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 5d6e645..817b3c0 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -143,9 +143,9 @@
if (d.status === 1) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeAgree" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeDisagree" shiro:hasPermission="user:update">拒绝</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
}else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
+ return ''
}
},minWidth: 300,align:'center'}
]]
--
Gitblit v1.9.1