超省新代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2023-07-26 709a4a10be56952ead6340e4822fce41a66e47cd 
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java


@@ -128,9 +128,9 @@


            TDriverResp tDriverResp = new TDriverResp();


            BeanUtils.copyProperties(tDriver,tDriverResp);




            if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance())){


            if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance()) && Objects.nonNull(tDriver.getCouponBalance())){


                // 设置余额


                tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));


                tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()).add(tDriver.getCouponBalance()));


            }




            // 所属代理商


@@ -199,9 +199,9 @@




        String monthDate = new SimpleDateFormat("yyyyMM").format(new Date());




        if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance())){


        if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance()) && Objects.nonNull(tDriver.getCouponBalance())){


            // 设置余额


            tDriver.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));


            tDriver.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()).add(tDriver.getCouponBalance()));


            model.addAttribute("balance",tDriver.getBalance());


        }else {


            model.addAttribute("balance",BigDecimal.ZERO);


@@ -388,8 +388,12 @@


            tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())


                    .eq("cityCode", city.getCode())


                    .eq("status", StatusEnum.NORMAL.getCode())


                    .eq("districtCode", city.getCode())


                    .last("LIMIT 1"));


//            tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())


//                    .eq("cityCode", city.getCode())


//                    .eq("status", StatusEnum.NORMAL.getCode())


//                    .eq("districtCode", city.getCode())


//                    .last("LIMIT 1"));


        }


        if(!CollectionUtils.isEmpty(tBranchOffice)){


            tDriver.setBranchOfficeId(tBranchOffice.get(0).getId());