From ad2b5d4c5dc6b9e2ce6a5e0d5eee88fa409d376f Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Sun, 24 Aug 2025 17:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/mm/VvCategoryPropertyRequest.java       |  6 +++---
 .../controller/mm/CategoryPropertyController.java   | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvCategoryPropertyRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvCategoryPropertyRequest.java
index 460121b..7d6f017 100644
--- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvCategoryPropertyRequest.java
+++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvCategoryPropertyRequest.java
@@ -14,19 +14,19 @@ public class VvCategoryPropertyRequest {
     /***
      * 属性名称
      */
-    private String categoryPropertyName;
+    private String adminCategoryPropertyName;
 
 
     /**
      * 类目名称
      */
-    private String categoryName;
+    private String adminCategoryName;
 
 
     /***
      * 类目id
      */
-    private Long categoryId;
+    private Long adminCategoryId;
 
 
 }
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CategoryPropertyController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CategoryPropertyController.java
index 76f430c..1ed4a34 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CategoryPropertyController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CategoryPropertyController.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 @Slf4j
 @RestController
-@RequestMapping("/mm/category/property")
+@RequestMapping("/mm/admin/category/property")
 public class CategoryPropertyController {
 
     @Autowired
@@ -46,9 +46,9 @@ public class CategoryPropertyController {
             @Override
             public List doSelect(IPage page) {
                 return vvCategoryPropertyDao.selectVvProperByCondition(page,
-                        vvPropertyRequest.getCategoryPropertyName(),
-                        vvPropertyRequest.getCategoryName(),
-                        vvPropertyRequest.getCategoryId());
+                        vvPropertyRequest.getAdminCategoryPropertyName(),
+                        vvPropertyRequest.getAdminCategoryName(),
+                        vvPropertyRequest.getAdminCategoryId());
 
             }
         });
@@ -76,15 +76,18 @@ public class CategoryPropertyController {
      */
     @RequestMapping("/insertOrUpdate")
     public R insert(@RequestBody List<VvPropertyInsertOrUpdateRequest> vvPropertyInsertOrUpdateRequestList) {
-
         for(VvPropertyInsertOrUpdateRequest vvPropertyInsertOrUpdateRequest  : vvPropertyInsertOrUpdateRequestList){
             VvCategoryPropertyEntity vvPropertyEntity = new VvCategoryPropertyEntity();
             BeanUtils.copyProperties(vvPropertyInsertOrUpdateRequest, vvPropertyEntity);
             vvCategoryPropertyDao.insertOrUpdateVvCategoryProperty(vvPropertyEntity);
 
             if (CollectionUtils.isNotEmpty(vvPropertyInsertOrUpdateRequest.getVvCategoryPropertyValueEntities())) {
+                int i = 1;
                 for (VvCategoryPropertyValueEntity vvPropertyValueEntity : vvPropertyInsertOrUpdateRequest.getVvCategoryPropertyValueEntities()) {
+                    vvPropertyValueEntity.setCategoryPropertyId(vvPropertyEntity.getId());
+                    vvPropertyValueEntity.setDefaultSort(i);
                     vvCategoryPropertyValueDao.insertOrUpdateVvCategoryPropertyValue(vvPropertyValueEntity);
+                    i ++ ;
                 }
             }
         }