正在显示
20 个修改的文件
包含
1070 行增加
和
4 行删除
| @@ -10,7 +10,7 @@ import ( | @@ -10,7 +10,7 @@ import ( | ||
| 10 | 10 | ||
| 11 | type GetDividendsEstimateQuery struct { | 11 | type GetDividendsEstimateQuery struct { |
| 12 | // 承接人分红预算记录ID | 12 | // 承接人分红预算记录ID |
| 13 | - DividendsEstimateId int64 `cname:"承接人分红预算记录ID" json:"dividendsEstimateId,string" valid:"Required"` | 13 | + DividendsEstimateId string `cname:"承接人分红预算记录ID" json:"dividendsEstimateId" valid:"Required"` |
| 14 | // 公司ID,通过集成REST上下文获取 | 14 | // 公司ID,通过集成REST上下文获取 |
| 15 | CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | 15 | CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` |
| 16 | // 组织机构ID | 16 | // 组织机构ID |
| 1 | +package command | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "reflect" | ||
| 6 | + "strings" | ||
| 7 | + "time" | ||
| 8 | + | ||
| 9 | + "github.com/beego/beego/v2/core/validation" | ||
| 10 | +) | ||
| 11 | + | ||
| 12 | +type OrderGoods struct { | ||
| 13 | + // 订单产品金额 | ||
| 14 | + OrderGoodAmount float64 `json:"orderGoodAmount"` | ||
| 15 | + // 订单产品名称 | ||
| 16 | + OrderGoodName string `json:"orderGoodName"` | ||
| 17 | + // 订单产品单价 | ||
| 18 | + OrderGoodPrice float64 `json:"orderGoodPrice"` | ||
| 19 | + // 订单产品数量 | ||
| 20 | + OrderGoodQuantity int64 `json:"orderGoodQuantity,string"` | ||
| 21 | + // 关联分红订单号 | ||
| 22 | + DividendsOrderNumber int64 `json:"dividendsOrderNumber,string"` | ||
| 23 | + // 关联的共创合约编号 | ||
| 24 | + CooperationContractNumber string `json:"cooperationContractNumber"` | ||
| 25 | + // 订单产品费用 | ||
| 26 | + OrderGoodExpense float64 `json:"orderGoodExpense"` | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +type CreateDividendsOrderCommand struct { | ||
| 30 | + // 客户名称 | ||
| 31 | + CustomerName string `cname:"客户名称" json:"customerName" valid:"Required"` | ||
| 32 | + // 分红订单金额 | ||
| 33 | + DividendsOrderAmount float64 `cname:"分红订单金额" json:"dividendsOrderAmount" valid:"Required"` | ||
| 34 | + // 分红订单号 | ||
| 35 | + DividendsOrderNumber string `cname:"分红订单号" json:"dividendsOrderNumber,string" valid:"Required"` | ||
| 36 | + // 分红订单原单号 | ||
| 37 | + DividendsOriginalOrderNum string `cname:"分红订单原单号" json:"dividendsOriginalOrderNum" valid:"Required"` | ||
| 38 | + // 订单产生时间 | ||
| 39 | + OrderTime time.Time `cname:"订单产生时间" json:"orderTime" valid:"Required"` | ||
| 40 | + // 备注 | ||
| 41 | + Remarks string `cname:"备注" json:"remarks" valid:"Required"` | ||
| 42 | + // 订单业务员uid | ||
| 43 | + SalesmanUid string `cname:"订单业务员uid" json:"salesmanUid,omitempty"` | ||
| 44 | + // 订单操作人uid | ||
| 45 | + OperatorUid string `cname:"订单操作人uid" json:"operatorUid,omitempty"` | ||
| 46 | + // 订单产品列表 | ||
| 47 | + OrderGoods []*OrderGoods `cname:"订单产品列表" json:"orderGoods,omitempty"` | ||
| 48 | + // 公司ID,通过集成REST上下文获取 | ||
| 49 | + CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | ||
| 50 | + // 组织机构ID | ||
| 51 | + OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` | ||
| 52 | + // 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员 | ||
| 53 | + UserId int64 `cname:"用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` | ||
| 54 | +} | ||
| 55 | + | ||
| 56 | +func (createDividendsOrderCommand *CreateDividendsOrderCommand) Valid(validation *validation.Validation) { | ||
| 57 | + validation.SetError("CustomValid", "未实现的自定义认证") | ||
| 58 | +} | ||
| 59 | + | ||
| 60 | +func (createDividendsOrderCommand *CreateDividendsOrderCommand) ValidateCommand() error { | ||
| 61 | + valid := validation.Validation{} | ||
| 62 | + b, err := valid.Valid(createDividendsOrderCommand) | ||
| 63 | + if err != nil { | ||
| 64 | + return err | ||
| 65 | + } | ||
| 66 | + if !b { | ||
| 67 | + elem := reflect.TypeOf(createDividendsOrderCommand).Elem() | ||
| 68 | + for _, validErr := range valid.Errors { | ||
| 69 | + field, isExist := elem.FieldByName(validErr.Field) | ||
| 70 | + if isExist { | ||
| 71 | + return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1)) | ||
| 72 | + } else { | ||
| 73 | + return fmt.Errorf(validErr.Message) | ||
| 74 | + } | ||
| 75 | + } | ||
| 76 | + } | ||
| 77 | + return nil | ||
| 78 | +} |
| 1 | +package command | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "reflect" | ||
| 6 | + "strings" | ||
| 7 | + | ||
| 8 | + "github.com/beego/beego/v2/core/validation" | ||
| 9 | +) | ||
| 10 | + | ||
| 11 | +type RemoveDividendsOrderCommand struct { | ||
| 12 | + // 分红订单ID | ||
| 13 | + DividendsOrderId string `cname:"分红订单ID" json:"dividendsOrderId" valid:"Required"` | ||
| 14 | + // 公司ID,通过集成REST上下文获取 | ||
| 15 | + CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | ||
| 16 | + // 组织机构ID | ||
| 17 | + OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` | ||
| 18 | + // 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员 | ||
| 19 | + UserId int64 `cname:"用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +func (removeDividendsOrderCommand *RemoveDividendsOrderCommand) Valid(validation *validation.Validation) { | ||
| 23 | + validation.SetError("CustomValid", "未实现的自定义认证") | ||
| 24 | +} | ||
| 25 | + | ||
| 26 | +func (removeDividendsOrderCommand *RemoveDividendsOrderCommand) ValidateCommand() error { | ||
| 27 | + valid := validation.Validation{} | ||
| 28 | + b, err := valid.Valid(removeDividendsOrderCommand) | ||
| 29 | + if err != nil { | ||
| 30 | + return err | ||
| 31 | + } | ||
| 32 | + if !b { | ||
| 33 | + elem := reflect.TypeOf(removeDividendsOrderCommand).Elem() | ||
| 34 | + for _, validErr := range valid.Errors { | ||
| 35 | + field, isExist := elem.FieldByName(validErr.Field) | ||
| 36 | + if isExist { | ||
| 37 | + return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1)) | ||
| 38 | + } else { | ||
| 39 | + return fmt.Errorf(validErr.Message) | ||
| 40 | + } | ||
| 41 | + } | ||
| 42 | + } | ||
| 43 | + return nil | ||
| 44 | +} |
| 1 | +package command | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "reflect" | ||
| 6 | + "strings" | ||
| 7 | + "time" | ||
| 8 | + | ||
| 9 | + "github.com/beego/beego/v2/core/validation" | ||
| 10 | +) | ||
| 11 | + | ||
| 12 | +type UpdateDividendsOrderCommand struct { | ||
| 13 | + // 分红订单ID | ||
| 14 | + DividendsOrderId string `cname:"分红订单ID" json:"dividendsOrderId" valid:"Required"` | ||
| 15 | + // 客户名称 | ||
| 16 | + CustomerName string `cname:"客户名称" json:"customerName" valid:"Required"` | ||
| 17 | + // 分红订单金额 | ||
| 18 | + DividendsOrderAmount float64 `cname:"分红订单金额" json:"dividendsOrderAmount" valid:"Required"` | ||
| 19 | + // 分红订单号 | ||
| 20 | + DividendsOrderNumber int64 `cname:"分红订单号" json:"dividendsOrderNumber,string" valid:"Required"` | ||
| 21 | + // 分红订单原单号 | ||
| 22 | + DividendsOriginalOrderNum string `cname:"分红订单原单号" json:"dividendsOriginalOrderNum" valid:"Required"` | ||
| 23 | + // 订单产生时间 | ||
| 24 | + OrderTime time.Time `cname:"订单产生时间" json:"orderTime" valid:"Required"` | ||
| 25 | + // 备注 | ||
| 26 | + Remarks string `cname:"备注" json:"remarks" valid:"Required"` | ||
| 27 | + // 业务员uid | ||
| 28 | + SalesmanUid string `cname:"业务员uid" json:"salesmanUid,omitempty"` | ||
| 29 | + // 操作人uid | ||
| 30 | + OperatorUid string `cname:"操作人uid" json:"operatorUid,omitempty"` | ||
| 31 | + // 公司ID,通过集成REST上下文获取 | ||
| 32 | + CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | ||
| 33 | + // 组织机构ID | ||
| 34 | + OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` | ||
| 35 | + // 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员 | ||
| 36 | + UserId int64 `cname:"用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` | ||
| 37 | +} | ||
| 38 | + | ||
| 39 | +func (updateDividendsOrderCommand *UpdateDividendsOrderCommand) Valid(validation *validation.Validation) { | ||
| 40 | + validation.SetError("CustomValid", "未实现的自定义认证") | ||
| 41 | +} | ||
| 42 | + | ||
| 43 | +func (updateDividendsOrderCommand *UpdateDividendsOrderCommand) ValidateCommand() error { | ||
| 44 | + valid := validation.Validation{} | ||
| 45 | + b, err := valid.Valid(updateDividendsOrderCommand) | ||
| 46 | + if err != nil { | ||
| 47 | + return err | ||
| 48 | + } | ||
| 49 | + if !b { | ||
| 50 | + elem := reflect.TypeOf(updateDividendsOrderCommand).Elem() | ||
| 51 | + for _, validErr := range valid.Errors { | ||
| 52 | + field, isExist := elem.FieldByName(validErr.Field) | ||
| 53 | + if isExist { | ||
| 54 | + return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1)) | ||
| 55 | + } else { | ||
| 56 | + return fmt.Errorf(validErr.Message) | ||
| 57 | + } | ||
| 58 | + } | ||
| 59 | + } | ||
| 60 | + return nil | ||
| 61 | +} |
| 1 | +package query | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "reflect" | ||
| 6 | + "strings" | ||
| 7 | + | ||
| 8 | + "github.com/beego/beego/v2/core/validation" | ||
| 9 | +) | ||
| 10 | + | ||
| 11 | +type GetDividendsOrderQuery struct { | ||
| 12 | + // 分红订单ID | ||
| 13 | + DividendsOrderId int64 `cname:"分红订单ID" json:"dividendsOrderId,string" valid:"Required"` | ||
| 14 | + // 公司ID,通过集成REST上下文获取 | ||
| 15 | + CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | ||
| 16 | + // 组织机构ID | ||
| 17 | + OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` | ||
| 18 | + // 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员 | ||
| 19 | + UserId int64 `cname:"用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +func (getDividendsOrderQuery *GetDividendsOrderQuery) Valid(validation *validation.Validation) { | ||
| 23 | + validation.SetError("CustomValid", "未实现的自定义认证") | ||
| 24 | +} | ||
| 25 | + | ||
| 26 | +func (getDividendsOrderQuery *GetDividendsOrderQuery) ValidateQuery() error { | ||
| 27 | + valid := validation.Validation{} | ||
| 28 | + b, err := valid.Valid(getDividendsOrderQuery) | ||
| 29 | + if err != nil { | ||
| 30 | + return err | ||
| 31 | + } | ||
| 32 | + if !b { | ||
| 33 | + elem := reflect.TypeOf(getDividendsOrderQuery).Elem() | ||
| 34 | + for _, validErr := range valid.Errors { | ||
| 35 | + field, isExist := elem.FieldByName(validErr.Field) | ||
| 36 | + if isExist { | ||
| 37 | + return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1)) | ||
| 38 | + } else { | ||
| 39 | + return fmt.Errorf(validErr.Message) | ||
| 40 | + } | ||
| 41 | + } | ||
| 42 | + } | ||
| 43 | + return nil | ||
| 44 | +} |
| 1 | +package query | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "reflect" | ||
| 6 | + "strings" | ||
| 7 | + | ||
| 8 | + "github.com/beego/beego/v2/core/validation" | ||
| 9 | +) | ||
| 10 | + | ||
| 11 | +type ListDividendsOrdersQuery struct { | ||
| 12 | + // 查询偏离量 | ||
| 13 | + Offset int `cname:"查询偏离量" json:"offset" valid:"Required"` | ||
| 14 | + // 查询限制 | ||
| 15 | + Limit int `cname:"查询限制" json:"limit" valid:"Required"` | ||
| 16 | + // 公司ID,通过集成REST上下文获取 | ||
| 17 | + CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | ||
| 18 | + // 组织机构ID | ||
| 19 | + OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` | ||
| 20 | + // 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员 | ||
| 21 | + UserId int64 `cname:"用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` | ||
| 22 | +} | ||
| 23 | + | ||
| 24 | +func (listDividendsOrdersQuery *ListDividendsOrdersQuery) Valid(validation *validation.Validation) { | ||
| 25 | + validation.SetError("CustomValid", "未实现的自定义认证") | ||
| 26 | +} | ||
| 27 | + | ||
| 28 | +func (listDividendsOrdersQuery *ListDividendsOrdersQuery) ValidateQuery() error { | ||
| 29 | + valid := validation.Validation{} | ||
| 30 | + b, err := valid.Valid(listDividendsOrdersQuery) | ||
| 31 | + if err != nil { | ||
| 32 | + return err | ||
| 33 | + } | ||
| 34 | + if !b { | ||
| 35 | + elem := reflect.TypeOf(listDividendsOrdersQuery).Elem() | ||
| 36 | + for _, validErr := range valid.Errors { | ||
| 37 | + field, isExist := elem.FieldByName(validErr.Field) | ||
| 38 | + if isExist { | ||
| 39 | + return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1)) | ||
| 40 | + } else { | ||
| 41 | + return fmt.Errorf(validErr.Message) | ||
| 42 | + } | ||
| 43 | + } | ||
| 44 | + } | ||
| 45 | + return nil | ||
| 46 | +} |
| 1 | +package query | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "reflect" | ||
| 6 | + "strings" | ||
| 7 | + | ||
| 8 | + "github.com/beego/beego/v2/core/validation" | ||
| 9 | +) | ||
| 10 | + | ||
| 11 | +type SearchDividendsOrderQuery struct { | ||
| 12 | + // 分红订单号 | ||
| 13 | + DividendsOrderNumber string `cname:"分红订单号" json:"dividendsOrderNumber,omitempty"` | ||
| 14 | + // 客户名称 | ||
| 15 | + CustomerName string `cname:"客户名称" json:"customerName,omitempty"` | ||
| 16 | + // 页面大小 | ||
| 17 | + PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` | ||
| 18 | + // 页面大小 | ||
| 19 | + PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` | ||
| 20 | + // 公司ID,通过集成REST上下文获取 | ||
| 21 | + CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | ||
| 22 | + // 组织机构ID | ||
| 23 | + OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` | ||
| 24 | + // 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员 | ||
| 25 | + UserId int64 `cname:"用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` | ||
| 26 | +} | ||
| 27 | + | ||
| 28 | +func (searchDividendsOrderQuery *SearchDividendsOrderQuery) Valid(validation *validation.Validation) { | ||
| 29 | + validation.SetError("CustomValid", "未实现的自定义认证") | ||
| 30 | +} | ||
| 31 | + | ||
| 32 | +func (searchDividendsOrderQuery *SearchDividendsOrderQuery) ValidateQuery() error { | ||
| 33 | + valid := validation.Validation{} | ||
| 34 | + b, err := valid.Valid(searchDividendsOrderQuery) | ||
| 35 | + if err != nil { | ||
| 36 | + return err | ||
| 37 | + } | ||
| 38 | + if !b { | ||
| 39 | + elem := reflect.TypeOf(searchDividendsOrderQuery).Elem() | ||
| 40 | + for _, validErr := range valid.Errors { | ||
| 41 | + field, isExist := elem.FieldByName(validErr.Field) | ||
| 42 | + if isExist { | ||
| 43 | + return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1)) | ||
| 44 | + } else { | ||
| 45 | + return fmt.Errorf(validErr.Message) | ||
| 46 | + } | ||
| 47 | + } | ||
| 48 | + } | ||
| 49 | + return nil | ||
| 50 | +} |
| 1 | +package query | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "reflect" | ||
| 6 | + "strings" | ||
| 7 | + | ||
| 8 | + "github.com/beego/beego/v2/core/validation" | ||
| 9 | +) | ||
| 10 | + | ||
| 11 | +type SearchDividendsOrderNumberQuery struct { | ||
| 12 | + // 分红订单号 | ||
| 13 | + DividendsOrderNumber string `cname:"分红订单号" json:"dividendsOrderNumber,omitempty"` | ||
| 14 | + // 公司ID,通过集成REST上下文获取 | ||
| 15 | + CompanyId int64 `cname:"公司ID,通过集成REST上下文获取" json:"companyId,string" valid:"Required"` | ||
| 16 | + // 组织机构ID | ||
| 17 | + OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` | ||
| 18 | + // 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员 | ||
| 19 | + UserId int64 `cname:"用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +func (searchDividendsOrderNumberQuery *SearchDividendsOrderNumberQuery) Valid(validation *validation.Validation) { | ||
| 23 | + validation.SetError("CustomValid", "未实现的自定义认证") | ||
| 24 | +} | ||
| 25 | + | ||
| 26 | +func (searchDividendsOrderNumberQuery *SearchDividendsOrderNumberQuery) ValidateQuery() error { | ||
| 27 | + valid := validation.Validation{} | ||
| 28 | + b, err := valid.Valid(searchDividendsOrderNumberQuery) | ||
| 29 | + if err != nil { | ||
| 30 | + return err | ||
| 31 | + } | ||
| 32 | + if !b { | ||
| 33 | + elem := reflect.TypeOf(searchDividendsOrderNumberQuery).Elem() | ||
| 34 | + for _, validErr := range valid.Errors { | ||
| 35 | + field, isExist := elem.FieldByName(validErr.Field) | ||
| 36 | + if isExist { | ||
| 37 | + return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1)) | ||
| 38 | + } else { | ||
| 39 | + return fmt.Errorf(validErr.Message) | ||
| 40 | + } | ||
| 41 | + } | ||
| 42 | + } | ||
| 43 | + return nil | ||
| 44 | +} |
| 1 | +package service | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "fmt" | ||
| 5 | + "github.com/linmadan/egglib-go/core/application" | ||
| 6 | + "github.com/linmadan/egglib-go/utils/tool_funs" | ||
| 7 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsOrder/command" | ||
| 8 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsOrder/query" | ||
| 9 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/factory" | ||
| 10 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain" | ||
| 11 | +) | ||
| 12 | + | ||
| 13 | +// DividendsOrderService 分红订单实体对象 | ||
| 14 | +type DividendsOrderService struct { | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +// CreateDividendsOrder 创建分红订单实体对象 | ||
| 18 | +func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createDividendsOrderCommand *command.CreateDividendsOrderCommand) (interface{}, error) { | ||
| 19 | + if err := createDividendsOrderCommand.ValidateCommand(); err != nil { | ||
| 20 | + return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
| 21 | + } | ||
| 22 | + transactionContext, err := factory.CreateTransactionContext(nil) | ||
| 23 | + if err != nil { | ||
| 24 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 25 | + } | ||
| 26 | + if err := transactionContext.StartTransaction(); err != nil { | ||
| 27 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 28 | + } | ||
| 29 | + defer func() { | ||
| 30 | + transactionContext.RollbackTransaction() | ||
| 31 | + }() | ||
| 32 | + newDividendsOrder := &domain.DividendsOrder{ | ||
| 33 | + CustomerName: createDividendsOrderCommand.CustomerName, | ||
| 34 | + DividendsOrderAmount: createDividendsOrderCommand.DividendsOrderAmount, | ||
| 35 | + DividendsOrderNumber: createDividendsOrderCommand.DividendsOrderNumber, | ||
| 36 | + DividendsOriginalOrderNum: createDividendsOrderCommand.DividendsOriginalOrderNum, | ||
| 37 | + OrderTime: createDividendsOrderCommand.OrderTime, | ||
| 38 | + //Remarks: createDividendsOrderCommand.Remarks, | ||
| 39 | + //SalesmanUid: createDividendsOrderCommand.SalesmanUid, | ||
| 40 | + //OperatorUid: createDividendsOrderCommand.OperatorUid, | ||
| 41 | + //OrderGoods: createDividendsOrderCommand.OrderGoods, | ||
| 42 | + //CompanyId: createDividendsOrderCommand.CompanyId, | ||
| 43 | + //OrgId: createDividendsOrderCommand.OrgId, | ||
| 44 | + //UserId: createDividendsOrderCommand.UserId, | ||
| 45 | + } | ||
| 46 | + var dividendsOrderRepository domain.DividendsOrderRepository | ||
| 47 | + if value, err := factory.CreateDividendsOrderRepository(map[string]interface{}{ | ||
| 48 | + "transactionContext": transactionContext, | ||
| 49 | + }); err != nil { | ||
| 50 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 51 | + } else { | ||
| 52 | + dividendsOrderRepository = value | ||
| 53 | + } | ||
| 54 | + if dividendsOrder, err := dividendsOrderRepository.Save(newDividendsOrder); err != nil { | ||
| 55 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 56 | + } else { | ||
| 57 | + if err := transactionContext.CommitTransaction(); err != nil { | ||
| 58 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 59 | + } | ||
| 60 | + return dividendsOrder, nil | ||
| 61 | + } | ||
| 62 | +} | ||
| 63 | + | ||
| 64 | +// GetDividendsOrder 返回分红订单实体对象 | ||
| 65 | +func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividendsOrderQuery *query.GetDividendsOrderQuery) (interface{}, error) { | ||
| 66 | + if err := getDividendsOrderQuery.ValidateQuery(); err != nil { | ||
| 67 | + return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
| 68 | + } | ||
| 69 | + transactionContext, err := factory.CreateTransactionContext(nil) | ||
| 70 | + if err != nil { | ||
| 71 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 72 | + } | ||
| 73 | + if err := transactionContext.StartTransaction(); err != nil { | ||
| 74 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 75 | + } | ||
| 76 | + defer func() { | ||
| 77 | + transactionContext.RollbackTransaction() | ||
| 78 | + }() | ||
| 79 | + var dividendsOrderRepository domain.DividendsOrderRepository | ||
| 80 | + if value, err := factory.CreateDividendsOrderRepository(map[string]interface{}{ | ||
| 81 | + "transactionContext": transactionContext, | ||
| 82 | + }); err != nil { | ||
| 83 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 84 | + } else { | ||
| 85 | + dividendsOrderRepository = value | ||
| 86 | + } | ||
| 87 | + dividendsOrder, err := dividendsOrderRepository.FindOne(map[string]interface{}{"dividendsOrderId": getDividendsOrderQuery.DividendsOrderId}) | ||
| 88 | + if err != nil { | ||
| 89 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 90 | + } | ||
| 91 | + if dividendsOrder == nil { | ||
| 92 | + return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(getDividendsOrderQuery.DividendsOrderId))) | ||
| 93 | + } else { | ||
| 94 | + if err := transactionContext.CommitTransaction(); err != nil { | ||
| 95 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 96 | + } | ||
| 97 | + return dividendsOrder, nil | ||
| 98 | + } | ||
| 99 | +} | ||
| 100 | + | ||
| 101 | +// ListDividendsOrders 返回分红订单实体对象列表 | ||
| 102 | +func (dividendsOrderService *DividendsOrderService) ListDividendsOrders(listDividendsOrdersQuery *query.ListDividendsOrdersQuery) (interface{}, error) { | ||
| 103 | + if err := listDividendsOrdersQuery.ValidateQuery(); err != nil { | ||
| 104 | + return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
| 105 | + } | ||
| 106 | + transactionContext, err := factory.CreateTransactionContext(nil) | ||
| 107 | + if err != nil { | ||
| 108 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 109 | + } | ||
| 110 | + if err := transactionContext.StartTransaction(); err != nil { | ||
| 111 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 112 | + } | ||
| 113 | + defer func() { | ||
| 114 | + transactionContext.RollbackTransaction() | ||
| 115 | + }() | ||
| 116 | + if err := transactionContext.CommitTransaction(); err != nil { | ||
| 117 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 118 | + } | ||
| 119 | + return nil, nil | ||
| 120 | +} | ||
| 121 | + | ||
| 122 | +// RemoveDividendsOrder 移除分红订单实体对象 | ||
| 123 | +func (dividendsOrderService *DividendsOrderService) RemoveDividendsOrder(removeDividendsOrderCommand *command.RemoveDividendsOrderCommand) (interface{}, error) { | ||
| 124 | + if err := removeDividendsOrderCommand.ValidateCommand(); err != nil { | ||
| 125 | + return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
| 126 | + } | ||
| 127 | + transactionContext, err := factory.CreateTransactionContext(nil) | ||
| 128 | + if err != nil { | ||
| 129 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 130 | + } | ||
| 131 | + if err := transactionContext.StartTransaction(); err != nil { | ||
| 132 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 133 | + } | ||
| 134 | + defer func() { | ||
| 135 | + transactionContext.RollbackTransaction() | ||
| 136 | + }() | ||
| 137 | + var dividendsOrderRepository domain.DividendsOrderRepository | ||
| 138 | + if value, err := factory.CreateDividendsOrderRepository(map[string]interface{}{ | ||
| 139 | + "transactionContext": transactionContext, | ||
| 140 | + }); err != nil { | ||
| 141 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 142 | + } else { | ||
| 143 | + dividendsOrderRepository = value | ||
| 144 | + } | ||
| 145 | + dividendsOrder, err := dividendsOrderRepository.FindOne(map[string]interface{}{"dividendsOrderId": removeDividendsOrderCommand.DividendsOrderId}) | ||
| 146 | + if err != nil { | ||
| 147 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 148 | + } | ||
| 149 | + if dividendsOrder == nil { | ||
| 150 | + return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(removeDividendsOrderCommand.DividendsOrderId))) | ||
| 151 | + } | ||
| 152 | + if dividendsOrder, err := dividendsOrderRepository.Remove(dividendsOrder); err != nil { | ||
| 153 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 154 | + } else { | ||
| 155 | + if err := transactionContext.CommitTransaction(); err != nil { | ||
| 156 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 157 | + } | ||
| 158 | + return dividendsOrder, nil | ||
| 159 | + } | ||
| 160 | +} | ||
| 161 | + | ||
| 162 | +// SearchDividendsOrder 查询分红订单方法 | ||
| 163 | +func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchDividendsOrderQuery *query.SearchDividendsOrderQuery) (interface{}, error) { | ||
| 164 | + if err := searchDividendsOrderQuery.ValidateQuery(); err != nil { | ||
| 165 | + return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
| 166 | + } | ||
| 167 | + transactionContext, err := factory.CreateTransactionContext(nil) | ||
| 168 | + if err != nil { | ||
| 169 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 170 | + } | ||
| 171 | + if err := transactionContext.StartTransaction(); err != nil { | ||
| 172 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 173 | + } | ||
| 174 | + defer func() { | ||
| 175 | + transactionContext.RollbackTransaction() | ||
| 176 | + }() | ||
| 177 | + if err := transactionContext.CommitTransaction(); err != nil { | ||
| 178 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 179 | + } | ||
| 180 | + return nil, nil | ||
| 181 | +} | ||
| 182 | + | ||
| 183 | +// SearchDividendsOrderNumber 查询分红订单方法 | ||
| 184 | +func (dividendsOrderService *DividendsOrderService) SearchDividendsOrderNumber(searchDividendsOrderNumberQuery *query.SearchDividendsOrderNumberQuery) (interface{}, error) { | ||
| 185 | + if err := searchDividendsOrderNumberQuery.ValidateQuery(); err != nil { | ||
| 186 | + return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
| 187 | + } | ||
| 188 | + transactionContext, err := factory.CreateTransactionContext(nil) | ||
| 189 | + if err != nil { | ||
| 190 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 191 | + } | ||
| 192 | + if err := transactionContext.StartTransaction(); err != nil { | ||
| 193 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 194 | + } | ||
| 195 | + defer func() { | ||
| 196 | + transactionContext.RollbackTransaction() | ||
| 197 | + }() | ||
| 198 | + if err := transactionContext.CommitTransaction(); err != nil { | ||
| 199 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 200 | + } | ||
| 201 | + return nil, nil | ||
| 202 | +} | ||
| 203 | + | ||
| 204 | +// UpdateDividendsOrder 更新分红订单实体对象 | ||
| 205 | +func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateDividendsOrderCommand *command.UpdateDividendsOrderCommand) (interface{}, error) { | ||
| 206 | + if err := updateDividendsOrderCommand.ValidateCommand(); err != nil { | ||
| 207 | + return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
| 208 | + } | ||
| 209 | + transactionContext, err := factory.CreateTransactionContext(nil) | ||
| 210 | + if err != nil { | ||
| 211 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 212 | + } | ||
| 213 | + if err := transactionContext.StartTransaction(); err != nil { | ||
| 214 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 215 | + } | ||
| 216 | + defer func() { | ||
| 217 | + transactionContext.RollbackTransaction() | ||
| 218 | + }() | ||
| 219 | + var dividendsOrderRepository domain.DividendsOrderRepository | ||
| 220 | + if value, err := factory.CreateDividendsOrderRepository(map[string]interface{}{ | ||
| 221 | + "transactionContext": transactionContext, | ||
| 222 | + }); err != nil { | ||
| 223 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 224 | + } else { | ||
| 225 | + dividendsOrderRepository = value | ||
| 226 | + } | ||
| 227 | + dividendsOrder, err := dividendsOrderRepository.FindOne(map[string]interface{}{"dividendsOrderId": updateDividendsOrderCommand.DividendsOrderId}) | ||
| 228 | + if err != nil { | ||
| 229 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 230 | + } | ||
| 231 | + if dividendsOrder == nil { | ||
| 232 | + return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(updateDividendsOrderCommand.DividendsOrderId))) | ||
| 233 | + } | ||
| 234 | + if err := dividendsOrder.Update(tool_funs.SimpleStructToMap(updateDividendsOrderCommand)); err != nil { | ||
| 235 | + return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
| 236 | + } | ||
| 237 | + if dividendsOrder, err := dividendsOrderRepository.Save(dividendsOrder); err != nil { | ||
| 238 | + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | ||
| 239 | + } else { | ||
| 240 | + if err := transactionContext.CommitTransaction(); err != nil { | ||
| 241 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 242 | + } | ||
| 243 | + return dividendsOrder, nil | ||
| 244 | + } | ||
| 245 | +} | ||
| 246 | + | ||
| 247 | +func NewDividendsOrderService(options map[string]interface{}) *DividendsOrderService { | ||
| 248 | + newDividendsOrderService := &DividendsOrderService{} | ||
| 249 | + return newDividendsOrderService | ||
| 250 | +} |
| @@ -2,12 +2,12 @@ package domain | @@ -2,12 +2,12 @@ package domain | ||
| 2 | 2 | ||
| 3 | import "time" | 3 | import "time" |
| 4 | 4 | ||
| 5 | -// 分红订单实体 | 5 | +// DividendsOrder 分红订单实体 |
| 6 | type DividendsOrder struct { | 6 | type DividendsOrder struct { |
| 7 | // 分红订单ID | 7 | // 分红订单ID |
| 8 | DividendsOrderId int64 `json:"dividendsOrderId,string"` | 8 | DividendsOrderId int64 `json:"dividendsOrderId,string"` |
| 9 | // 分红订单号 | 9 | // 分红订单号 |
| 10 | - DividendsOrderNumber int64 `json:"dividendsOrderNumber,string"` | 10 | + DividendsOrderNumber string `json:"dividendsOrderNumber"` |
| 11 | // 分红订单原单号 | 11 | // 分红订单原单号 |
| 12 | DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` | 12 | DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` |
| 13 | // 分红订单金额 | 13 | // 分红订单金额 |
| @@ -56,7 +56,7 @@ func (dividendsOrder *DividendsOrder) Identify() interface{} { | @@ -56,7 +56,7 @@ func (dividendsOrder *DividendsOrder) Identify() interface{} { | ||
| 56 | 56 | ||
| 57 | func (dividendsOrder *DividendsOrder) Update(data map[string]interface{}) error { | 57 | func (dividendsOrder *DividendsOrder) Update(data map[string]interface{}) error { |
| 58 | if dividendsOrderNumber, ok := data["dividendsOrderNumber"]; ok { | 58 | if dividendsOrderNumber, ok := data["dividendsOrderNumber"]; ok { |
| 59 | - dividendsOrder.DividendsOrderNumber = dividendsOrderNumber.(int64) | 59 | + dividendsOrder.DividendsOrderNumber = dividendsOrderNumber.(string) |
| 60 | } | 60 | } |
| 61 | if dividendsOriginalOrderNum, ok := data["dividendsOriginalOrderNum"]; ok { | 61 | if dividendsOriginalOrderNum, ok := data["dividendsOriginalOrderNum"]; ok { |
| 62 | dividendsOrder.DividendsOriginalOrderNum = dividendsOriginalOrderNum.(string) | 62 | dividendsOrder.DividendsOriginalOrderNum = dividendsOriginalOrderNum.(string) |
| 1 | +package controllers | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/linmadan/egglib-go/web/beego" | ||
| 5 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsOrder/command" | ||
| 6 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsOrder/query" | ||
| 7 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsOrder/service" | ||
| 8 | +) | ||
| 9 | + | ||
| 10 | +type DividendsOrderController struct { | ||
| 11 | + beego.BaseController | ||
| 12 | +} | ||
| 13 | + | ||
| 14 | +func (controller *DividendsOrderController) CreateDividendsOrder() { | ||
| 15 | + dividendsOrderService := service.NewDividendsOrderService(nil) | ||
| 16 | + createDividendsOrderCommand := &command.CreateDividendsOrderCommand{} | ||
| 17 | + controller.Unmarshal(createDividendsOrderCommand) | ||
| 18 | + data, err := dividendsOrderService.CreateDividendsOrder(createDividendsOrderCommand) | ||
| 19 | + controller.Response(data, err) | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +func (controller *DividendsOrderController) UpdateDividendsOrder() { | ||
| 23 | + dividendsOrderService := service.NewDividendsOrderService(nil) | ||
| 24 | + updateDividendsOrderCommand := &command.UpdateDividendsOrderCommand{} | ||
| 25 | + controller.Unmarshal(updateDividendsOrderCommand) | ||
| 26 | + dividendsOrderId := controller.GetString(":dividendsOrderId") | ||
| 27 | + updateDividendsOrderCommand.DividendsOrderId = dividendsOrderId | ||
| 28 | + data, err := dividendsOrderService.UpdateDividendsOrder(updateDividendsOrderCommand) | ||
| 29 | + controller.Response(data, err) | ||
| 30 | +} | ||
| 31 | + | ||
| 32 | +func (controller *DividendsOrderController) GetDividendsOrder() { | ||
| 33 | + dividendsOrderService := service.NewDividendsOrderService(nil) | ||
| 34 | + getDividendsOrderQuery := &query.GetDividendsOrderQuery{} | ||
| 35 | + dividendsOrderId, _ := controller.GetInt64(":dividendsOrderId") | ||
| 36 | + getDividendsOrderQuery.DividendsOrderId = dividendsOrderId | ||
| 37 | + data, err := dividendsOrderService.GetDividendsOrder(getDividendsOrderQuery) | ||
| 38 | + controller.Response(data, err) | ||
| 39 | +} | ||
| 40 | + | ||
| 41 | +func (controller *DividendsOrderController) RemoveDividendsOrder() { | ||
| 42 | + dividendsOrderService := service.NewDividendsOrderService(nil) | ||
| 43 | + removeDividendsOrderCommand := &command.RemoveDividendsOrderCommand{} | ||
| 44 | + controller.Unmarshal(removeDividendsOrderCommand) | ||
| 45 | + dividendsOrderId := controller.GetString(":dividendsOrderId") | ||
| 46 | + removeDividendsOrderCommand.DividendsOrderId = dividendsOrderId | ||
| 47 | + data, err := dividendsOrderService.RemoveDividendsOrder(removeDividendsOrderCommand) | ||
| 48 | + controller.Response(data, err) | ||
| 49 | +} | ||
| 50 | + | ||
| 51 | +func (controller *DividendsOrderController) SearchDividendsOrder() { | ||
| 52 | + dividendsOrderService := service.NewDividendsOrderService(nil) | ||
| 53 | + searchDividendsOrderQuery := &query.SearchDividendsOrderQuery{} | ||
| 54 | + data, err := dividendsOrderService.SearchDividendsOrder(searchDividendsOrderQuery) | ||
| 55 | + controller.Response(data, err) | ||
| 56 | +} | ||
| 57 | + | ||
| 58 | +func (controller *DividendsOrderController) SearchDividendsOrderNumber() { | ||
| 59 | + dividendsOrderService := service.NewDividendsOrderService(nil) | ||
| 60 | + searchDividendsOrderNumberQuery := &query.SearchDividendsOrderNumberQuery{} | ||
| 61 | + data, err := dividendsOrderService.SearchDividendsOrderNumber(searchDividendsOrderNumberQuery) | ||
| 62 | + controller.Response(data, err) | ||
| 63 | +} | ||
| 64 | + | ||
| 65 | +func (controller *DividendsOrderController) ListDividendsOrders() { | ||
| 66 | + dividendsOrderService := service.NewDividendsOrderService(nil) | ||
| 67 | + listDividendsOrdersQuery := &query.ListDividendsOrdersQuery{} | ||
| 68 | + offset, _ := controller.GetInt("offset") | ||
| 69 | + listDividendsOrdersQuery.Offset = offset | ||
| 70 | + limit, _ := controller.GetInt("limit") | ||
| 71 | + listDividendsOrdersQuery.Limit = limit | ||
| 72 | + data, err := dividendsOrderService.ListDividendsOrders(listDividendsOrdersQuery) | ||
| 73 | + controller.Response(data, err) | ||
| 74 | +} |
| 1 | +package routers | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/beego/beego/v2/server/web" | ||
| 5 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/port/beego/controllers" | ||
| 6 | +) | ||
| 7 | + | ||
| 8 | +func init() { | ||
| 9 | + web.Router("/dividends-orders/", &controllers.DividendsOrderController{}, "Post:CreateDividendsOrder") | ||
| 10 | + web.Router("/dividends-orders/:dividendsOrderId", &controllers.DividendsOrderController{}, "Put:UpdateDividendsOrder") | ||
| 11 | + web.Router("/dividends-orders/:dividendsOrderId", &controllers.DividendsOrderController{}, "Get:GetDividendsOrder") | ||
| 12 | + web.Router("/dividends-orders/:dividendsOrderId", &controllers.DividendsOrderController{}, "Delete:RemoveDividendsOrder") | ||
| 13 | + web.Router("/dividends-orders/search", &controllers.DividendsOrderController{}, "Post:SearchDividendsOrder") | ||
| 14 | + web.Router("/dividends-orders/search-order-number", &controllers.DividendsOrderController{}, "Post:SearchDividendsOrderNumber") | ||
| 15 | + web.Router("/dividends-orders/", &controllers.DividendsOrderController{}, "Get:ListDividendsOrders") | ||
| 16 | +} |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "net/http" | ||
| 5 | + | ||
| 6 | + "github.com/gavv/httpexpect" | ||
| 7 | + . "github.com/onsi/ginkgo" | ||
| 8 | + . "github.com/onsi/gomega" | ||
| 9 | + pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 10 | +) | ||
| 11 | + | ||
| 12 | +var _ = Describe("创建分红订单实体对象", func() { | ||
| 13 | + Describe("提交数据创建分红订单实体对象", func() { | ||
| 14 | + Context("提交正确的新分红订单实体数据", func() { | ||
| 15 | + It("返回分红订单实体数据", func() { | ||
| 16 | + httpExpect := httpexpect.New(GinkgoT(), server.URL) | ||
| 17 | + body := map[string]interface{}{ | ||
| 18 | + "customerName": "string", | ||
| 19 | + "dividendsOrderAmount": "float64", | ||
| 20 | + "dividendsOrderNumber": "string", | ||
| 21 | + "dividendsOriginalOrderNum": "string", | ||
| 22 | + "orderTime": "datetime", | ||
| 23 | + "remarks": "string", | ||
| 24 | + "salesmanUid": "string", | ||
| 25 | + "operatorUid": "string", | ||
| 26 | + "orderGoods": "array", | ||
| 27 | + "companyId": "int64", | ||
| 28 | + "orgId": "int64", | ||
| 29 | + "userId": "int64", | ||
| 30 | + } | ||
| 31 | + httpExpect.POST("/dividends-orders/"). | ||
| 32 | + WithJSON(body). | ||
| 33 | + Expect(). | ||
| 34 | + Status(http.StatusOK). | ||
| 35 | + JSON(). | ||
| 36 | + Object(). | ||
| 37 | + ContainsKey("code").ValueEqual("code", 0). | ||
| 38 | + ContainsKey("msg").ValueEqual("msg", "ok"). | ||
| 39 | + ContainsKey("data").Value("data").Object(). | ||
| 40 | + ContainsKey("dividendsOrderId").ValueNotEqual("dividendsOrderId", BeZero()) | ||
| 41 | + }) | ||
| 42 | + }) | ||
| 43 | + }) | ||
| 44 | + AfterEach(func() { | ||
| 45 | + _, err := pG.DB.Exec("DELETE FROM dividends_orders WHERE true") | ||
| 46 | + Expect(err).NotTo(HaveOccurred()) | ||
| 47 | + }) | ||
| 48 | +}) |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "net/http" | ||
| 5 | + "net/http/httptest" | ||
| 6 | + "testing" | ||
| 7 | + | ||
| 8 | + "github.com/beego/beego/v2/server/web" | ||
| 9 | + . "github.com/onsi/ginkgo" | ||
| 10 | + . "github.com/onsi/gomega" | ||
| 11 | + _ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application" | ||
| 12 | + _ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 13 | + _ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/port/beego" | ||
| 14 | +) | ||
| 15 | + | ||
| 16 | +func TestDividendsOrder(t *testing.T) { | ||
| 17 | + RegisterFailHandler(Fail) | ||
| 18 | + RunSpecs(t, "Beego Port DividendsOrder Correlations Test Case Suite") | ||
| 19 | +} | ||
| 20 | + | ||
| 21 | +var handler http.Handler | ||
| 22 | +var server *httptest.Server | ||
| 23 | + | ||
| 24 | +var _ = BeforeSuite(func() { | ||
| 25 | + handler = web.BeeApp.Handlers | ||
| 26 | + server = httptest.NewServer(handler) | ||
| 27 | +}) | ||
| 28 | + | ||
| 29 | +var _ = AfterSuite(func() { | ||
| 30 | + server.Close() | ||
| 31 | +}) |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/go-pg/pg/v10" | ||
| 5 | + "net/http" | ||
| 6 | + | ||
| 7 | + "github.com/gavv/httpexpect" | ||
| 8 | + . "github.com/onsi/ginkgo" | ||
| 9 | + . "github.com/onsi/gomega" | ||
| 10 | + pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 11 | +) | ||
| 12 | + | ||
| 13 | +var _ = Describe("返回分红订单实体对象", func() { | ||
| 14 | + var dividendsOrderId int64 | ||
| 15 | + BeforeEach(func() { | ||
| 16 | + _, err := pG.DB.QueryOne( | ||
| 17 | + pg.Scan(÷ndsOrderId), | ||
| 18 | + "INSERT INTO dividends_orders (dividends_order_id, dividends_order_number, dividends_original_order_num, dividends_order_amount, order_salesman, order_time, dividend_time, dividend_status, region, customer_name, org, company, created_at, deleted_at, updated_at, operate_time, operator) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_order_id", | ||
| 19 | + "testDividendsOrderId", "testDividendsOrderNumber", "testDividendsOriginalOrderNum", "testDividendsOrderAmount", "testOrderSalesman", "testOrderTime", "testDividendTime", "testDividendStatus", "testRegion", "testCustomerName", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperateTime", "testOperator") | ||
| 20 | + Expect(err).NotTo(HaveOccurred()) | ||
| 21 | + }) | ||
| 22 | + Describe("根据dividendsOrderId参数返回分红订单实体", func() { | ||
| 23 | + Context("传入有效的dividendsOrderId", func() { | ||
| 24 | + It("返回分红订单实体数据", func() { | ||
| 25 | + httpExpect := httpexpect.New(GinkgoT(), server.URL) | ||
| 26 | + httpExpect.GET("/dividends-orders/{dividendsOrderId}"). | ||
| 27 | + Expect(). | ||
| 28 | + Status(http.StatusOK). | ||
| 29 | + JSON(). | ||
| 30 | + Object(). | ||
| 31 | + ContainsKey("code").ValueEqual("code", 0). | ||
| 32 | + ContainsKey("msg").ValueEqual("msg", "ok"). | ||
| 33 | + ContainsKey("data").Value("data").Object() | ||
| 34 | + }) | ||
| 35 | + }) | ||
| 36 | + }) | ||
| 37 | + AfterEach(func() { | ||
| 38 | + _, err := pG.DB.Exec("DELETE FROM dividends_orders WHERE true") | ||
| 39 | + Expect(err).NotTo(HaveOccurred()) | ||
| 40 | + }) | ||
| 41 | +}) |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/go-pg/pg/v10" | ||
| 5 | + "net/http" | ||
| 6 | + | ||
| 7 | + "github.com/gavv/httpexpect" | ||
| 8 | + . "github.com/onsi/ginkgo" | ||
| 9 | + . "github.com/onsi/gomega" | ||
| 10 | + pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 11 | +) | ||
| 12 | + | ||
| 13 | +var _ = Describe("返回分红订单实体对象列表", func() { | ||
| 14 | + var dividendsOrderId int64 | ||
| 15 | + BeforeEach(func() { | ||
| 16 | + _, err := pG.DB.QueryOne( | ||
| 17 | + pg.Scan(÷ndsOrderId), | ||
| 18 | + "INSERT INTO dividends_orders (dividends_order_id, dividends_order_number, dividends_original_order_num, dividends_order_amount, order_salesman, order_time, dividend_time, dividend_status, region, customer_name, org, company, created_at, deleted_at, updated_at, operate_time, operator) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_order_id", | ||
| 19 | + "testDividendsOrderId", "testDividendsOrderNumber", "testDividendsOriginalOrderNum", "testDividendsOrderAmount", "testOrderSalesman", "testOrderTime", "testDividendTime", "testDividendStatus", "testRegion", "testCustomerName", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperateTime", "testOperator") | ||
| 20 | + Expect(err).NotTo(HaveOccurred()) | ||
| 21 | + }) | ||
| 22 | + Describe("返回分红订单实体对象列表", func() { | ||
| 23 | + Context("", func() { | ||
| 24 | + It("", func() { | ||
| 25 | + httpExpect := httpexpect.New(GinkgoT(), server.URL) | ||
| 26 | + httpExpect.GET("/dividends-orders/"). | ||
| 27 | + WithQuery("offset", "int"). | ||
| 28 | + WithQuery("limit", "int"). | ||
| 29 | + Expect(). | ||
| 30 | + Status(http.StatusOK). | ||
| 31 | + JSON(). | ||
| 32 | + Object(). | ||
| 33 | + ContainsKey("code").ValueEqual("code", 0). | ||
| 34 | + ContainsKey("msg").ValueEqual("msg", "ok"). | ||
| 35 | + ContainsKey("data").Value("data").Object() | ||
| 36 | + }) | ||
| 37 | + }) | ||
| 38 | + }) | ||
| 39 | + AfterEach(func() { | ||
| 40 | + _, err := pG.DB.Exec("DELETE FROM dividends_orders WHERE true") | ||
| 41 | + Expect(err).NotTo(HaveOccurred()) | ||
| 42 | + }) | ||
| 43 | +}) |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/go-pg/pg/v10" | ||
| 5 | + "net/http" | ||
| 6 | + | ||
| 7 | + "github.com/gavv/httpexpect" | ||
| 8 | + . "github.com/onsi/ginkgo" | ||
| 9 | + . "github.com/onsi/gomega" | ||
| 10 | + pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 11 | +) | ||
| 12 | + | ||
| 13 | +var _ = Describe("移除分红订单实体对象", func() { | ||
| 14 | + var dividendsOrderId int64 | ||
| 15 | + BeforeEach(func() { | ||
| 16 | + _, err := pG.DB.QueryOne( | ||
| 17 | + pg.Scan(÷ndsOrderId), | ||
| 18 | + "INSERT INTO dividends_orders (dividends_order_id, dividends_order_number, dividends_original_order_num, dividends_order_amount, order_salesman, order_time, dividend_time, dividend_status, region, customer_name, org, company, created_at, deleted_at, updated_at, operate_time, operator) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_order_id", | ||
| 19 | + "testDividendsOrderId", "testDividendsOrderNumber", "testDividendsOriginalOrderNum", "testDividendsOrderAmount", "testOrderSalesman", "testOrderTime", "testDividendTime", "testDividendStatus", "testRegion", "testCustomerName", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperateTime", "testOperator") | ||
| 20 | + Expect(err).NotTo(HaveOccurred()) | ||
| 21 | + }) | ||
| 22 | + Describe("根据参数移除分红订单实体对象", func() { | ||
| 23 | + Context("传入有效的dividendsOrderId", func() { | ||
| 24 | + It("返回被移除分红订单实体的数据", func() { | ||
| 25 | + httpExpect := httpexpect.New(GinkgoT(), server.URL) | ||
| 26 | + httpExpect.DELETE("/dividends-orders/{dividendsOrderId}"). | ||
| 27 | + Expect(). | ||
| 28 | + Status(http.StatusOK). | ||
| 29 | + JSON(). | ||
| 30 | + Object(). | ||
| 31 | + ContainsKey("code").ValueEqual("code", 0). | ||
| 32 | + ContainsKey("msg").ValueEqual("msg", "ok"). | ||
| 33 | + ContainsKey("data").Value("data").Object() | ||
| 34 | + }) | ||
| 35 | + }) | ||
| 36 | + }) | ||
| 37 | + AfterEach(func() { | ||
| 38 | + _, err := pG.DB.Exec("DELETE FROM dividends_orders WHERE true") | ||
| 39 | + Expect(err).NotTo(HaveOccurred()) | ||
| 40 | + }) | ||
| 41 | +}) |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/go-pg/pg/v10" | ||
| 5 | + "net/http" | ||
| 6 | + | ||
| 7 | + "github.com/gavv/httpexpect" | ||
| 8 | + . "github.com/onsi/ginkgo" | ||
| 9 | + . "github.com/onsi/gomega" | ||
| 10 | + pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 11 | +) | ||
| 12 | + | ||
| 13 | +var _ = Describe("查询分红订单方法", func() { | ||
| 14 | + var dividendsOrderId int64 | ||
| 15 | + BeforeEach(func() { | ||
| 16 | + _, err := pG.DB.QueryOne( | ||
| 17 | + pg.Scan(÷ndsOrderId), | ||
| 18 | + "INSERT INTO dividends_orders (dividends_order_id, dividends_order_number, dividends_original_order_num, dividends_order_amount, order_salesman, order_time, dividend_time, dividend_status, region, customer_name, org, company, created_at, deleted_at, updated_at, operate_time, operator) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_order_id", | ||
| 19 | + "testDividendsOrderId", "testDividendsOrderNumber", "testDividendsOriginalOrderNum", "testDividendsOrderAmount", "testOrderSalesman", "testOrderTime", "testDividendTime", "testDividendStatus", "testRegion", "testCustomerName", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperateTime", "testOperator") | ||
| 20 | + Expect(err).NotTo(HaveOccurred()) | ||
| 21 | + }) | ||
| 22 | + Describe("查询分红订单方法", func() { | ||
| 23 | + Context("", func() { | ||
| 24 | + It("", func() { | ||
| 25 | + httpExpect := httpexpect.New(GinkgoT(), server.URL) | ||
| 26 | + body := map[string]interface{}{ | ||
| 27 | + "dividendsOrderNumber": "string", | ||
| 28 | + "companyId": "int64", | ||
| 29 | + "orgId": "int64", | ||
| 30 | + "userId": "int64", | ||
| 31 | + } | ||
| 32 | + httpExpect.POST("/dividends-orders/search-order-number"). | ||
| 33 | + WithJSON(body). | ||
| 34 | + Expect(). | ||
| 35 | + Status(http.StatusOK). | ||
| 36 | + JSON(). | ||
| 37 | + Object(). | ||
| 38 | + ContainsKey("code").ValueEqual("code", 0). | ||
| 39 | + ContainsKey("msg").ValueEqual("msg", "ok"). | ||
| 40 | + ContainsKey("data").Value("data").Object() | ||
| 41 | + }) | ||
| 42 | + }) | ||
| 43 | + }) | ||
| 44 | + AfterEach(func() { | ||
| 45 | + _, err := pG.DB.Exec("DELETE FROM dividends_orders WHERE true") | ||
| 46 | + Expect(err).NotTo(HaveOccurred()) | ||
| 47 | + }) | ||
| 48 | +}) |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/go-pg/pg/v10" | ||
| 5 | + "net/http" | ||
| 6 | + | ||
| 7 | + "github.com/gavv/httpexpect" | ||
| 8 | + . "github.com/onsi/ginkgo" | ||
| 9 | + . "github.com/onsi/gomega" | ||
| 10 | + pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 11 | +) | ||
| 12 | + | ||
| 13 | +var _ = Describe("查询分红订单方法", func() { | ||
| 14 | + var dividendsOrderId int64 | ||
| 15 | + BeforeEach(func() { | ||
| 16 | + _, err := pG.DB.QueryOne( | ||
| 17 | + pg.Scan(÷ndsOrderId), | ||
| 18 | + "INSERT INTO dividends_orders (dividends_order_id, dividends_order_number, dividends_original_order_num, dividends_order_amount, order_salesman, order_time, dividend_time, dividend_status, region, customer_name, org, company, created_at, deleted_at, updated_at, operate_time, operator) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_order_id", | ||
| 19 | + "testDividendsOrderId", "testDividendsOrderNumber", "testDividendsOriginalOrderNum", "testDividendsOrderAmount", "testOrderSalesman", "testOrderTime", "testDividendTime", "testDividendStatus", "testRegion", "testCustomerName", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperateTime", "testOperator") | ||
| 20 | + Expect(err).NotTo(HaveOccurred()) | ||
| 21 | + }) | ||
| 22 | + Describe("查询分红订单方法", func() { | ||
| 23 | + Context("", func() { | ||
| 24 | + It("", func() { | ||
| 25 | + httpExpect := httpexpect.New(GinkgoT(), server.URL) | ||
| 26 | + body := map[string]interface{}{ | ||
| 27 | + "dividendsOrderNumber": "string", | ||
| 28 | + "customerName": "string", | ||
| 29 | + "pageSize": "int32", | ||
| 30 | + "pageNumber": "int32", | ||
| 31 | + "companyId": "int64", | ||
| 32 | + "orgId": "int64", | ||
| 33 | + "userId": "int64", | ||
| 34 | + } | ||
| 35 | + httpExpect.POST("/dividends-orders/search"). | ||
| 36 | + WithJSON(body). | ||
| 37 | + Expect(). | ||
| 38 | + Status(http.StatusOK). | ||
| 39 | + JSON(). | ||
| 40 | + Object(). | ||
| 41 | + ContainsKey("code").ValueEqual("code", 0). | ||
| 42 | + ContainsKey("msg").ValueEqual("msg", "ok"). | ||
| 43 | + ContainsKey("data").Value("data").Object() | ||
| 44 | + }) | ||
| 45 | + }) | ||
| 46 | + }) | ||
| 47 | + AfterEach(func() { | ||
| 48 | + _, err := pG.DB.Exec("DELETE FROM dividends_orders WHERE true") | ||
| 49 | + Expect(err).NotTo(HaveOccurred()) | ||
| 50 | + }) | ||
| 51 | +}) |
| 1 | +package dividends_order | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/go-pg/pg/v10" | ||
| 5 | + "net/http" | ||
| 6 | + | ||
| 7 | + "github.com/gavv/httpexpect" | ||
| 8 | + . "github.com/onsi/ginkgo" | ||
| 9 | + . "github.com/onsi/gomega" | ||
| 10 | + pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg" | ||
| 11 | +) | ||
| 12 | + | ||
| 13 | +var _ = Describe("更新分红订单实体对象", func() { | ||
| 14 | + var dividendsOrderId int64 | ||
| 15 | + BeforeEach(func() { | ||
| 16 | + _, err := pG.DB.QueryOne( | ||
| 17 | + pg.Scan(÷ndsOrderId), | ||
| 18 | + "INSERT INTO dividends_orders (dividends_order_id, dividends_order_number, dividends_original_order_num, dividends_order_amount, order_salesman, order_time, dividend_time, dividend_status, region, customer_name, org, company, created_at, deleted_at, updated_at, operate_time, operator) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_order_id", | ||
| 19 | + "testDividendsOrderId", "testDividendsOrderNumber", "testDividendsOriginalOrderNum", "testDividendsOrderAmount", "testOrderSalesman", "testOrderTime", "testDividendTime", "testDividendStatus", "testRegion", "testCustomerName", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperateTime", "testOperator") | ||
| 20 | + Expect(err).NotTo(HaveOccurred()) | ||
| 21 | + }) | ||
| 22 | + Describe("提交数据更新分红订单实体对象", func() { | ||
| 23 | + Context("提交正确的分红订单实体数据", func() { | ||
| 24 | + It("返回更新后的分红订单实体数据", func() { | ||
| 25 | + httpExpect := httpexpect.New(GinkgoT(), server.URL) | ||
| 26 | + body := map[string]interface{}{ | ||
| 27 | + "customerName": "string", | ||
| 28 | + "dividendsOrderAmount": "float64", | ||
| 29 | + "dividendsOrderNumber": "string", | ||
| 30 | + "dividendsOriginalOrderNum": "string", | ||
| 31 | + "orderTime": "datetime", | ||
| 32 | + "remarks": "string", | ||
| 33 | + "salesmanUid": "string", | ||
| 34 | + "operatorUid": "string", | ||
| 35 | + "companyId": "int64", | ||
| 36 | + "orgId": "int64", | ||
| 37 | + "userId": "int64", | ||
| 38 | + } | ||
| 39 | + httpExpect.PUT("/dividends-orders/{dividendsOrderId}"). | ||
| 40 | + WithJSON(body). | ||
| 41 | + Expect(). | ||
| 42 | + Status(http.StatusOK). | ||
| 43 | + JSON(). | ||
| 44 | + Object(). | ||
| 45 | + ContainsKey("code").ValueEqual("code", 0). | ||
| 46 | + ContainsKey("msg").ValueEqual("msg", "ok"). | ||
| 47 | + ContainsKey("data").Value("data").Object(). | ||
| 48 | + ContainsKey("dividendsOrderId").ValueEqual("dividendsOrderId", dividendsOrderId) | ||
| 49 | + }) | ||
| 50 | + }) | ||
| 51 | + }) | ||
| 52 | + AfterEach(func() { | ||
| 53 | + _, err := pG.DB.Exec("DELETE FROM dividends_orders WHERE true") | ||
| 54 | + Expect(err).NotTo(HaveOccurred()) | ||
| 55 | + }) | ||
| 56 | +}) |
-
请 注册 或 登录 后发表评论