From 993c89754d492a684108839ecba56fe8ca5b160f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 09:35:41 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 211 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 168 insertions(+), 43 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 d3b6229..972dc79 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
@@ -6,21 +6,23 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.OrderNumConstants;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.CodeGenerateUtils;
-import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.*;
-import com.ruoyi.system.dto.*;
+import com.ruoyi.system.dto.OrderMealGeneratorCountDTO;
+import com.ruoyi.system.dto.OrderMealGeneratorDTO;
+import com.ruoyi.system.dto.OrderSaleGeneratorDTO;
import com.ruoyi.system.mapper.TDataGeneratorMapper;
-import com.ruoyi.system.query.TDataGeneratorQuery;
+import com.ruoyi.system.query.*;
import com.ruoyi.system.service.*;
-import com.ruoyi.system.vo.SysUserVO;
-import com.ruoyi.system.vo.TDataGeneratorVO;
-import com.ruoyi.system.vo.TFoundationConfigVO;
-import org.apache.poi.ss.formula.functions.T;
+import com.ruoyi.system.vo.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -58,17 +60,22 @@
@Autowired
private TOrderStockGoodsService orderStockGoodsService;
@Autowired
- private TokenService tokenService;
- @Autowired
private TStockDataSetService stockDataSetService;
+ @Autowired
+ private TGoodsTypeService goodsTypeService;
+ @Autowired
+ private TShopService shopService;
+ @Autowired
+ private RedisCache redisCache;
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
@Override
public void mealDataGenerator(OrderMealGeneratorDTO dto) {
// 存储数据生成数据
TDataGenerator dataGenerator = new TDataGenerator();
- dataGenerator.setUserId(tokenService.getLoginUser().getUserId());
- dataGenerator.setUserName(tokenService.getLoginUser().getNickName());
- dataGenerator.setShopId(dataGenerator.getShopId());
+ dataGenerator.setUserId(dto.getUserId());
+ dataGenerator.setUserName(dto.getNickName());
+ dataGenerator.setShopId(dto.getShopId());
dataGenerator.setStartTime(dto.getStartTime());
dataGenerator.setEndTime(dto.getEndTime());
dataGenerator.setMinMoney(dto.getMinMoney());
@@ -101,10 +108,13 @@
orderMeal.setBoardId(board.getId());
orderMeal.setMealType(1);
orderMeal.setMealPerson(random);
- orderMeal.setOrderNum(OrderNumConstants.MEAL + CodeGenerateUtils.generateOrderSn());
+ orderMeal.setMealTime(orderMealGeneratorCountDTO.getTime());
+ orderMeal.setOrderNum(OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn());
orderMeal.setStatus(2);
List<TOrderMealGoods> orderMealGoods = new ArrayList<>();
+ // 获取当前桌的菜品
List<TFoundationConfigVO> foundationConfigVOS = foundationConfigs.stream().filter(e -> e.getMealCount().equals(random)).collect(Collectors.toList());
+ // 每种菜品分类需要几个菜的生成
foundationConfigVOS.forEach(e -> {
int random1 = getRandom(e.getMinCount(), e.getMaxCount());
List<TGoods> typeGoods = goods.stream().filter(m -> e.getTypeId().equals(m.getTypeId())).collect(Collectors.toList());
@@ -125,6 +135,7 @@
tOrderMealGoods.setGoodsPicture(typeGood.getGoodsPicture());
tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice());
tOrderMealGoods.setGoodsCount(1);
+ tOrderMealGoods.setTypeId(typeGood.getTypeId());
orderMealGoods.add(tOrderMealGoods);
}
}
@@ -187,14 +198,25 @@
allOrderMeals.addAll(otherOrderMeals);
allOrderMeals.forEach(e->{
e.setIsCover(0);
+ e.setShopId(dataGenerator.getShopId());
e.setGeneratorId(dataGenerator.getId());
});
+
+ // 判断是否进行了终止操作
+ if(redisCache.hasKey(OrderNumConstants.MEAL+"_"+dto.getShopId())){
+ redisCache.deleteObject(OrderNumConstants.MEAL+"_"+dto.getShopId());
+ return;
+ }
+
orderMealService.saveBatch(allOrderMeals);
for (TOrderMeal orderMeal : allOrderMeals) {
orderMeal.getMealOrderGoods().forEach(e->e.setOrderId(orderMeal.getId()));
}
- orderMealGoodsService.saveBatch(allOrderMeals.stream().map(TOrderMeal::getMealOrderGoods).flatMap(Collection::stream).collect(Collectors.toList()));
+ List<TGoodsType> list = goodsTypeService.list();
+ List<TOrderMealGoods> collect = allOrderMeals.stream().map(TOrderMeal::getMealOrderGoods).flatMap(Collection::stream).collect(Collectors.toList());
+ collect.forEach(e->e.setTypeName(list.stream().filter(m->m.getId().equals(e.getTypeId())).findFirst().get().getTypeName()));
+ orderMealGoodsService.saveBatch(collect);
// 存储
long end = System.currentTimeMillis() - start;
System.err.println("相差时间========="+end);
@@ -204,6 +226,7 @@
}
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
@Override
public void saleDataGenerator(OrderSaleGeneratorDTO dto) {
// 查询上一次的数据生成时间
@@ -218,12 +241,13 @@
.last("limit 1"));
// 存储数据生成数据
TDataGenerator dataGenerator = new TDataGenerator();
- dataGenerator.setUserId(tokenService.getLoginUser().getUserId());
- dataGenerator.setUserName(tokenService.getLoginUser().getNickName());
+ dataGenerator.setUserId(dto.getUserId());
+ dataGenerator.setUserName(dto.getNickName());
dataGenerator.setShopId(dataGenerator.getShopId());
dataGenerator.setStartTime(dto.getStartTime());
dataGenerator.setEndTime(dto.getEndTime());
dataGenerator.setStatus(2);
+ dataGenerator.setShopId(dto.getShopId());
dataGenerator.setOrderType(2);
this.save(dataGenerator);
@@ -234,12 +258,11 @@
// 添加销售订单数
List<TOrderSale> orderSales = dto.getOrderSales();
- orderSaleService.saveBatch(orderSales);
- for (TOrderSale orderSale : orderSales) {
- orderSale.getOrderSaleGoods().forEach(e->e.setOrderId(orderSale.getId()));
- }
+ orderSales.forEach(e->{
+ e.setGeneratorId(dataGenerator.getId());
+ e.setOrderNum(OrderNumConstants.SALE + CodeGenerateUtils.generateVolumeSn());
+ });
List<TOrderSaleGoods> orderSaleGoods = orderSales.stream().map(TOrderSale::getOrderSaleGoods).flatMap(Collection::stream).collect(Collectors.toList());
- orderSaleGoodsService.saveBatch(orderSaleGoods);
// 生成进货数据
List<TOrderStock> stockList = new ArrayList<>();
@@ -267,7 +290,8 @@
tOrderStockGoods.setGoodsName(k);
tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
- tOrderStockGoods.setSalePrice(v.get(0).getSalePrice());
+ tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
+ tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
@@ -302,7 +326,8 @@
tOrderStockGoods.setGoodsName(k);
tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
- tOrderStockGoods.setSalePrice(v.get(0).getSalePrice());
+ tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
+ tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
@@ -330,7 +355,8 @@
tOrderStockGoods.setGoodsName(k);
tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
- tOrderStockGoods.setSalePrice(v.get(0).getSalePrice());
+ tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
+ tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods1.add(tOrderStockGoods);
@@ -358,7 +384,8 @@
tOrderStockGoods.setGoodsName(k);
tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
- tOrderStockGoods.setSalePrice(v.get(0).getSalePrice());
+ tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
+ tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
@@ -366,6 +393,11 @@
orderStock.setOrderStockGoods(orderStockGoods);
stockList.add(orderStock);
}
+ }
+ // 判断是否进行了终止操作
+ if(redisCache.hasKey(OrderNumConstants.STOCK+"_"+dto.getShopId())){
+ redisCache.deleteObject(OrderNumConstants.STOCK+"_"+dto.getShopId());
+ return;
}
// 删除上一次的数据生成
TOrderStock orderStock = orderStockService.getOne(Wrappers.lambdaQuery(TOrderStock.class)
@@ -375,7 +407,18 @@
if(Objects.nonNull(orderStock)){
orderStockService.removeById(orderStock);
}
+ orderSaleService.saveBatch(orderSales);
+ for (TOrderSale orderSale : orderSales) {
+ orderSale.getOrderSaleGoods().forEach(e->e.setOrderId(orderSale.getId()));
+ }
+ List<TGoodsType> list = goodsTypeService.list();
+// orderSaleGoods.forEach(e->e.setTypeName(list.stream().filter(m->m.getId().equals(e.getTypeId())).findFirst().get().getTypeName()));
+ orderSaleGoods.forEach(e->{
+ e.setId(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()));
@@ -389,6 +432,9 @@
PageInfo<TDataGeneratorVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TDataGeneratorVO> list = this.baseMapper.pageList(query,pageInfo);
List<Long> ids = list.stream().map(TDataGeneratorVO::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(ids)){
+ return new PageInfo<>();
+ }
if(query.getOrderType() == 1){
List<TOrderMeal> orderMeals = orderMealService.list(Wrappers.lambdaQuery(TOrderMeal.class)
.in(TOrderMeal::getGeneratorId, ids));
@@ -402,15 +448,16 @@
tDataGeneratorVO.setTotalRevenue(money);
}
}else {
- List<TOrderStock> orderStocks = orderStockService.list(Wrappers.lambdaQuery(TOrderStock.class)
- .in(TOrderStock::getGeneratorId, ids));
- List<Long> stockIds = orderStocks.stream().map(TOrderStock::getId).collect(Collectors.toList());
- List<TOrderStockGoods> stockGoods = orderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class)
- .in(TOrderStockGoods::getOrderId, stockIds));
+ List<TOrderSale> orderSales = orderSaleService.list(Wrappers.lambdaQuery(TOrderSale.class)
+ .in(TOrderSale::getGeneratorId, ids));
+// List<Long> saleIds = orderSales.stream().map(TOrderSale::getId).collect(Collectors.toList());
+// List<TOrderSaleGoods> orderSaleGoods = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
+// .in(TOrderSaleGoods::getOrderId, saleIds));
for (TDataGeneratorVO tDataGeneratorVO : list) {
- List<Long> collect = orderStocks.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderStock::getId).collect(Collectors.toList());
- BigDecimal money = stockGoods.stream().filter(e -> collect.contains(e.getOrderId()))
- .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getStockPrice().multiply(new BigDecimal(y.getStockCount()))), BigDecimal::add);
+// 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);
}
}
@@ -430,13 +477,100 @@
// 修改覆盖类型为已覆盖
orderMealService.update(Wrappers.lambdaUpdate(TOrderMeal.class).set(TOrderMeal::getIsCover, 1).eq(TOrderMeal::getGeneratorId, id));
}else {
+ // 删除时间段的数据
+ orderStockService.remove(Wrappers.lambdaQuery(TOrderStock.class)
+ .gt(TOrderStock::getCreateTime, dataGenerator.getStartTime())
+ .lt(TOrderStock::getCreateTime, dataGenerator.getEndTime()));
// 修改覆盖类型为已覆盖
orderStockService.update(Wrappers.lambdaUpdate(TOrderStock.class).set(TOrderStock::getIsCover, 1).eq(TOrderStock::getGeneratorId, id));
}
+ dataGenerator.setStatus(3);
+ this.updateById(dataGenerator);
+ }
+
+ @Override
+ public TDataGeneratorMealDetailVO mealGeneratorDataDetail(TDataGeneratorMealQuery query) {
+ // 查询餐饮数据生成详情
+ TDataGenerator dataGenerator = this.getById(query.getGeneratorId());
+ TDataGeneratorMealDetailVO data = new TDataGeneratorMealDetailVO();
+ BeanUtils.copyProperties(dataGenerator,data);
+ // 查询店铺
+ TShop shop = shopService.getById(dataGenerator.getShopId());
+ if(Objects.nonNull(shop)){
+ data.setShopName(shop.getShopName());
+ }
+ // 查询订单
+ PageInfo<TOrderMealVO> pageInfo = orderMealService.pageListGenerator(query);
+ data.setOrderMealList(pageInfo);
+ // 统计支付金额
+ Map<String, Double> map = orderMealService.getDataGeneratorMealDetail(query);
+ BigDecimal money = new BigDecimal(map.get("moneyPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal card = new BigDecimal(map.get("cardPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal weiXin = new BigDecimal(map.get("weiXinPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal ali = new BigDecimal(map.get("aliPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal other = new BigDecimal(map.get("otherPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ data.setMoneyPayAmount(money);
+ data.setCardPayAmount(card);
+ data.setWeiXinPayAmount(weiXin);
+ data.setAliPayAmount(ali);
+ data.setOtherPayAmount(other);
+ return data;
+ }
+
+ @Override
+ public TDataGeneratorSaleDetailVO saleGeneratorDataDetail(TDataGeneratorSaleQuery query) {
+ // 查询餐饮数据生成详情
+ TDataGeneratorSaleDetailVO data = new TDataGeneratorSaleDetailVO();
+ // 查询订单
+ TOrderSaleQuery orderSaleQuery = new TOrderSaleQuery();
+ orderSaleQuery.setTimeType(query.getTimeType());
+ orderSaleQuery.setPayType(query.getPayType());
+ orderSaleQuery.setOrderNum(query.getOrderNum());
+ orderSaleQuery.setGeneratorId(query.getGeneratorId());
+ PageInfo<TOrderSaleVO> pageInfo = orderSaleService.pageList(orderSaleQuery);
+ data.setOrderMealList(pageInfo);
+ // 统计支付金额
+ Map<String, Double> map = orderSaleService.getDataGeneratorSaleDetail(query);
+ BigDecimal money = new BigDecimal(map.get("moneyPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal card = new BigDecimal(map.get("cardPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal weiXin = new BigDecimal(map.get("weiXinPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal ali = new BigDecimal(map.get("aliPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal other = new BigDecimal(map.get("otherPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ data.setMoneyPayAmount(money);
+ data.setCardPayAmount(card);
+ data.setWeiXinPayAmount(weiXin);
+ data.setAliPayAmount(ali);
+ data.setOtherPayAmount(other);
+ return data;
+ }
+
+ @Override
+ public TDataGeneratorStockDetailVO stockGeneratorDataDetail(TDataGeneratorStockQuery query) {
+ // 查询餐饮数据生成详情
+ TDataGeneratorStockDetailVO data = new TDataGeneratorStockDetailVO();
+ // 查询订单
+ TOrderStockQuery orderStockQuery = new TOrderStockQuery();
+ orderStockQuery.setGeneratorId(query.getGeneratorId());
+ orderStockQuery.setTimeType(query.getTimeType());
+ orderStockQuery.setStockNum(query.getOrderNum());
+ PageInfo<TOrderStockVO> pageInfo = orderStockService.pageList(orderStockQuery);
+ data.setOrderStockVOList(pageInfo);
+ // 统计支付金额
+ Map<String, Object> map = orderStockService.getDataGeneratorStockDetail(query);
+ Integer totalStock = Integer.parseInt(map.get("totalStock").toString());
+ BigDecimal stockAmountSum = new BigDecimal(map.get("stockAmountSum").toString());
+ data.setTotalStock(totalStock);
+ data.setStockAmountSum(stockAmountSum);
+ return data;
+ }
+
+ @Override
+ public List<TOrderSaleVO> mealGeneratorExport(TDataGeneratorMealQuery query) {
+ return null;
}
private int getRandomPayType(Integer size,BigDecimal count) {
- BigDecimal bigDecimal = new BigDecimal(size).multiply(count.divide(new BigDecimal(100))).setScale(0, RoundingMode.HALF_UP);
+ BigDecimal bigDecimal = new BigDecimal(size).multiply(count.divide(new BigDecimal(100))).setScale(0, BigDecimal.ROUND_FLOOR);
return Integer.parseInt(bigDecimal.toString());
}
@@ -457,13 +591,4 @@
return selected;
}
- public static void main(String[] args) {
-// System.err.println(new Random().nextInt(1 - 0 + 1) + 0);
- List<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(2);
- list.add(3);
- list.add(4);
- System.err.println(list.subList(1,2));
- }
}
--
Gitblit v1.7.1