代码提交

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java

@@ -97,7 +97,7 @@ public class EquipmentPropertyController {
     /**
      * 新增特征值
      */
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody EquipmentProperty equipmentProperty) {
         equipmentPropertyService.add(equipmentProperty);
         return AjaxResult.success();
@@ -106,7 +106,7 @@ public class EquipmentPropertyController {
     /**
      * 修改特征值
      */
-    @PutMapping
+    @PutMapping("/update")
     public AjaxResult update(@Validated @RequestBody EquipmentProperty equipmentProperty) {
         equipmentPropertyService.update(equipmentProperty);
         return AjaxResult.success();

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java

@@ -17,7 +17,7 @@ public interface EquipmentPropertyMapper {
     void insert(EquipmentProperty equipmentProperty);
 
 
-    EquipmentProperty getByPropertyName(@Param("propertyName") String propertyName);
+    EquipmentProperty getByPropertyName(EquipmentProperty equipmentProperty);
     void updateById(EquipmentProperty equipmentProperty);
 
 

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java

@@ -51,7 +51,7 @@ public class EquipmentPropertyServiceImpl implements EquipmentPropertyService {
 
 
         // 1. 根据 property_name 查询是否已存在记录
-        EquipmentProperty existingProperty = equipmentPropertyMapper.getByPropertyName(equipmentProperty.getPropertyName());
+        EquipmentProperty existingProperty = equipmentPropertyMapper.getByPropertyName(equipmentProperty);
 
         if (existingProperty != null) {
             // 2. 若存在，合并 property_value（用逗号分隔）

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml

@@ -250,7 +250,7 @@
 
     <!-- 根据 propertyName 查询记录 -->
     <select id="getByPropertyName" resultType="com.bonus.material.devConfig.domain.EquipmentProperty">
-        SELECT * FROM ma_type_properties WHERE property_name = #{propertyName}
+        SELECT * FROM ma_type_properties WHERE property_name = #{propertyName} and type_id=#{typeId}
     </select>
 
     <!-- 更新记录 -->