bug修改

无关风月

2 天以前 a782d74cf0a6e2181f68bb1f4472ade94626f688

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java

@@ -14,16 +14,10 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.vo.UserDto;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.order.entity.Order;
import com.ruoyi.order.entity.Withdraw;
import com.ruoyi.order.entity.WithdrawDetail;
import com.ruoyi.order.entity.WithdrawalSetting;
import com.ruoyi.order.entity.*;
import com.ruoyi.order.mapper.WithdrawMapper;
import com.ruoyi.order.request.WithdrawExportRequest;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.WithdrawDetailService;
import com.ruoyi.order.service.WithdrawService;
import com.ruoyi.order.service.WithdrawalSettingService;
import com.ruoyi.order.service.*;
import com.ruoyi.order.vo.MoneyQueryRequest;
import com.ruoyi.order.vo.UserWithdrawRecordVO;
import com.ruoyi.order.vx.HttpUtil;
@@ -56,6 +50,8 @@

    @Resource
    private WithdrawalSettingService withdrawalSettingService;
    @Resource
    private WithdrawRecordService withdrawRecordService;
    @Resource
    private OrderService orderService;
    @Resource
@@ -245,8 +241,16 @@
        withdraw.setApplyForMoney(order.getOrderMoney());
        withdraw.setOrderId(orderId);
        withdraw.setCityCode(order.getCityCode());

        this.save(withdraw);
        WithdrawRecord withdrawRecord = new WithdrawRecord();
        withdrawRecord.setWithdrawId(withdraw.getId());
        withdrawRecord.setOrderId(withdraw.getOrderId());
        withdrawRecord.setUserId(withdraw.getUserId());
        withdrawRecord.setWithdrawType(1);
        withdrawRecord.setCreateTime(new Date());
        withdrawRecord.setAuditStatus(1);
        withdrawRecordService.save(withdrawRecord);

        // 未开启全局 提现审核，则用户提现不需要后台审核
        if (Constants.ZERO.equals(withdrawalSetting.getEnableProcess())) {
            // 已通过
@@ -394,7 +398,10 @@
                    JSONObject.toJSONString(postMap),
                    "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
                    "1665330417",
                    "/usr/local/vx/apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
//                    "D:\\apiclient_key.pem",
                    "/usr/local/vx/apiclient_key.pem",

                    "/v3/fund-app/mch-transfer/transfer-bills");
            JSONObject jsonObject = JSONObject.parseObject(result);
//            WithdrawDetail withdrawDetail = new WithdrawDetail();
//            withdrawDetail.setWithdrawId(withdrawId);