超省新代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2023-05-10 67ac6f18da66cc5b703e1ec849e96bdac586d6d1 
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java


@@ -18,7 +18,10 @@


import com.stylefeng.guns.modular.system.service.ITDriverService;


import com.baomidou.mybatisplus.service.impl.ServiceImpl;


import com.stylefeng.guns.modular.system.service.ITRegionService;


import org.apache.commons.io.FileUtils;


import org.apache.poi.hdf.extractor.TC;


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.beans.BeanUtils;


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


import org.springframework.stereotype.Service;


@@ -27,7 +30,11 @@


import org.springframework.util.StringUtils;




import java.io.File;


import java.io.IOException;


import java.io.InputStream;


import java.math.BigDecimal;


import java.net.URL;


import java.net.URLConnection;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.Period;


@@ -63,6 +70,8 @@


    @Autowired


    private TRegionMapper tRegionMapper;


    @Autowired


    private TRevenueMapper tRevenueMapper;


    @Autowired


    private ITRegionService itRegionService;


    @Autowired


    private HttpUtils httpUtils;


@@ -72,6 +81,7 @@


    @Autowired


    private TCashWithdrawalMapper tCashWithdrawalMapper;




    private Logger log = LoggerFactory.getLogger(this.getClass());


    @Override


    public EntityWrapper<TDriver> getPageList(String createTime, String phone, Integer status) {


        EntityWrapper<TDriver> wrapper = new EntityWrapper<>();


@@ -132,11 +142,11 @@


            }


            //累计订单量


            List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())


                    && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());


                    && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());


            tDriverResp.setCumulativeOrderCount(cumulativeOrderCount.size());


            //当月订单量


            List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())


                    && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())


                    && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))


            && new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());


            tDriverResp.setMonthOrderCount(monthOrderCount.size());


            // 拒单次数


@@ -240,11 +250,11 @@


        if(!CollectionUtils.isEmpty(tOrders)){


            //累计订单量


            List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())


                    && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());


                    && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());


            model.addAttribute("cumulativeOrderCount",cumulativeOrderCount.size());


            //当月订单量


            List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())


                    && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())


                    && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))


                    && new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());


            model.addAttribute("monthOrderCount",monthOrderCount.size());


            // 拒单次数


@@ -256,25 +266,29 @@


                    .eq("userDriverId", tDriver.getId())


                    .eq("state", 2));


            BigDecimal balance = tDriver.getBalance();


            if(!CollectionUtils.isEmpty(tCashWithdrawals)){


                Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);


                if(reduce.isPresent()){


                    balance = balance.add(reduce.get());


                }


            }


            List<TRechargeRecord> tRechargeRecords = tRechargeRecordMapper.selectList(new EntityWrapper<TRechargeRecord>()


                    .eq("type", UserTypeEnum.DRIVER.getCode())


                    .eq("userId", tDriver.getId())


                    .eq("payType", 1)


                    .eq("payStatus", PayStatusEnum.FINISH.getCode()));


            if(!CollectionUtils.isEmpty(tRechargeRecords)){


                Optional<BigDecimal> reduce = tRechargeRecords.stream().map(TRechargeRecord::getAmount).reduce(BigDecimal::add);


                if(reduce.isPresent()){


                    balance = balance.subtract(reduce.get());


                }


            }


//            if(!CollectionUtils.isEmpty(tCashWithdrawals)){


//                Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);


//                if(reduce.isPresent()){


//                    balance = balance.add(reduce.get());


//                }


//            }


//            List<TRechargeRecord> tRechargeRecords = tRechargeRecordMapper.selectList(new EntityWrapper<TRechargeRecord>()


//                    .eq("type", UserTypeEnum.DRIVER.getCode())


//                    .eq("userId", tDriver.getId())


//                    .eq("payType", 1)


//                    .eq("payStatus", PayStatusEnum.FINISH.getCode()));


//            if(!CollectionUtils.isEmpty(tRechargeRecords)){


//                Optional<BigDecimal> reduce = tRechargeRecords.stream().map(TRechargeRecord::getAmount).reduce(BigDecimal::add);


//                if(reduce.isPresent()){


//                    balance = balance.subtract(reduce.get());


//                }


//            }


            List<TRevenue> tRevenues = tRevenueMapper.selectList(new EntityWrapper<TRevenue>()


                    .eq("userType", 2)


                    .eq("userId", tDriver.getId()));


            Optional<BigDecimal> reduce = tRevenues.stream().map(TRevenue::getAmount).reduce(BigDecimal::add);


            // 减去充值金额


            model.addAttribute("cumulativeIncome",balance);


            reduce.ifPresent(bigDecimal -> model.addAttribute("cumulativeIncome", bigDecimal));


        }else {


            model.addAttribute("cumulativeOrderCount",0);


            model.addAttribute("monthOrderCount",0);


@@ -285,11 +299,9 @@


    }




    @Override


    public JSONObject ocr(String imgUrl) {


        File file = new File(imgUrl);


    public JSONObject ocr(File file) {


        String result = httpUtils.ocr("2", file);


        JSONObject jsonObject = JSONObject.parseObject(result);


        return jsonObject;


        return JSONObject.parseObject(result);


    }




    @Override