From a589ea476500365820e7f8b7ae0efa059b14c994 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 18 Jun 2025 16:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=8F=A3=E5=91=B3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A2=9E=E5=8A=A0=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E7=BA=BF=E5=95=86=E5=9F=8E=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SmErpAuxiliaryCodeEntity.java | 5 + .../controller/ShopCategoryController.java | 121 ++++++++++++++++++ .../entity/ShopCategoryEntity.java | 115 +++++++++++++++++ .../mapper/ShopCategoryMapper.java | 11 ++ .../service/ShopCategoryService.java | 8 ++ .../service/impl/ShopCategoryServiceImpl.java | 16 +++ .../service/impl/SmErpSpuServiceImpl.java | 53 ++++++-- .../resources/mapper/ShopCategoryMapper.xml | 22 ++++ 8 files changed, 341 insertions(+), 10 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ShopCategoryController.java create mode 100644 pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopCategoryEntity.java create mode 100644 pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/ShopCategoryMapper.java create mode 100644 pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/ShopCategoryService.java create mode 100644 pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopCategoryServiceImpl.java create mode 100644 pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/ShopCategoryMapper.xml 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 8b06edc5e..07b48301a 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 @@ -90,4 +90,9 @@ public class SmErpAuxiliaryCodeEntity extends Model { @Schema(description="包装单位") @TableField(exist = false) private String unit; + + + @Schema(description="口味") + @TableField(exist = false) + private String taste; } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ShopCategoryController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ShopCategoryController.java new file mode 100644 index 000000000..f37f5c95b --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ShopCategoryController.java @@ -0,0 +1,121 @@ +package com.bsd.pjcloud.supermarket.controller; + +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.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.ShopCategoryEntity; +import com.bsd.pjcloud.supermarket.service.ShopCategoryService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 在线商品分类 + * + * @author zjf + * @date 2025-06-18 16:49:20 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/shopCategory" ) +@Tag(description = "shopCategory" , name = "在线商品分类管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class ShopCategoryController { + + private final ShopCategoryService shopCategoryService; + + /** + * 分页查询 + * @param page 分页对象 + * @param shopCategory 在线商品分类 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('supermarket_shopCategory_view')" ) + public R getShopCategoryPage(@ParameterObject Page page, @ParameterObject ShopCategoryEntity shopCategory) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StrUtil.isNotBlank(shopCategory.getName()),ShopCategoryEntity::getName,shopCategory.getName()); + return R.ok(shopCategoryService.page(page, wrapper)); + } + + + /** + * 通过id查询在线商品分类 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('supermarket_shopCategory_view')" ) + public R getById(@PathVariable("id" ) Integer id) { + return R.ok(shopCategoryService.getById(id)); + } + + /** + * 新增在线商品分类 + * @param shopCategory 在线商品分类 + * @return R + */ + @Operation(summary = "新增在线商品分类" , description = "新增在线商品分类" ) + @SysLog("新增在线商品分类" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('supermarket_shopCategory_add')" ) + public R save(@RequestBody ShopCategoryEntity shopCategory) { + return R.ok(shopCategoryService.save(shopCategory)); + } + + /** + * 修改在线商品分类 + * @param shopCategory 在线商品分类 + * @return R + */ + @Operation(summary = "修改在线商品分类" , description = "修改在线商品分类" ) + @SysLog("修改在线商品分类" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('supermarket_shopCategory_edit')" ) + public R updateById(@RequestBody ShopCategoryEntity shopCategory) { + return R.ok(shopCategoryService.updateById(shopCategory)); + } + + /** + * 通过id删除在线商品分类 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除在线商品分类" , description = "通过id删除在线商品分类" ) + @SysLog("通过id删除在线商品分类" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('supermarket_shopCategory_del')" ) + public R removeById(@RequestBody Integer[] ids) { + return R.ok(shopCategoryService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param shopCategory 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('supermarket_shopCategory_export')" ) + public List export(ShopCategoryEntity shopCategory,Integer[] ids) { + return shopCategoryService.list(Wrappers.lambdaQuery(shopCategory).in(ArrayUtil.isNotEmpty(ids), ShopCategoryEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopCategoryEntity.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopCategoryEntity.java new file mode 100644 index 000000000..d1bd01694 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopCategoryEntity.java @@ -0,0 +1,115 @@ +package com.bsd.pjcloud.supermarket.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 在线商品分类 + * + * @author zjf + * @date 2025-06-18 16:49:20 + */ +@Data +@TenantTable +@TableName("shop_category") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "在线商品分类") +public class ShopCategoryEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Integer id; + + /** + * 父级分类ID，0为顶级 + */ + @Schema(description="父级分类ID，0为顶级") + private Integer parentId; + + /** + * 分类名称 + */ + @Schema(description="分类名称") + private String name; + + /** + * 层级(1/2/3) + */ + @Schema(description="层级(1/2/3)") + private Integer level; + + /** + * 排序 + */ + @Schema(description="排序") + private Integer sort; + + /** + * 状态(0正常，1下架) + */ + @Schema(description="状态(0正常，1下架)") + private Integer status; + + /** + * 分类图片 + */ + @Schema(description="分类图片") + private String picUrl; + + /** + * 部门ID + */ + @Schema(description="部门ID") + private Long deptId; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建者") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新者") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除（0=正常 1=删除） + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除（0=正常 1=删除）") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/ShopCategoryMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/ShopCategoryMapper.java new file mode 100644 index 000000000..2d4836d2a --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/ShopCategoryMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.supermarket.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.supermarket.entity.ShopCategoryEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopCategoryMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/ShopCategoryService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/ShopCategoryService.java new file mode 100644 index 000000000..fc67a34bd --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/ShopCategoryService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.supermarket.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.supermarket.entity.ShopCategoryEntity; + +public interface ShopCategoryService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopCategoryServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopCategoryServiceImpl.java new file mode 100644 index 000000000..a6f0f1972 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopCategoryServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.supermarket.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.supermarket.entity.ShopCategoryEntity; +import com.bsd.pjcloud.supermarket.mapper.ShopCategoryMapper; +import com.bsd.pjcloud.supermarket.service.ShopCategoryService; +import org.springframework.stereotype.Service; +/** + * 在线商品分类 + * + * @author zjf + * @date 2025-06-18 16:49:20 + */ +@Service +public class ShopCategoryServiceImpl extends ServiceImpl implements ShopCategoryService { +} \ 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 57fc9b4e0..36ff006a6 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 @@ -241,23 +241,56 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpAuxiliaryCodeEntityList = supermarketSpu.getSmErpAuxiliaryCodeEntityList(); if (CollectionUtils.isNotEmpty(smErpAuxiliaryCodeEntityList)) { List 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; - 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)); + + // 构建包装单位映射：根据单位名称和口味分组 + Map unitMap = new HashMap<>(); + + // 先处理已存在的包装单位 + if (CollectionUtils.isNotEmpty(updateUnits)) { + unitMap.putAll(updateUnits.stream() + .collect(Collectors.toMap( + unit -> unit.getUnit() + "_" + (unit.getTaste() != null ? unit.getTaste() : ""), + unit -> unit + ))); } - for (int i = 0; i < insertCollect.size(); i++) { - SmErpAuxiliaryCodeEntity smErpAuxiliaryCodeEntity = insertCollect.get(i); - smErpAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()); - smErpAuxiliaryCodeEntity.setUnitId(unitMap.get(smErpAuxiliaryCodeEntity.getUnit()).getId()); + + // 再处理新增的包装单位 + if (CollectionUtils.isNotEmpty(insertUnits)) { + unitMap.putAll(insertUnits.stream() + .collect(Collectors.toMap( + unit -> unit.getUnit() + "_" + (unit.getTaste() != null ? unit.getTaste() : ""), + unit -> unit + ))); + } + + // 为新增的辅助条码设置包装单位ID + for (SmErpAuxiliaryCodeEntity auxiliaryCode : insertCollect) { + String unitKey = auxiliaryCode.getUnit() + "_" + (auxiliaryCode.getTaste() != null ? auxiliaryCode.getTaste() : ""); + SmErpUnitEntity unit = unitMap.get(unitKey); + if (unit != null) { + auxiliaryCode.setSpuId(supermarketSpu.getId()); + auxiliaryCode.setUnitId(unit.getId()); + } else { + return R.failed("找不到对应的包装单位：" + auxiliaryCode.getUnit() + "，口味：" + (auxiliaryCode.getTaste() != null ? auxiliaryCode.getTaste() : "无")); } - + } + + // 为更新的辅助条码设置包装单位ID（如果单位发生变化） + for (SmErpAuxiliaryCodeEntity auxiliaryCode : updateCollect) { + String unitKey = auxiliaryCode.getUnit() + "_" + (auxiliaryCode.getTaste() != null ? auxiliaryCode.getTaste() : ""); + SmErpUnitEntity unit = unitMap.get(unitKey); + if (unit != null) { + auxiliaryCode.setUnitId(unit.getId()); + } else { + return R.failed("找不到对应的包装单位：" + auxiliaryCode.getUnit() + "，口味：" + (auxiliaryCode.getTaste() != null ? auxiliaryCode.getTaste() : "无")); + } + } smErpAuxiliaryCodeService.saveBatch(insertCollect); smErpAuxiliaryCodeService.updateBatchById(updateCollect); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/ShopCategoryMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/ShopCategoryMapper.xml new file mode 100644 index 000000000..9ac6f6bd8 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/ShopCategoryMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file