From a6f06bcb3e1e608b7f75b0f6cb18d8e72c35395c Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 22 Jan 2025 16:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=94=B9=E8=B6=85=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/entity/SmErpSpuEntity.java | 4 +- .../supermarket/vo/sm/SmErpUnitVo.java | 72 +++++++++++++++++++ .../controller/SmErpSpuController.java | 1 + .../controller/SmErpUnitController.java | 21 ++++++ .../main/resources/mapper/SmErpSpuMapper.xml | 4 +- 5 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpUnitVo.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java index e68a91553..1f77d90da 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java @@ -139,7 +139,7 @@ public class SmErpSpuEntity extends Model { * 规格 */ @Schema(description="规格") - private String specification; + private String spec; /** * 产地 @@ -151,7 +151,7 @@ public class SmErpSpuEntity extends Model { * 装数 */ @Schema(description="装数") - private Integer packingQuantity; + private Integer packageNum; /** * 进价（分为单位） diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpUnitVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpUnitVo.java new file mode 100644 index 000000000..99dbbcb2b --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpUnitVo.java @@ -0,0 +1,72 @@ +package com.bsd.pjcloud.supermarket.vo.sm; + +import com.baomidou.mybatisplus.annotation.*; +import com.bsd.pjcloud.common.core.util.MoneyDeserializer; +import com.bsd.pjcloud.common.core.util.MoneySerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + + +@Data +@Schema(description = "后台线上商品-选择库存商品-查询包装单位信息") +public class SmErpUnitVo { + + + /** + * 包装单位id + */ + @Schema(description="包装单位id") + private Long id; + + /** + * 条码 + */ + @Schema(description="条码") + private String barCode; + + /** + * 规格 + */ + @Schema(description="规格") + private String spec; + + /** + * 单位 + */ + @Schema(description="单位") + private String unit; + + /** + * 内装数量 + */ + @Schema(description="内装") + private Integer packageNum; + + + /** + * 零售价/单位分 + */ + @Schema(description="零售价/单位分") + @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 + @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 + private Integer retailPrice; + + /** + * spuID + */ + @Schema(description="spuID") + private Long spuId; + + /** + * 促销价 + */ + @Schema(description="促销价") + @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 + @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 + private Integer promotionPrice; + +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index 547c9c9cc..debddedc0 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -87,6 +87,7 @@ public class SmErpSpuController { wrapper.eq(null!=supermarketSpu.getCategoryId(), SmErpSpuEntity::getCategoryId,supermarketSpu.getCategoryId()); return R.ok(smErpSpuService.OnlineSpuPageScope(page, wrapper)); } + /** * 通过id查询商品spu * @param id id diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpUnitController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpUnitController.java index 055f9926a..af0058534 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpUnitController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpUnitController.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity; +import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; import com.bsd.pjcloud.supermarket.service.SmErpUnitService; import org.springframework.security.access.prepost.PreAuthorize; @@ -67,6 +69,25 @@ public class SmErpUnitController { return R.ok(smErpUnitService.getById(id)); } + /** + * 分页查询-线上商城通过id查询商品详情 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询详情" , description = "通过id查询" ) + @GetMapping("/getOnlineSkuBySpuId/{id}" ) + @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_view')" ) + public R getOnlineSkuBySpuId(@PathVariable("id" ) Long id) { + LambdaQueryWrapper smErpUnitEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + smErpUnitEntityLambdaQueryWrapper.eq(SmErpUnitEntity::getSpuId, id); + //过滤停售的 + smErpUnitEntityLambdaQueryWrapper.eq(SmErpUnitEntity::getStatus, "0"); + + List list = smErpUnitService.list(smErpUnitEntityLambdaQueryWrapper); + + + return R.ok(list); + } /** * 新增商品包装单位(sku) * @param supermarketUnit 商品包装单位(sku) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml index 1da1bd0fd..1c2101632 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml @@ -21,9 +21,9 @@ - + - +