Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go-pp/partner01 into feat/order-domain

merge

+version: v1
+kind: Schema
+metadata:
+  name: companyAdmin
+  description: 公司管理员信息值对象
+  attributes:
+    - ref: userAccount
+      required: true
+    - ref: userName
+      required: true

@@ -23,4 +23,4 @@ metadata:
   - name: admin
   - name: admin
     description: 公司主管理员
     description: 公司主管理员
     type:
     type:
-      schema: userInfo
+      schema: companyAdmin

@@ -13,13 +13,11 @@ metadata:
     required: true
     required: true
   - ref: remarks
   - ref: remarks
     required: false
     required: false
-  - name: adminId
-    description: 公司主管理员Id
-    type:
-      primitive: int64
-  result:
-  - ref: count
+  - ref: userAccount
     required: true
     required: true
+  - ref: userName
+    required: true
+  result:
   - name: company
   - name: company
     type: 
     type: 
       schema: company
       schema: company

@@ -8,8 +8,6 @@ metadata:
   - ref: companyId
   - ref: companyId
     required: true
     required: true
   result:
   result:
-  - ref: count
-    required: true
   - name: company
   - name: company
     type: 
     type: 
       schema: company
       schema: company

@@ -7,7 +7,9 @@ metadata:
   payload:
   payload:
   - ref: companyId
   - ref: companyId
     required: true
     required: true
-  - ref: userId
+  - ref: userAccount
+    required: true
+  - ref: userName
     required: true
     required: true
   result:
   result:
   - name: company
   - name: company

@@ -15,10 +15,9 @@ metadata:
     required: false
     required: false
   - ref: remarks
   - ref: remarks
     required: false
     required: false
-  - name: adminId
-    description: 公司主管理员Id
-    type:
-      primitive: int64 
+  - ref: userAccount
+    required: false
+  - ref: userName
     required: false
     required: false
   result:
   result:
   - name: company
   - name: company

+package command
+
+import (
+	"fmt"
+
+	"github.com/beego/beego/v2/core/validation"
+)
+
+type ConvertCompanyStatusCommand struct {
+	// 公司Id
+	CompanyId int64 `json:"companyId" valid:"Required"`
+	// 状态 1正常 2禁用
+	Status int64 `json:"status" valid:"Required"`
+}
+
+func (convertCompanyStatusCommand *ConvertCompanyStatusCommand) Valid(validation *validation.Validation) {
+	// _ = validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (convertCompanyStatusCommand *ConvertCompanyStatusCommand) ValidateCommand() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(convertCompanyStatusCommand)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package command
+
+import (
+	"fmt"
+
+	"github.com/beego/beego/v2/core/validation"
+)
+
+type CreateCompanyCommand struct {
+	// 公司名称
+	Name string `json:"name" valid:"Required"`
+	// 公司简称
+	Abbreviation string `json:"abbreviation" valid:"Required"`
+	// 状态 1正常 2禁用
+	Status int64 `json:"status" valid:"Required"`
+	// 备注
+	Remarks string `json:"remarks,omitempty"`
+	// 公司主管理员账号
+	UserAccount string `json:"userAccount" valid:"Required"`
+	// 公司主管理员姓名
+	UserName string `json:"userName" valid:"Required"`
+}
+
+func (createCompanyCommand *CreateCompanyCommand) Valid(validation *validation.Validation) {
+	// _ = validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (createCompanyCommand *CreateCompanyCommand) ValidateCommand() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(createCompanyCommand)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package command
+
+import (
+	"fmt"
+
+	"github.com/beego/beego/v2/core/validation"
+)
+
+type RemoveCompanyCommand struct {
+	// 公司Id
+	CompanyId int64 `json:"companyId" valid:"Required"`
+}
+
+func (removeCompanyCommand *RemoveCompanyCommand) Valid(validation *validation.Validation) {
+	// _ = validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (removeCompanyCommand *RemoveCompanyCommand) ValidateCommand() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(removeCompanyCommand)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package command
+
+import (
+	"fmt"
+
+	"github.com/beego/beego/v2/core/validation"
+)
+
+type SetCompanyAdminCommand struct {
+	// 公司Id
+	CompanyId int64 `json:"companyId" valid:"Required"`
+	// 公司主管理员账号
+	UserAccount string `json:"userAccount" valid:"Required"`
+	// 公司主管理员姓名
+	UserName string `json:"userName" valid:"Required"`
+}
+
+func (setCompanyAdminCommand *SetCompanyAdminCommand) Valid(validation *validation.Validation) {
+	// _ = validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (setCompanyAdminCommand *SetCompanyAdminCommand) ValidateCommand() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(setCompanyAdminCommand)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package command
+
+import (
+	"fmt"
+
+	"github.com/beego/beego/v2/core/validation"
+)
+
+type UpdateCompanyCommand struct {
+	// 公司Id
+	CompanyId int64 `json:"companyId" valid:"Required"`
+	// 公司名称
+	Name string `json:"name,omitempty"`
+	// 公司简称
+	Abbreviation string `json:"abbreviation,omitempty"`
+	// 状态 1正常 2禁用
+	Status int64 `json:"status,omitempty"`
+	// 备注
+	Remarks string `json:"remarks,omitempty"`
+	// 公司主管理员账号
+	UserAccount string `json:"userAccount,omitempty"`
+	// 公司主管理员姓名
+	UserName string `json:"userName,omitempty"`
+}
+
+func (updateCompanyCommand *UpdateCompanyCommand) Valid(validation *validation.Validation) {
+	// _ = validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (updateCompanyCommand *UpdateCompanyCommand) ValidateCommand() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(updateCompanyCommand)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package query
+
+import (
+	"fmt"
+
+	"github.com/beego/beego/v2/core/validation"
+)
+
+type GetCompanyQuery struct {
+	// 公司Id
+	CompanyId int64 `json:"companyId" valid:"Required"`
+}
+
+func (getCompanyQuery *GetCompanyQuery) Valid(validation *validation.Validation) {
+	// _ = validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (getCompanyQuery *GetCompanyQuery) ValidateQuery() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(getCompanyQuery)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package query
+
+import (
+	"fmt"
+
+	"github.com/beego/beego/v2/core/validation"
+)
+
+type ListCompanyQuery struct {
+	// 查询偏离量
+	Offset int `json:"offset" valid:"Required"`
+	// 查询限制
+	Limit int `json:"limit" valid:"Required"`
+}
+
+func (listCompanyQuery *ListCompanyQuery) Valid(validation *validation.Validation) {
+	// _ = validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (listCompanyQuery *ListCompanyQuery) ValidateQuery() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(listCompanyQuery)
+	if err != nil {
+		return err
+	}
+	if !b {
+		for _, validErr := range valid.Errors {
+			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
+		}
+	}
+	return nil
+}

+package service
+
+import (
+	"fmt"
+	"github.com/linmadan/egglib-go/core/application"
+	"github.com/linmadan/egglib-go/utils/tool_funs"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/application/company/command"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/application/company/query"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/application/factory"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/domain"
+	"time"
+)
+
+// 公司服务
+type CompanyService struct {
+}
+
+// 公司状态转换  禁用、启用
+func (companyService *CompanyService) ConvertCompanyStatus(convertCompanyStatusCommand *command.ConvertCompanyStatusCommand) (interface{}, error) {
+	if err := convertCompanyStatusCommand.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+	var companyRepository domain.CompanyRepository
+	if value, err := factory.CreateCompanyRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyRepository = value
+	}
+	company, err := companyRepository.FindOne(map[string]interface{}{"companyId": convertCompanyStatusCommand.CompanyId})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if company == nil {
+		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(convertCompanyStatusCommand.CompanyId)))
+	}
+	if err := company.Update(tool_funs.SimpleStructToMap(convertCompanyStatusCommand)); err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	if company, err := companyRepository.Save(company); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		if err := transactionContext.CommitTransaction(); err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		return company, nil
+	}
+}
+
+// 创建
+func (companyService *CompanyService) CreateCompany(createCompanyCommand *command.CreateCompanyCommand) (interface{}, error) {
+	if err := createCompanyCommand.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+
+	newCompany := &domain.Company{
+		CompanyInfo: &domain.CompanyInfo{
+			Name:         createCompanyCommand.Name,         // 公司名称
+			Abbreviation: createCompanyCommand.Abbreviation, // 公司简称
+			Logo:         "",                                // 公司logo
+			Phone:        "",                                // 公司联系电话
+			Status:       createCompanyCommand.Status,       // 状态 1正常 2禁用
+			Remarks:      createCompanyCommand.Remarks,      // 备注
+			Enable:       1,                                 // 是否有效【1:有效】【2:无效】
+			Admin: &domain.CompanyAdmin{
+				UserAccount: createCompanyCommand.UserAccount, // 用户手机号
+				UserName:    createCompanyCommand.UserName,    // 用户名称
+			},                                               // 公司主管理员
+		},
+		CreateAt: time.Now(),
+		UpdateAt: time.Now(),
+	}
+	var companyRepository domain.CompanyRepository
+	if value, err := factory.CreateCompanyRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyRepository = value
+	}
+	if company, err := companyRepository.Save(newCompany); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		// todo 新增公司管理员
+
+		if err := transactionContext.CommitTransaction(); err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		return company, nil
+	}
+}
+
+// 返回
+func (companyService *CompanyService) GetCompany(getCompanyQuery *query.GetCompanyQuery) (interface{}, error) {
+	if err := getCompanyQuery.ValidateQuery(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+	var companyRepository domain.CompanyRepository
+	if value, err := factory.CreateCompanyRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyRepository = value
+	}
+	company, err := companyRepository.FindOne(map[string]interface{}{"companyId": getCompanyQuery.CompanyId})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if company == nil {
+		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(getCompanyQuery.CompanyId)))
+	} else {
+		if err := transactionContext.CommitTransaction(); err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		return company, nil
+	}
+}
+
+// 返回列表
+func (companyService *CompanyService) ListCompany(listCompanyQuery *query.ListCompanyQuery) (interface{}, error) {
+	if err := listCompanyQuery.ValidateQuery(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+	var companyRepository domain.CompanyRepository
+	if value, err := factory.CreateCompanyRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyRepository = value
+	}
+	if count, companies, err := companyRepository.Find(tool_funs.SimpleStructToMap(listCompanyQuery)); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		if err := transactionContext.CommitTransaction(); err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		return map[string]interface{}{
+			"count":    count,
+			"companies": companies,
+		}, nil
+	}
+}
+
+// 移除
+func (companyService *CompanyService) RemoveCompany(removeCompanyCommand *command.RemoveCompanyCommand) (interface{}, error) {
+	if err := removeCompanyCommand.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+	var companyRepository domain.CompanyRepository
+	if value, err := factory.CreateCompanyRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyRepository = value
+	}
+	company, err := companyRepository.FindOne(map[string]interface{}{"companyId": removeCompanyCommand.CompanyId})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if company == nil {
+		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(removeCompanyCommand.CompanyId)))
+	}
+	if company, err := companyRepository.Remove(company); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		if err := transactionContext.CommitTransaction(); err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		return company, nil
+	}
+}
+
+// 设置公司管理员
+func (companyService *CompanyService) SetCompanyAdmin(setCompanyAdminCommand *command.SetCompanyAdminCommand) (interface{}, error) {
+	if err := setCompanyAdminCommand.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+	var companyRepository domain.CompanyRepository
+	if value, err := factory.CreateCompanyRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyRepository = value
+	}
+	company, err := companyRepository.FindOne(map[string]interface{}{"companyId": setCompanyAdminCommand.CompanyId})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if company == nil {
+		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(setCompanyAdminCommand.CompanyId)))
+	}
+
+	newCompanyAdmin := &domain.CompanyAdmin{
+		UserAccount: setCompanyAdminCommand.UserAccount, // 用户手机号
+		UserName:    setCompanyAdminCommand.UserName,    // 用户名称
+	}
+	// 更改公司管理员信息
+	if err := company.SetCompanyAdmin(newCompanyAdmin); err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+
+	if company, err := companyRepository.Save(company); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		// todo 更改公司管理员
+
+		if err := transactionContext.CommitTransaction(); err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		return company, nil
+	}
+}
+
+// 更新
+func (companyService *CompanyService) UpdateCompany(updateCompanyCommand *command.UpdateCompanyCommand) (interface{}, error) {
+	if err := updateCompanyCommand.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+	var companyRepository domain.CompanyRepository
+	if value, err := factory.CreateCompanyRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyRepository = value
+	}
+	company, err := companyRepository.FindOne(map[string]interface{}{"companyId": updateCompanyCommand.CompanyId})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if company == nil {
+		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(updateCompanyCommand.CompanyId)))
+	}
+	if err := company.Update(tool_funs.SimpleStructToMap(updateCompanyCommand)); err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+
+	// 更改公司管理员信息
+	if updateCompanyCommand.UserAccount != "" || updateCompanyCommand.UserName != "" {
+		companyAdmin := company.CompanyInfo.Admin
+		if updateCompanyCommand.UserAccount != "" {
+			companyAdmin.UserAccount = updateCompanyCommand.UserAccount // 用户手机号
+		}
+		if updateCompanyCommand.UserName != "" {
+			companyAdmin.UserName = updateCompanyCommand.UserName // 用户名称
+		}
+		if err := company.SetCompanyAdmin(companyAdmin); err != nil {
+			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+		}
+
+		// todo 更改公司管理员
+	}
+
+	if company, err := companyRepository.Save(company); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		if err := transactionContext.CommitTransaction(); err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		return company, nil
+	}
+}
+
+func NewCompanyService(options map[string]interface{}) *CompanyService {
+	newCompanyService := &CompanyService{}
+	return newCompanyService
+}

@@ -34,9 +34,6 @@ func (company *Company) Update(data map[string]interface{}) error {
 	if companyId, ok := data["companyId"]; ok {
 	if companyId, ok := data["companyId"]; ok {
 		company.CompanyId = companyId.(int64)
 		company.CompanyId = companyId.(int64)
 	}
 	}
-	if companyId, ok := data["companyId"]; ok {
-		company.CompanyInfo.CompanyId = companyId.(int64)
-	}
 	if name, ok := data["name"]; ok {
 	if name, ok := data["name"]; ok {
 		company.CompanyInfo.Name = name.(string)
 		company.CompanyInfo.Name = name.(string)
 	}
 	}
@@ -58,5 +55,28 @@ func (company *Company) Update(data map[string]interface{}) error {
 	if enable, ok := data["enable"]; ok {
 	if enable, ok := data["enable"]; ok {
 		company.CompanyInfo.Enable = enable.(int64)
 		company.CompanyInfo.Enable = enable.(int64)
 	}
 	}
+	if userAccount, ok := data["userAccount"]; ok {
+		company.CompanyInfo.Admin.UserAccount = userAccount.(string)
+	}
+	if userName, ok := data["userName"]; ok {
+		company.CompanyInfo.Admin.UserName = userName.(string)
+	}
+
+	if createAt, ok := data["createAt"]; ok {
+		company.CreateAt = createAt.(time.Time)
+	}
+	if updateAt, ok := data["updateAt"]; ok {
+		company.UpdateAt = updateAt.(time.Time)
+	}
+	if deleteAt, ok := data["deleteAt"]; ok {
+		company.DeleteAt = deleteAt.(time.Time)
+	}
+
+	return nil
+}
+
+// 更改公司管理员信息
+func (company *Company) SetCompanyAdmin(admin *CompanyAdmin) error {
+	company.CompanyInfo.Admin = admin
 	return nil
 	return nil
 }
 }

@@ -2,22 +2,18 @@ package domain
 
 
 // 公司信息
 // 公司信息
 type CompanyInfo struct {
 type CompanyInfo struct {
-	// 公司Id
-	CompanyId int64 `json:"companyId"`
-	// 公司名称
-	Name string `json:"name"`
-	// 公司简称
-	Abbreviation string `json:"abbreviation"`
-	// 公司logo
-	Logo string `json:"logo"`
-	// 公司联系电话
-	Phone string `json:"phone"`
-	// 状态 1正常 2禁用
-	Status int64 `json:"status"`
-	// 备注
-	Remarks string `json:"remarks"`
-	// 是否有效【1:有效】【2:无效】
-	Enable int64 `json:"enable"`
-	// 公司主管理员
-	Admin *UserInfo `json:"admin"`
+	Name         string        `json:"name"`         // 公司名称
+	Abbreviation string        `json:"abbreviation"` // 公司简称
+	Logo         string        `json:"logo"`         // 公司logo
+	Phone        string        `json:"phone"`        // 公司联系电话
+	Status       int64         `json:"status"`       // 状态 1正常 2禁用
+	Remarks      string        `json:"remarks"`      // 备注
+	Enable       int64         `json:"enable"`       // 是否有效【1:有效】【2:无效】
+	Admin        *CompanyAdmin `json:"admin"`        // 公司主管理员
+}
+
+// 公司管理员信息值对象
+type CompanyAdmin struct {
+	UserAccount string `json:"userPhone"` // 用户手机号
+	UserName    string `json:"userName"`  // 用户名称
 }
 }

@@ -6,7 +6,7 @@ import (
 )
 )
 
 
 type Company struct {
 type Company struct {
-	tableName string `pg:"companys,alias:company"`
+	tableName string `pg:"companies,alias:company"`
 	// 公司Id
 	// 公司Id
 	CompanyId int64 `pg:",pk"`
 	CompanyId int64 `pg:",pk"`
 	// 公司信息
 	// 公司信息
@@ -16,5 +16,5 @@ type Company struct {
 	// 更新时间
 	// 更新时间
 	UpdateAt time.Time
 	UpdateAt time.Time
 	// 删除时间
 	// 删除时间
-	DeleteAt time.Time
+	DeleteAt time.Time `pg:",soft_delete"`
 }
 }

@@ -30,7 +30,6 @@ func (repository *CompanyRepository) Save(company *domain.Company) (*domain.Comp
 		"company_info",
 		"company_info",
 		"create_at",
 		"create_at",
 		"update_at",
 		"update_at",
-		"delete_at",
 	}
 	}
 	insertFieldsSnippet := sqlbuilder.SqlFieldsSnippet(sqlBuildFields)
 	insertFieldsSnippet := sqlbuilder.SqlFieldsSnippet(sqlBuildFields)
 	insertPlaceHoldersSnippet := sqlbuilder.SqlPlaceHoldersSnippet(sqlBuildFields)
 	insertPlaceHoldersSnippet := sqlbuilder.SqlPlaceHoldersSnippet(sqlBuildFields)
@@ -53,7 +52,9 @@ func (repository *CompanyRepository) Save(company *domain.Company) (*domain.Comp
 				&company.UpdateAt,
 				&company.UpdateAt,
 				&company.DeleteAt,
 				&company.DeleteAt,
 			),
 			),
-			fmt.Sprintf("INSERT INTO companys (%s) VALUES (%s) RETURNING %s", insertFieldsSnippet, insertPlaceHoldersSnippet, returningFieldsSnippet),
+
+			fmt.Sprintf("INSERT INTO companies (%s) VALUES (%s) RETURNING %s", insertFieldsSnippet, insertPlaceHoldersSnippet, returningFieldsSnippet),
+
 			company.CompanyId,
 			company.CompanyId,
 			company.CompanyInfo,
 			company.CompanyInfo,
 			company.CreateAt,
 			company.CreateAt,
@@ -71,8 +72,9 @@ func (repository *CompanyRepository) Save(company *domain.Company) (*domain.Comp
 				&company.UpdateAt,
 				&company.UpdateAt,
 				&company.DeleteAt,
 				&company.DeleteAt,
 			),
 			),
-			fmt.Sprintf("UPDATE companys SET %s WHERE company_id=? RETURNING %s", updateFieldsSnippet, returningFieldsSnippet),
-			company.CompanyId,
+
+			fmt.Sprintf("UPDATE companies SET %s WHERE company_id=? RETURNING %s", updateFieldsSnippet, returningFieldsSnippet),
+
 			company.CompanyInfo,
 			company.CompanyInfo,
 			company.CreateAt,
 			company.CreateAt,
 			company.UpdateAt,
 			company.UpdateAt,
@@ -115,21 +117,23 @@ func (repository *CompanyRepository) FindOne(queryOptions map[string]interface{}
 func (repository *CompanyRepository) Find(queryOptions map[string]interface{}) (int64, []*domain.Company, error) {
 func (repository *CompanyRepository) Find(queryOptions map[string]interface{}) (int64, []*domain.Company, error) {
 	tx := repository.transactionContext.PgTx
 	tx := repository.transactionContext.PgTx
 	var companyModels []*models.Company
 	var companyModels []*models.Company
-	companys := make([]*domain.Company, 0)
+
+	companies := make([]*domain.Company, 0)
+
 	query := sqlbuilder.BuildQuery(tx.Model(&companyModels), queryOptions)
 	query := sqlbuilder.BuildQuery(tx.Model(&companyModels), queryOptions)
 	query.SetOffsetAndLimit(20)
 	query.SetOffsetAndLimit(20)
 	query.SetOrderDirect("company_id", "DESC")
 	query.SetOrderDirect("company_id", "DESC")
 	if count, err := query.SelectAndCount(); err != nil {
 	if count, err := query.SelectAndCount(); err != nil {
-		return 0, companys, err
+		return 0, companies, err
 	} else {
 	} else {
 		for _, companyModel := range companyModels {
 		for _, companyModel := range companyModels {
 			if company, err := transform.TransformToCompanyDomainModelFromPgModels(companyModel); err != nil {
 			if company, err := transform.TransformToCompanyDomainModelFromPgModels(companyModel); err != nil {
-				return 0, companys, err
+				return 0, companies, err
 			} else {
 			} else {
-				companys = append(companys, company)
+				companies = append(companies, company)
 			}
 			}
 		}
 		}
-		return int64(count), companys, nil
+		return int64(count), companies, nil
 	}
 	}
 }
 }
 func NewCompanyRepository(transactionContext *pgTransaction.TransactionContext) (*CompanyRepository, error) {
 func NewCompanyRepository(transactionContext *pgTransaction.TransactionContext) (*CompanyRepository, error) {

+package controllers
+
+import (
+	"github.com/linmadan/egglib-go/web/beego"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/application/company/command"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/application/company/query"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/application/company/service"
+)
+
+type CompanyController struct {
+	beego.BaseController
+}
+
+func (controller *CompanyController) CreateCompany() {
+	companyService := service.NewCompanyService(nil)
+	createCompanyCommand := &command.CreateCompanyCommand{}
+	controller.Unmarshal(createCompanyCommand)
+	data, err := companyService.CreateCompany(createCompanyCommand)
+	controller.Response(data, err)
+}
+
+func (controller *CompanyController) UpdateCompany() {
+	companyService := service.NewCompanyService(nil)
+	updateCompanyCommand := &command.UpdateCompanyCommand{}
+	controller.Unmarshal(updateCompanyCommand)
+	companyId, _ := controller.GetInt64(":companyId")
+	updateCompanyCommand.CompanyId = companyId
+	data, err := companyService.UpdateCompany(updateCompanyCommand)
+	controller.Response(data, err)
+}
+
+func (controller *CompanyController) GetCompany() {
+	companyService := service.NewCompanyService(nil)
+	getCompanyQuery := &query.GetCompanyQuery{}
+	companyId, _ := controller.GetInt64(":companyId")
+	getCompanyQuery.CompanyId = companyId
+	data, err := companyService.GetCompany(getCompanyQuery)
+	controller.Response(data, err)
+}
+
+func (controller *CompanyController) RemoveCompany() {
+	companyService := service.NewCompanyService(nil)
+	removeCompanyCommand := &command.RemoveCompanyCommand{}
+	controller.Unmarshal(removeCompanyCommand)
+	companyId, _ := controller.GetInt64(":companyId")
+	removeCompanyCommand.CompanyId = companyId
+	data, err := companyService.RemoveCompany(removeCompanyCommand)
+	controller.Response(data, err)
+}
+
+func (controller *CompanyController) ListCompany() {
+	companyService := service.NewCompanyService(nil)
+	listCompanyQuery := &query.ListCompanyQuery{}
+	offset, _ := controller.GetInt("offset")
+	listCompanyQuery.Offset = offset
+	limit, _ := controller.GetInt("limit")
+	listCompanyQuery.Limit = limit
+	data, err := companyService.ListCompany(listCompanyQuery)
+	controller.Response(data, err)
+}
+
+func (controller *CompanyController) ConvertCompanyStatus() {
+	companyService := service.NewCompanyService(nil)
+	convertCompanyStatusCommand := &command.ConvertCompanyStatusCommand{}
+	controller.Unmarshal(convertCompanyStatusCommand)
+	data, err := companyService.ConvertCompanyStatus(convertCompanyStatusCommand)
+	controller.Response(data, err)
+}
+
+func (controller *CompanyController) SetCompanyAdmin() {
+	companyService := service.NewCompanyService(nil)
+	setCompanyAdminCommand := &command.SetCompanyAdminCommand{}
+	controller.Unmarshal(setCompanyAdminCommand)
+	data, err := companyService.SetCompanyAdmin(setCompanyAdminCommand)
+	controller.Response(data, err)
+}

+package routers
+
+import (
+	"github.com/beego/beego/v2/server/web"
+	"gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/port/beego/controllers"
+)
+
+func init() {
+	web.Router("/companies/", &controllers.CompanyController{}, "Post:CreateCompany")
+	web.Router("/companies/:companyId", &controllers.CompanyController{}, "Put:UpdateCompany")
+	web.Router("/companies/:companyId", &controllers.CompanyController{}, "Get:GetCompany")
+	web.Router("/companies/:companyId", &controllers.CompanyController{}, "Delete:RemoveCompany")
+	web.Router("/companies/", &controllers.CompanyController{}, "Get:ListCompany")
+	web.Router("/companies/convertCompanyStatus", &controllers.CompanyController{}, "Post:ConvertCompanyStatus")
+	web.Router("/companies/setCompanyAdmin", &controllers.CompanyController{}, "Post:SetCompanyAdmin")
+}

+package company
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/beego/beego/v2/server/web"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	_ "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+	_ "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/port/beego"
+)
+
+func TestCompany(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Beego Port Company Correlations Test Case Suite")
+}
+
+var handler http.Handler
+var server *httptest.Server
+
+var _ = BeforeSuite(func() {
+	handler = web.BeeApp.Handlers
+	server = httptest.NewServer(handler)
+})
+
+var _ = AfterSuite(func() {
+	server.Close()
+})

+package company
+
+import (
+	"net/http"
+
+	"github.com/gavv/httpexpect"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	pG "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+)
+
+var _ = Describe("公司状态转换  禁用、启用", func() {
+	var companyId int64
+	BeforeEach(func() {
+		_, err := pG.DB.QueryOne(
+			pg.Scan(&companyId),
+			"INSERT INTO companys (company_id, company_info, create_at, update_at, delete_at) VALUES (?, ?, ?, ?, ?) RETURNING company_id",
+			"testCompanyId", "testCompanyInfo", "testCreateAt", "testUpdateAt", "testDeleteAt")
+		Expect(err).NotTo(HaveOccurred())
+	})
+	Describe("公司状态转换  禁用、启用", func() {
+		Context("", func() {
+			It("", func() {
+				httpExpect := httpexpect.New(GinkgoT(), server.URL)
+				body := map[string]interface{}{
+					"companyId": "int64",
+					"status":    "int64",
+				}
+				httpExpect.POST("/companys/convertCompanyStatus").
+					WithJSON(body).
+					Expect().
+					Status(http.StatusOK).
+					JSON().
+					Object().
+					ContainsKey("code").ValueEqual("code", 0).
+					ContainsKey("msg").ValueEqual("msg", "ok").
+					ContainsKey("data").Value("data").Object()
+			})
+		})
+	})
+	AfterEach(func() {
+		_, err := pG.DB.Exec("DELETE FROM companys WHERE true")
+		Expect(err).NotTo(HaveOccurred())
+	})
+})

+package company
+
+import (
+	"net/http"
+
+	"github.com/gavv/httpexpect"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	pG "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+)
+
+var _ = Describe("创建", func() {
+	Describe("提交数据创建", func() {
+		Context("提交正确的新公司信息数据", func() {
+			It("返回公司信息数据", func() {
+				httpExpect := httpexpect.New(GinkgoT(), server.URL)
+				body := map[string]interface{}{
+					"name":         "string",
+					"abbreviation": "string",
+					"status":       "int64",
+					"remarks":      "string",
+					"userAccount":  "string",
+					"userName":     "string",
+				}
+				httpExpect.POST("/companys/").
+					WithJSON(body).
+					Expect().
+					Status(http.StatusOK).
+					JSON().
+					Object().
+					ContainsKey("code").ValueEqual("code", 0).
+					ContainsKey("msg").ValueEqual("msg", "ok").
+					ContainsKey("data").Value("data").Object().
+					ContainsKey("companyId").ValueNotEqual("companyId", BeZero())
+			})
+		})
+	})
+	AfterEach(func() {
+		_, err := pG.DB.Exec("DELETE FROM companys WHERE true")
+		Expect(err).NotTo(HaveOccurred())
+	})
+})

+package company
+
+import (
+	"net/http"
+
+	"github.com/gavv/httpexpect"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	pG "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+)
+
+var _ = Describe("返回", func() {
+	var companyId int64
+	BeforeEach(func() {
+		_, err := pG.DB.QueryOne(
+			pg.Scan(&companyId),
+			"INSERT INTO companys (company_id, company_info, create_at, update_at, delete_at) VALUES (?, ?, ?, ?, ?) RETURNING company_id",
+			"testCompanyId", "testCompanyInfo", "testCreateAt", "testUpdateAt", "testDeleteAt")
+		Expect(err).NotTo(HaveOccurred())
+	})
+	Describe("根据companyId参数返回公司信息", func() {
+		Context("传入有效的companyId", func() {
+			It("返回公司信息数据", func() {
+				httpExpect := httpexpect.New(GinkgoT(), server.URL)
+				httpExpect.GET("/companys/{companyId}").
+					Expect().
+					Status(http.StatusOK).
+					JSON().
+					Object().
+					ContainsKey("code").ValueEqual("code", 0).
+					ContainsKey("msg").ValueEqual("msg", "ok").
+					ContainsKey("data").Value("data").Object()
+			})
+		})
+	})
+	AfterEach(func() {
+		_, err := pG.DB.Exec("DELETE FROM companys WHERE true")
+		Expect(err).NotTo(HaveOccurred())
+	})
+})

+package company
+
+import (
+	"net/http"
+
+	"github.com/gavv/httpexpect"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	pG "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+)
+
+var _ = Describe("返回列表", func() {
+	var companyId int64
+	BeforeEach(func() {
+		_, err := pG.DB.QueryOne(
+			pg.Scan(&companyId),
+			"INSERT INTO companys (company_id, company_info, create_at, update_at, delete_at) VALUES (?, ?, ?, ?, ?) RETURNING company_id",
+			"testCompanyId", "testCompanyInfo", "testCreateAt", "testUpdateAt", "testDeleteAt")
+		Expect(err).NotTo(HaveOccurred())
+	})
+	Describe("根据参数返回公司信息列表", func() {
+		Context("传入有效的参数", func() {
+			It("返回公司信息数据列表", func() {
+				httpExpect := httpexpect.New(GinkgoT(), server.URL)
+				httpExpect.GET("/companys/").
+					WithQuery("offset", "int").
+					WithQuery("limit", "int").
+					Expect().
+					Status(http.StatusOK).
+					JSON().
+					Object().
+					ContainsKey("code").ValueEqual("code", 0).
+					ContainsKey("msg").ValueEqual("msg", "ok").
+					ContainsKey("data").Value("data").Object().
+					ContainsKey("count").ValueEqual("count", 1).
+					ContainsKey("companys").Value("companys").Array()
+			})
+		})
+	})
+	AfterEach(func() {
+		_, err := pG.DB.Exec("DELETE FROM companys WHERE true")
+		Expect(err).NotTo(HaveOccurred())
+	})
+})

+package company
+
+import (
+	"net/http"
+
+	"github.com/gavv/httpexpect"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	pG "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+)
+
+var _ = Describe("移除", func() {
+	var companyId int64
+	BeforeEach(func() {
+		_, err := pG.DB.QueryOne(
+			pg.Scan(&companyId),
+			"INSERT INTO companys (company_id, company_info, create_at, update_at, delete_at) VALUES (?, ?, ?, ?, ?) RETURNING company_id",
+			"testCompanyId", "testCompanyInfo", "testCreateAt", "testUpdateAt", "testDeleteAt")
+		Expect(err).NotTo(HaveOccurred())
+	})
+	Describe("根据参数移除", func() {
+		Context("传入有效的companyId", func() {
+			It("返回被移除公司信息的数据", func() {
+				httpExpect := httpexpect.New(GinkgoT(), server.URL)
+				httpExpect.DELETE("/companys/{companyId}").
+					Expect().
+					Status(http.StatusOK).
+					JSON().
+					Object().
+					ContainsKey("code").ValueEqual("code", 0).
+					ContainsKey("msg").ValueEqual("msg", "ok").
+					ContainsKey("data").Value("data").Object()
+			})
+		})
+	})
+	AfterEach(func() {
+		_, err := pG.DB.Exec("DELETE FROM companys WHERE true")
+		Expect(err).NotTo(HaveOccurred())
+	})
+})

+package company
+
+import (
+	"net/http"
+
+	"github.com/gavv/httpexpect"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	pG "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+)
+
+var _ = Describe("设置公司管理员", func() {
+	var companyId int64
+	BeforeEach(func() {
+		_, err := pG.DB.QueryOne(
+			pg.Scan(&companyId),
+			"INSERT INTO companys (company_id, company_info, create_at, update_at, delete_at) VALUES (?, ?, ?, ?, ?) RETURNING company_id",
+			"testCompanyId", "testCompanyInfo", "testCreateAt", "testUpdateAt", "testDeleteAt")
+		Expect(err).NotTo(HaveOccurred())
+	})
+	Describe("设置公司管理员", func() {
+		Context("", func() {
+			It("", func() {
+				httpExpect := httpexpect.New(GinkgoT(), server.URL)
+				body := map[string]interface{}{
+					"companyId":   "int64",
+					"userAccount": "string",
+					"userName":    "string",
+				}
+				httpExpect.POST("/companys/setCompanyAdmin").
+					WithJSON(body).
+					Expect().
+					Status(http.StatusOK).
+					JSON().
+					Object().
+					ContainsKey("code").ValueEqual("code", 0).
+					ContainsKey("msg").ValueEqual("msg", "ok").
+					ContainsKey("data").Value("data").Object()
+			})
+		})
+	})
+	AfterEach(func() {
+		_, err := pG.DB.Exec("DELETE FROM companys WHERE true")
+		Expect(err).NotTo(HaveOccurred())
+	})
+})

+package company
+
+import (
+	"net/http"
+
+	"github.com/gavv/httpexpect"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	pG "gitlab.fjmaimaimai.com/mmm-go-pp/partner01/pkg/infrastructure/pg"
+)
+
+var _ = Describe("更新", func() {
+	var companyId int64
+	BeforeEach(func() {
+		_, err := pG.DB.QueryOne(
+			pg.Scan(&companyId),
+			"INSERT INTO companys (company_id, company_info, create_at, update_at, delete_at) VALUES (?, ?, ?, ?, ?) RETURNING company_id",
+			"testCompanyId", "testCompanyInfo", "testCreateAt", "testUpdateAt", "testDeleteAt")
+		Expect(err).NotTo(HaveOccurred())
+	})
+	Describe("提交数据更新", func() {
+		Context("提交正确的公司信息数据", func() {
+			It("返回更新后的公司信息数据", func() {
+				httpExpect := httpexpect.New(GinkgoT(), server.URL)
+				body := map[string]interface{}{
+					"name":         "string",
+					"abbreviation": "string",
+					"status":       "int64",
+					"remarks":      "string",
+					"userAccount":  "string",
+					"userName":     "string",
+				}
+				httpExpect.PUT("/companys/{companyId}").
+					WithJSON(body).
+					Expect().
+					Status(http.StatusOK).
+					JSON().
+					Object().
+					ContainsKey("code").ValueEqual("code", 0).
+					ContainsKey("msg").ValueEqual("msg", "ok").
+					ContainsKey("data").Value("data").Object().
+					ContainsKey("companyId").ValueEqual("companyId", companyId)
+			})
+		})
+	})
+	AfterEach(func() {
+		_, err := pG.DB.Exec("DELETE FROM companys WHERE true")
+		Expect(err).NotTo(HaveOccurred())
+	})
+})