修改bug

Pu Zhibing

2025-04-30 d1e1d0098fdbbf092a98332d30eb720926cd1823

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TWithdrawalController.java

@@ -1,11 +1,16 @@
package com.stylefeng.guns.modular.system.controller.general;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.controller.util.ExcelUtil;
import com.stylefeng.guns.modular.system.controller.util.HttpUtils;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TWithdrawal;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITWithdrawalService;
@@ -131,6 +136,12 @@

        if(withdrawal.getStatus() == 3){
            withdrawal.setRemark(withdrawal.getRemark());
            TWithdrawal tWithdrawal = withdrawalService.selectById(withdrawal.getId());
            TDriver driver = driverService.selectById(tWithdrawal.getDriverId());
            BigDecimal balance = driver.getBalance();
            BigDecimal withdrawalMoney = tWithdrawal.getWithdrawalMoney();
            driver.setBalance(balance.add(withdrawalMoney));
            driverService.updateById(driver);
        }

        withdrawalService.updateById(withdrawal);
@@ -150,7 +161,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
        List<Map<String, Object>> list = withdrawalService.excel(beginTime, endTime, driverName, status);
        List<Map<String, Object>> list = withdrawalService.excel1(beginTime, endTime, driverName, status);
        try {
            String fileName = "提现管理" + System.currentTimeMillis() + ".xls"; // 文件名
            String sheetName = "提现管理";// sheet名
@@ -173,10 +184,8 @@
                object = list.get(i);
                values[i][0] = new SimpleDateFormat("yyyy-MM-dd HH:mm").format((Date) object.get("withdrawalTime"));
                values[i][1] = object.get("driverName").toString();
                values[i][2] = (Integer)object.get("withdrawalType")==1?"支付宝": "银行卡";
                values[i][3] = (Integer)object.get("withdrawalType")==1?
                        "收款人:"+object.get("receivePaymentName").toString()+"/n"+"支付宝号:"+object.get("receivePaymentAccount").toString()
                : "开户行:"+object.get("openBank").toString()+"/n"+"收款人:"+object.get("receivePaymentName").toString()+"/n"+"银行卡号:"+object.get("receivePaymentAccount").toString();
                values[i][2] = "银行卡";
                values[i][3] = "开户行:"+object.get("openBank").toString()+"/n"+"收款人:"+object.get("receivePaymentName").toString()+"/n"+"银行卡号:"+object.get("receivePaymentAccount").toString();
                values[i][4] = new BigDecimal(object.get("driverBalance").toString()).setScale(2, RoundingMode.HALF_UP).toString();
                values[i][5] = object.get("withdrawalMoney").toString();
                values[i][6] = object.get("driverPhone").toString();