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

去除多余cost字段

Browse Source
This commit is contained in:
SongZhang
2024-06-26 14:18:24 +08:00
parent 3ecd9c216a
commit 29299d3689
3 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
View File

@@ -320,10 +320,6 @@ public class TbProduct implements Serializable {
@ApiModelProperty("库存数量") @ApiModelProperty("库存数量")
private Integer stockNumber; private Integer stockNumber;
@Column(name = "`total_cost_price`")
@ApiModelProperty(value = "总成本价")
private BigDecimal totalCostPrice = BigDecimal.ZERO;
public void copy(TbProduct source){ public void copy(TbProduct source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

4
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
View File

@@ -140,7 +140,5 @@ public class TbProductSku implements Serializable {
@ApiModelProperty(value = "是否暂停销售") @ApiModelProperty(value = "是否暂停销售")
private Integer isPauseSale = 0; private Integer isPauseSale = 0;
@Column(name = "`total_cost_price`")
@ApiModelProperty(value = "总成本价")
private BigDecimal totalCostPrice = BigDecimal.ZERO;
} }

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

@@ -248,7 +248,6 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
productStockDetail.setSubType(1); productStockDetail.setSubType(1);
totalCostPrice = productListDto.getCostPrice().multiply(BigDecimal.valueOf(productListDto.getNumber())); totalCostPrice = productListDto.getCostPrice().multiply(BigDecimal.valueOf(productListDto.getNumber()));
productStockDetail.setCostAmount(totalCostPrice); productStockDetail.setCostAmount(totalCostPrice);
setProOrSkuCost(product, tbProductSku,totalCostPrice, false);
productStockDetail.setType("供应商出库"); productStockDetail.setType("供应商出库");
break; break;
@@ -262,7 +261,6 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
productStockDetail.setSubType(1); productStockDetail.setSubType(1);
totalCostPrice = productListDto.getCostPrice().multiply(BigDecimal.valueOf(productListDto.getNumber())); totalCostPrice = productListDto.getCostPrice().multiply(BigDecimal.valueOf(productListDto.getNumber()));
productStockDetail.setCostAmount(totalCostPrice); productStockDetail.setCostAmount(totalCostPrice);
setProOrSkuCost(product, tbProductSku,totalCostPrice, true);
productStockDetail.setType("供应商入库"); productStockDetail.setType("供应商入库");
break; break;
@@ -299,29 +297,6 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
return resources; return resources;
} }
/**
* 根据是否共享库存调整成本价
* @param product 商品
* @param tbProductSku sku商品
* @param cost 成本价
* @param isAdd true 增加 false 减少
*/
private void setProOrSkuCost(TbProduct product, TbProductSku tbProductSku, BigDecimal cost, boolean isAdd) {
if (product.getTotalCostPrice() == null) {
product.setTotalCostPrice(BigDecimal.ZERO);
}
if (tbProductSku.getTotalCostPrice() == null) {
tbProductSku.setTotalCostPrice(BigDecimal.ZERO);
}
if (product.getIsDistribute() == 1) {
product.setTotalCostPrice(isAdd ? product.getTotalCostPrice().add(cost) : product.getTotalCostPrice().subtract(cost));
}else {
tbProductSku.setTotalCostPrice(isAdd ? tbProductSku.getTotalCostPrice().add(cost) : tbProductSku.getTotalCostPrice().subtract(cost));
}
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)