From e3d5e14c2a5e48f4d91d25c8147184cd5c039d93 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 15 Sep 2025 20:05:13 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=8E=BB=E6=8E=89prodName;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/storeHomepage/StoreHomeProdResVO.java | 2 -- .../controller/xkt/vo/storeProd/StoreProdAppResVO.java | 2 -- .../controller/xkt/vo/storeProd/StoreProdCreateVO.java | 2 -- .../web/controller/xkt/vo/storeProd/StoreProdResVO.java | 2 -- .../controller/xkt/vo/storeProd/StoreProdUpdateVO.java | 2 -- .../web/controller/xkt/vo/storeProd/StoreProdVO.java | 2 -- .../ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java | 2 -- .../ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java | 2 -- .../java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java | 2 -- .../com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java | 2 -- .../ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java | 2 -- .../ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 8 ++++---- 12 files changed, 4 insertions(+), 26 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java index 1de82644a..2b60b9ac6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java @@ -92,8 +92,6 @@ public class StoreHomeProdResVO { public static class StoreProdInfoVO { @ApiModelProperty("档口商品ID") private Long storeProdId; - @ApiModelProperty("档口商品名称") - private String prodName; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "创建时间") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java index 22c30e5e5..53ae4efb2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java @@ -23,8 +23,6 @@ public class StoreProdAppResVO { private Long storeProdId; @ApiModelProperty(value = "档口ID") private Long storeId; - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "商品标题") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java index b690c83c9..3945f092a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java @@ -26,8 +26,6 @@ import java.util.List; public class StoreProdCreateVO { - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空!") private Long storeId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java index a29f77282..ac018cc2e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java @@ -26,8 +26,6 @@ public class StoreProdResVO { private Long storeProdId; @ApiModelProperty(value = "档口ID") private Long storeId; - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "商品分类ID") private Long prodCateId; @ApiModelProperty(value = "工厂货号") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java index 54264a6bf..47aba68bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java @@ -26,8 +26,6 @@ import java.util.List; public class StoreProdUpdateVO { - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空!") private Long storeId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java index be2afe45e..be10af571 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java @@ -26,8 +26,6 @@ import java.util.List; public class StoreProdVO { - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空!") private Long storeId; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java index cafe45d58..eeab5a337 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java @@ -89,8 +89,6 @@ public class StoreHomeProdResDTO { public static class StoreProdInfoDTO { @ApiModelProperty("档口商品ID") private Long storeProdId; - @ApiModelProperty("档口商品名称") - private String prodName; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "创建时间") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java index 312be52b5..37c3f643e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java @@ -29,8 +29,6 @@ public class StoreProdAppResDTO { private Long storeId; @ApiModelProperty(value = "档口名称") private String storeName; - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "商品标题") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java index 526ee0c3d..07fb51f20 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java @@ -27,8 +27,6 @@ import java.util.List; @Accessors(chain = true) public class StoreProdDTO { - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "档口ID") private Long storeId; @ApiModelProperty(value = "商品分类ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java index 7a1da884c..ce42dd447 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java @@ -32,8 +32,6 @@ public class StoreProdResDTO { private Long storeProdId; @ApiModelProperty("档口ID") private Long storeId; - @ApiModelProperty("档口商品名称") - private String prodName; @ApiModelProperty(value = "商品分类ID") private Long prodCateId; @ApiModelProperty(value = "工厂货号") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java index 7debe9993..9b7e5b77b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java @@ -28,8 +28,6 @@ import java.util.List; public class StoreProdUpdateDTO { - @ApiModelProperty(value = "档口商品名称") - private String prodName; @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空!") private Long storeId; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 4d879fa0c..ae3305985 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -344,7 +344,7 @@ public class StoreProductServiceImpl implements IStoreProductService { .forEach(color -> color.setDelFlag(Constants.DELETED)); // 新增的颜色。分为两种情况:1. 完全新增的颜色 2. 已存在，新加到商品中 final List updateProdColorNameList = updateDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).distinct().collect(Collectors.toList()); - for (int i = 1; i <= updateProdColorNameList.size(); i++) { + for (int i = 0; i < updateProdColorNameList.size(); i++) { final Long updateProdColorId = storeColorMap.get(updateProdColorNameList.get(i)); // 已存在的颜色则不新增 if (exitProdColorIdList.contains(updateProdColorId)) { @@ -352,7 +352,7 @@ public class StoreProductServiceImpl implements IStoreProductService { } // 新增的商品颜色 dbProdColorList.add(new StoreProductColor().setStoreColorId(updateProdColorId).setStoreProdId(storeProdId).setStoreId(storeId) - .setColorName(updateProdColorNameList.get(i)).setOrderNum(i).setProdStatus(EProductStatus.ON_SALE.getValue())); + .setColorName(updateProdColorNameList.get(i)).setOrderNum(i+1).setProdStatus(EProductStatus.ON_SALE.getValue())); } // 更新商品颜色或新增商品颜色 this.storeProdColorMapper.insertOrUpdate(dbProdColorList); @@ -454,9 +454,9 @@ public class StoreProductServiceImpl implements IStoreProductService { // 新增档口颜色尺码与价格 List prodColorList = new ArrayList<>(); final List prodColorNameList = createDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).distinct().collect(Collectors.toList()); - for (int i = 1; i <= prodColorNameList.size(); i++) { + for (int i = 0; i < prodColorNameList.size(); i++) { prodColorList.add(new StoreProductColor().setStoreColorId(storeColorMap.get(prodColorNameList.get(i))).setStoreProdId(storeProdId) - .setStoreId(storeId).setColorName(prodColorNameList.get(i)).setOrderNum(i).setProdStatus(EProductStatus.ON_SALE.getValue())); + .setStoreId(storeId).setColorName(prodColorNameList.get(i)).setOrderNum(i+1).setProdStatus(EProductStatus.ON_SALE.getValue())); } this.storeProdColorMapper.insert(prodColorList); // 新增档口颜色尺码对应价格