新需求

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -482,6 +482,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         //订单退款申请，更新账户的实际余额
+        refundApplication.setOrderId(id);
         TaOrgAccount taOrgAccount = assembleRefundAccount(refundApplication.getOrgId(), refundApplication, CommConstant.ITEM_TYPE_REFUND);
         taOrgAccountMapper.updateById(taOrgAccount);
 
@@ -519,6 +520,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         //退款订单驳回，更新账户的可用余额
+        refundApplication.setOrderId(id);
         TaOrgAccount taOrgAccount = assembleRefundAccount(refundApplication.getOrgId(), refundApplication, CommConstant.ITEM_TYPE_REJECT);
         taOrgAccountMapper.updateById(taOrgAccount);
 
@@ -562,12 +564,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         rechargeAccount.setAccountId(selectOneAccount.getAccountId());
 
         if (CommConstant.ITEM_TYPE_REFUND.equals(operateType)) {
-            rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() - refundApplication.getAmount());
-            rechargeAccount.setTotalRefund(selectOneAccount.getTotalRefund() + refundApplication.getAmount());
+            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication);
+            rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() - taOrgRefundApplication.getAmount());
+            rechargeAccount.setTotalRefund(selectOneAccount.getTotalRefund() + taOrgRefundApplication.getAmount());
         }
 
         if (CommConstant.ITEM_TYPE_REJECT.equals(operateType)) {
-            rechargeAccount.setAvailableBalance(refundApplication.getAmount());
+            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication);
+            rechargeAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() + taOrgRefundApplication.getAmount());
         }
 
         rechargeAccount.setModifyDate(LocalDateTime.now());
@@ -713,4 +717,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return sysUser;
     }
 
+    public TaOrgRefundApplication selectRefundApplication(TaOrgRefundApplication refundApplication){
+        QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
+        taOrgRefundApplicationQueryWrapper.eq("order_id", refundApplication.getOrderId());
+        return taOrgRefundApplicationMapper.selectOne(taOrgRefundApplicationQueryWrapper);
+    }
+
 }