无关风月
1 天以前 3044a637a15e09d50ad733fd482c6e64e90df2f9
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
@@ -138,7 +138,7 @@
            throw new GlobalException("当前订单提现申请已通过!");
        }
        return weChatPay(order.getOrderMoney(), openId,list.get(0).getId(),order.getServeName());
        return weChatPay(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney(), openId,list.get(0).getId(),order.getServeName());
    }
    @Override
@@ -253,9 +253,9 @@
            withdraw.setState(Constants.ONE);
            // 商家微信打款至微信零钱
            boolean update = weChatPay(order.getOrderMoney(), openId,withdraw.getId(),order.getServerName());
//            if (!update) {
//                throw new GlobalException("交易提现失败,请检查是否绑定微信!");
//            }
            if (!update) {
                throw new GlobalException("交易提现失败,请检查是否绑定微信!");
            }
        } else {
            // 待审核
            withdraw.setState(Constants.ZERO);
@@ -422,15 +422,12 @@
                withdrawDetail.setMoney(transferAmount);
                withdrawDetail.setOutBatchNo(postMap.get("out_bill_no")+"");
                withdrawDetailService.save(withdrawDetail);
            } else {
                allTransfersSuccessful = false;
                break;
                throw new GlobalException("提现失败,失败原因:"+jsonObject.getString("message"));
//                allTransfersSuccessful = false;
//                break;
            }
        }
        return allTransfersSuccessful;
    }