From 1699a33b1e8d8ef6bddf080cb2a2d734b6099e48 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 8 Sep 2025 18:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E5=AF=8C=E5=95=86=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MallAppController.java | 24 +++++++++---------- .../supermarket/entity/MallProductEntity.java | 14 +++++------ .../entity/MallProductSkuEntity.java | 14 +++++------ .../vo/app/MallProductDetailAppVo.java | 14 +++++------ .../vo/app/MallProductListAppVo.java | 20 ++++++++-------- .../vo/app/MallProductSkuAppVo.java | 14 +++++------ 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java index 556b28d0f..381463fcf 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java @@ -153,7 +153,7 @@ public class MallAppController { ); // 按商品ID分组SKU - Map> skuMap = skuList.stream() + Map> skuMap = skuList.stream() .collect(Collectors.groupingBy(MallProductSkuEntity::getProductId)); // 转换为VO @@ -177,14 +177,14 @@ public class MallAppController { productVo.setMinPrice(skus.stream() .map(MallProductSkuEntity::getPrice) .filter(Objects::nonNull) - .min(java.math.BigDecimal::compareTo) - .orElse(java.math.BigDecimal.ZERO)); + .min(Integer::compareTo) + .orElse(0)); // 计算总库存 productVo.setTotalStock(skus.stream() .map(MallProductSkuEntity::getStock) .filter(Objects::nonNull) - .mapToInt(Integer::intValue) + .mapToDouble(Double::doubleValue) .sum()); @@ -232,13 +232,13 @@ public class MallAppController { @ParameterObject Page page, @RequestParam(required = false) Long categoryId, @RequestParam(required = false) String keyword, - @RequestParam(required = false) Long merchantId + Long merchantId ) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(categoryId != null, MallProductEntity::getCategoryId, categoryId); wrapper.like(StrUtil.isNotBlank(keyword), MallProductEntity::getTitle, keyword); wrapper.eq(merchantId != null, MallProductEntity::getMerchantId, merchantId); - wrapper.eq(MallProductEntity::getStatus, 1); // 只查上架商品 + wrapper.eq(MallProductEntity::getStatus, MallConstants.Status.ENABLED); // 只查上架商品 IPage productPage = mallProductService.page(page, wrapper); @@ -267,14 +267,14 @@ public class MallAppController { vo.setMinPrice(skus.stream() .map(MallProductSkuEntity::getPrice) .filter(Objects::nonNull) - .min(java.math.BigDecimal::compareTo) - .orElse(java.math.BigDecimal.ZERO)); + .min(Integer::compareTo) + .orElse(0)); // 计算总库存 vo.setTotalStock(skus.stream() .map(MallProductSkuEntity::getStock) .filter(Objects::nonNull) - .mapToInt(Integer::intValue) + .mapToDouble(Double::doubleValue) .sum()); return vo; @@ -490,14 +490,14 @@ public class MallAppController { vo.setMinPrice(skus.stream() .map(MallProductSkuEntity::getPrice) .filter(Objects::nonNull) - .min(java.math.BigDecimal::compareTo) - .orElse(java.math.BigDecimal.ZERO)); + .min(Integer::compareTo) + .orElse(0)); // 计算总库存 vo.setTotalStock(skus.stream() .map(MallProductSkuEntity::getStock) .filter(Objects::nonNull) - .mapToInt(Integer::intValue) + .mapToDouble(Double::doubleValue) .sum()); return vo; diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductEntity.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductEntity.java index 7ff265f53..51cdbfff5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductEntity.java @@ -79,22 +79,22 @@ public class MallProductEntity extends Model { private Integer priceType; /** - * SPU售价(当price_type=2有效) + * SPU售价(当price_type=2有效，单位：分) */ - @Schema(description="SPU售价(当price_type=2有效)") - private BigDecimal spuPrice; + @Schema(description="SPU售价(当price_type=2有效，单位：分)") + private Integer spuPrice; /** - * 划线价 + * 划线价(单位：分) */ - @Schema(description="划线价") - private BigDecimal originalPrice; + @Schema(description="划线价(单位：分)") + private Integer originalPrice; /** * 总库存(冗余) */ @Schema(description="总库存(冗余)") - private Integer totalStock; + private Double totalStock; /** * 计量单位 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductSkuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductSkuEntity.java index 48243a29f..f2ef60795 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductSkuEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/MallProductSkuEntity.java @@ -49,22 +49,22 @@ public class MallProductSkuEntity extends Model { private String skuName; /** - * 售价 + * 售价(单位：分) */ - @Schema(description="售价") - private BigDecimal price; + @Schema(description="售价(单位：分)") + private Integer price; /** - * 成本价 + * 成本价(单位：分) */ - @Schema(description="成本价") - private BigDecimal costPrice; + @Schema(description="成本价(单位：分)") + private Integer costPrice; /** * 库存 */ @Schema(description="库存") - private Integer stock; + private Double stock; /** * 条码 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductDetailAppVo.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductDetailAppVo.java index 6b8a45fde..4a84b61d9 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductDetailAppVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductDetailAppVo.java @@ -72,22 +72,22 @@ public class MallProductDetailAppVo { private Integer priceType; /** - * SPU售价 + * SPU售价(单位：分) */ - @Schema(description = "SPU售价") - private BigDecimal spuPrice; + @Schema(description = "SPU售价(单位：分)") + private Integer spuPrice; /** - * 划线价 + * 划线价(单位：分) */ - @Schema(description = "划线价") - private BigDecimal originalPrice; + @Schema(description = "划线价(单位：分)") + private Integer originalPrice; /** * 总库存 */ @Schema(description = "总库存") - private Integer totalStock; + private Double totalStock; /** * 计量单位 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductListAppVo.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductListAppVo.java index 86e0bea61..5d83cc422 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductListAppVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductListAppVo.java @@ -70,22 +70,22 @@ public class MallProductListAppVo { private Integer priceType; /** - * SPU售价 + * SPU售价(单位：分) */ - @Schema(description = "SPU售价") - private BigDecimal spuPrice; + @Schema(description = "SPU售价(单位：分)") + private Integer spuPrice; /** - * 划线价 + * 划线价(单位：分) */ - @Schema(description = "划线价") - private BigDecimal originalPrice; + @Schema(description = "划线价(单位：分)") + private Integer originalPrice; /** * 总库存 */ @Schema(description = "总库存") - private Integer totalStock; + private Double totalStock; /** * 计量单位 @@ -100,10 +100,10 @@ public class MallProductListAppVo { private Integer status; /** - * 最低价格（从SKU中计算） + * 最低价格（从SKU中计算，单位：分） */ - @Schema(description = "最低价格") - private BigDecimal minPrice; + @Schema(description = "最低价格(单位：分)") + private Integer minPrice; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductSkuAppVo.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductSkuAppVo.java index 16b68fff9..fce283f81 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductSkuAppVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/vo/app/MallProductSkuAppVo.java @@ -40,22 +40,22 @@ public class MallProductSkuAppVo { private String skuName; /** - * 售价 + * 售价(单位：分) */ - @Schema(description = "售价") - private BigDecimal price; + @Schema(description = "售价(单位：分)") + private Integer price; /** - * 成本价 + * 成本价(单位：分) */ - @Schema(description = "成本价") - private BigDecimal costPrice; + @Schema(description = "成本价(单位：分)") + private Integer costPrice; /** * 库存 */ @Schema(description = "库存") - private Integer stock; + private Double stock; /** * 条码