Merge remote-tracking branch 'origin/dev' into dev

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

@@ -121,6 +121,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus, payStartDate, payEndDate);
             result.getRecords().forEach(e -> {
+                if (CommConstant.ITEM_TYPE_REFUND.equals(orderType)){
+                    e.setAvailableBalance(calculateAvailableAmount(e.getOrgId()));
+                }
                 e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
             });
             return result;
@@ -159,6 +162,20 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return urlList;
     }
 
+    public Integer calculateAvailableAmount(Integer orgId){
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.getOrgAccountById(orgId);
+
+        //查询总充值金额
+        Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(orgId);
+
+        //查询退款冻结额
+        Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(orgId);
+
+        //账户余额=总充值金额-已消费金额-已退款额-退款冻结额
+        Integer balance = totalRechargeAmount - taOrgAccount.getPurchaseAmount() - taOrgAccount.getTotalRefund() - totalBlockAmount;
+
+        return balance;
+    }
     /**
      * 微信支付
      *
@@ -593,23 +610,16 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("order_id", id);
-        int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
+        taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新账户冻结记录
-        int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
+        updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
 
         //更新订单状态
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrderId(id);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_FAIL);
-        int taOrgOrderUpdateResult = taOrgOrderMapper.updateById(taOrgOrder);
-
-        if (taOrgAccountBlockedUpdateResult < 1 ||
-                taOrgRefundApplicationUpdateResult < 1 ||
-                taOrgOrderUpdateResult < 1) {
-            responseBean.addError("驳回失败");
-            return responseBean;
-        }
+        taOrgOrderMapper.updateById(taOrgOrder);
 
         return responseBean;