From 66a4d910a33d1273427b513e008bd9cd4c5d4054 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 23 九月 2024 19:04:15 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 134 +++++++++++++++++++++++++++++++++++---------
1 files changed, 106 insertions(+), 28 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
index eb36fce..1255135 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
+++ b/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;
@@ -136,6 +139,7 @@
if (good.getGoodsNum().equals(typeGood.getGoodsNum())) {
count+=1;
good.setGoodsCount(good.getGoodsCount() + 1);
+ good.setGoodsSalePrice(good.getGoodsSalePrice().add(typeGood.getSalePrice()));
break; // 找到后直接跳出循环
}
}
@@ -235,8 +239,25 @@
long end = System.currentTimeMillis() - start;
System.err.println("相差时间========="+end);
}else {
- this.removeById(dataGenerator);
- 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);
+ }
}
}
@@ -276,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());
@@ -288,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());
@@ -306,10 +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.setGoodsId(v.get(0).getGoodsId());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
+ 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);
@@ -318,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());
@@ -343,10 +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.setGoodsId(v.get(0).getGoodsId());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
+ 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);
@@ -355,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());
@@ -373,10 +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.setGoodsId(v.get(0).getGoodsId());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
+ 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);
@@ -385,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());
@@ -403,10 +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.setGoodsId(v.get(0).getGoodsId());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
+ 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);
@@ -434,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()));
@@ -459,12 +497,14 @@
.in(TOrderMeal::getGeneratorId, ids));
List<Long> mealIds = orderMeals.stream().map(TOrderMeal::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(mealIds)){
- List<TOrderMealGoods> mealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
- .in(TOrderMealGoods::getOrderId, 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);
+// 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);
}
}
@@ -495,15 +535,37 @@
if(dataGenerator.getOrderType() == 1){
// 删除时间段的数据
orderMealService.remove(Wrappers.lambdaQuery(TOrderMeal.class)
- .gt(TOrderMeal::getMealTime, dataGenerator.getStartTime())
- .lt(TOrderMeal::getMealTime, 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::getStockTime, dataGenerator.getStartTime())
- .lt(TOrderStock::getStockTime, 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));
}
@@ -550,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);
// 统计支付金额
@@ -576,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);
// 统计支付金额
--
Gitblit v1.7.1