From 8bac74233cf3f2dcd4ea8b941938db40e75ce1cd Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 22 Jan 2025 12:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=B6=85=E5=B8=82=EF=BC=8C?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/order/HardCarServiceImpl.java | 12 +- .../RemoteSupermarketUnitSkuService.java | 4 +- .../vo/app/SupermarketSpuAppDetailsVo.java | 4 +- .../SmErpAuxiliaryCodeVo.java} | 4 +- .../SmErpBrandSimpleVo.java} | 4 +- .../SmErpCategorySimpleVo.java} | 4 +- .../SmErpSpuVo.java} | 9 +- .../vo/{ => erp}/SmErpSupplierSimpleVo.java | 2 +- .../{ => erp}/SmErpSupplierTypeSimpleVo.java | 2 +- .../SmErpUnitVo.java} | 5 +- .../SmErpUnitWithSpuVo.java} | 6 +- .../supermarket/vo/sm/SmErpPageScopeVo.java | 113 ++++++++++++++++++ .../controller/SmErpBrandController.java | 4 +- .../controller/SmErpCategoryController.java | 6 +- .../controller/SmErpSpuController.java | 18 ++- .../controller/SmErpSupplierController.java | 3 +- .../SmErpSupplierTypeController.java | 3 +- .../supermarket/mapper/SmErpUnitMapper.java | 4 +- .../supermarket/service/SmErpSpuService.java | 10 ++ .../supermarket/service/SmErpUnitService.java | 4 +- .../service/impl/SmErpSpuServiceImpl.java | 38 ++++-- .../service/impl/SmErpUnitServiceImpl.java | 4 +- .../main/resources/mapper/SmErpUnitMapper.xml | 2 +- 23 files changed, 210 insertions(+), 55 deletions(-) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{SupermarketAuxiliaryCodeVo.java => erp/SmErpAuxiliaryCodeVo.java} (94%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{SupermarketBrandSimpleVo.java => erp/SmErpBrandSimpleVo.java} (72%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{SupermarketCategorySimpleVo.java => erp/SmErpCategorySimpleVo.java} (71%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{SupermarketSpuVo.java => erp/SmErpSpuVo.java} (92%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{ => erp}/SmErpSupplierSimpleVo.java (90%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{ => erp}/SmErpSupplierTypeSimpleVo.java (90%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{SupermarketUnitVo.java => erp/SmErpUnitVo.java} (96%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{SupermarketUnitWithSpuVo.java => erp/SmErpUnitWithSpuVo.java} (95%) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpPageScopeVo.java diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java index 61c12b09d..edf39b7e5 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java @@ -26,7 +26,7 @@ import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper; import com.bsd.pjcloud.hard.mapper.order.HardParentCarMapper; import com.bsd.pjcloud.hard.service.HardCarService; import com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketUnitSkuService; -import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitWithSpuVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -77,7 +77,7 @@ public class HardCarServiceImpl extends ServiceImpl supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); + List supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); for (HardCarVo v : resultList) { supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { v.setSpuId(spu.getSpuId()); @@ -161,7 +161,7 @@ public class HardCarServiceImpl extends ServiceImpl { // 查询超市商品 AtomicInteger supermarketTotalPrice = new AtomicInteger(); - List supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); + List supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); for (HardCreateCarDto v : list) { supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { Integer price = getSupermarket(spu); @@ -233,7 +233,7 @@ public class HardCarServiceImpl extends ServiceImpl carObjectList = new ArrayList<>(); - List supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); + List supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); for (HardCreateCarDto v : productList) { HardCarEntity item = HardCarEntity.builder().parentCarId(parentCarId).build(); supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { @@ -281,7 +281,7 @@ public class HardCarServiceImpl extends ServiceImpl supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); + List supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); for (HardCreateCarDto v : list) { supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { str.append(spu.getProductName()).append("x").append(v.getProductCount()).append(";"); @@ -301,7 +301,7 @@ public class HardCarServiceImpl extends ServiceImpl> getSupermarketUnits(@RequestBody List ids); + R> getSupermarketUnits(@RequestBody List ids); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java index bad08be23..184dbbcdb 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java @@ -3,7 +3,7 @@ package com.bsd.pjcloud.supermarket.vo.app; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.bsd.pjcloud.supermarket.vo.SupermarketUnitVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -158,6 +158,6 @@ public class SupermarketSpuAppDetailsVo { @Schema(description = "包装对象集合") - private List supermarketUnitEntityList; + private List supermarketUnitEntityList; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketAuxiliaryCodeVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpAuxiliaryCodeVo.java similarity index 94% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketAuxiliaryCodeVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpAuxiliaryCodeVo.java index ad39c72f3..bb4e2faad 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketAuxiliaryCodeVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpAuxiliaryCodeVo.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import com.baomidou.mybatisplus.annotation.*; import com.bsd.pjcloud.common.core.util.TenantTable; @@ -17,7 +17,7 @@ import java.time.LocalDateTime; @TenantTable @TableName("supermarket_auxiliary_code") @Schema(description = "商品辅助条码") -public class SupermarketAuxiliaryCodeVo { +public class SmErpAuxiliaryCodeVo { /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketBrandSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpBrandSimpleVo.java similarity index 72% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketBrandSimpleVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpBrandSimpleVo.java index e45f1dd02..0ad357b1c 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketBrandSimpleVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpBrandSimpleVo.java @@ -1,11 +1,11 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -public class SupermarketBrandSimpleVo { +public class SmErpBrandSimpleVo { @Schema(description = "品牌id") diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpCategorySimpleVo.java similarity index 71% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpCategorySimpleVo.java index b946effdd..d0111e235 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpCategorySimpleVo.java @@ -1,11 +1,11 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -public class SupermarketCategorySimpleVo { +public class SmErpCategorySimpleVo { @Schema(description = "分类id") diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketSpuVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSpuVo.java similarity index 92% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketSpuVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSpuVo.java index f2de32894..3cd8a9fc9 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketSpuVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSpuVo.java @@ -1,17 +1,16 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @Data @Schema(description="ad Spuvo") -public class SupermarketSpuVo { +public class SmErpSpuVo { /** * 商品 SPU 编号，自增 @@ -157,9 +156,9 @@ public class SupermarketSpuVo { @Schema(description = "辅助条码集合") - private List supermarketAuxiliaryCodeEntityList; + private List supermarketAuxiliaryCodeEntityList; @Schema(description = "包装对象集合") - private List supermarketUnitEntityList; + private List supermarketUnitEntityList; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java similarity index 90% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierSimpleVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java index 187ccb3c6..5a9c32a11 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierSimpleVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierTypeSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierTypeSimpleVo.java similarity index 90% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierTypeSimpleVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierTypeSimpleVo.java index 574d71645..111ad28e6 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierTypeSimpleVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierTypeSimpleVo.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitVo.java similarity index 96% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitVo.java index e266320be..eb968bd6f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitVo.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import com.baomidou.mybatisplus.annotation.*; import com.bsd.pjcloud.common.core.util.MoneyDeserializer; @@ -8,7 +8,6 @@ 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 lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -21,7 +20,7 @@ import java.time.LocalDateTime; @Data @TenantTable @Schema(description = "商品包装单位(sku)") -public class SupermarketUnitVo{ +public class SmErpUnitVo { /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitWithSpuVo.java similarity index 95% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitWithSpuVo.java index b1ff47581..4e142d15a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitWithSpuVo.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.supermarket.vo; +package com.bsd.pjcloud.supermarket.vo.erp; import com.baomidou.mybatisplus.annotation.*; import com.bsd.pjcloud.common.core.util.MoneyDeserializer; @@ -8,10 +8,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.time.LocalDateTime; - @Data -public class SupermarketUnitWithSpuVo { +public class SmErpUnitWithSpuVo { /** * 货号 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpPageScopeVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpPageScopeVo.java new file mode 100644 index 000000000..2eb51ae84 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/SmErpPageScopeVo.java @@ -0,0 +1,113 @@ +package com.bsd.pjcloud.supermarket.vo.sm; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +@Data +@Schema(description = "后台线上商品-选择库存商品-分页查询库存商品信息") +public class SmErpPageScopeVo { + + /** + * 商品 SPU 编号，自增 + */ + @Schema(description="商品 SPU 编号，自增") + private Long id; + + /** + * 货号 + */ + @Schema(description="货号") + private String productCode; + + /** + * 自编码/条码 + */ + @Schema(description="自编码/条码") + private String barcode; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + private String productName; + + + + /** + * 商品分类编号 + */ + @Schema(description="商品分类编号") + private Long categoryId; + + /** + * 商品封面图 + */ + @Schema(description="商品封面图") + private String picUrl; + + + /** + * 排序字段 + */ + @Schema(description="排序字段") + private Integer sort; + + /** + * 商品状态: 1 上架（开启） 0 下架（禁用） -1 回收 + */ + @Schema(description="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收") + private String status; + + + /** + * 商户编号 + */ + @Schema(description="商户编号") + private Long merchantId; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 规格 + */ +// @Schema(description="规格") +// private String specification; + + /** + * 产地 + */ + @Schema(description="产地") + private String origin; + + /** + * 商品性质(字典) + */ + @Schema(description="商品性质(字典)") + private String productNature; + + + /** + * 辅助条码id + */ + @Schema(description="辅助条码id") + private String auxiliaryBarcodeId; + + /** + * 品牌id + */ + @Schema(description="品牌id") + private Long brandId; + + /** + * 货商id + */ + @Schema(description="货商id") + private Long supplierId; + + +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpBrandController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpBrandController.java index 54080513e..3dcf1ae00 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpBrandController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpBrandController.java @@ -12,7 +12,7 @@ import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.supermarket.entity.SmErpBrandEntity; import com.bsd.pjcloud.supermarket.service.SmErpBrandService; -import com.bsd.pjcloud.supermarket.vo.SupermarketBrandSimpleVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpBrandSimpleVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -131,7 +131,7 @@ public class SmErpBrandController { @GetMapping("/simpleAll") public R getSimpleAll() { List list = smErpBrandService.list(); - List bean = BeanUtils.toBean(list, SupermarketBrandSimpleVo.class); + List bean = BeanUtils.toBean(list, SmErpBrandSimpleVo.class); return R.ok(bean); } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java index 5bda02e99..3a9c91f5f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java @@ -12,7 +12,7 @@ import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity; import com.bsd.pjcloud.supermarket.service.SmErpCategoryService; -import com.bsd.pjcloud.supermarket.vo.SupermarketCategorySimpleVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpCategorySimpleVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -131,7 +131,7 @@ public class SmErpCategoryController { @GetMapping("/simpleAll") public R getSimpleAll() { List list = smErpCategoryService.listScope(); - List bean = BeanUtils.toBean(list, SupermarketCategorySimpleVo.class); + List bean = BeanUtils.toBean(list, SmErpCategorySimpleVo.class); return R.ok(bean); } @@ -147,7 +147,7 @@ public class SmErpCategoryController { public R getAppSimpleAll(@RequestParam("merchantId")Long merchantId) { List list = smErpCategoryService. list(new LambdaQueryWrapper().eq(SmErpCategoryEntity::getMerchantId, merchantId)); - List bean = BeanUtils.toBean(list, SupermarketCategorySimpleVo.class); + List bean = BeanUtils.toBean(list, SmErpCategorySimpleVo.class); return R.ok(bean); } 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 1394c0d0a..547c9c9cc 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 @@ -70,7 +70,23 @@ public class SmErpSpuController { return R.ok(smErpSpuService.pageScope(page, wrapper)); } - + /** + * 分页查询 + * @param page 分页对象 + * @param supermarketSpu 商品spu + * @return + */ + @Operation(summary = "分页查询-线上商城" , description = "分页查询-线上商城" ) + @GetMapping("/onlineSpuPage" ) + @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" ) + public R getOnlineSpuPageScope(@ParameterObject Page page, @ParameterObject SmErpSpuEntity supermarketSpu) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()), SmErpSpuEntity::getProductCode,supermarketSpu.getProductCode()); + wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarcode()), SmErpSpuEntity::getBarcode,supermarketSpu.getBarcode()); + wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName()); + 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/SmErpSupplierController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierController.java index cc9d76b11..25dcd5c23 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierController.java @@ -12,7 +12,7 @@ import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.supermarket.entity.SmErpSupplierEntity; import com.bsd.pjcloud.supermarket.service.SmErpSupplierService; -import com.bsd.pjcloud.supermarket.vo.SmErpSupplierSimpleVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpSupplierSimpleVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -24,7 +24,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 货商管理 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java index aa796380e..c58737e89 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java @@ -12,7 +12,7 @@ import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity; import com.bsd.pjcloud.supermarket.service.SmErpSupplierTypeService; -import com.bsd.pjcloud.supermarket.vo.SmErpSupplierTypeSimpleVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpSupplierTypeSimpleVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -24,7 +24,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 货商类别 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpUnitMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpUnitMapper.java index 48fe2d8c7..245c814e9 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpUnitMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpUnitMapper.java @@ -2,7 +2,7 @@ package com.bsd.pjcloud.supermarket.mapper; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; -import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitWithSpuVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -16,5 +16,5 @@ public interface SmErpUnitMapper extends PjcloudBaseMapper { * @param ids * @return */ - List getSupermarketUnitsWithSpu(List ids); + List getSupermarketUnitsWithSpu(List ids); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java index 231deb0db..067a641e7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java @@ -7,6 +7,7 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; +import com.bsd.pjcloud.supermarket.vo.sm.SmErpPageScopeVo; import java.util.ArrayList; @@ -60,4 +61,13 @@ public interface SmErpSpuService extends IService { * @return */ Object getSupermarketSpuAppDetailById(Long id); + + + /** + * 后台，在线商城分页选择 + * @param page + * @param wrapper + * @return + */ + Page OnlineSpuPageScope(Page page, LambdaQueryWrapper wrapper); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpUnitService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpUnitService.java index 453df828c..b40bf740e 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpUnitService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpUnitService.java @@ -2,7 +2,7 @@ package com.bsd.pjcloud.supermarket.service; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; -import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitWithSpuVo; import java.util.List; @@ -14,5 +14,5 @@ public interface SmErpUnitService extends IService { * @param ids * @return */ - List getSupermarketUnitsWithSpu(List ids); + List getSupermarketUnitsWithSpu(List ids); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index f918fcc46..a911de543 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -15,9 +15,12 @@ import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper; import com.bsd.pjcloud.supermarket.service.SmErpAuxiliaryCodeService; import com.bsd.pjcloud.supermarket.service.SmErpSpuService; import com.bsd.pjcloud.supermarket.service.SmErpUnitService; -import com.bsd.pjcloud.supermarket.vo.*; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuDetailsVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppUnitVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpAuxiliaryCodeVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpSpuVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitVo; +import com.bsd.pjcloud.supermarket.vo.sm.SmErpPageScopeVo; import lombok.AllArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -145,7 +148,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl list = baseMapper.selectListAllScope(supermarketSpuQueryDTO, DataScope.of()); - List bean = BeanUtils.toBean(list, SupermarketSpuVo.class); + List bean = BeanUtils.toBean(list, SmErpSpuVo.class); return bean; @@ -156,12 +159,12 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); List supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SmErpAuxiliaryCodeEntity::getSpuId, id)); - SupermarketSpuVo supermarketSpuVo = BeanUtils.toBean(smErpSpuEntity, SupermarketSpuVo.class); - List supermarketUnitVoList = BeanUtils.toBean(smErpUnitEntityList, SupermarketUnitVo.class); - List supermarketAuxiliaryCodeVos = BeanUtils.toBean(supermarketAuxiliaryCodeEntities, SupermarketAuxiliaryCodeVo.class); - supermarketSpuVo.setSupermarketUnitEntityList(supermarketUnitVoList); - supermarketSpuVo.setSupermarketAuxiliaryCodeEntityList(supermarketAuxiliaryCodeVos); - return supermarketSpuVo; + SmErpSpuVo smErpSpuVo = BeanUtils.toBean(smErpSpuEntity, SmErpSpuVo.class); + List smErpUnitVoList = BeanUtils.toBean(smErpUnitEntityList, SmErpUnitVo.class); + List smErpAuxiliaryCodeVos = BeanUtils.toBean(supermarketAuxiliaryCodeEntities, SmErpAuxiliaryCodeVo.class); + smErpSpuVo.setSupermarketUnitEntityList(smErpUnitVoList); + smErpSpuVo.setSupermarketAuxiliaryCodeEntityList(smErpAuxiliaryCodeVos); + return smErpSpuVo; } @Override @@ -174,4 +177,23 @@ public class SmErpSpuServiceImpl extends ServiceImpl OnlineSpuPageScope(Page page, LambdaQueryWrapper wrapper) { + wrapper.eq(SmErpSpuEntity::getStatus, "0"); + // 查询分页数据 + Page spuPage = baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + + // 将 SmErpSpuEntity 转换为 SmErpPageScopeVo + List voList = spuPage.getRecords().stream() + .map(entity -> BeanUtils.toBean(entity, SmErpPageScopeVo.class)) + .collect(Collectors.toList()); + + // 创建新的 Page 对象并设置数据 + Page resultPage = new Page<>(); + org.springframework.beans.BeanUtils.copyProperties(spuPage, resultPage); + resultPage.setRecords(voList); + + return resultPage; + } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpUnitServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpUnitServiceImpl.java index 88f32b91c..658a72d68 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpUnitServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpUnitServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpUnitMapper; import com.bsd.pjcloud.supermarket.service.SmErpUnitService; -import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitWithSpuVo; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +18,7 @@ import java.util.List; @Service public class SmErpUnitServiceImpl extends ServiceImpl implements SmErpUnitService { @Override - public List getSupermarketUnitsWithSpu(List ids) { + public List getSupermarketUnitsWithSpu(List ids) { return baseMapper.getSupermarketUnitsWithSpu(ids); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml index 42baa2345..db473a0fb 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml @@ -23,7 +23,7 @@ - +