update

liujie

2025-11-27 ff2261f6817134897542c6e004a02c4a16426111

 ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -10,6 +10,7 @@
import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.modular.cloudPayment.example.AllocationExample;
import com.stylefeng.guns.modular.cloudPayment.req.AllocationReq;
import com.stylefeng.guns.modular.huifu.biz.DouGongRefundBiz;
import com.stylefeng.guns.modular.huifu.biz.FenZhangUtil;
import com.stylefeng.guns.modular.system.controller.util.Base64Util;
import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
@@ -37,10 +38,7 @@
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 快车改派管理控制器
@@ -822,6 +820,9 @@
    @Autowired
    private ITPubTransactionDetailsService itPubTransactionDetailsService;

    @Autowired
    private DouGongRefundBiz douGongRefundBiz;

    /**
     * 操作跨城改派管理
     * optType 1=拒绝 2=取消
@@ -925,6 +926,13 @@
                        //添加交易明细
                        transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
                    }else{
                        TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
                        UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", driver.getPhone()).eq("type", 1).last("limit 1"));
                        if(null == userWithdrawal){
                            return ResultUtil.error("该司机未进件");
                        }
                        FenZhangUtil.fenzhang(RequestSeqUtil.generate("TK"), DateUtil.format(new Date(), "yyyyMMdd"),orderCrossCity.getPayMoney().toString(),userWithdrawal.getHuiFuId());

//                        PaymentRecord query = paymentRecordService.query(1, null, null, tReassign.getOrderId(), 3, null, 2).get(0);
//                        if(null == query){
//                            return ResultUtil.error("订单还未进行支付");