czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

This commit is contained in:
wangw 2024-10-15 10:06:33 +08:00
parent fdf551358f f8c763ad9d
commit 544a251a67
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java
View File

@ -417,13 +417,9 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
.eq(TbProduct::getId, stockRecordMsg.getProductId()) .eq(TbProduct::getId, stockRecordMsg.getProductId())
.eq(TbProduct::getIsDel, 0)); .eq(TbProduct::getIsDel, 0));
TbProductSku productSku = producSkutMapper.selectOne(new LambdaUpdateWrapper<TbProductSku>() if (product == null) {
.eq(TbProductSku::getShopId, stockRecordMsg.getShopId()) log.info("商品不存在");
.eq(TbProductSku::getId, stockRecordMsg.getSkuId()) throw new BadRequestException("商品不存在");
.eq(TbProductSku::getIsDel, 0));
if (product == null || productSku == null) {
log.info("商品或sku不存在");
throw new BadRequestException("商品或sku不存在");
} }
TbShopUnit tbShopUnit = shopUnitRepository.findById(product.getUnitId()).orElse(null); TbShopUnit tbShopUnit = shopUnitRepository.findById(product.getUnitId()).orElse(null);
@ -469,9 +465,9 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
productStockDetail.setSkuId(String.valueOf(stockRecordMsg.getSkuId())); productStockDetail.setSkuId(String.valueOf(stockRecordMsg.getSkuId()));
productStockDetail.setSubType(stockRecordMsg.getSubType()); productStockDetail.setSubType(stockRecordMsg.getSubType());
productStockDetail.setType(stockRecordMsg.getType()); productStockDetail.setType(stockRecordMsg.getType());
productStockDetail.setSpecSnap(productSku.getSpecSnap()); productStockDetail.setSpecSnap("");
productStockDetail.setStockNumber(Double.valueOf(stockRecordMsg.getNumber())); productStockDetail.setStockNumber(Double.valueOf(stockRecordMsg.getNumber()));
productStockDetail.setCostAmount(productSku.getSalePrice().multiply(BigDecimal.valueOf(Math.abs(stockRecordMsg.getNumber())))); // productStockDetail.setCostAmount(productSku.getSalePrice().multiply(BigDecimal.valueOf(Math.abs(stockRecordMsg.getNumber()))));
productStockDetail.setLeftNumber(product.getStockNumber() - stockRecordMsg.getNumber()); productStockDetail.setLeftNumber(product.getStockNumber() - stockRecordMsg.getNumber());
productStockDetail.setRecordId(stockOperate.getId().toString()); productStockDetail.setRecordId(stockOperate.getId().toString());
productStockDetail.setStockSnap(JSONObject.toJSONString(snapItem)); productStockDetail.setStockSnap(JSONObject.toJSONString(snapItem));