bug修复

ruoyi-business/src/main/java/com/ruoyi/agent/enums/BalanceSourceType.java

@@ -13,6 +13,7 @@ import java.util.Objects;
 public enum BalanceSourceType implements IIntegerEnum {
     USER_ORDER(1, "用户商家下单"),
     WITHDRAW(2, "提现"),
+    WITHDRAW_FAIL(3, "提现失败"),
     ;
 
     @EnumValue

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentServiceImpl.java

@@ -102,6 +102,8 @@ public class AgentServiceImpl implements IAgentService {
         return voList.stream().map(vo -> {
             vo.setTotalStatisticsAmount(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.INNER, BalanceSourceType.USER_ORDER, null));
             vo.setTotalStatisticsWithdrawalAmount(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.OUTER, BalanceSourceType.WITHDRAW, null));
+            //减去提现失败
+            vo.setTotalStatisticsWithdrawalAmount(vo.getTotalStatisticsWithdrawalAmount().subtract(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.INNER, BalanceSourceType.WITHDRAW_FAIL, null)));
             vo.setSurplusAccountCode(agentAccountCodeService.sumSurplusAccountCode(vo.getAgentId(), Arrays.asList(AccountCodeStatus.UNUSED, AccountCodeStatus.WAIT_USE)));
             vo.setPromotionBusinessNum(businessService.sumPromotionBusinessNum(vo.getAgentId()));
             return vo;
@@ -354,6 +356,10 @@ public class AgentServiceImpl implements IAgentService {
         bo.setBillType(BillType.OUTER);
         bo.setSourceType(BalanceSourceType.WITHDRAW);
         agentAmountStatisticsVo.setTotalStatisticsWithdrawalAmount(baseMapper.selectSumAmount(bo));
+        //减去提现失败
+        bo.setBillType(BillType.INNER);
+        bo.setSourceType(BalanceSourceType.WITHDRAW_FAIL);
+        agentAmountStatisticsVo.setTotalStatisticsWithdrawalAmount(agentAmountStatisticsVo.getTotalStatisticsWithdrawalAmount().subtract(baseMapper.selectSumAmount(bo)));
         return agentAmountStatisticsVo;
     }
 

ruoyi-shop/src/main/java/com/ruoyi/shop/withdrawal/service/impl/WithdrawalServiceImpl.java

@@ -372,7 +372,7 @@ public class WithdrawalServiceImpl implements IWithdrawalService {
                     .userId(withdrawal.getWithdrawalSourceId())
                     .entryValue(withdrawal.getAmount())
                     .isAdd(true)
-                    .sourceType(BalanceSourceType.WITHDRAWAL)
+                    .sourceType(BalanceSourceType.WITHDRAWAL_FAIL)
                     .sourceId(withdrawal.getId())
                     .sourceCode(withdrawal.getWithdrawalNo())
                     .remark("提现失败返回")
@@ -382,7 +382,7 @@ public class WithdrawalServiceImpl implements IWithdrawalService {
                     .agentId(withdrawal.getWithdrawalSourceId())
                     .entryValue(withdrawal.getAmount())
                     .isAdd(true)
-                    .sourceType(com.ruoyi.agent.enums.BalanceSourceType.WITHDRAW)
+                    .sourceType(com.ruoyi.agent.enums.BalanceSourceType.WITHDRAW_FAIL)
                     .sourceId(withdrawal.getId())
                     .sourceCode(withdrawal.getWithdrawalNo())
                     .remark("提现失败返回")

ruoyi-user/src/main/java/com/ruoyi/user/enums/BalanceSourceType.java

@@ -21,6 +21,7 @@ public enum BalanceSourceType implements IIntegerEnum {
     ONLINE_ORDER_REFUND_DEDUCT(6, "在线订单退款扣除补贴"),
     SUBSIDY_OVERFLOW_RETURN(7, "消费排队均摊补贴溢出退回"),
     WITHDRAWAL(8, "提现"),
+    WITHDRAWAL_FAIL(12, "提现失败"),
     BALANCE_TO_INTEGRAL(9, "余额转积分"),
     ONLINE_ORDER_REFUND_DEDUCT_RETURN_BUSINESS(11, "在线订单退款扣除补贴退回后返还给商家")
     ;