提交修改

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPropertyDao.java

@@ -10,6 +10,7 @@ package com.heyu.api.data.dao.vv;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.heyu.api.data.entity.vv.VvPropertyEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lz.mybatis.plugin.annotations.IN;
 import com.lz.mybatis.plugin.annotations.LIKE;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,4 +41,6 @@ public interface VvPropertyDao extends BaseMapper<VvPropertyEntity> {
 
 
 	List<VvPropertyEntity> selectVvProperByCondition(IPage page, @LIKE String propertyName,@LIKE String categoryName, Long categoryId);
+
+	List<VvPropertyEntity> selectVvPropertyByIds(@IN List<Long> id);
 }

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPropertyValueDao.java

@@ -7,8 +7,10 @@ package com.heyu.api.data.dao.vv;
 * @author quyixiao
 * @since 2025-08-20
 */
+import com.heyu.api.data.entity.vv.VvPropertyEntity;
 import com.heyu.api.data.entity.vv.VvPropertyValueEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lz.mybatis.plugin.annotations.IN;
 import com.lz.mybatis.plugin.annotations.OrderBy;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -39,4 +41,8 @@ public interface VvPropertyValueDao extends BaseMapper<VvPropertyValueEntity> {
 
 	@OrderBy(VvPropertyValueEntity.default_sort)
 	List<VvPropertyValueEntity> selectVvPropertyValueByPropertyId(Long propertyId);
+
+
+
+	List<VvPropertyValueEntity> selectVvPropertyValueByIds(@IN List<Long> id);
 }

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPropertyIndexSortRequest.java

@@ -0,0 +1,16 @@
+package com.heyu.api.alibaba.request.mm;
+
+
+import lombok.Data;
+
+@Data
+public class VvPropertyIndexSortRequest {
+
+    private Long propertyId;
+
+
+
+
+    private int defaultSort;
+
+}

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPropertyIndexValueSortRequest.java

@@ -0,0 +1,15 @@
+package com.heyu.api.alibaba.request.mm;
+
+
+import lombok.Data;
+
+@Data
+public class VvPropertyIndexValueSortRequest {
+
+    private Long propertyValueId;
+
+
+
+    private int defaultSort;
+
+}

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPropertyInsertOrUpdateRequest.java

@@ -0,0 +1,22 @@
+package com.heyu.api.alibaba.request.mm;
+
+import com.heyu.api.data.entity.vv.VvPropertyEntity;
+import com.heyu.api.data.entity.vv.VvPropertyValueEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VvPropertyInsertOrUpdateRequest extends VvPropertyEntity {
+
+
+    /***
+     *  属性值列表
+     */
+    private List<VvPropertyValueEntity> vvPropertyValueList;
+
+
+
+
+
+}

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPropertySortRequest.java

@@ -0,0 +1,14 @@
+package com.heyu.api.alibaba.request.mm;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+
+
+
+@Data
+public class VvPropertySortRequest {
+    private List<Long> propertyIds;
+}

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPropertyValueSortRequest.java

@@ -0,0 +1,13 @@
+package com.heyu.api.alibaba.request.mm;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VvPropertyValueSortRequest {
+    private List<Long> propertyValueIds;
+
+
+}

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPropesrtyRequest.java

@@ -0,0 +1,22 @@
+package com.heyu.api.alibaba.request.mm;
+
+
+import lombok.Data;
+
+@Data
+public class VvPropesrtyRequest {
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+
+    private String propertyName;
+
+    private String categoryName;
+
+
+    private Long categoryId;
+
+
+}

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/PropertyController.java

@@ -2,19 +2,17 @@ package com.heyu.api.controller.mm;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.heyu.api.alibaba.request.mm.VvCategoryIndexSortRequest;
-import com.heyu.api.alibaba.request.mm.VvCategorySortRequest;
-import com.heyu.api.alibaba.request.mm.VvPropertyRequest;
+import com.heyu.api.alibaba.request.mm.*;
 import com.heyu.api.data.dao.vv.VvPropertyDao;
 import com.heyu.api.data.dao.vv.VvPropertyValueDao;
 import com.heyu.api.data.dto.vv.VvPropertyDTO;
-import com.heyu.api.data.entity.vv.VvCategoryEntity;
 import com.heyu.api.data.entity.vv.VvPropertyEntity;
 import com.heyu.api.data.entity.vv.VvPropertyValueEntity;
 import com.heyu.api.data.utils.R;
 import com.heyu.api.utils.ISelect;
 import com.heyu.api.utils.PPageUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,7 +38,7 @@ public class PropertyController {
      * 列表
      */
     @RequestMapping("/list")
-    public R list(VvPropertyRequest vvPropertyRequest) {
+    public R list(VvPropesrtyRequest vvPropertyRequest) {
         PPageUtils pageUtils = PPageUtils.startPage(vvPropertyRequest.getPageNum(), vvPropertyRequest.getPageSize())
                 .doSelect(new ISelect() {
                     @Override
@@ -72,12 +70,19 @@ public class PropertyController {
 
     /***
      * 插入或更新
-     * @param vvCategoryEntity
+     *
      * @return
      */
     @RequestMapping("/insertOrUpdate")
-    public R insert(VvCategoryEntity vvCategoryEntity) {
-
+    public R insert(VvPropertyInsertOrUpdateRequest vvPropertyInsertOrUpdateRequest) {
+        VvPropertyEntity vvPropertyEntity = new VvPropertyEntity();
+        BeanUtils.copyProperties(vvPropertyInsertOrUpdateRequest, vvPropertyEntity);
+        vvPropertyDao.insertOrUpdateVvProperty(vvPropertyEntity);
+        if (CollectionUtils.isNotEmpty(vvPropertyInsertOrUpdateRequest.getVvPropertyValueList())) {
+            for (VvPropertyValueEntity vvPropertyValueEntity : vvPropertyInsertOrUpdateRequest.getVvPropertyValueList()) {
+                vvPropertyValueDao.insertOrUpdateVvPropertyValue(vvPropertyValueEntity);
+            }
+        }
         return R.ok().setData("保存成功");
     }
 
@@ -85,7 +90,26 @@ public class PropertyController {
      * 排序
      */
     @RequestMapping("/sort")
-    public R sort(VvCategorySortRequest vvCategorySortRequest) {
+    public R sort(VvPropertySortRequest vvPropertySortRequest) {
+        List<VvPropertyEntity> propertyEntities = vvPropertyDao.selectVvPropertyByIds(vvPropertySortRequest.getPropertyIds());
+        for (VvPropertyEntity propertyEntity : propertyEntities) {
+            propertyEntity.setDefaultSort(vvPropertySortRequest.getPropertyIds().indexOf(propertyEntity.getId()) + 1);
+            vvPropertyDao.updateVvPropertyById(propertyEntity);
+        }
+        return R.ok().setData("保存成功");
+    }
+
+
+    /***
+     * 排序
+     */
+    @RequestMapping("/value/sort")
+    public R sortValue(VvPropertyValueSortRequest vvPropertyValueSortRequest) {
+        List<VvPropertyValueEntity> propertyEntities = vvPropertyValueDao.selectVvPropertyValueByIds(vvPropertyValueSortRequest.getPropertyValueIds());
+        for (VvPropertyValueEntity propertyEntity : propertyEntities) {
+            propertyEntity.setDefaultSort(vvPropertyValueSortRequest.getPropertyValueIds().indexOf(propertyEntity.getId()) + 1);
+            vvPropertyValueDao.updateVvPropertyValueById(propertyEntity);
+        }
 
         return R.ok().setData("保存成功");
     }
@@ -94,11 +118,27 @@ public class PropertyController {
      * 排序
      */
     @RequestMapping("/update/sort/index")
-    public R updateSortIndex(VvCategoryIndexSortRequest vvCategorySortRequest) {
+    public R updateSortIndex(VvPropertyIndexSortRequest vvCategorySortRequest) {
 
+        VvPropertyEntity vvPropertyEntity = vvPropertyDao.selectVvPropertyById(vvCategorySortRequest.getPropertyId());
+        vvPropertyEntity.setDefaultSort(vvCategorySortRequest.getDefaultSort());
+
+        vvPropertyDao.updateVvPropertyById(vvPropertyEntity);
 
         return R.ok().setData("保存成功");
     }
 
 
+    /***
+     * 排序
+     */
+    @RequestMapping("/update/value/sort/index")
+    public R updateSortIndex(VvPropertyIndexValueSortRequest vvCategorySortRequest) {
+        VvPropertyValueEntity vvPropertyValue = vvPropertyValueDao.selectVvPropertyValueById(vvCategorySortRequest.getPropertyValueId());
+        vvPropertyValue.setDefaultSort(vvCategorySortRequest.getDefaultSort());
+        vvPropertyValueDao.updateVvPropertyValueById(vvPropertyValue);
+        return R.ok().setData("保存成功");
+    }
+
+
 }