From 97cf3094ce37ee629ca6b948a9317a7ed1796c18 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 07 九月 2024 17:56:29 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 138 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 112 insertions(+), 26 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 b1e5abd..e58f7b3 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -13,12 +14,14 @@
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.TDataGeneratorVO;
-import com.ruoyi.system.vo.TFoundationConfigVO;
+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 java.math.BigDecimal;
import java.math.RoundingMode;
@@ -62,6 +65,7 @@
@Autowired
private RedisCache redisCache;
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
@Override
public void mealDataGenerator(OrderMealGeneratorDTO dto) {
// 存储数据生成数据
@@ -101,7 +105,8 @@
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());
@@ -215,6 +220,7 @@
}
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
@Override
public void saleDataGenerator(OrderSaleGeneratorDTO dto) {
// 查询上一次的数据生成时间
@@ -235,6 +241,7 @@
dataGenerator.setStartTime(dto.getStartTime());
dataGenerator.setEndTime(dto.getEndTime());
dataGenerator.setStatus(2);
+ dataGenerator.setShopId(dto.getShopId());
dataGenerator.setOrderType(2);
this.save(dataGenerator);
@@ -245,6 +252,10 @@
// 添加销售订单数
List<TOrderSale> orderSales = dto.getOrderSales();
+ 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());
// 生成进货数据
@@ -273,7 +284,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);
@@ -308,7 +320,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);
@@ -336,7 +349,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);
@@ -364,7 +378,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);
@@ -391,7 +406,10 @@
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.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()));
@@ -421,15 +439,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);
}
}
@@ -454,6 +473,82 @@
}
}
+ @Override
+ public TDataGeneratorMealDetailVO mealGeneratorDataDetail(TDataGeneratorMealQuery query) {
+ // 查询餐饮数据生成详情
+ TDataGenerator dataGenerator = this.getById(query.getGeneratorId());
+ TDataGeneratorMealDetailVO data = new TDataGeneratorMealDetailVO();
+ BeanUtils.copyProperties(dataGenerator,data);
+ // 查询订单
+ PageInfo<TOrderMealVO> pageInfo = orderMealService.pageListGenerator(query);
+ data.setOrderMealList(pageInfo);
+ // 统计支付金额
+ Map<String, BigDecimal> map = orderMealService.getDataGeneratorMealDetail(query);
+ BigDecimal money = map.get("moneyPay");
+ BigDecimal card = map.get("cardPay");
+ BigDecimal weiXin = map.get("weiXinPay");
+ BigDecimal ali = map.get("aliPay");
+ BigDecimal other = map.get("otherPay");
+ 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, BigDecimal> map = orderSaleService.getDataGeneratorMealDetail(query);
+ BigDecimal money = map.get("moneyPay");
+ BigDecimal card = map.get("cardPay");
+ BigDecimal weiXin = map.get("weiXinPay");
+ BigDecimal ali = map.get("aliPay");
+ BigDecimal other = map.get("otherPay");
+ 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);
return Integer.parseInt(bigDecimal.toString());
@@ -476,13 +571,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