From 3d1cf55e874a5b79c74725af946bfe235c3b06fd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 九月 2024 18:15:34 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 126 +++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 44 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 6f8a49d..3d40bdc 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;
@@ -19,6 +20,9 @@
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;
@@ -60,15 +64,18 @@
@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(dto.getUserId());
dataGenerator.setUserName(dto.getNickName());
- dataGenerator.setShopId(dataGenerator.getShopId());
+ 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,8 @@
tOrderMealGoods.setGoodsPicture(typeGood.getGoodsPicture());
tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice());
tOrderMealGoods.setGoodsCount(1);
+ tOrderMealGoods.setTypeId(typeGood.getTypeId());
+ tOrderMealGoods.setGoodsId(typeGood.getId());
orderMealGoods.add(tOrderMealGoods);
}
}
@@ -215,6 +227,7 @@
}
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
@Override
public void saleDataGenerator(OrderSaleGeneratorDTO dto) {
// 查询上一次的数据生成时间
@@ -235,6 +248,7 @@
dataGenerator.setStartTime(dto.getStartTime());
dataGenerator.setEndTime(dto.getEndTime());
dataGenerator.setStatus(2);
+ dataGenerator.setShopId(dto.getShopId());
dataGenerator.setOrderType(2);
this.save(dataGenerator);
@@ -245,7 +259,10 @@
// 添加销售订单数
List<TOrderSale> orderSales = dto.getOrderSales();
- orderSales.forEach(e->e.setGeneratorId(dataGenerator.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());
// 生成进货数据
@@ -274,8 +291,10 @@
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.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
});
@@ -309,8 +328,10 @@
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.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
});
@@ -337,8 +358,10 @@
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.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods1.add(tOrderStockGoods);
});
@@ -365,8 +388,10 @@
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.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
});
@@ -392,7 +417,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()));
@@ -409,29 +437,37 @@
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));
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);
+ tDataGeneratorVO.setTotalRevenue(money);
+ }
}
}else {
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));
+// 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 = 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);
- tDataGeneratorVO.setTotalRevenue(money);
+// 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);
+ if(!CollectionUtils.isEmpty(orderSales)){
+ BigDecimal money = orderSales.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
+ tDataGeneratorVO.setTotalRevenue(money);
+ }
}
}
pageInfo.setRecords(list);
@@ -450,9 +486,15 @@
// 修改覆盖类型为已覆盖
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
@@ -461,16 +503,21 @@
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, 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");
+ 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);
@@ -492,12 +539,12 @@
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");
+ 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);
@@ -532,7 +579,7 @@
}
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());
}
@@ -553,13 +600,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