绵阳收银系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2024-09-23 66a4d910a33d1273427b513e008bd9cd4c5d4054 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java


@@ -9,6 +9,7 @@


import com.ruoyi.common.core.redis.RedisCache;


import com.ruoyi.common.exception.ServiceException;


import com.ruoyi.common.utils.CodeGenerateUtils;


import com.ruoyi.common.utils.DateUtils;


import com.ruoyi.system.domain.*;


import com.ruoyi.system.dto.OrderMealGeneratorCountDTO;


import com.ruoyi.system.dto.OrderMealGeneratorDTO;


@@ -26,6 +27,8 @@




import java.math.BigDecimal;


import java.math.RoundingMode;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.util.*;


import java.util.stream.Collectors;


@@ -90,11 +93,22 @@


        this.save(dataGenerator);


        long start = System.currentTimeMillis();


        // 查询所有的人数用餐标准


        List<TFoundationConfigVO> foundationConfigs = foundationConfigService.getList();


        List<TFoundationConfigVO> foundationConfigs = foundationConfigService.getList(dto.getShopId());


        if(CollectionUtils.isEmpty(foundationConfigs)){


            throw new ServiceException("请先添加该店铺用餐标准");


        }


        // 查询所有桌子


        List<TBoard> boards = boardService.list();


        List<TBoard> boards = boardService.list(Wrappers.lambdaQuery(TBoard.class)


                .eq(TBoard::getShopId,dto.getShopId()));


        if(CollectionUtils.isEmpty(boards)){


            throw new ServiceException("请先添加该店铺桌台信息");


        }


        // 查询所有菜品


        List<TGoods> goods = goodsService.list();


        List<TGoods> goods = goodsService.list(Wrappers.lambdaQuery(TGoods.class)


                .eq(TGoods::getShopId,dto.getShopId()));


        if(CollectionUtils.isEmpty(goods)){


            throw new ServiceException("请先添加该店铺菜品信息");


        }


        // 循环待生成订单列表，添加到集合中，批量插入


        List<OrderMealGeneratorCountDTO> orderMealGeneratorCountDTOS = dto.getOrderMealGeneratorCountDTOS();


        List<TOrderMeal> orderMeals = new ArrayList<>();


@@ -125,6 +139,7 @@


                            if (good.getGoodsNum().equals(typeGood.getGoodsNum())) {


                                count+=1;


                                good.setGoodsCount(good.getGoodsCount() + 1);


                                good.setGoodsSalePrice(good.getGoodsSalePrice().add(typeGood.getSalePrice()));


                                break; // 找到后直接跳出循环


                            }


                        }


@@ -136,18 +151,21 @@


                            tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice());


                            tOrderMealGoods.setGoodsCount(1);


                            tOrderMealGoods.setTypeId(typeGood.getTypeId());


                            tOrderMealGoods.setGoodsId(typeGood.getId());


                            orderMealGoods.add(tOrderMealGoods);


                        }


                    }


                });


                orderMeal.setMealOrderGoods(orderMealGoods);


                orderMeal.setOrderMoney(orderMealGoods.stream().map(TOrderMealGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());


                orderMeal.setPayMoney(orderMealGoods.stream().map(TOrderMealGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());


                orderMeals.add(orderMeal);


                if(!CollectionUtils.isEmpty(orderMealGoods)){


                    orderMeal.setMealOrderGoods(orderMealGoods);


                    orderMeal.setOrderMoney(orderMealGoods.stream().map(good->good.getGoodsSalePrice().multiply(new BigDecimal(good.getGoodsCount()))).reduce(BigDecimal::add).get());


                    orderMeal.setPayMoney(orderMealGoods.stream().map(good->good.getGoodsSalePrice().multiply(new BigDecimal(good.getGoodsCount()))).reduce(BigDecimal::add).get());


                    orderMeals.add(orderMeal);


                }


            }


        }


        BigDecimal sumMoney = orderMeals.stream().map(TOrderMeal::getPayMoney).reduce(BigDecimal::add).get();


        if(sumMoney.compareTo(dto.getMinMoney()) >= 0 || sumMoney.compareTo(dto.getMaxMoney()) <= 0){


        if(sumMoney.compareTo(dto.getMinMoney()) >= 0 && sumMoney.compareTo(dto.getMaxMoney()) <= 0){


            int weiXin = getRandomPayType(orderMeals.size(), dto.getWeiXinProportion());


            int ali = getRandomPayType(orderMeals.size(), dto.getAliProportion());


            int card = getRandomPayType(orderMeals.size(), dto.getCardProportion());


@@ -221,7 +239,25 @@


            long end = System.currentTimeMillis() - start;


            System.err.println("相差时间========="+end);


        }else {


            throw new ServiceException("数据生成不在营业额范围内");


            // 生成失败 进行重试


            String key = dto.getShopId()+"_fail";


            if(redisCache.hasKey(key)){


                Object cacheObject = redisCache.getCacheObject(key);


                int i = Integer.parseInt(cacheObject.toString());


                if(i == 10){


                    this.removeById(dataGenerator);


                    redisCache.deleteObject(key);


                    throw new ServiceException("多次匹配数据不成功，请调整营业额范围");


                }else {


                    this.removeById(dataGenerator);


                    redisCache.setCacheObject(key,i+1);


                    this.mealDataGenerator(dto);


                }


            }else {


                this.removeById(dataGenerator);


                redisCache.setCacheObject(key,1);


                this.mealDataGenerator(dto);


            }


        }




    }


@@ -261,6 +297,7 @@


        orderSales.forEach(e->{


            e.setGeneratorId(dataGenerator.getId());


            e.setOrderNum(OrderNumConstants.SALE + CodeGenerateUtils.generateVolumeSn());


            e.setIsCover(0);


        });


        List<TOrderSaleGoods> orderSaleGoods = orderSales.stream().map(TOrderSale::getOrderSaleGoods).flatMap(Collection::stream).collect(Collectors.toList());




@@ -273,8 +310,9 @@


            if(i==stockDataSets.size()-1){


                // 最后一次


                LocalDate endTime = LocalDate.now();


                List<Long> saleIds = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) <= 0).map(TOrderSale::getId).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList = orderSaleGoods.stream().filter(e -> saleIds.contains(e.getOrderId())).collect(Collectors.toList());


                List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) <= 0).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();


                collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));


                // 根据商品新生成一条数据


                TOrderStock orderStock = new TOrderStock();


                orderStock.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());


@@ -291,9 +329,13 @@


                    tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());


                    tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());


                    tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());


                    tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());


//                    tOrderStockGoods.setThisCostPrice(v.get(0).getThisSalePrice());


                    tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());


                    tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());


                    tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());


                    int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();


                    BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);


                    BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);


                    tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));


                    orderStockGoods.add(tOrderStockGoods);


                });


                orderStock.setOrderStockGoods(orderStockGoods);


@@ -302,8 +344,9 @@


            }else if(i==0 && Objects.nonNull(stockDataSet)){


                // 第一次 第一次的进货时间为上一次的结束时间  开始时间为上一次的开始时间


                LocalDate startTime1 = stockDataSet.getStockDate();


                List<Long> saleIds = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) < 0).map(TOrderSale::getId).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList = orderSaleGoods.stream().filter(e -> saleIds.contains(e.getOrderId())).collect(Collectors.toList());


                List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) < 0).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();


                collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));


                // 查询上一次开始之后的订单数据


                List<TOrderSale> orderSales1 = orderSaleService.list(new LambdaQueryWrapper<TOrderSale>().gt(TOrderSale::getOrderTime, startTime1));


                List<Long> saleIds1 = orderSales1.stream().map(TOrderSale::getId).collect(Collectors.toList());


@@ -327,9 +370,13 @@


                    tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());


                    tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());


                    tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());


                    tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());


//                    tOrderStockGoods.setThisCostPrice(v.get(0).getThisSalePrice());


                    tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());


                    tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());


                    tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());


                    int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();


                    BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);


                    BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);


                    tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));


                    orderStockGoods.add(tOrderStockGoods);


                });


                orderStock.setOrderStockGoods(orderStockGoods);


@@ -338,8 +385,9 @@


                // 处理第一次到下一次的数据


                TStockDataSet end = stockDataSets.get(i + 1);


                LocalDate endTime = end.getStockDate();


                List<Long> saleIds2 = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).map(TOrderSale::getId).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList2 = orderSaleGoods.stream().filter(e -> saleIds2.contains(e.getOrderId())).collect(Collectors.toList());


                List<TOrderSale> collect1 = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList2 = new ArrayList<>();


                collect1.forEach(e->orderSaleGoodsList2.addAll(e.getOrderSaleGoods()));


                // 根据商品新生成一条数据


                TOrderStock orderStock1 = new TOrderStock();


                orderStock1.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());


@@ -356,9 +404,13 @@


                    tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());


                    tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());


                    tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());


                    tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());


//                    tOrderStockGoods.setThisCostPrice(v.get(0).getThisSalePrice());


                    tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());


                    tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());


                    tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());


                    int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();


                    BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);


                    BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);


                    tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));


                    orderStockGoods1.add(tOrderStockGoods);


                });


                orderStock1.setOrderStockGoods(orderStockGoods1);


@@ -367,8 +419,9 @@


            }else {


                TStockDataSet end = stockDataSets.get(i + 1);


                LocalDate endTime = end.getStockDate();


                List<Long> saleIds = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).map(TOrderSale::getId).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList = orderSaleGoods.stream().filter(e -> saleIds.contains(e.getOrderId())).collect(Collectors.toList());


                List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).collect(Collectors.toList());


                List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();


                collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));


                // 根据商品新生成一条数据


                TOrderStock orderStock = new TOrderStock();


                orderStock.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());


@@ -385,9 +438,13 @@


                    tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());


                    tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());


                    tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());


                    tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());


//                    tOrderStockGoods.setThisCostPrice(v.get(0).getThisSalePrice());


                    tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());


                    tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());


                    tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());


                    int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();


                    BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);


                    BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);


                    tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));


                    orderStockGoods.add(tOrderStockGoods);


                });


                orderStock.setOrderStockGoods(orderStockGoods);


@@ -415,10 +472,10 @@


//        orderSaleGoods.forEach(e->e.setTypeName(list.stream().filter(m->m.getId().equals(e.getTypeId())).findFirst().get().getTypeName()));


        orderSaleGoods.forEach(e->{


            e.setId(null);


            e.setGoodsCostPrice(null);


        });


        orderSaleGoodsService.saveBatch(orderSaleGoods);


        // 添加数据


        stockList.forEach(e->e.setShopId(dataGenerator.getShopId()));


        orderStockService.saveBatch(stockList);


        for (TOrderStock stock : stockList) {


            stock.getOrderStockGoods().forEach(e->e.setOrderId(stock.getId()));


@@ -439,13 +496,17 @@


            List<TOrderMeal> orderMeals = orderMealService.list(Wrappers.lambdaQuery(TOrderMeal.class)


                    .in(TOrderMeal::getGeneratorId, ids));


            List<Long> mealIds = orderMeals.stream().map(TOrderMeal::getId).collect(Collectors.toList());


            List<TOrderMealGoods> mealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)


                    .in(TOrderMealGoods::getOrderId, mealIds));


            for (TDataGeneratorVO tDataGeneratorVO : list) {


                List<Long> collect = orderMeals.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderMeal::getId).collect(Collectors.toList());


                BigDecimal money = mealGoods.stream().filter(e -> collect.contains(e.getOrderId()))


                        .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsSalePrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);


                tDataGeneratorVO.setTotalRevenue(money);


            if(!CollectionUtils.isEmpty(mealIds)){


//                List<TOrderMealGoods> mealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)


//                        .in(TOrderMealGoods::getOrderId, mealIds));


                for (TDataGeneratorVO tDataGeneratorVO : list) {


//                    List<Long> collect = orderMeals.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderMeal::getId).collect(Collectors.toList());


//                    BigDecimal money = mealGoods.stream().filter(e -> collect.contains(e.getOrderId()))


//                            .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsSalePrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);


                    BigDecimal money = orderMeals.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId()))


                            .map(TOrderMeal::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add);


                    tDataGeneratorVO.setTotalRevenue(money);


                }


            }


        }else {


            List<TOrderSale> orderSales = orderSaleService.list(Wrappers.lambdaQuery(TOrderSale.class)


@@ -457,8 +518,10 @@


//                List<Long> collect = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderSale::getId).collect(Collectors.toList());


//                BigDecimal money = orderSaleGoods.stream().filter(e -> collect.contains(e.getOrderId()))


//                        .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsCostPrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);


                BigDecimal money = orderSales.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();


                tDataGeneratorVO.setTotalRevenue(money);


                if(!CollectionUtils.isEmpty(orderSales)){


                    BigDecimal money = orderSales.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();


                    tDataGeneratorVO.setTotalRevenue(money);


                }


            }


        }


        pageInfo.setRecords(list);


@@ -472,15 +535,37 @@


        if(dataGenerator.getOrderType() == 1){


            // 删除时间段的数据


            orderMealService.remove(Wrappers.lambdaQuery(TOrderMeal.class)


                    .gt(TOrderMeal::getCreateTime, dataGenerator.getStartTime())


                    .lt(TOrderMeal::getCreateTime, dataGenerator.getEndTime()));


                    .ge(TOrderMeal::getMealTime, dataGenerator.getStartTime())


                    .le(TOrderMeal::getMealTime, dataGenerator.getEndTime())


                    .eq(TOrderMeal::getIsCover,1));


            // 修改覆盖类型为已覆盖


            orderMealService.update(Wrappers.lambdaUpdate(TOrderMeal.class).set(TOrderMeal::getIsCover, 1).eq(TOrderMeal::getGeneratorId, id));


        }else {


            List<TOrderStock> list = orderStockService.list(Wrappers.lambdaQuery(TOrderStock.class)


                    .eq(TOrderStock::getGeneratorId, id));


            List<Long> stockIds = list.stream().map(TOrderStock::getId).collect(Collectors.toList());


            if(!CollectionUtils.isEmpty(stockIds)){


                List<TOrderStockGoods> list1 = orderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class)


                        .in(TOrderStockGoods::getOrderId, stockIds));


                // 判断集合中的进价是否为0


                for (TOrderStockGoods tOrderStockGoods : list1) {


                    if(tOrderStockGoods.getThisCostPrice().compareTo(BigDecimal.ZERO) == 0){


                        throw new ServiceException("进价不能为0");


                    }


                }


            }


            // 删除时间段的数据


            orderSaleService.remove(Wrappers.lambdaQuery(TOrderSale.class)


                    .ge(TOrderSale::getOrderTime, dataGenerator.getStartTime())


                    .le(TOrderSale::getOrderTime, dataGenerator.getEndTime())


                    .eq(TOrderSale::getIsCover,1));


            // 修改覆盖类型为已覆盖


            orderSaleService.update(Wrappers.lambdaUpdate(TOrderSale.class).set(TOrderSale::getIsCover, 1).eq(TOrderSale::getGeneratorId, id));


            // 删除时间段的数据


            orderStockService.remove(Wrappers.lambdaQuery(TOrderStock.class)


                    .gt(TOrderStock::getCreateTime, dataGenerator.getStartTime())


                    .lt(TOrderStock::getCreateTime, dataGenerator.getEndTime()));


                    .ge(TOrderStock::getStockTime, dataGenerator.getStartTime())


                    .le(TOrderStock::getStockTime, dataGenerator.getEndTime())


                    .eq(TOrderStock::getIsCover,1));


            // 修改覆盖类型为已覆盖


            orderStockService.update(Wrappers.lambdaUpdate(TOrderStock.class).set(TOrderStock::getIsCover, 1).eq(TOrderStock::getGeneratorId, id));


        }


@@ -527,6 +612,14 @@


        orderSaleQuery.setPayType(query.getPayType());


        orderSaleQuery.setOrderNum(query.getOrderNum());


        orderSaleQuery.setGeneratorId(query.getGeneratorId());


        try {


            if (Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())){


                orderSaleQuery.setStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getStartTime()));


                orderSaleQuery.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getEndTime()));


            }


        } catch (ParseException e) {


            throw new ServiceException(e.getMessage());


        }


        PageInfo<TOrderSaleVO> pageInfo = orderSaleService.pageList(orderSaleQuery);


        data.setOrderMealList(pageInfo);


        // 统计支付金额


@@ -553,6 +646,14 @@


        orderStockQuery.setGeneratorId(query.getGeneratorId());


        orderStockQuery.setTimeType(query.getTimeType());


        orderStockQuery.setStockNum(query.getOrderNum());


        try {


            if(Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())){


                orderStockQuery.setStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getStartTime()));


                orderStockQuery.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getEndTime()));


            }


        } catch (ParseException e) {


            throw new ServiceException(e.getMessage());


        }


        PageInfo<TOrderStockVO> pageInfo = orderStockService.pageList(orderStockQuery);


        data.setOrderStockVOList(pageInfo);


        // 统计支付金额