igo出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-08-12 e0a1f37e19bd90c0d10b04cf3ec235d2508c5370 
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java


@@ -12,6 +12,8 @@


import com.stylefeng.guns.modular.system.vo.PlatformVO;


import com.stylefeng.guns.modular.system.vo.WaterMoneyVO;


import com.stylefeng.guns.modular.system.vo.WaterVO;


import io.swagger.models.auth.In;


import org.checkerframework.checker.units.qual.A;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Controller;


import org.springframework.ui.Model;


@@ -529,6 +531,9 @@


        Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();


        // 用户取消订单记录


        List<OrderCancel> orderCancels = new ArrayList<>();


        List<Integer> integers = new ArrayList<>();


        integers.add(1);


        integers.add(2);


        if (time == 5 && !StringUtils.hasLength(insertTime)){


            // 余额充值wrapper


            orderType = new EntityWrapper<TPubTransactionDetails>()


@@ -555,6 +560,10 @@


            // 司机手动结算金额


            orderType1 = new EntityWrapper<SettlementDetail>()


                    .in("orderType", Arrays.asList(1, 4));


            // 用户取消订单费用


            orderCancelEntityWrapper.eq("state", 2)


                    .eq("userType", 1).in("payType",integers)


                    ;


        }else{


            orderType = new EntityWrapper<TPubTransactionDetails>()


                    .eq("orderType", 5)


@@ -587,10 +596,9 @@


            // 用户取消订单费用


            orderCancelEntityWrapper.eq("state", 2)


                    .eq("userType", 1)


                    .in("payType",integers)


                    .between("insertTime", start, end);


        }






        if (type != null){


            switch (type){


                case 1:


@@ -1136,6 +1144,9 @@


        Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();


        // 司机手动结算金额


        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();


        List<Integer> integers = new ArrayList<>();


        integers.add(1);


        integers.add(2);


        if (time == 5 && !StringUtils.hasLength(insertTime)){


            // 余额充值wrapper


            orderType = new EntityWrapper<TPubTransactionDetails>()


@@ -1165,6 +1176,7 @@


                    .in("orderType", Arrays.asList(1, 4));


            // 用户取消订单费用


             orderCancelEntityWrapper.eq("state", 2)


                     .in("payType",integers)


                    .eq("userType", 1);


        }else{


            orderType = new EntityWrapper<TPubTransactionDetails>()


@@ -1199,6 +1211,7 @@


            // 用户取消订单费用


            orderCancelEntityWrapper.eq("state", 2)


                    .eq("userType", 1)


                    .in("payType",integers)


                    .between("insertTime", start, end);


        }