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

共享库存修改

Browse Source
This commit is contained in:
GYJ
2024-06-24 15:25:06 +08:00
parent b9b35849c3
commit 063d5731f3
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
View File

@@ -54,7 +54,7 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
Page<StockVo> searchProStock(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock,@Param("num")Double num, Pageable pageable);
@Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" +
"sku.id,pro.id,pro.coverImg,pro.name,unit.name,pro.typeEnum,sku.specSnap,pro.isStock, " +
"0,pro.id,pro.coverImg,pro.name,unit.name,pro.typeEnum,sku.specSnap,pro.isStock, " +
"CASE " +
" WHEN pro.isDistribute = 1 THEN pro.stockNumber " +
" ELSE SUM(sku.stockNumber) " +
@@ -75,7 +75,7 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
Page<StockV2Vo> searchProStockV2(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock, Pageable pageable);
@Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" +
"sku.id,pro.id,pro.coverImg,pro.name,unit.name,pro.typeEnum,sku.specSnap,pro.isStock, " +
"sku.id,0,pro.coverImg,pro.name,unit.name,pro.typeEnum,sku.specSnap,pro.isStock, " +
"CASE " +
" WHEN pro.isDistribute = 1 THEN pro.stockNumber " +
" ELSE SUM(sku.stockNumber) " +

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

@@ -248,11 +248,11 @@ public class StockServiceImpl implements StockService {
Map<Integer, Double> idStockMap = new HashMap<>();
for (StockV2Vo stockVo : list) {
if (stockVo.getProId() == 0) {
tbProductSkuRepository.updateStockNumber2(stockVo.getId(), shopId, Double.parseDouble(stockVo.getNumber().toString()));
tbProductSkuRepository.updateStockNumber2(stockVo.getSkuId(), shopId, Double.parseDouble(stockVo.getNumber().toString()));
} else {
productService.updateStockNumber(stockVo.getProId(), Double.parseDouble(stockVo.getNumber().toString()));
}
idStockMap.put(stockVo.getId(), Double.parseDouble(stockVo.getNumber().toString()));
idStockMap.put(stockVo.getSkuId(), Double.parseDouble(stockVo.getNumber().toString()));
}
redisUtils.redisUp(2, shopId, idStockMap);
}

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

@@ -126,12 +126,16 @@ public class TbProductServiceImpl implements TbProductService {
List<TbProductSku> skuList = new ArrayList<>();
TbProductVo tbProductVo = new TbProductVo();
//sku,并且计算销量以及库存
Double stockNumber = 0.00;
for (TbProductSku sku : tbProductSkus) {
//sku
if (sku.getProductId().equals(product.getId().toString())) {
skuList.add(sku);
stockNumber = stockNumber + sku.getStockNumber();
double stockNumber = 0.00;
if (product.getIsDistribute() == 1) {
stockNumber = Double.valueOf(product.getStockNumber());
} else {
for (TbProductSku sku : tbProductSkus) {
//sku
if (sku.getProductId().equals(product.getId().toString())) {
skuList.add(sku);
stockNumber = stockNumber + sku.getStockNumber();
}
}
}
tbProductVo.setStockNumber(stockNumber);

8
eladmin-system/src/main/java/cn/ysk/cashier/vo/StockV2Vo.java
View File

@@ -9,7 +9,8 @@ import java.util.List;
*/
@Data
public class StockV2Vo {
private Integer id;
private String id;
private Integer skuId;
private Integer proId;
private String img;
private String name;
@@ -24,7 +25,7 @@ public class StockV2Vo {
public StockV2Vo(Integer proId, Integer skuId, String name, String unitName,String specSnap, Object number,Object stockNumber, Integer isDistribute) {
this.proId = proId;
this.id = skuId;
this.skuId = skuId;
this.name = name;
this.unitName = unitName;
this.specSnap = specSnap;
@@ -35,7 +36,8 @@ public class StockV2Vo {
public StockV2Vo(Integer id, Integer proId,String img,String name,String unitName, String type, String specSnap,
Object isStock, Object number, Integer isDistribute, Integer isPauseSale) {
this.id = id;
this.id = id.toString() + "-" + proId.toString();
this.skuId = id;
this.proId = proId;
this.img = img;
this.name = name;