Merge remote-tracking branch 'origin/main'

This commit is contained in:
Jack 2025-08-06 20:40:35 +08:00
commit 4bd3b562f9
2 changed files with 2 additions and 2 deletions

View File

@ -20,5 +20,5 @@ public class ProductVo {
private long id;
private float ItemSalePrice;
private Long did;
private int itemQuantity;
private int item_quantity;
}

View File

@ -379,7 +379,7 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl<ShopPageBaseMapper,
item_id_row.add(did);
List<ShopProductItem> shopProductItems= shopProductItemService.list(new QueryWrapper<ShopProductItem>().eq("item_id",did));
if(!shopProductItems.isEmpty()){
((JSONObject) datum).set("itemQuantity",shopProductItems.get(0).getItem_quantity()) ;
((JSONObject) datum).set("item_quantity",shopProductItems.get(0).getItem_quantity()) ;
}
}
}