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

修复盘点价格错误问题

This commit is contained in:
SongZhang 2024-07-02 10:35:55 +08:00
parent ff3d5a054d
commit f491a382cb
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStocktakinController.java
View File

@ -24,7 +24,6 @@ public class TbProductStocktakinController {
private final TbProductStocktakinService tbProductStocktakinService; private final TbProductStocktakinService tbProductStocktakinService;
@PostMapping @PostMapping
@AnonymousAccess
@ApiOperation("新增盘点") @ApiOperation("新增盘点")
public ResponseEntity<Object> addStocktakin( public ResponseEntity<Object> addStocktakin(
@RequestBody @Validated TbProductStocktakinDTO productStocktakinDTO @RequestBody @Validated TbProductStocktakinDTO productStocktakinDTO
@ -42,7 +41,6 @@ public class TbProductStocktakinController {
return ResponseEntity.ok("成功"); return ResponseEntity.ok("成功");
} }
@AnonymousAccess
@GetMapping @GetMapping
@ApiOperation("获取盘点数据") @ApiOperation("获取盘点数据")
public ResponseEntity<Object> getStocktakinList(TbProductStocktakinQueryCriteria productStocktakinQueryCriteria, Pageable pageable) { public ResponseEntity<Object> getStocktakinList(TbProductStocktakinQueryCriteria productStocktakinQueryCriteria, Pageable pageable) {

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

@ -75,13 +75,15 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
} }
TbProduct product = tbProductRepository.findById(productStocktakinDTO.getProductId()).orElse(null); TbProduct product = tbProductRepository.findById(productStocktakinDTO.getProductId()).orElse(null);
if (product == null) {
throw new BadRequestException("商品不存在, 商品id: {}" + productStocktakinDTO.getProductId());
}
TbProductStocktakin productStocktakin = new TbProductStocktakin(); TbProductStocktakin productStocktakin = new TbProductStocktakin();
productStocktakin.setProductId(productStocktakinDTO.getProductId()); productStocktakin.setProductId(productStocktakinDTO.getProductId());
productStocktakin.setCreateTime(DateUtil.date()); productStocktakin.setCreateTime(DateUtil.date());
productStocktakin.setNote(productStocktakinDTO.getNote()); productStocktakin.setNote(productStocktakinDTO.getNote());
productStocktakin.setStock(product.getStockNumber());
productStocktakin.setInventoryStock(productStocktakinDTO.getStocktakinNum()); productStocktakin.setInventoryStock(productStocktakinDTO.getStocktakinNum());
productStocktakin.setName(product.getName()); productStocktakin.setName(product.getName());
productStocktakin.setCoverImg(product.getCoverImg()); productStocktakin.setCoverImg(product.getCoverImg());
@ -131,9 +133,7 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
if (product.getIsDistribute() == 1) { if (product.getIsDistribute() == 1) {
round = (int) Math.floor( product.getStockNumber()); round = (int) Math.floor( product.getStockNumber());
productStocktakin.setPhasePrice( productStocktakin.setPhasePrice(
productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(productStocktakinDTO.getStocktakinNum())).subtract( productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(phaseNum))
productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(product.getStockNumber()))
)
); );
productStockDetail.setSubType(productStocktakinDTO.getStocktakinNum() > product.getStockNumber() ? 1 : -1); productStockDetail.setSubType(productStocktakinDTO.getStocktakinNum() > product.getStockNumber() ? 1 : -1);
@ -141,6 +141,7 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
productStockDetail.setType(productStocktakinDTO.getStocktakinNum() > product.getStockNumber() ? "盘点入库" : "盘点出库"); productStockDetail.setType(productStocktakinDTO.getStocktakinNum() > product.getStockNumber() ? "盘点入库" : "盘点出库");
productStocktakin.setPhaseNum(productStocktakinDTO.getStocktakinNum() - product.getStockNumber()); productStocktakin.setPhaseNum(productStocktakinDTO.getStocktakinNum() - product.getStockNumber());
productStocktakin.setStock(product.getStockNumber());
if (tbProductRepository.updateStock(product.getId(), product.getStockNumber(), productStocktakinDTO.getStocktakinNum()) < 1) { if (tbProductRepository.updateStock(product.getId(), product.getStockNumber(), productStocktakinDTO.getStocktakinNum()) < 1) {
throw new BadRequestException("修改库存失败，稍后再试"); throw new BadRequestException("修改库存失败，稍后再试");
} }
@ -165,10 +166,10 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
productStockDetail.setType(productStocktakinDTO.getStocktakinNum() > productSku.getStockNumber() ? "盘点入库" : "盘点出库"); productStockDetail.setType(productStocktakinDTO.getStocktakinNum() > productSku.getStockNumber() ? "盘点入库" : "盘点出库");
productStocktakin.setSkuId(productSku.getId()); productStocktakin.setSkuId(productSku.getId());
productStocktakin.setPhasePrice( productStocktakin.setPhasePrice(
productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(productStocktakinDTO.getStocktakinNum())).subtract( productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(phaseNum))
productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(product.getStockNumber()))
)
); );
productStocktakin.setStock(productSku.getStockNumber().intValue());
productStocktakin.setPhaseNum((int) (productStocktakinDTO.getStocktakinNum() - productSku.getStockNumber())); productStocktakin.setPhaseNum((int) (productStocktakinDTO.getStocktakinNum() - productSku.getStockNumber()));
if (producSkutMapper.updateStock(productSku.getId(), productSku.getStockNumber(), productStocktakinDTO.getStocktakinNum()) < 1) { if (producSkutMapper.updateStock(productSku.getId(), productSku.getStockNumber(), productStocktakinDTO.getStocktakinNum()) < 1) {
throw new BadRequestException("修改库存失败，稍后再试"); throw new BadRequestException("修改库存失败，稍后再试");