实现商户注册、管理员审核商户申请接口

internal/dao/internal/merchant_admins.go

@@ -33,6 +33,9 @@ type MerchantAdminsColumns struct {
 	CreatedAt    string // 创建时间
 	UpdatedAt    string // 更新时间
 	DeletedAt    string // 软删除时间戳
+	IsPrimary    string // 是否主账号：0=否，1=是
+	LastLoginIp  string // 最后登录IP
+	RoleId       string // 角色ID
 }
 
 // merchantAdminsColumns holds the columns for the table merchant_admins.
@@ -50,6 +53,9 @@ var merchantAdminsColumns = MerchantAdminsColumns{
 	CreatedAt:    "created_at",
 	UpdatedAt:    "updated_at",
 	DeletedAt:    "deleted_at",
+	IsPrimary:    "is_primary",
+	LastLoginIp:  "last_login_ip",
+	RoleId:       "role_id",
 }
 
 // NewMerchantAdminsDao creates and returns a new DAO object for table data access.

internal/dao/internal/merchants.go

@@ -20,36 +20,52 @@ type MerchantsDao struct {
 
 // MerchantsColumns defines and stores column names for the table merchants.
 type MerchantsColumns struct {
-	Id              string // 商户ID
-	Name            string // 商户名称
-	BusinessLicense string // 营业执照号
-	LegalPerson     string // 法人姓名
-	ContactName     string // 联系人姓名
-	ContactPhone    string // 联系人电话
-	ContactEmail    string // 联系人邮箱
-	Address         string // 商户地址
-	Status          string // 状态：1=正常，2=禁用，3=待审核
-	ExpireAt        string // 服务到期时间
-	CreatedAt       string // 创建时间
-	UpdatedAt       string // 更新时间
-	DeletedAt       string // 软删除时间戳
+	Id                string // 商户ID
+	Name              string // 商户名称
+	BusinessLicense   string // 营业执照号
+	LegalPerson       string // 法人姓名
+	ContactName       string // 联系人姓名
+	ContactPhone      string // 联系人电话
+	ContactEmail      string // 联系人邮箱
+	Address           string // 商户地址
+	Status            string // 状态：1=正常，2=禁用
+	ExpireAt          string // 服务到期时间
+	CreatedAt         string // 创建时间
+	UpdatedAt         string // 更新时间
+	DeletedAt         string // 软删除时间戳
+	ApplicationReason string // 申请理由
+	CreatedBy         string // 创建人ID
+	CreatedByType     string // 创建人类型：1=系统管理员，2=商户注册
+	AuditStatus       string // 审核状态：0=待审核，1=审核通过，2=审核拒绝
+	AuditBy           string // 审核人ID
+	AuditAt           string // 审核时间
+	AuditRemark       string // 审核备注
+	RejectReason      string // 拒绝原因
 }
 
 // merchantsColumns holds the columns for the table merchants.
 var merchantsColumns = MerchantsColumns{
-	Id:              "id",
-	Name:            "name",
-	BusinessLicense: "business_license",
-	LegalPerson:     "legal_person",
-	ContactName:     "contact_name",
-	ContactPhone:    "contact_phone",
-	ContactEmail:    "contact_email",
-	Address:         "address",
-	Status:          "status",
-	ExpireAt:        "expire_at",
-	CreatedAt:       "created_at",
-	UpdatedAt:       "updated_at",
-	DeletedAt:       "deleted_at",
+	Id:                "id",
+	Name:              "name",
+	BusinessLicense:   "business_license",
+	LegalPerson:       "legal_person",
+	ContactName:       "contact_name",
+	ContactPhone:      "contact_phone",
+	ContactEmail:      "contact_email",
+	Address:           "address",
+	Status:            "status",
+	ExpireAt:          "expire_at",
+	CreatedAt:         "created_at",
+	UpdatedAt:         "updated_at",
+	DeletedAt:         "deleted_at",
+	ApplicationReason: "application_reason",
+	CreatedBy:         "created_by",
+	CreatedByType:     "created_by_type",
+	AuditStatus:       "audit_status",
+	AuditBy:           "audit_by",
+	AuditAt:           "audit_at",
+	AuditRemark:       "audit_remark",
+	RejectReason:      "reject_reason",
 }
 
 // NewMerchantsDao creates and returns a new DAO object for table data access.

internal/dao/internal/store_admins.go

@@ -33,6 +33,7 @@ type StoreAdminsColumns struct {
 	CreatedAt    string // 创建时间
 	UpdatedAt    string // 更新时间
 	DeletedAt    string // 软删除时间戳
+	RoleId       string // 角色ID
 }
 
 // storeAdminsColumns holds the columns for the table store_admins.
@@ -50,6 +51,7 @@ var storeAdminsColumns = StoreAdminsColumns{
 	CreatedAt:    "created_at",
 	UpdatedAt:    "updated_at",
 	DeletedAt:    "deleted_at",
+	RoleId:       "role_id",
 }
 
 // NewStoreAdminsDao creates and returns a new DAO object for table data access.

internal/dao/internal/stores.go

@@ -20,34 +20,32 @@ type StoresDao struct {
 
 // StoresColumns defines and stores column names for the table stores.
 type StoresColumns struct {
-	Id            string // 门店ID
-	MerchantId    string // 所属商户ID
-	Name          string // 门店名称
-	StoreCode     string // 门店编号
-	Address       string // 门店地址
-	ContactName   string // 联系人姓名
-	ContactPhone  string // 联系人电话
-	BusinessHours string // 营业时间
-	Status        string // 状态：1=正常营业，2=暂停营业，3=已关闭
-	CreatedAt     string // 创建时间
-	UpdatedAt     string // 更新时间
-	DeletedAt     string // 软删除时间戳
+	Id           string // 门店ID
+	MerchantId   string // 所属商户ID
+	Name         string // 门店名称
+	StoreCode    string // 门店编号
+	Address      string // 门店地址
+	ContactName  string // 联系人姓名
+	ContactPhone string // 联系人电话
+	Status       string // 状态：1=正常营业，2=暂停营业，3=已关闭
+	CreatedAt    string // 创建时间
+	UpdatedAt    string // 更新时间
+	DeletedAt    string // 软删除时间戳
 }
 
 // storesColumns holds the columns for the table stores.
 var storesColumns = StoresColumns{
-	Id:            "id",
-	MerchantId:    "merchant_id",
-	Name:          "name",
-	StoreCode:     "store_code",
-	Address:       "address",
-	ContactName:   "contact_name",
-	ContactPhone:  "contact_phone",
-	BusinessHours: "business_hours",
-	Status:        "status",
-	CreatedAt:     "created_at",
-	UpdatedAt:     "updated_at",
-	DeletedAt:     "deleted_at",
+	Id:           "id",
+	MerchantId:   "merchant_id",
+	Name:         "name",
+	StoreCode:    "store_code",
+	Address:      "address",
+	ContactName:  "contact_name",
+	ContactPhone: "contact_phone",
+	Status:       "status",
+	CreatedAt:    "created_at",
+	UpdatedAt:    "updated_at",
+	DeletedAt:    "deleted_at",
 }
 
 // NewStoresDao creates and returns a new DAO object for table data access.