From cb0dfd7b24144b6cc77fd468f672d0dba4a8a28f Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 11 Jun 2025 16:35:53 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=95=86=E5=9F=8E-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/supermarket/vo/OnlineShopVo.java | 76 +++++++++++++++++++ .../controller/SmSpuController.java | 43 +++++++++++ .../supermarket/service/SmSpuService.java | 7 ++ .../service/impl/SmErpSpuServiceImpl.java | 2 +- .../service/impl/SmSpuServiceImpl.java | 13 ++++ 5 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java new file mode 100644 index 000000000..a14742855 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java @@ -0,0 +1,76 @@ +package com.bsd.pjcloud.supermarket.vo; + + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * 在线商城 商品数据 + */ +@Data +public class OnlineShopVo { + + + private Long categoryId; + + private String categoryName; + + private List smSpuVos; + + @Data + class SmSpuVo { + /** + * 线上SPU 编号，自增 + */ + @Schema(description="线上SPU 编号，自增") + private Long id; + + /** + * 库存商品id + */ + @Schema(description="库存商品id") + private Long erpSpuId; + + /** + * 商品详情 + */ + @Schema(description="商品详情") + private String description; + + /** + * 商品轮播图地址 + 数组，以逗号分隔 + 最多上传15张 + */ + @Schema(description="商品轮播图地址") + private String sliderPicUrls; + + /** + * 排序字段 + */ + @Schema(description="排序字段") + private Integer sort; + + + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 销量 + */ + @Schema(description="销量") + private Integer salesCount; + + } + + +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java index f8d3103c8..7e94aeb7f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java @@ -11,11 +11,15 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; 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.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper; +import com.bsd.pjcloud.supermarket.service.SmErpCategoryService; import com.bsd.pjcloud.supermarket.service.SmErpSpuService; import com.bsd.pjcloud.supermarket.service.SmSpuService; +import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpCategorySimpleVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmSpuEditVo; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; @@ -31,6 +35,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 线上超市 @@ -50,6 +55,10 @@ public class SmSpuController { private final SmErpSpuService smErpSpuService; private final RemoteMchService remoteMchService; + + private final SmErpCategoryService smErpCategoryService; + + /** * 分页查询 * @param page 分页对象 @@ -145,5 +154,39 @@ public class SmSpuController { + /** + * 获取商户下所有的在线商品，并且获取分类 + * @return + */ + @Operation(summary = "APP在线商城数据查询",description = "通过商户id获取该商户下的在线商品数据") + @GetMapping("/app/onlineShopList") + public R> getOnlineShopList(@RequestParam("merchantId")Long merchantId) { + + List list=smSpuService.getOnlineShopList(merchantId); + + return R.ok(); + } + + + + /** + * 获取商户下所有的在线商品，并且获取分类 + * @return + */ + @Operation(summary = "APP在线商城数据查询",description = "通过商户id获取该商户下的在线商品数据") + @GetMapping("/app/onlineCategoryList") + public R> getOnlineCategoryList(@RequestParam("merchantId")Long merchantId) { + + R byId = remoteMchService.getById(merchantId); + MchManageVo data = byId.getData(); + if (Objects.isNull(data)){ + return R.failed("商户不存在"); + } + Long deptId = data.getDeptId(); + + List categoryEntities = smErpCategoryService.list(Wrappers.lambdaQuery().eq(SmErpCategoryEntity::getDeptId, deptId)); + List bean = BeanUtils.toBean(categoryEntities, SmErpCategorySimpleVo.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/service/SmSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java index 8accd737d..5428084a4 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java @@ -18,4 +18,11 @@ public interface SmSpuService extends IService { Object getAppPage(Page page, SupermarketSpuAppQueryDTO supermarketSpuQueryDTO); + + /** + * 查询该商户下的所有在线商品数据 + * @param merchantId + * @return + */ + List getOnlineShopList(Long merchantId); } \ 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 82231c9ba..cdadbe179 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 @@ -558,7 +558,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl duplicateRows = importProductCodeMap.get(productCode); if (duplicateRows.size() > 1) { diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java index 6ee833b76..cb3ac10e4 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java @@ -48,4 +48,17 @@ public class SmSpuServiceImpl extends ServiceImpl impl IPage appPage=baseMapper.getAppPage(page,supermarketSpuQueryDTO); return appPage; } + + @Override + public List getOnlineShopList(Long merchantId) { + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(SmSpuEntity::getMerchantId, merchantId) + //上架数据 0 + .eq(SmSpuEntity::getStatus, "0"); + List list = baseMapper.selectList(eq); + + List erpSpuIds= list.stream().map(smSpuEntity -> smSpuEntity.getErpSpuId()).collect(Collectors.toList()); + + return list; + } } \ No newline at end of file From 24c47b2f7dcecc1b8cd910826a7451edf6004061 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 11 Jun 2025 18:47:24 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=95=86=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/supermarket/vo/OnlineShopVo.java | 96 +++++++++++++------ .../vo/sm/smspu/app/SmErpUnitAppVo.java | 74 ++++++++++++++ .../controller/SmSpuController.java | 42 +++++--- .../supermarket/mapper/SmSpuMapper.java | 12 +++ .../supermarket/service/SmSpuService.java | 8 +- .../service/impl/SmSpuServiceImpl.java | 10 +- .../src/main/resources/mapper/SmSpuMapper.xml | 12 +++ 7 files changed, 205 insertions(+), 49 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/app/SmErpUnitAppVo.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java index a14742855..e3430e109 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java @@ -2,33 +2,27 @@ package com.bsd.pjcloud.supermarket.vo; import com.baomidou.mybatisplus.annotation.*; +import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity; +import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; +import com.bsd.pjcloud.supermarket.vo.sm.smspu.app.SmErpUnitAppVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; /** - * 在线商城 商品数据 + * app在线商城 商品列表数据 */ @Data public class OnlineShopVo { - private Long categoryId; - private String categoryName; - - private List smSpuVos; - - @Data - class SmSpuVo { - /** - * 线上SPU 编号，自增 - */ - @Schema(description="线上SPU 编号，自增") - private Long id; + @Schema(description="线上SPU 编号，自增") + private Long id; /** * 库存商品id @@ -50,19 +44,6 @@ public class OnlineShopVo { @Schema(description="商品轮播图地址") private String sliderPicUrls; - /** - * 排序字段 - */ - @Schema(description="排序字段") - private Integer sort; - - - - /** - * 部门id - */ - @Schema(description="部门id") - private Long deptId; /** * 销量 @@ -70,7 +51,68 @@ public class OnlineShopVo { @Schema(description="销量") private Integer salesCount; - } + + + /** + * 货号 + */ + @Schema(description="货号") + private String productCode; + + /** + * 自编码/条码 + */ + @Schema(description="自编码/条码") + private String barcode; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + private String productName; + + + /** + * 商品简介 + */ + @Schema(description="商品简介") + private String introduction; + + + /** + * 商品封面图 + */ + @Schema(description="商品封面图") + private String picUrl; + + + /** + * 库存 + */ + @Schema(description="库存") + private Double stock; + + + /** + * 商品性质(字典) + */ + @Schema(description="商品性质(字典)") + private String productNature; + + + /** + * 货商id + */ + @Schema(description="货商id") + private Long supplierName; + + + + + @Schema(description = "包装对象集合对象") + private List smErpUnitEntityList; + + } diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/app/SmErpUnitAppVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/app/SmErpUnitAppVo.java new file mode 100644 index 000000000..a084ec00c --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/app/SmErpUnitAppVo.java @@ -0,0 +1,74 @@ +package com.bsd.pjcloud.supermarket.vo.sm.smspu.app; + + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@Schema(description = "移动端商品列表包装对象vo") +public class SmErpUnitAppVo { + /** + * 包装单位id + */ + @Schema(description="包装单位id") + private Long id; + + /** + * 条码 + */ + @Schema(description="条码") + private String barCode; + + /** + * 规格 + */ + @Schema(description="规格") + private String spec; + + /** + * 单位 + */ + @Schema(description="单位") + private String unit; + + /** + * 状态(0正常，1停销) + */ + @Schema(description="状态(0正常，1停销)") + private Integer status; + + /** + * 内装数量 + */ + @Schema(description="内装数量") + private Integer packageNum; + + /** + * 零售价/单位分 + */ + @Schema(description="零售价/单位分") + private Integer retailPrice; + + /** + * spuID + */ + @Schema(description="spuID") + private Long spuId; + + /** + * 促销价 + */ + @Schema(description="促销价") + private Integer promotionPrice; + + + + + + + @Schema(description = "是否是基础库存,默认0否，1是") + private Boolean isBase; +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java index 7e94aeb7f..02826db54 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; @@ -160,31 +161,48 @@ public class SmSpuController { */ @Operation(summary = "APP在线商城数据查询",description = "通过商户id获取该商户下的在线商品数据") @GetMapping("/app/onlineShopList") - public R> getOnlineShopList(@RequestParam("merchantId")Long merchantId) { + public R> getOnlineShopList(@RequestParam("categoryId")Long categoryId,@ParameterObject Page page) { - List list=smSpuService.getOnlineShopList(merchantId); + IPage onlineShopList = smSpuService.getOnlineShopList(categoryId, page); - return R.ok(); + return R.ok(onlineShopList); } /** - * 获取商户下所有的在线商品，并且获取分类 + * 获取商户下所有获取分类 * @return */ - @Operation(summary = "APP在线商城数据查询",description = "通过商户id获取该商户下的在线商品数据") + @Operation(summary = "APP在线商城分类数据查询",description = "获取商户下所有获取分类通过商户id") @GetMapping("/app/onlineCategoryList") public R> getOnlineCategoryList(@RequestParam("merchantId")Long merchantId) { - R byId = remoteMchService.getById(merchantId); - MchManageVo data = byId.getData(); - if (Objects.isNull(data)){ - return R.failed("商户不存在"); - } - Long deptId = data.getDeptId(); +// R byId = remoteMchService.getById(merchantId); +// MchManageVo data = byId.getData(); +// if (Objects.isNull(data)){ +// return R.failed("商户不存在"); +// } +// Long deptId = data.getDeptId(); +// +// List categoryEntities = smErpCategoryService.list(Wrappers.lambdaQuery().eq(SmErpCategoryEntity::getDeptId, deptId)); +// List bean = BeanUtils.toBean(categoryEntities, SmErpCategorySimpleVo.class); + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(SmSpuEntity::getMerchantId, merchantId) + //上架数据 0 + .eq(SmSpuEntity::getStatus, "0"); + List list = smSpuService.list(eq); + List erpSpuIds = list.stream().map(smSpuEntity -> smSpuEntity.getErpSpuId()).collect(Collectors.toList()); - List categoryEntities = smErpCategoryService.list(Wrappers.lambdaQuery().eq(SmErpCategoryEntity::getDeptId, deptId)); + LambdaQueryWrapper smErpSpuEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + smErpSpuEntityLambdaQueryWrapper.in(SmErpSpuEntity::getId, erpSpuIds); + List erpSpuEntities = smErpSpuService.list(smErpSpuEntityLambdaQueryWrapper); + + List categoryIds= erpSpuEntities.stream().map(smErpSpuEntity -> smErpSpuEntity.getCategoryId()).collect(Collectors.toList()); + + LambdaQueryWrapper smErpCategoryEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + smErpCategoryEntityLambdaQueryWrapper.in(SmErpCategoryEntity::getId, categoryIds); + List categoryEntities = smErpCategoryService.list(smErpCategoryEntityLambdaQueryWrapper); List bean = BeanUtils.toBean(categoryEntities, SmErpCategorySimpleVo.class); return R.ok(bean); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java index b40f9faf1..c9d4fa95b 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java @@ -7,11 +7,14 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; +import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface SmSpuMapper extends PjcloudBaseMapper { @@ -33,4 +36,13 @@ public interface SmSpuMapper extends PjcloudBaseMapper { * @return */ IPage getAppPage(Page page, @Param("supermarketSpuQueryDTO")SupermarketSpuAppQueryDTO supermarketSpuQueryDTO); + + + /** + * 移动端分页获取线上商品数据 + * @param categoryId + * @param page + * @return + */ + IPage getOnlineShopList(@Param("categoryId") Long categoryId, Page page); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java index 5428084a4..7b0d5da1d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java @@ -1,10 +1,12 @@ package com.bsd.pjcloud.supermarket.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; +import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo; import java.util.List; @@ -20,9 +22,9 @@ public interface SmSpuService extends IService { Object getAppPage(Page page, SupermarketSpuAppQueryDTO supermarketSpuQueryDTO); /** - * 查询该商户下的所有在线商品数据 - * @param merchantId + * 查询该分类下的所有在线商品数据 + * @param categoryId * @return */ - List getOnlineShopList(Long merchantId); + IPage getOnlineShopList(Long categoryId, Page page); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java index cb3ac10e4..c0673d5a1 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java @@ -13,6 +13,7 @@ import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper; import com.bsd.pjcloud.supermarket.mapper.SmErpUnitMapper; import com.bsd.pjcloud.supermarket.mapper.SmSpuMapper; import com.bsd.pjcloud.supermarket.service.SmSpuService; +import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; @@ -50,14 +51,9 @@ public class SmSpuServiceImpl extends ServiceImpl impl } @Override - public List getOnlineShopList(Long merchantId) { - LambdaQueryWrapper eq = new LambdaQueryWrapper() - .eq(SmSpuEntity::getMerchantId, merchantId) - //上架数据 0 - .eq(SmSpuEntity::getStatus, "0"); - List list = baseMapper.selectList(eq); + public IPage getOnlineShopList(Long categoryId, Page page) { - List erpSpuIds= list.stream().map(smSpuEntity -> smSpuEntity.getErpSpuId()).collect(Collectors.toList()); + IPage list = baseMapper.getOnlineShopList(categoryId,page); return list; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml index e7ef6604f..8c3204bdb 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml @@ -53,4 +53,16 @@ + \ No newline at end of file From 94d62329d19c9fcceb06c4ac548fc270604601c0 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 12 Jun 2025 11:42:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/supermarket/dto/SmSpuPageDTO.java | 10 +++++++++ .../controller/SmSpuController.java | 3 ++- .../supermarket/mapper/SmSpuMapper.java | 3 ++- .../supermarket/service/SmSpuService.java | 3 ++- .../service/impl/SmSpuServiceImpl.java | 3 ++- .../src/main/resources/mapper/SmSpuMapper.xml | 22 ++++++++++++++----- 6 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java new file mode 100644 index 000000000..fcf3506a4 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java @@ -0,0 +1,10 @@ +package com.bsd.pjcloud.supermarket.dto; + + +import lombok.Data; + +@Data +public class SmSpuPageDTO { + + private String productName; +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java index 02826db54..f59e9be36 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java @@ -12,6 +12,7 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; @@ -69,7 +70,7 @@ public class SmSpuController { @Operation(summary = "分页查询" , description = "分页查询" ) @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('supermarket_smSpu_view')" ) - public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuEntity smSpu) { + public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuPageDTO smSpu) { return R.ok(smSpuService.pageScope(page, smSpu)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java index c9d4fa95b..fc02839ec 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; @@ -26,7 +27,7 @@ public interface SmSpuMapper extends PjcloudBaseMapper { * @param of * @return */ - IPage selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuEntity smSpu, DataScope of); + IPage selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuPageDTO smSpu, DataScope of); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java index 7b0d5da1d..32f5dcca5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.vo.OnlineShopVo; @@ -15,7 +16,7 @@ public interface SmSpuService extends IService { - Object pageScope(Page page, SmSpuEntity smSpu); + Object pageScope(Page page, SmSpuPageDTO smSpu); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java index c0673d5a1..85db26a6d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper; @@ -39,7 +40,7 @@ public class SmSpuServiceImpl extends ServiceImpl impl private final SmErpUnitMapper smErpUnitMapper; @Override - public Object pageScope(Page page, SmSpuEntity smSpu) { + public Object pageScope(Page page, SmSpuPageDTO smSpu) { IPage pageData = baseMapper.selectSmErpPageScopeVo(page,smSpu, DataScope.of()); return pageData; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml index 8c3204bdb..a1d96d1d3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml @@ -30,7 +30,13 @@ on sp.erp_spu_id = esp.id left join sm_erp_category eca on esp.category_id = eca.id - where sp.del_flag = 0 + + esp.del_flag = 0 and sp.del_flag = 0 + + and esp.product_name like concat('%', #{smspu.productName}, '%') + + + \ No newline at end of file From cd3c05811ca6f01bc591b609aaaa56b46cff875c Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 12 Jun 2025 15:16:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/pjcloud/supermarket/controller/SmErpSpuController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7d3165347..65d9aa540 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 @@ -229,7 +229,7 @@ public class SmErpSpuController { */ @PostMapping("/import") @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_import')" ) - @Idempotent(key = "#key", expireTime = 10, info = "请勿重复导入,10秒后再重新尝试") + @Idempotent(expireTime = 10, info = "请勿重复导入,10秒后再重新尝试") public R importErpSpu(@RequestExcel List dtos, BindingResult bindingResult) { List collect = dtos.stream().filter(smErpSpuImportDto -> smErpSpuImportDto.getProductCode() != null).collect(Collectors.toList()); if (CollectionUtils.isEmpty(collect)) { From 638c546d37e0734aef66d0d97e985543905fb79d Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 12 Jun 2025 16:11:42 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E5=B8=82?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E6=9D=A1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SmErpAuxiliaryCodeEntity.java | 5 +++++ .../service/impl/SmErpSpuServiceImpl.java | 20 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java index d83d8b48b..8b06edc5e 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java @@ -85,4 +85,9 @@ public class SmErpAuxiliaryCodeEntity extends Model { @Schema(description="包装单位id") private Long unitId; + + + @Schema(description="包装单位") + @TableField(exist = false) + private String unit; } \ 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 cdadbe179..2472f4764 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 @@ -108,6 +108,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl unitMap = smErpUnitEntityList.stream().collect(Collectors.toMap(smErpUnitEntity -> smErpUnitEntity.getUnit(), smErpUnitEntity -> smErpUnitEntity)); + //辅助条码 List smErpAuxiliaryCodeEntityList = supermarketSpu.getSmErpAuxiliaryCodeEntityList(); if (CollectionUtils.isNotEmpty(smErpAuxiliaryCodeEntityList)) { - smErpAuxiliaryCodeEntityList.forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId())); + for (int i = 0; i < smErpAuxiliaryCodeEntityList.size(); i++) { + SmErpAuxiliaryCodeEntity smErpAuxiliaryCodeEntity = smErpAuxiliaryCodeEntityList.get(i); + smErpAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()); + smErpAuxiliaryCodeEntity.setUnitId(unitMap.get(smErpAuxiliaryCodeEntity.getUnit()).getId()); + } smErpAuxiliaryCodeService.saveBatch(smErpAuxiliaryCodeEntityList); } @@ -165,7 +172,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList(); - + List insertUnits= new ArrayList<>(); if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) { List baseUnits = smErpUnitEntityList.stream() @@ -178,7 +185,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl insertUnits = smErpUnitEntityList.stream() + insertUnits = smErpUnitEntityList.stream() .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList()); insertUnits.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId())); List updateUnits = smErpUnitEntityList.stream() @@ -234,7 +241,12 @@ public class SmErpSpuServiceImpl extends ServiceImpl insertCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList()); List updateCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() != null).collect(Collectors.toList()); - insertCollect.stream().forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId())); + Map unitMap = insertUnits.stream().collect(Collectors.toMap(smErpUnitEntity -> smErpUnitEntity.getUnit(), smErpUnitEntity -> smErpUnitEntity)); + for (int i = 0; i < insertCollect.size(); i++) { + SmErpAuxiliaryCodeEntity smErpAuxiliaryCodeEntity = insertCollect.get(i); + smErpAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()); + smErpAuxiliaryCodeEntity.setUnitId(unitMap.get(smErpAuxiliaryCodeEntity.getUnit()).getId()); + } smErpAuxiliaryCodeService.saveBatch(insertCollect); smErpAuxiliaryCodeService.updateBatchById(updateCollect); From 8dffb993a45d7536312e2c88573f71753d6c8372 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 13 Jun 2025 13:03:24 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E5=B8=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SmErpSpuController.java | 1 + .../service/impl/SmErpSpuServiceImpl.java | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) 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 65d9aa540..293fc6bf1 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 @@ -84,6 +84,7 @@ public class SmErpSpuController { wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()), SmErpSpuEntity::getProductCode,supermarketSpu.getProductCode()); wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarcode()), SmErpSpuEntity::getBarcode,supermarketSpu.getBarcode()); wrapper.like(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName()); + wrapper.orderByDesc(SmErpSpuEntity::getCreateTime); return R.ok(smErpSpuService.pageScope(page, wrapper)); } 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 2472f4764..ee971116b 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 @@ -173,6 +173,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList(); List insertUnits= new ArrayList<>(); + List updateUnits= new ArrayList<>(); if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) { List baseUnits = smErpUnitEntityList.stream() @@ -188,7 +189,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl supermarketUnitEntity.getId() == null).collect(Collectors.toList()); insertUnits.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId())); - List updateUnits = smErpUnitEntityList.stream() + updateUnits = smErpUnitEntityList.stream() .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() != null).collect(Collectors.toList()); smErpUnitService.updateBatchById(updateUnits); smErpUnitService.saveBatch(insertUnits); @@ -241,12 +242,19 @@ public class SmErpSpuServiceImpl extends ServiceImpl insertCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList()); List updateCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() != null).collect(Collectors.toList()); - Map unitMap = insertUnits.stream().collect(Collectors.toMap(smErpUnitEntity -> smErpUnitEntity.getUnit(), smErpUnitEntity -> smErpUnitEntity)); - for (int i = 0; i < insertCollect.size(); i++) { - SmErpAuxiliaryCodeEntity smErpAuxiliaryCodeEntity = insertCollect.get(i); - smErpAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()); - smErpAuxiliaryCodeEntity.setUnitId(unitMap.get(smErpAuxiliaryCodeEntity.getUnit()).getId()); + Map unitMap; + if (CollectionUtils.isNotEmpty(insertUnits)){ + unitMap = insertUnits.stream().collect(Collectors.toMap(smErpUnitEntity -> smErpUnitEntity.getUnit(), smErpUnitEntity -> smErpUnitEntity)); + }else { + unitMap = updateUnits.stream().collect(Collectors.toMap(smErpUnitEntity -> smErpUnitEntity.getUnit(), smErpUnitEntity -> smErpUnitEntity)); } + for (int i = 0; i < insertCollect.size(); i++) { + SmErpAuxiliaryCodeEntity smErpAuxiliaryCodeEntity = insertCollect.get(i); + smErpAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()); + smErpAuxiliaryCodeEntity.setUnitId(unitMap.get(smErpAuxiliaryCodeEntity.getUnit()).getId()); + } + + smErpAuxiliaryCodeService.saveBatch(insertCollect); smErpAuxiliaryCodeService.updateBatchById(updateCollect); From 3decfc9bf7f4c22d69a5e486cdb3b1df98d9a2ee Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 13 Jun 2025 13:37:40 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E5=8D=95=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bsd/pjcloud/supermarket/service/SmErpSpuService.java | 5 +++++ .../service/impl/SmErpInventoryRecordsServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 cbbe59f03..daf81367c 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 @@ -102,4 +102,9 @@ public interface SmErpSpuService extends IService { */ R importErpSpu(List smErpSupplierImportDtos, BindingResult bindingResult); + + + +// R calculateCostPrice(); + } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java index 7ce471126..d9d4f2700 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java @@ -163,7 +163,7 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl itemEntity.getPackageNum() * itemEntity.getQuantity()).sum(); int totalRealRrice = smErpInventoryRecordsItemEntityList.stream().filter(Objects::nonNull).mapToInt(SmErpCostPriceVo::getTotalAmount).sum(); - double costPrice = (totalRealRrice / 100) / totalNum; + double costPrice = totalRealRrice / totalNum; SmErpSpuEntity smErpSpuEntity = new SmErpSpuEntity(); smErpSpuEntity.setCostPrice(costPrice); From 08890883c4a35dc3e4182e33c5f3772c625fe62e Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 13 Jun 2025 13:42:53 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E5=8D=95=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SmErpInventoryRecordsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java index d9d4f2700..7ce471126 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java @@ -163,7 +163,7 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl itemEntity.getPackageNum() * itemEntity.getQuantity()).sum(); int totalRealRrice = smErpInventoryRecordsItemEntityList.stream().filter(Objects::nonNull).mapToInt(SmErpCostPriceVo::getTotalAmount).sum(); - double costPrice = totalRealRrice / totalNum; + double costPrice = (totalRealRrice / 100) / totalNum; SmErpSpuEntity smErpSpuEntity = new SmErpSpuEntity(); smErpSpuEntity.setCostPrice(costPrice); From 5c480b5932160b02684e9d4851f3e32a031978e2 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 13 Jun 2025 13:46:41 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 ee971116b..1f93408ff 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 @@ -630,6 +630,10 @@ public class SmErpSpuServiceImpl extends ServiceImpl Date: Fri, 13 Jun 2025 16:46:05 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E6=9D=A1=E4=BB=B6=E5=86=85=E8=A3=85=E6=95=B0?= =?UTF-8?q?>0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1f93408ff..97160f01a 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 @@ -124,6 +124,10 @@ public class SmErpSpuServiceImpl extends ServiceImpl unitCollect = smErpUnitEntityList.stream().filter(smErpUnitEntity -> smErpUnitEntity.getPackageNum() <= 0).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(unitCollect)){ + return R.failed("包装类型内装数量不能小于等于0!"); + } if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) { smErpUnitEntityList.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId())); smErpUnitService.saveBatch(smErpUnitEntityList);