diff --git a/src/main/java/com/ai/da/common/task/AliPayTask.java b/src/main/java/com/ai/da/common/task/AliPayTask.java
index 0d9c8390..f95a3a10 100644
--- a/src/main/java/com/ai/da/common/task/AliPayTask.java
+++ b/src/main/java/com/ai/da/common/task/AliPayTask.java
@@ -1,6 +1,6 @@
 package com.ai.da.common.task;
 
-import com.ai.da.mapper.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.ai.da.common.enums.PayTypeEnum;
 import com.ai.da.service.AliPayService;
 import com.ai.da.service.OrderInfoService;
diff --git a/src/main/java/com/ai/da/controller/AliPayController.java b/src/main/java/com/ai/da/controller/AliPayController.java
index a6f3c20f..5559a186 100644
--- a/src/main/java/com/ai/da/controller/AliPayController.java
+++ b/src/main/java/com/ai/da/controller/AliPayController.java
@@ -1,7 +1,7 @@
 package com.ai.da.controller;
 
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.ai.da.service.AliPayService;
 import com.ai.da.service.OrderInfoService;
 import com.alipay.api.AlipayApiException;
diff --git a/src/main/java/com/ai/da/controller/OrderInfoController.java b/src/main/java/com/ai/da/controller/OrderInfoController.java
index b71d0e04..63e3463c 100644
--- a/src/main/java/com/ai/da/controller/OrderInfoController.java
+++ b/src/main/java/com/ai/da/controller/OrderInfoController.java
@@ -2,7 +2,7 @@ package com.ai.da.controller;
 
 import com.ai.da.common.enums.OrderStatusEnum;
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.ai.da.service.OrderInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/src/main/java/com/ai/da/controller/ProductController.java b/src/main/java/com/ai/da/controller/ProductController.java
index b22b1537..ac2e4be0 100644
--- a/src/main/java/com/ai/da/controller/ProductController.java
+++ b/src/main/java/com/ai/da/controller/ProductController.java
@@ -2,7 +2,7 @@ package com.ai.da.controller;
 
 
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.entity.Product;
+import com.ai.da.mapper.primary.entity.Product;
 import com.ai.da.service.ProductService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/src/main/java/com/ai/da/mapper/OrderInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/OrderInfoMapper.java
similarity index 60%
rename from src/main/java/com/ai/da/mapper/OrderInfoMapper.java
rename to src/main/java/com/ai/da/mapper/primary/OrderInfoMapper.java
index 4b8b6d68..b9d74a0f 100644
--- a/src/main/java/com/ai/da/mapper/OrderInfoMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/OrderInfoMapper.java
@@ -1,6 +1,6 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
-import com.ai.da.mapper.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
diff --git a/src/main/java/com/ai/da/mapper/PaymentInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
similarity index 60%
rename from src/main/java/com/ai/da/mapper/PaymentInfoMapper.java
rename to src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
index 1406b6bc..27b147a4 100644
--- a/src/main/java/com/ai/da/mapper/PaymentInfoMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
@@ -1,6 +1,6 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
-import com.ai.da.mapper.entity.PaymentInfo;
+import com.ai.da.mapper.primary.entity.PaymentInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {
diff --git a/src/main/java/com/ai/da/mapper/ProductMapper.java b/src/main/java/com/ai/da/mapper/primary/ProductMapper.java
similarity index 59%
rename from src/main/java/com/ai/da/mapper/ProductMapper.java
rename to src/main/java/com/ai/da/mapper/primary/ProductMapper.java
index 1ffdf2eb..69850d55 100644
--- a/src/main/java/com/ai/da/mapper/ProductMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/ProductMapper.java
@@ -1,6 +1,6 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
-import com.ai.da.mapper.entity.Product;
+import com.ai.da.mapper.primary.entity.Product;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface ProductMapper extends BaseMapper<Product> {
diff --git a/src/main/java/com/ai/da/mapper/RefundInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/RefundInfoMapper.java
similarity index 60%
rename from src/main/java/com/ai/da/mapper/RefundInfoMapper.java
rename to src/main/java/com/ai/da/mapper/primary/RefundInfoMapper.java
index 8f9c746e..d625e3ed 100644
--- a/src/main/java/com/ai/da/mapper/RefundInfoMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/RefundInfoMapper.java
@@ -1,7 +1,7 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
 
-import com.ai.da.mapper.entity.RefundInfo;
+import com.ai.da.mapper.primary.entity.RefundInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface RefundInfoMapper extends BaseMapper<RefundInfo> {
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java b/src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
index 862feb59..b9be4bc2 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
@@ -2,10 +2,8 @@ package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,6 +17,7 @@ public class BaseEntity implements Serializable {
     /**
      * ID
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java b/src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
index 12255f12..a4668176 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java b/src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
index ceacf94a..8557aa83 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Product.java b/src/main/java/com/ai/da/mapper/primary/entity/Product.java
index 9aa55531..de2df0cf 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/Product.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Product.java
@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java b/src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
index 594be318..ee07efc8 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
diff --git a/src/main/java/com/ai/da/service/OrderInfoService.java b/src/main/java/com/ai/da/service/OrderInfoService.java
index 1507d931..eaac6df3 100644
--- a/src/main/java/com/ai/da/service/OrderInfoService.java
+++ b/src/main/java/com/ai/da/service/OrderInfoService.java
@@ -2,7 +2,7 @@ package com.ai.da.service;
 
 
 import com.ai.da.common.enums.OrderStatusEnum;
-import com.ai.da.mapper.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
diff --git a/src/main/java/com/ai/da/service/ProductService.java b/src/main/java/com/ai/da/service/ProductService.java
index 9ac2597d..bf086fba 100644
--- a/src/main/java/com/ai/da/service/ProductService.java
+++ b/src/main/java/com/ai/da/service/ProductService.java
@@ -1,6 +1,6 @@
 package com.ai.da.service;
 
-import com.ai.da.mapper.entity.Product;
+import com.ai.da.mapper.primary.entity.Product;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface ProductService extends IService<Product> {
diff --git a/src/main/java/com/ai/da/service/RefundInfoService.java b/src/main/java/com/ai/da/service/RefundInfoService.java
index 014004cd..3690c794 100644
--- a/src/main/java/com/ai/da/service/RefundInfoService.java
+++ b/src/main/java/com/ai/da/service/RefundInfoService.java
@@ -1,7 +1,7 @@
 package com.ai.da.service;
 
 
-import com.ai.da.mapper.entity.RefundInfo;
+import com.ai.da.mapper.primary.entity.RefundInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
diff --git a/src/main/java/com/ai/da/service/impl/AliPayServiceImpl.java b/src/main/java/com/ai/da/service/impl/AliPayServiceImpl.java
index a018ff9d..38d67eac 100644
--- a/src/main/java/com/ai/da/service/impl/AliPayServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AliPayServiceImpl.java
@@ -3,8 +3,8 @@ package com.ai.da.service.impl;
 import com.ai.da.common.enums.AliPayTradeStateEnum;
 import com.ai.da.common.enums.OrderStatusEnum;
 import com.ai.da.common.enums.PayTypeEnum;
-import com.ai.da.mapper.entity.OrderInfo;
-import com.ai.da.mapper.entity.RefundInfo;
+import com.ai.da.mapper.primary.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.RefundInfo;
 import com.ai.da.service.AliPayService;
 import com.ai.da.service.OrderInfoService;
 import com.ai.da.service.PaymentInfoService;
diff --git a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
index 7e3ba77d..3c7544b6 100644
--- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
@@ -9,7 +9,9 @@ import com.ai.da.common.enums.LibraryLevel1TypeEnum;
 import com.ai.da.common.utils.CopyUtil;
 import com.ai.da.common.utils.MD5Utils;
 import com.ai.da.common.utils.MinioUtil;
+import com.ai.da.mapper.primary.AccountMapper;
 import com.ai.da.mapper.primary.LibraryMapper;
+import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.mapper.primary.entity.ChatRobot;
 import com.ai.da.mapper.primary.ChatRobotMapper;
 import com.ai.da.mapper.primary.entity.Library;
diff --git a/src/main/java/com/ai/da/service/impl/OrderInfoServiceImpl.java b/src/main/java/com/ai/da/service/impl/OrderInfoServiceImpl.java
index aa1f5255..8b7662f7 100644
--- a/src/main/java/com/ai/da/service/impl/OrderInfoServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/OrderInfoServiceImpl.java
@@ -3,10 +3,10 @@ package com.ai.da.service.impl;
 
 import com.ai.da.common.enums.OrderStatusEnum;
 import com.ai.da.common.utils.OrderNoUtils;
-import com.ai.da.mapper.OrderInfoMapper;
-import com.ai.da.mapper.ProductMapper;
-import com.ai.da.mapper.entity.OrderInfo;
-import com.ai.da.mapper.entity.Product;
+import com.ai.da.mapper.primary.OrderInfoMapper;
+import com.ai.da.mapper.primary.ProductMapper;
+import com.ai.da.mapper.primary.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.Product;
 import com.ai.da.service.OrderInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
index 4bafa595..31cca80a 100644
--- a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
@@ -1,8 +1,8 @@
 package com.ai.da.service.impl;
 
 import com.ai.da.common.enums.PayTypeEnum;
-import com.ai.da.mapper.PaymentInfoMapper;
-import com.ai.da.mapper.entity.PaymentInfo;
+import com.ai.da.mapper.primary.PaymentInfoMapper;
+import com.ai.da.mapper.primary.entity.PaymentInfo;
 import com.ai.da.service.PaymentInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
diff --git a/src/main/java/com/ai/da/service/impl/ProductServiceImpl.java b/src/main/java/com/ai/da/service/impl/ProductServiceImpl.java
index 0aa9d4b3..3797b913 100644
--- a/src/main/java/com/ai/da/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ProductServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ai.da.service.impl;
 
-import com.ai.da.mapper.ProductMapper;
-import com.ai.da.mapper.entity.Product;
+import com.ai.da.mapper.primary.ProductMapper;
+import com.ai.da.mapper.primary.entity.Product;
 import com.ai.da.service.ProductService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/ai/da/service/impl/RefundInfoServiceImpl.java b/src/main/java/com/ai/da/service/impl/RefundInfoServiceImpl.java
index f05dd74f..b340a802 100644
--- a/src/main/java/com/ai/da/service/impl/RefundInfoServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/RefundInfoServiceImpl.java
@@ -1,9 +1,9 @@
 package com.ai.da.service.impl;
 
 import com.ai.da.common.utils.OrderNoUtils;
-import com.ai.da.mapper.RefundInfoMapper;
-import com.ai.da.mapper.entity.OrderInfo;
-import com.ai.da.mapper.entity.RefundInfo;
+import com.ai.da.mapper.primary.RefundInfoMapper;
+import com.ai.da.mapper.primary.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.RefundInfo;
 import com.ai.da.service.OrderInfoService;
 import com.ai.da.service.RefundInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;