From ae4c93dd2e2aef79332360fb5dec13c5b2c961f3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 九月 2024 18:36:07 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
index 48efe17..a5cca79 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
@@ -9,10 +9,7 @@
import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.TOrderSaleDTO;
import com.ruoyi.system.dto.TOrderStockDTO;
-import com.ruoyi.system.mapper.TDataGeneratorMapper;
-import com.ruoyi.system.mapper.TOrderSaleGoodsMapper;
-import com.ruoyi.system.mapper.TOrderSaleMapper;
-import com.ruoyi.system.mapper.TOrderStockMapper;
+import com.ruoyi.system.mapper.*;
import com.ruoyi.system.query.TDataGeneratorQuery;
import com.ruoyi.system.query.TDataGeneratorStockQuery;
import com.ruoyi.system.query.TOrderStockQuery;
@@ -50,6 +47,8 @@
private TStockDataSetService stockDataSetService;
@Autowired
private TDataGeneratorMapper dataGeneratorMapper;
+ @Autowired
+ private TGoodsService goodsService;
@Override
public void add(TOrderStockDTO dto) {
// 进货单号
@@ -61,11 +60,22 @@
dto.setIsCover(0);
}
this.save(dto);
- // 添加商品
+ List<TGoods> goods = goodsService.list(Wrappers.lambdaQuery(TGoods.class));
+ List<TGoods> goodsUpdateList = new ArrayList<>();
+ // 添加商品
orderStockGoods.forEach(orderSaleGoods1 -> {
orderSaleGoods1.setId(null);
orderSaleGoods1.setOrderId(dto.getId());
+ for (TGoods good : goods) {
+ if(good.getGoodsNum().equals(orderSaleGoods1.getGoodsNum())){
+ good.setInventory(orderSaleGoods1.getStockCount()+good.getInventory());
+ goodsUpdateList.add(good);
+ }else {
+ break;
+ }
+ }
});
+ goodsService.updateBatchById(goodsUpdateList);
tOrderStockGoodsService.saveBatch(orderStockGoods);
}
@@ -88,7 +98,7 @@
@Override
public PageInfo<TOrderStockVO> pageList(TOrderStockQuery query) {
- if(Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())){
+ if(Objects.isNull(query.getStartTime()) && Objects.isNull(query.getEndTime())){
// 判断时间
if(Objects.nonNull(query.getTimeType())){
LocalDateTime startTime = null;
@@ -130,8 +140,13 @@
List<TOrderStockGoods> collect = orderStockGoods.stream().filter(orderSaleGoods -> orderSaleGoods.getOrderId().equals(orderStockVO.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect)){
orderStockVO.setOrderStockGoods(collect);
- orderStockVO.setOrderStockCount(collect.size());
- orderStockVO.setTotalPrice(collect.stream().map(TOrderStockGoods::getCostPrice).reduce(BigDecimal::add).get());
+ int sum = collect.stream().mapToInt(TOrderStockGoods::getStockCount).sum();
+ orderStockVO.setOrderStockCount(sum);
+ BigDecimal money = BigDecimal.ZERO;
+ for (TOrderStockGoods tOrderStockGoods : collect) {
+ money = money.add(tOrderStockGoods.getThisCostPrice().multiply(new BigDecimal(tOrderStockGoods.getStockCount())));
+ }
+ orderStockVO.setTotalPrice(money);
}
});
}
--
Gitblit v1.7.1