diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/ErpProductRelationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/ErpProductRelationMapper.java
new file mode 100644
index 0000000..b632413
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/ErpProductRelationMapper.java
@@ -0,0 +1,93 @@
+package com.ruoyi.jarvis.mapper;
+
+import java.util.List;
+import com.ruoyi.jarvis.domain.ErpProductRelation;
+
+/**
+ * ERP商品关联Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface ErpProductRelationMapper 
+{
+    /**
+     * 查询ERP商品关联
+     * 
+     * @param id ERP商品关联主键
+     * @return ERP商品关联
+     */
+    public ErpProductRelation selectErpProductRelationById(Long id);
+
+    /**
+     * 查询ERP商品关联列表
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return ERP商品关联集合
+     */
+    public List<ErpProductRelation> selectErpProductRelationList(ErpProductRelation erpProductRelation);
+
+    /**
+     * 新增ERP商品关联
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return 结果
+     */
+    public int insertErpProductRelation(ErpProductRelation erpProductRelation);
+
+    /**
+     * 修改ERP商品关联
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return 结果
+     */
+    public int updateErpProductRelation(ErpProductRelation erpProductRelation);
+
+    /**
+     * 删除ERP商品关联
+     * 
+     * @param id ERP商品关联主键
+     * @return 结果
+     */
+    public int deleteErpProductRelationById(Long id);
+
+    /**
+     * 批量删除ERP商品关联
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteErpProductRelationByIds(Long[] ids);
+
+    /**
+     * 根据常用商品ID查询ERP商品关联列表
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return ERP商品关联集合
+     */
+    public List<ErpProductRelation> selectErpProductRelationByFavoriteId(Long favoriteProductId);
+
+    /**
+     * 根据应用ID查询ERP商品关联列表
+     * 
+     * @param appid 应用ID
+     * @return ERP商品关联集合
+     */
+    public List<ErpProductRelation> selectErpProductRelationByAppid(String appid);
+
+    /**
+     * 根据常用商品ID删除ERP商品关联
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return 结果
+     */
+    public int deleteErpProductRelationByFavoriteId(Long favoriteProductId);
+
+    /**
+     * 统计常用商品的ERP关联数量
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return 关联数量
+     */
+    public int countErpProductRelationByFavoriteId(Long favoriteProductId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IErpProductRelationService.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IErpProductRelationService.java
new file mode 100644
index 0000000..1248017
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IErpProductRelationService.java
@@ -0,0 +1,102 @@
+package com.ruoyi.jarvis.service;
+
+import java.util.List;
+import com.ruoyi.jarvis.domain.ErpProductRelation;
+
+/**
+ * ERP商品关联Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface IErpProductRelationService 
+{
+    /**
+     * 查询ERP商品关联
+     * 
+     * @param id ERP商品关联主键
+     * @return ERP商品关联
+     */
+    public ErpProductRelation selectErpProductRelationById(Long id);
+
+    /**
+     * 查询ERP商品关联列表
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return ERP商品关联集合
+     */
+    public List<ErpProductRelation> selectErpProductRelationList(ErpProductRelation erpProductRelation);
+
+    /**
+     * 新增ERP商品关联
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return 结果
+     */
+    public int insertErpProductRelation(ErpProductRelation erpProductRelation);
+
+    /**
+     * 修改ERP商品关联
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return 结果
+     */
+    public int updateErpProductRelation(ErpProductRelation erpProductRelation);
+
+    /**
+     * 批量删除ERP商品关联
+     * 
+     * @param ids 需要删除的ERP商品关联主键集合
+     * @return 结果
+     */
+    public int deleteErpProductRelationByIds(Long[] ids);
+
+    /**
+     * 删除ERP商品关联信息
+     * 
+     * @param id ERP商品关联主键
+     * @return 结果
+     */
+    public int deleteErpProductRelationById(Long id);
+
+    /**
+     * 根据常用商品ID查询ERP商品关联列表
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return ERP商品关联集合
+     */
+    public List<ErpProductRelation> selectErpProductRelationByFavoriteId(Long favoriteProductId);
+
+    /**
+     * 根据应用ID查询ERP商品关联列表
+     * 
+     * @param appid 应用ID
+     * @return ERP商品关联集合
+     */
+    public List<ErpProductRelation> selectErpProductRelationByAppid(String appid);
+
+    /**
+     * 根据常用商品ID删除ERP商品关联
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return 结果
+     */
+    public int deleteErpProductRelationByFavoriteId(Long favoriteProductId);
+
+    /**
+     * 统计常用商品的ERP关联数量
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return 关联数量
+     */
+    public int countErpProductRelationByFavoriteId(Long favoriteProductId);
+
+    /**
+     * 批量添加ERP商品关联
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @param erpProductRelations ERP商品关联列表
+     * @return 结果
+     */
+    public int batchInsertErpProductRelations(Long favoriteProductId, List<ErpProductRelation> erpProductRelations);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/ErpProductRelationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/ErpProductRelationServiceImpl.java
new file mode 100644
index 0000000..e3ece0b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/ErpProductRelationServiceImpl.java
@@ -0,0 +1,163 @@
+package com.ruoyi.jarvis.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.jarvis.mapper.ErpProductRelationMapper;
+import com.ruoyi.jarvis.domain.ErpProductRelation;
+import com.ruoyi.jarvis.service.IErpProductRelationService;
+
+/**
+ * ERP商品关联Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Service
+public class ErpProductRelationServiceImpl implements IErpProductRelationService 
+{
+    @Autowired
+    private ErpProductRelationMapper erpProductRelationMapper;
+
+    /**
+     * 查询ERP商品关联
+     * 
+     * @param id ERP商品关联主键
+     * @return ERP商品关联
+     */
+    @Override
+    public ErpProductRelation selectErpProductRelationById(Long id)
+    {
+        return erpProductRelationMapper.selectErpProductRelationById(id);
+    }
+
+    /**
+     * 查询ERP商品关联列表
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return ERP商品关联集合
+     */
+    @Override
+    public List<ErpProductRelation> selectErpProductRelationList(ErpProductRelation erpProductRelation)
+    {
+        return erpProductRelationMapper.selectErpProductRelationList(erpProductRelation);
+    }
+
+    /**
+     * 新增ERP商品关联
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return 结果
+     */
+    @Override
+    public int insertErpProductRelation(ErpProductRelation erpProductRelation)
+    {
+        return erpProductRelationMapper.insertErpProductRelation(erpProductRelation);
+    }
+
+    /**
+     * 修改ERP商品关联
+     * 
+     * @param erpProductRelation ERP商品关联
+     * @return 结果
+     */
+    @Override
+    public int updateErpProductRelation(ErpProductRelation erpProductRelation)
+    {
+        return erpProductRelationMapper.updateErpProductRelation(erpProductRelation);
+    }
+
+    /**
+     * 批量删除ERP商品关联
+     * 
+     * @param ids 需要删除的ERP商品关联主键集合
+     * @return 结果
+     */
+    @Override
+    public int deleteErpProductRelationByIds(Long[] ids)
+    {
+        return erpProductRelationMapper.deleteErpProductRelationByIds(ids);
+    }
+
+    /**
+     * 删除ERP商品关联信息
+     * 
+     * @param id ERP商品关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpProductRelationById(Long id)
+    {
+        return erpProductRelationMapper.deleteErpProductRelationById(id);
+    }
+
+    /**
+     * 根据常用商品ID查询ERP商品关联列表
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return ERP商品关联集合
+     */
+    @Override
+    public List<ErpProductRelation> selectErpProductRelationByFavoriteId(Long favoriteProductId)
+    {
+        return erpProductRelationMapper.selectErpProductRelationByFavoriteId(favoriteProductId);
+    }
+
+    /**
+     * 根据应用ID查询ERP商品关联列表
+     * 
+     * @param appid 应用ID
+     * @return ERP商品关联集合
+     */
+    @Override
+    public List<ErpProductRelation> selectErpProductRelationByAppid(String appid)
+    {
+        return erpProductRelationMapper.selectErpProductRelationByAppid(appid);
+    }
+
+    /**
+     * 根据常用商品ID删除ERP商品关联
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpProductRelationByFavoriteId(Long favoriteProductId)
+    {
+        return erpProductRelationMapper.deleteErpProductRelationByFavoriteId(favoriteProductId);
+    }
+
+    /**
+     * 统计常用商品的ERP关联数量
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @return 关联数量
+     */
+    @Override
+    public int countErpProductRelationByFavoriteId(Long favoriteProductId)
+    {
+        return erpProductRelationMapper.countErpProductRelationByFavoriteId(favoriteProductId);
+    }
+
+    /**
+     * 批量添加ERP商品关联
+     * 
+     * @param favoriteProductId 常用商品ID
+     * @param erpProductRelations ERP商品关联列表
+     * @return 结果
+     */
+    @Override
+    public int batchInsertErpProductRelations(Long favoriteProductId, List<ErpProductRelation> erpProductRelations)
+    {
+        if (erpProductRelations == null || erpProductRelations.isEmpty()) {
+            return 0;
+        }
+        
+        int result = 0;
+        for (ErpProductRelation erpProductRelation : erpProductRelations) {
+            erpProductRelation.setFavoriteProductId(favoriteProductId);
+            result += insertErpProductRelation(erpProductRelation);
+        }
+        return result;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/FavoriteProductServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/FavoriteProductServiceImpl.java
new file mode 100644
index 0000000..5e18a33
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/FavoriteProductServiceImpl.java
@@ -0,0 +1,278 @@
+package com.ruoyi.jarvis.service.impl;
+
+import java.util.List;
+import java.util.Date;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.jarvis.mapper.FavoriteProductMapper;
+import com.ruoyi.jarvis.mapper.ErpProductRelationMapper;
+import com.ruoyi.jarvis.domain.FavoriteProduct;
+import com.ruoyi.jarvis.domain.ErpProductRelation;
+import com.ruoyi.jarvis.service.IFavoriteProductService;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.alibaba.fastjson2.JSON;
+
+/**
+ * 常用商品Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Service
+public class FavoriteProductServiceImpl implements IFavoriteProductService 
+{
+    @Autowired
+    private FavoriteProductMapper favoriteProductMapper;
+    
+    @Autowired
+    private ErpProductRelationMapper erpProductRelationMapper;
+
+    /**
+     * 查询常用商品
+     * 
+     * @param id 常用商品主键
+     * @return 常用商品
+     */
+    @Override
+    public FavoriteProduct selectFavoriteProductById(Long id)
+    {
+        FavoriteProduct favoriteProduct = favoriteProductMapper.selectFavoriteProductById(id);
+        if (favoriteProduct != null) {
+            // 查询关联的ERP商品
+            List<ErpProductRelation> erpProducts = erpProductRelationMapper.selectErpProductRelationByFavoriteId(id);
+            favoriteProduct.setErpProducts(erpProducts);
+        }
+        return favoriteProduct;
+    }
+
+    /**
+     * 查询常用商品列表
+     * 
+     * @param favoriteProduct 常用商品
+     * @return 常用商品
+     */
+    @Override
+    public List<FavoriteProduct> selectFavoriteProductList(FavoriteProduct favoriteProduct)
+    {
+        return favoriteProductMapper.selectFavoriteProductList(favoriteProduct);
+    }
+
+    /**
+     * 新增常用商品
+     * 
+     * @param favoriteProduct 常用商品
+     * @return 结果
+     */
+    @Override
+    public int insertFavoriteProduct(FavoriteProduct favoriteProduct)
+    {
+        // 设置创建用户信息
+        if (favoriteProduct.getCreateUserId() == null) {
+            favoriteProduct.setCreateUserId(SecurityUtils.getUserId());
+        }
+        if (StringUtils.isEmpty(favoriteProduct.getCreateUserName())) {
+            favoriteProduct.setCreateUserName(SecurityUtils.getUsername());
+        }
+        
+        // 设置默认值
+        if (favoriteProduct.getIsTop() == null) {
+            favoriteProduct.setIsTop(0);
+        }
+        if (favoriteProduct.getSortWeight() == null) {
+            favoriteProduct.setSortWeight(0);
+        }
+        if (favoriteProduct.getUseCount() == null) {
+            favoriteProduct.setUseCount(0);
+        }
+        
+        return favoriteProductMapper.insertFavoriteProduct(favoriteProduct);
+    }
+
+    /**
+     * 修改常用商品
+     * 
+     * @param favoriteProduct 常用商品
+     * @return 结果
+     */
+    @Override
+    public int updateFavoriteProduct(FavoriteProduct favoriteProduct)
+    {
+        return favoriteProductMapper.updateFavoriteProduct(favoriteProduct);
+    }
+
+    /**
+     * 批量删除常用商品
+     * 
+     * @param ids 需要删除的常用商品主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFavoriteProductByIds(Long[] ids)
+    {
+        // 先删除关联的ERP商品关系
+        for (Long id : ids) {
+            erpProductRelationMapper.deleteErpProductRelationByFavoriteId(id);
+        }
+        return favoriteProductMapper.deleteFavoriteProductByIds(ids);
+    }
+
+    /**
+     * 删除常用商品信息
+     * 
+     * @param id 常用商品主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFavoriteProductById(Long id)
+    {
+        // 先删除关联的ERP商品关系
+        erpProductRelationMapper.deleteErpProductRelationByFavoriteId(id);
+        return favoriteProductMapper.deleteFavoriteProductById(id);
+    }
+
+    /**
+     * 根据SKUID查询常用商品
+     * 
+     * @param skuid SKUID
+     * @return 常用商品
+     */
+    @Override
+    public FavoriteProduct selectFavoriteProductBySkuid(String skuid)
+    {
+        return favoriteProductMapper.selectFavoriteProductBySkuid(skuid);
+    }
+
+    /**
+     * 添加商品到常用列表
+     * 
+     * @param favoriteProduct 常用商品信息
+     * @return 结果
+     */
+    @Override
+    public int addToFavorites(FavoriteProduct favoriteProduct)
+    {
+        // 检查是否已经存在
+        FavoriteProduct existing = favoriteProductMapper.selectFavoriteProductBySkuid(favoriteProduct.getSkuid());
+        if (existing != null) {
+            // 如果已存在，更新使用次数和最后使用时间
+            return updateUseCountAndTime(existing.getId());
+        }
+        
+        // 设置创建用户信息
+        favoriteProduct.setCreateUserId(SecurityUtils.getUserId());
+        favoriteProduct.setCreateUserName(SecurityUtils.getUsername());
+        favoriteProduct.setIsTop(0);
+        favoriteProduct.setSortWeight(0);
+        favoriteProduct.setUseCount(1);
+        favoriteProduct.setLastUsedTime(DateUtils.getTime());
+        
+        return favoriteProductMapper.insertFavoriteProduct(favoriteProduct);
+    }
+
+    /**
+     * 从常用列表移除商品
+     * 
+     * @param skuid SKUID
+     * @return 结果
+     */
+    @Override
+    public int removeFromFavorites(String skuid)
+    {
+        FavoriteProduct existing = favoriteProductMapper.selectFavoriteProductBySkuid(skuid);
+        if (existing != null) {
+            return deleteFavoriteProductById(existing.getId());
+        }
+        return 0;
+    }
+
+    /**
+     * 更新使用次数和最后使用时间
+     * 
+     * @param id 常用商品ID
+     * @return 结果
+     */
+    @Override
+    public int updateUseCountAndTime(Long id)
+    {
+        return favoriteProductMapper.updateUseCountAndTime(id);
+    }
+
+    /**
+     * 更新置顶状态
+     * 
+     * @param id 常用商品ID
+     * @param isTop 是否置顶
+     * @return 结果
+     */
+    @Override
+    public int updateTopStatus(Long id, Integer isTop)
+    {
+        FavoriteProduct favoriteProduct = new FavoriteProduct();
+        favoriteProduct.setId(id);
+        favoriteProduct.setIsTop(isTop);
+        return favoriteProductMapper.updateTopStatus(favoriteProduct);
+    }
+
+    /**
+     * 批量置顶/取消置顶
+     * 
+     * @param ids 常用商品ID数组
+     * @param isTop 是否置顶
+     * @return 结果
+     */
+    @Override
+    public int batchUpdateTopStatus(Long[] ids, Integer isTop)
+    {
+        int result = 0;
+        for (Long id : ids) {
+            result += updateTopStatus(id, isTop);
+        }
+        return result;
+    }
+
+    /**
+     * 查询用户的常用商品列表（按置顶和排序权重排序）
+     * 
+     * @param createUserId 创建用户ID
+     * @return 常用商品集合
+     */
+    @Override
+    public List<FavoriteProduct> selectUserFavoriteProducts(Long createUserId)
+    {
+        return favoriteProductMapper.selectUserFavoriteProducts(createUserId);
+    }
+
+    /**
+     * 根据线报消息创建常用商品
+     * 
+     * @param xbMessageItem 线报消息项
+     * @return 结果
+     */
+    @Override
+    public int createFromXbMessage(Object xbMessageItem)
+    {
+        // 这里需要根据实际的线报消息结构来解析数据
+        // 暂时返回0，具体实现需要根据实际数据结构调整
+        return 0;
+    }
+
+    /**
+     * 快速发品（从常用商品）
+     * 
+     * @param id 常用商品ID
+     * @param appid ERP应用ID
+     * @return 结果
+     */
+    @Override
+    public Object quickPublishFromFavorite(Long id, String appid)
+    {
+        // 更新使用次数和最后使用时间
+        updateUseCountAndTime(id);
+        
+        // 这里可以调用实际的发品接口
+        // 暂时返回成功信息
+        return "发品请求已提交，应用ID: " + appid;
+    }
+}
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/ErpProductRelationMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/ErpProductRelationMapper.xml
new file mode 100644
index 0000000..e27ca41
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/ErpProductRelationMapper.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.jarvis.mapper.ErpProductRelationMapper">
+    
+    <resultMap type="ErpProductRelation" id="ErpProductRelationResult">
+        <result property="id"                column="id"                />
+        <result property="favoriteProductId" column="favorite_product_id"/>
+        <result property="appid"             column="appid"             />
+        <result property="erpProductId"      column="erp_product_id"    />
+        <result property="erpProductTitle"   column="erp_product_title" />
+        <result property="erpProductUrl"     column="erp_product_url"   />
+        <result property="erpProductStatus"  column="erp_product_status"/>
+        <result property="remark"            column="remark"            />
+        <result property="createTime"        column="create_time"       />
+        <result property="updateTime"        column="update_time"       />
+    </resultMap>
+
+    <sql id="selectErpProductRelationVo">
+        select id, favorite_product_id, appid, erp_product_id, erp_product_title, 
+               erp_product_url, erp_product_status, remark, create_time, update_time
+        from erp_product_relation
+    </sql>
+
+    <select id="selectErpProductRelationList" parameterType="ErpProductRelation" resultMap="ErpProductRelationResult">
+        <include refid="selectErpProductRelationVo"/>
+        <where>  
+            <if test="favoriteProductId != null "> and favorite_product_id = #{favoriteProductId}</if>
+            <if test="appid != null  and appid != ''"> and appid = #{appid}</if>
+            <if test="erpProductId != null  and erpProductId != ''"> and erp_product_id = #{erpProductId}</if>
+            <if test="erpProductStatus != null  and erpProductStatus != ''"> and erp_product_status = #{erpProductStatus}</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectErpProductRelationById" parameterType="Long" resultMap="ErpProductRelationResult">
+        <include refid="selectErpProductRelationVo"/>
+        where id = #{id}
+    </select>
+    
+    <select id="selectErpProductRelationByFavoriteId" parameterType="Long" resultMap="ErpProductRelationResult">
+        <include refid="selectErpProductRelationVo"/>
+        where favorite_product_id = #{favoriteProductId}
+        order by create_time desc
+    </select>
+    
+    <select id="selectErpProductRelationByAppid" parameterType="String" resultMap="ErpProductRelationResult">
+        <include refid="selectErpProductRelationVo"/>
+        where appid = #{appid}
+        order by create_time desc
+    </select>
+        
+    <insert id="insertErpProductRelation" parameterType="ErpProductRelation" useGeneratedKeys="true" keyProperty="id">
+        insert into erp_product_relation
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="favoriteProductId != null">favorite_product_id,</if>
+            <if test="appid != null and appid != ''">appid,</if>
+            <if test="erpProductId != null and erpProductId != ''">erp_product_id,</if>
+            <if test="erpProductTitle != null and erpProductTitle != ''">erp_product_title,</if>
+            <if test="erpProductUrl != null and erpProductUrl != ''">erp_product_url,</if>
+            <if test="erpProductStatus != null and erpProductStatus != ''">erp_product_status,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            create_time,
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="favoriteProductId != null">#{favoriteProductId},</if>
+            <if test="appid != null and appid != ''">#{appid},</if>
+            <if test="erpProductId != null and erpProductId != ''">#{erpProductId},</if>
+            <if test="erpProductTitle != null and erpProductTitle != ''">#{erpProductTitle},</if>
+            <if test="erpProductUrl != null and erpProductUrl != ''">#{erpProductUrl},</if>
+            <if test="erpProductStatus != null and erpProductStatus != ''">#{erpProductStatus},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            sysdate(),
+        </trim>
+    </insert>
+
+    <update id="updateErpProductRelation" parameterType="ErpProductRelation">
+        update erp_product_relation
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="favoriteProductId != null">favorite_product_id = #{favoriteProductId},</if>
+            <if test="appid != null and appid != ''">appid = #{appid},</if>
+            <if test="erpProductId != null and erpProductId != ''">erp_product_id = #{erpProductId},</if>
+            <if test="erpProductTitle != null and erpProductTitle != ''">erp_product_title = #{erpProductTitle},</if>
+            <if test="erpProductUrl != null and erpProductUrl != ''">erp_product_url = #{erpProductUrl},</if>
+            <if test="erpProductStatus != null and erpProductStatus != ''">erp_product_status = #{erpProductStatus},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            update_time = sysdate(),
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteErpProductRelationById" parameterType="Long">
+        delete from erp_product_relation where id = #{id}
+    </delete>
+
+    <delete id="deleteErpProductRelationByIds" parameterType="String">
+        delete from erp_product_relation where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteErpProductRelationByFavoriteId" parameterType="Long">
+        delete from erp_product_relation where favorite_product_id = #{favoriteProductId}
+    </delete>
+    
+    <select id="countErpProductRelationByFavoriteId" parameterType="Long" resultType="Integer">
+        select count(*) from erp_product_relation where favorite_product_id = #{favoriteProductId}
+    </select>
+    
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/FavoriteProductMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/FavoriteProductMapper.xml
new file mode 100644
index 0000000..cee2ef4
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/FavoriteProductMapper.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.jarvis.mapper.FavoriteProductMapper">
+    
+    <resultMap type="FavoriteProduct" id="FavoriteProductResult">
+        <result property="id"           column="id"           />
+        <result property="skuid"        column="skuid"        />
+        <result property="productName"  column="product_name" />
+        <result property="shopName"     column="shop_name"    />
+        <result property="shopId"       column="shop_id"      />
+        <result property="productUrl"   column="product_url"  />
+        <result property="productImage" column="product_image"/>
+        <result property="price"        column="price"        />
+        <result property="commissionInfo" column="commission_info"/>
+        <result property="isTop"        column="is_top"       />
+        <result property="sortWeight"   column="sort_weight"  />
+        <result property="remark"       column="remark"       />
+        <result property="createUserId" column="create_user_id"/>
+        <result property="createUserName" column="create_user_name"/>
+        <result property="erpProductIds" column="erp_product_ids"/>
+        <result property="category"     column="category"     />
+        <result property="brand"        column="brand"        />
+        <result property="lastUsedTime" column="last_used_time"/>
+        <result property="useCount"     column="use_count"    />
+        <result property="createTime"   column="create_time"  />
+        <result property="updateTime"   column="update_time"  />
+    </resultMap>
+
+    <sql id="selectFavoriteProductVo">
+        select id, skuid, product_name, shop_name, shop_id, product_url, product_image, 
+               price, commission_info, is_top, sort_weight, remark, create_user_id, 
+               create_user_name, erp_product_ids, category, brand, last_used_time, 
+               use_count, create_time, update_time
+        from favorite_product
+    </sql>
+
+    <select id="selectFavoriteProductList" parameterType="FavoriteProduct" resultMap="FavoriteProductResult">
+        <include refid="selectFavoriteProductVo"/>
+        <where>  
+            <if test="skuid != null  and skuid != ''"> and skuid = #{skuid}</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="shopName != null  and shopName != ''"> and shop_name like concat('%', #{shopName}, '%')</if>
+            <if test="shopId != null  and shopId != ''"> and shop_id = #{shopId}</if>
+            <if test="category != null  and category != ''"> and category like concat('%', #{category}, '%')</if>
+            <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
+            <if test="isTop != null "> and is_top = #{isTop}</if>
+            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+        order by is_top desc, sort_weight desc, create_time desc
+    </select>
+    
+    <select id="selectFavoriteProductById" parameterType="Long" resultMap="FavoriteProductResult">
+        <include refid="selectFavoriteProductVo"/>
+        where id = #{id}
+    </select>
+    
+    <select id="selectFavoriteProductBySkuid" parameterType="String" resultMap="FavoriteProductResult">
+        <include refid="selectFavoriteProductVo"/>
+        where skuid = #{skuid}
+    </select>
+    
+    <select id="selectUserFavoriteProducts" parameterType="Long" resultMap="FavoriteProductResult">
+        <include refid="selectFavoriteProductVo"/>
+        where create_user_id = #{createUserId}
+        order by is_top desc, sort_weight desc, last_used_time desc, create_time desc
+    </select>
+        
+    <insert id="insertFavoriteProduct" parameterType="FavoriteProduct" useGeneratedKeys="true" keyProperty="id">
+        insert into favorite_product
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="skuid != null and skuid != ''">skuid,</if>
+            <if test="productName != null and productName != ''">product_name,</if>
+            <if test="shopName != null and shopName != ''">shop_name,</if>
+            <if test="shopId != null and shopId != ''">shop_id,</if>
+            <if test="productUrl != null and productUrl != ''">product_url,</if>
+            <if test="productImage != null and productImage != ''">product_image,</if>
+            <if test="price != null and price != ''">price,</if>
+            <if test="commissionInfo != null and commissionInfo != ''">commission_info,</if>
+            <if test="isTop != null">is_top,</if>
+            <if test="sortWeight != null">sort_weight,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="createUserId != null">create_user_id,</if>
+            <if test="createUserName != null and createUserName != ''">create_user_name,</if>
+            <if test="erpProductIds != null and erpProductIds != ''">erp_product_ids,</if>
+            <if test="category != null and category != ''">category,</if>
+            <if test="brand != null and brand != ''">brand,</if>
+            <if test="lastUsedTime != null and lastUsedTime != ''">last_used_time,</if>
+            <if test="useCount != null">use_count,</if>
+            create_time,
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="skuid != null and skuid != ''">#{skuid},</if>
+            <if test="productName != null and productName != ''">#{productName},</if>
+            <if test="shopName != null and shopName != ''">#{shopName},</if>
+            <if test="shopId != null and shopId != ''">#{shopId},</if>
+            <if test="productUrl != null and productUrl != ''">#{productUrl},</if>
+            <if test="productImage != null and productImage != ''">#{productImage},</if>
+            <if test="price != null and price != ''">#{price},</if>
+            <if test="commissionInfo != null and commissionInfo != ''">#{commissionInfo},</if>
+            <if test="isTop != null">#{isTop},</if>
+            <if test="sortWeight != null">#{sortWeight},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="createUserId != null">#{createUserId},</if>
+            <if test="createUserName != null and createUserName != ''">#{createUserName},</if>
+            <if test="erpProductIds != null and erpProductIds != ''">#{erpProductIds},</if>
+            <if test="category != null and category != ''">#{category},</if>
+            <if test="brand != null and brand != ''">#{brand},</if>
+            <if test="lastUsedTime != null and lastUsedTime != ''">#{lastUsedTime},</if>
+            <if test="useCount != null">#{useCount},</if>
+            sysdate(),
+        </trim>
+    </insert>
+
+    <update id="updateFavoriteProduct" parameterType="FavoriteProduct">
+        update favorite_product
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="skuid != null and skuid != ''">skuid = #{skuid},</if>
+            <if test="productName != null and productName != ''">product_name = #{productName},</if>
+            <if test="shopName != null and shopName != ''">shop_name = #{shopName},</if>
+            <if test="shopId != null and shopId != ''">shop_id = #{shopId},</if>
+            <if test="productUrl != null and productUrl != ''">product_url = #{productUrl},</if>
+            <if test="productImage != null and productImage != ''">product_image = #{productImage},</if>
+            <if test="price != null and price != ''">price = #{price},</if>
+            <if test="commissionInfo != null and commissionInfo != ''">commission_info = #{commissionInfo},</if>
+            <if test="isTop != null">is_top = #{isTop},</if>
+            <if test="sortWeight != null">sort_weight = #{sortWeight},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
+            <if test="createUserName != null and createUserName != ''">create_user_name = #{createUserName},</if>
+            <if test="erpProductIds != null and erpProductIds != ''">erp_product_ids = #{erpProductIds},</if>
+            <if test="category != null and category != ''">category = #{category},</if>
+            <if test="brand != null and brand != ''">brand = #{brand},</if>
+            <if test="lastUsedTime != null and lastUsedTime != ''">last_used_time = #{lastUsedTime},</if>
+            <if test="useCount != null">use_count = #{useCount},</if>
+            update_time = sysdate(),
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFavoriteProductById" parameterType="Long">
+        delete from favorite_product where id = #{id}
+    </delete>
+
+    <delete id="deleteFavoriteProductByIds" parameterType="String">
+        delete from favorite_product where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+    <update id="updateUseCountAndTime" parameterType="Long">
+        update favorite_product 
+        set use_count = ifnull(use_count, 0) + 1,
+            last_used_time = sysdate(),
+            update_time = sysdate()
+        where id = #{id}
+    </update>
+    
+    <update id="updateTopStatus" parameterType="FavoriteProduct">
+        update favorite_product 
+        set is_top = #{isTop},
+            sort_weight = case when #{isTop} = 1 then 100 else 0 end,
+            update_time = sysdate()
+        where id = #{id}
+    </update>
+    
+</mapper>