From 3064a503bc6d0030c1f812d57c4ba2cb7a650fea Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Sep 2022 14:27:45 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java |   82 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 72 insertions(+), 10 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 7dc3136..21a4142 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;
@@ -58,6 +60,7 @@
     private final IApiMallMemberWalletService iApiMallMemberWalletService;
 
     private final AppVersionMapper appVersionMapper;
+    private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
 
     private final MallNewsInfoMapper mallNewsInfoMapper;
     private final MallShopApplyMapper mallShopApplyMapper;
@@ -96,6 +99,24 @@
     }
 
     @Override
+    public void changeIdentity(Integer type, Long id, Integer value) {
+        MallMember mallMember = mallMemberMapper.selectById(id);
+        if(mallMember == null) {
+            throw new FebsException("参数错误");
+        }
+
+        if (type == 1) {
+            mallMember.setDirector(value);
+        } else if (type == 2){
+            mallMember.setStoreMaster(value);
+        } else {
+            throw new FebsException("参数错误");
+        }
+
+        this.baseMapper.updateById(mallMember);
+    }
+
+    @Override
     public MallMemberVo getMallMemberInfoById(long id) {
         MallMemberVo mallMemberVo = mallMemberMapper.getMallMemberInfoById(id);
         return mallMemberVo;
@@ -122,16 +143,37 @@
         return adminMoneyChargeListVos;
     }
 
+    private final IXcxPayService iXcxPayService;
+
     @Override
     @Transactional
     public FebsResponse chargeAgree(Long id) {
-        MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
-        if(ObjectUtil.isEmpty(mallMoneyFlow)){
+
+        MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+        if(ObjectUtil.isEmpty(mallMemberWithdraw)){
             return new FebsResponse().fail().message("系统繁忙,请刷新后重试");
         }
-        if(1 != mallMoneyFlow.getStatus()){
+        if(1 != mallMemberWithdraw.getStatus()){
             return new FebsResponse().fail().message("当前状态不是提现中");
         }
+
+        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();
@@ -140,13 +182,20 @@
     @Override
     @Transactional
     public FebsResponse chargeDisagree(Long id) {
-        MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
-        if(ObjectUtil.isEmpty(mallMoneyFlow)){
+        MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+        if(ObjectUtil.isEmpty(mallMemberWithdraw)){
             return new FebsResponse().fail().message("系统繁忙,请刷新后重试");
         }
-        if(1 != mallMoneyFlow.getStatus()){
+        if(1 != mallMemberWithdraw.getStatus()){
             return new FebsResponse().fail().message("当前状态不是提现中");
         }
+        mallMemberWithdraw.setStatus(3);
+        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);
         mallMoneyFlow.setStatus(3);
         mallMoneyFlowMapper.updateById(mallMoneyFlow);
 
@@ -158,8 +207,8 @@
     @Override
     public AdminMallMemberPaymentVo getMallMemberPaymentInfoByFlowId(long id) {
         AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
-        MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
-        AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMoneyFlow.getMemberId());
+        MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+        AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMemberWithdraw.getMemberId());
         if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
             adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
         }
@@ -322,8 +371,9 @@
         }
 
         BigDecimal bigDecimal = mallSystemPayDto.getAddBalance();
+        boolean isReduce = false;
         if(bigDecimal.compareTo(BigDecimal.ZERO) <= 0){
-            return new FebsResponse().fail().message("拨付数目需要大于0");
+            isReduce = true;
         }
 
         Integer type = mallSystemPayDto.getType();
@@ -338,7 +388,15 @@
             throw new FebsException("参数错误");
         }
 
-        iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
+        if (isReduce) {
+            int i = iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);
+
+            if (i == 2) {
+                throw new FebsException("剩余数量不足");
+            }
+        } else {
+            iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
+        }
         mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
         return new FebsResponse().success();
     }
@@ -426,6 +484,10 @@
             throw new FebsException("申请已审核, 请勿重复操作");
         }
 
+        MallMember member = mallMemberMapper.selectById(apply.getMemberId());
+        member.setStoreMaster(1);
+        mallMemberMapper.updateById(member);
+
         apply.setStatus(MallShopApply.APPLY_AGREE);
         mallShopApplyMapper.updateById(apply);
     }

--
Gitblit v1.9.1