feat 商品允许修改品类

dengwei
1 parent 93103ae7
Showing 5 changed files with 84 additions and 22 deletions
etrade-shop/src/main/java/com/diligrp/etrade/shop/api/StockApi.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/ProductUpdateCo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/response/ProductDetailVo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/impl/ProductServiceImpl.java
etrade-shop/src/main/resources/com/diligrp/etrade/dao/mapper/ProductMapper.xml
 package com.diligrp.etrade.shop.api;
  
-import cn.hutool.core.collection.CollUtil;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.shop.domain.request.StockAddRequest;
 import com.diligrp.etrade.shop.domain.request.StockDeductRequest;
-import com.diligrp.etrade.shop.model.Stock;
 import com.diligrp.etrade.shop.service.StockService;
 import com.diligrp.idempotent.spring.boot.annotation.Idempotent;
 import org.springframework.web.bind.annotation.*;
  
-import java.util.Collections;
 import java.util.List;
  
 /**
@@ -55,20 +52,4 @@ public class StockApi {
         return Message.success();
     }
  
-
-    /**
-     * Query stock data for a single product.
-     *
-     * @param productId The ID of the product to query stock data for.
-     * @return Stock data for the specified product.
-     */
-    @GetMapping("/{productId}")
-    public Message<Stock> getStockByProductId(@PathVariable Long productId) {
-        List<Stock> stocks = stockService.listByProductIds(Collections.singletonList(productId));
-        if (CollUtil.isEmpty(stocks)) {
-            return Message.failure("Stock data not found for the product ID: " + productId);
-        }
-        return Message.success(stocks.get(0));
-    }
-
 }
@@ -18,6 +18,24 @@ public class ProductUpdateCo implements Serializable {
     private Long id;
  
     /**
+     * 品类主键
+     */
+    @NotNull(message = "品类主键不能为空")
+    private Long categoryId;
+
+    /**
+     * 品类主键全路径
+     */
+    @NotBlank(message = "品类主键全路径不能为空")
+    private String categoryIdPath;
+
+    /**
+     * 名称全路径
+     */
+    @NotBlank(message = "名称全路径不能为空")
+    private String namePath;
+
+    /**
      * 数据版本号
      */
     @NotNull(message = "数据版本号不能为空")
@@ -146,4 +164,28 @@ public class ProductUpdateCo implements Serializable {
     public void setLabel(List<Integer> label) {
         this.label = label;
     }
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getCategoryIdPath() {
+        return categoryIdPath;
+    }
+
+    public void setCategoryIdPath(String categoryIdPath) {
+        this.categoryIdPath = categoryIdPath;
+    }
+
+    public String getNamePath() {
+        return namePath;
+    }
+
+    public void setNamePath(String namePath) {
+        this.namePath = namePath;
+    }
 }
@@ -35,6 +35,11 @@ public class ProductDetailVo implements Serializable {
     private Long categoryId;
  
     /**
+     * 品类主键全路径
+     */
+    private String categoryIdPath;
+
+    /**
      * 名称
      */
     private String name;
@@ -300,4 +305,12 @@ public class ProductDetailVo implements Serializable {
     public void setLabel(List<Integer> label) {
         this.label = label;
     }
+
+    public String getCategoryIdPath() {
+        return categoryIdPath;
+    }
+
+    public void setCategoryIdPath(String categoryIdPath) {
+        this.categoryIdPath = categoryIdPath;
+    }
 }
@@ -83,11 +83,16 @@ public class ProductServiceImpl implements ProductService {
         ProductDo entity = JsonUtils.convertValue(co, ProductDo.class);
         ProductDetailVo pd = mapper.detail(entity.getId());
         validateExist(pd);
-        entity.setCategoryId(pd.getCategoryId());
         //校验商品
         productAdapterService.validateProduct(pd, co.getVersion());
  
         //1.更新商品,2.校验是否更新成功
+        if (StringUtils.isNotBlank(entity.getCategoryIdPath())) {
+            entity.setCategoryIdPathJson(Arrays.stream(entity.getCategoryIdPath().split(",")).map(Long::valueOf).toList());
+        }
+        if (StringUtils.isNotBlank(entity.getNamePath())) {
+            entity.setNamePathJson(Arrays.stream(entity.getNamePath().split(",")).toList());
+        }
         productAdapterService.validateUpdateSuccess(mapper.update(entity), pd.getAlias());
  
         /*
@@ -443,8 +448,8 @@ public class ProductServiceImpl implements ProductService {
  
         /*
          *  注意:品类的基础信息是一致的，但是对应不同市场其图片是不一样的
+         *  同步信息
          */
-        //同步信息
         co.setAlias(null);
         mapper.productCategorySync(co);
     }
@@ -50,6 +50,7 @@
         <result column="p.modified_time" property="modifiedTime"/>
         <result column="p.code" property="code"/>
         <result column="p.category_id" property="categoryId"/>
+        <result column="p.category_id_path" property="categoryIdPath"/>
         <result column="p.name" property="name"/>
         <result column="p.name_path" property="namePath"/>
         <result column="p.alias" property="alias"/>
@@ -154,7 +155,26 @@
     </insert>
  
     <update id="update">
-        update product SET modifier_id = #{modifierId},
+        update product
+        SET modifier_id = #{modifierId},
+        <if test="categoryId != null">
+            categoryId = #{categoryId},
+        </if>
+        <if test="categoryIdPath != null">
+            category_id_path = #{categoryIdPath},
+        </if>
+        <if test="categoryIdPathJson != null">
+            category_id_path_json = #{categoryIdPathJson},
+        </if>
+        <if test="code != null">
+            code = #{code},
+        </if>
+        <if test="namePath != null">
+            name_path = #{namePath},
+        </if>
+        <if test="namePathJson != null">
+            name_path_json = #{namePathJson},
+        </if>
         <if test="alias != null and alias != ''">
             alias = #{alias},
         </if>
@@ -497,6 +517,7 @@
              , p.modified_time AS "p.modified_time"
              , p.code          AS "p.code"
              , p.category_id   AS "p.category_id"
+             , p.category_id_path   AS "p.category_id_path"
              , p.name          AS "p.name"
              , p.name_path     AS "p.name_path"
              , p.alias         AS "p.alias"