8.22

liujie

2025-08-22 7730556a61fdaa0c11ec4bbc5f8df6690e17a61f

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java

@@ -12,10 +12,7 @@
import com.stylefeng.guns.modular.system.dao.TUseMoneyMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.UUIDUtil;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -261,11 +258,13 @@
                eq.eq("state",1);

            }
            eq.ne("orderType",6);
            if (state!=null&&state==2){
                eq.eq("state",2);
                eq.ne("state",2);
            }
            eq.orderBy("insertTime",false);
            List<TransactionDetails> transactionDetails = iTransactionDetailsService.selectList(eq);
            List<OrderTaxi> orderTaxis = orderTaxiService.selectList(null);
            if ((state!=null&&state==1)||(state!=null&&state==2)){
                List<HistoryVo> historyVos = new ArrayList<>();
                for (TransactionDetails transactionDetail : transactionDetails) {
@@ -275,12 +274,24 @@
                            case 2:
                                historyVo.setState("订单收入");
                                break;
                            case 3:
                                historyVo.setState("城际出行");
                                break;
                            case 4:
                                historyVo.setState("同城小件物流");
                                break;
                            default:
                                historyVo.setState("充值");
                                break;
                        }
                        historyVo.setAddordown(1);
                    }else {
                        OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
                        if (orderTaxi!=null){
                            if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1||orderTaxi.getPayType()!=2)){
                                continue;
                            }
                        }
                        historyVo.setState("扣除");
                        historyVo.setAddordown(0);
                    }
@@ -307,12 +318,24 @@
                        case 2:
                            historyVo.setState("订单收入");
                            break;
                        case 3:
                            historyVo.setState("城际出行");
                            break;
                        case 4:
                            historyVo.setState("同城小件物流");
                            break;
                        default:
                            historyVo.setState("充值");
                            break;
                    }
                    historyVo.setAddordown(1);
                }else {
                    OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
                    if (orderTaxi!=null){
                        if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1||orderTaxi.getPayType()!=2)){
                            continue;
                        }
                    }
                    historyVo.setState("扣除");
                    historyVo.setAddordown(0);
                }