Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev
正在显示
11 个修改的文件
包含
102 行增加
和
52 行删除
@@ -54,11 +54,14 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *Cred | @@ -54,11 +54,14 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *Cred | ||
54 | CooperationContractNumber: param.CooperationContractNumber, | 54 | CooperationContractNumber: param.CooperationContractNumber, |
55 | ParticipateType: param.ParticipateType, // 参与类型 | 55 | ParticipateType: param.ParticipateType, // 参与类型 |
56 | PaymentDocumentAttachment: param.PaymentDocumentAttachment, // 支付凭证附件 | 56 | PaymentDocumentAttachment: param.PaymentDocumentAttachment, // 支付凭证附件 |
57 | - Org: param.Org, // 数据所属组织机构 | ||
58 | - Company: param.Company, // 公司 | ||
59 | - CreatedAt: param.CreatedAt.Unix() * 1000, // 创建时间 | ||
60 | - UpdatedAt: param.UpdatedAt.Unix() * 1000, // 更新时间 | ||
61 | - AccountDetail: param.AccountDetail, | 57 | + Org: domain.Org{ |
58 | + OrgID: param.Org.OrgID, | ||
59 | + OrgName: param.Org.OrgName, | ||
60 | + }, // 数据所属组织机构 | ||
61 | + Company: param.Company, // 公司 | ||
62 | + CreatedAt: param.CreatedAt.Unix() * 1000, // 创建时间 | ||
63 | + UpdatedAt: param.UpdatedAt.Unix() * 1000, // 更新时间 | ||
64 | + AccountDetail: param.AccountDetail, | ||
62 | } | 65 | } |
63 | data.Participator.UserInfo.UserName = param.Participator.UserName | 66 | data.Participator.UserInfo.UserName = param.Participator.UserName |
64 | data.Participator.UserInfo.UserPhone = param.Participator.UserPhone | 67 | data.Participator.UserInfo.UserPhone = param.Participator.UserPhone |
@@ -2,13 +2,14 @@ package service | @@ -2,13 +2,14 @@ package service | ||
2 | 2 | ||
3 | import ( | 3 | import ( |
4 | "fmt" | 4 | "fmt" |
5 | + "math/rand" | ||
6 | + "time" | ||
7 | + | ||
5 | "github.com/linmadan/egglib-go/core/application" | 8 | "github.com/linmadan/egglib-go/core/application" |
6 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command" | 9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command" |
7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" | 10 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" |
8 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" | 11 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" |
9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user" | 12 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user" |
10 | - "math/rand" | ||
11 | - "time" | ||
12 | ) | 13 | ) |
13 | 14 | ||
14 | // 企业端统计 【25%】 | 15 | // 企业端统计 【25%】 |
@@ -48,6 +49,10 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics | @@ -48,6 +49,10 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics | ||
48 | models, err := gateway.CooperationModeList(allied_creation_cooperation.ReqCooperationModeList{ | 49 | models, err := gateway.CooperationModeList(allied_creation_cooperation.ReqCooperationModeList{ |
49 | PageSize: 20, | 50 | PageSize: 20, |
50 | PageNumber: 1, | 51 | PageNumber: 1, |
52 | + CompanyId: cmd.Operator.CompanyId, | ||
53 | + OrgId: cmd.Operator.OrgId, | ||
54 | + UserId: cmd.Operator.UserId, | ||
55 | + UserBaseId: cmd.Operator.UserBaseId, | ||
51 | }) | 56 | }) |
52 | if err != nil { | 57 | if err != nil { |
53 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | 58 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) |
@@ -184,12 +184,12 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon | @@ -184,12 +184,12 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon | ||
184 | } | 184 | } |
185 | u.SalesmanUser.UserId = v.Salesman.UserId | 185 | u.SalesmanUser.UserId = v.Salesman.UserId |
186 | u.SalesmanUser.UserInfo.UsersId = v.Salesman.UserId | 186 | u.SalesmanUser.UserInfo.UsersId = v.Salesman.UserId |
187 | - u.SalesmanUser.UserInfo.UsersName = v.Salesman.UserInfo.UserName | ||
188 | - u.SalesmanUser.UserInfo.Phone = v.Salesman.UserInfo.UserPhone | 187 | + u.SalesmanUser.UserInfo.UsersName = v.Salesman.UserName |
188 | + u.SalesmanUser.UserInfo.Phone = v.Salesman.UserPhone | ||
189 | u.ReferrerUser.UserId = v.Referrer.UserId | 189 | u.ReferrerUser.UserId = v.Referrer.UserId |
190 | u.ReferrerUser.UserInfo.UsersId = v.Referrer.UserId | 190 | u.ReferrerUser.UserInfo.UsersId = v.Referrer.UserId |
191 | - u.ReferrerUser.UserInfo.UsersName = v.Referrer.UserInfo.UserName | ||
192 | - u.ReferrerUser.UserInfo.Phone = v.Referrer.UserInfo.UserPhone | 191 | + u.ReferrerUser.UserInfo.UsersName = v.Referrer.UserName |
192 | + u.ReferrerUser.UserInfo.Phone = v.Referrer.UserPhone | ||
193 | contractUndertaker = append(contractUndertaker, u) | 193 | contractUndertaker = append(contractUndertaker, u) |
194 | } | 194 | } |
195 | undertakerTypesUncheckedAvailable := param.UndertakerTypesUncheckedAvailable | 195 | undertakerTypesUncheckedAvailable := param.UndertakerTypesUncheckedAvailable |
@@ -235,7 +235,7 @@ type CooperationContractUndertake struct { | @@ -235,7 +235,7 @@ type CooperationContractUndertake struct { | ||
235 | Attachment []domain.Attachment `json:"attachment"` | 235 | Attachment []domain.Attachment `json:"attachment"` |
236 | } | 236 | } |
237 | 237 | ||
238 | -func ToCooperationContractUndertake(allied_creation_cooperation.DataCooperationContractSearchByUndertaker) *CooperationContractUndertake { | ||
239 | - data := CooperationContractUndertake{} | ||
240 | - return &data | ||
241 | -} | 238 | +// func ToCooperationContractUndertake(allied_creation_cooperation.DataCooperationContractSearchByUndertaker) *CooperationContractUndertake { |
239 | +// data := CooperationContractUndertake{} | ||
240 | +// return &data | ||
241 | +// } |
@@ -219,6 +219,7 @@ func (cooperationContractService *CooperationContractService) SearchCooperationC | @@ -219,6 +219,7 @@ func (cooperationContractService *CooperationContractService) SearchCooperationC | ||
219 | SponsorName: queryParam.ContractSponsor, | 219 | SponsorName: queryParam.ContractSponsor, |
220 | PageNumber: queryParam.PageNumber, | 220 | PageNumber: queryParam.PageNumber, |
221 | PageIndex: queryParam.PageSize, | 221 | PageIndex: queryParam.PageSize, |
222 | + CompanyId: queryParam.Operator.CompanyId, | ||
222 | }) | 223 | }) |
223 | data := []dto.CooperationContractUndertake{{}} | 224 | data := []dto.CooperationContractUndertake{{}} |
224 | return 10, data, err | 225 | return 10, data, err |
@@ -71,6 +71,10 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo | @@ -71,6 +71,10 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo | ||
71 | PageSize: listCooperationModeQuery.PageSize, | 71 | PageSize: listCooperationModeQuery.PageSize, |
72 | CooperationModeName: listCooperationModeQuery.CooperationModeName, | 72 | CooperationModeName: listCooperationModeQuery.CooperationModeName, |
73 | OrganizationName: listCooperationModeQuery.OrganizationName, | 73 | OrganizationName: listCooperationModeQuery.OrganizationName, |
74 | + CompanyId: listCooperationModeQuery.Operator.CompanyId, | ||
75 | + UserId: 0, | ||
76 | + OrgId: 0, | ||
77 | + UserBaseId: 0, | ||
74 | }) | 78 | }) |
75 | if err != nil { | 79 | if err != nil { |
76 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 80 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
@@ -19,13 +19,16 @@ type CreditAccountItem struct { | @@ -19,13 +19,16 @@ type CreditAccountItem struct { | ||
19 | UserPhone string `json:"userPhone"` // 用户手机号 | 19 | UserPhone string `json:"userPhone"` // 用户手机号 |
20 | UserType int `json:"userType"` // 用户类型,1员工,2共创用户,3公开 | 20 | UserType int `json:"userType"` // 用户类型,1员工,2共创用户,3公开 |
21 | } `json:"participator"` // 参与人 | 21 | } `json:"participator"` // 参与人 |
22 | - ParticipateType string `json:"participateType"` // 参与类型 | ||
23 | - PaymentDocumentAttachment domain.Attachment `json:"paymentDocumentAttachment"` // 支付凭证附件 | ||
24 | - Org domain.Org `json:"org"` // 数据所属组织机构 | ||
25 | - Company domain.CompanyData `json:"company"` // 公司 | ||
26 | - CreatedAt int64 `json:"createdAt"` // 创建时间 | ||
27 | - UpdatedAt int64 `json:"updatedAt"` // 更新时间 | ||
28 | - AccountDetail []struct { | 22 | + ParticipateType string `json:"participateType"` // 参与类型 |
23 | + PaymentDocumentAttachment domain.Attachment `json:"paymentDocumentAttachment"` // 支付凭证附件 | ||
24 | + Org struct { | ||
25 | + OrgID int `json:"orgId,string"` | ||
26 | + OrgName string `json:"orgName"` | ||
27 | + } `json:"org"` // 数据所属组织机构 | ||
28 | + Company domain.CompanyData `json:"company"` // 公司 | ||
29 | + CreatedAt int64 `json:"createdAt"` // 创建时间 | ||
30 | + UpdatedAt int64 `json:"updatedAt"` // 更新时间 | ||
31 | + AccountDetail []struct { | ||
29 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` | 32 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` |
30 | DividendsType int `json:"dividendsType"` | 33 | DividendsType int `json:"dividendsType"` |
31 | DividendsAmount float64 `json:"dividendsAmount"` | 34 | DividendsAmount float64 `json:"dividendsAmount"` |
@@ -55,12 +58,13 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *Cred | @@ -55,12 +58,13 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *Cred | ||
55 | CooperationContractNumber: param.CooperationContractNumber, | 58 | CooperationContractNumber: param.CooperationContractNumber, |
56 | ParticipateType: param.ParticipateType, // 参与类型 | 59 | ParticipateType: param.ParticipateType, // 参与类型 |
57 | PaymentDocumentAttachment: param.PaymentDocumentAttachment, // 支付凭证附件 | 60 | PaymentDocumentAttachment: param.PaymentDocumentAttachment, // 支付凭证附件 |
58 | - Org: param.Org, // 数据所属组织机构 | ||
59 | Company: param.Company, // 公司 | 61 | Company: param.Company, // 公司 |
60 | CreatedAt: param.CreatedAt.UnixNano() / 1e6, // 创建时间 | 62 | CreatedAt: param.CreatedAt.UnixNano() / 1e6, // 创建时间 |
61 | UpdatedAt: param.UpdatedAt.UnixNano() / 1e6, // 更新时间 | 63 | UpdatedAt: param.UpdatedAt.UnixNano() / 1e6, // 更新时间 |
62 | AccountDetail: param.AccountDetail, | 64 | AccountDetail: param.AccountDetail, |
63 | } | 65 | } |
66 | + data.Org.OrgID = param.Org.OrgID | ||
67 | + data.Org.OrgName = param.Org.OrgName | ||
64 | data.Participator.UserName = param.Participator.UserName | 68 | data.Participator.UserName = param.Participator.UserName |
65 | data.Participator.UserPhone = param.Participator.UserPhone | 69 | data.Participator.UserPhone = param.Participator.UserPhone |
66 | data.Participator.UserType = param.Participator.UserType | 70 | data.Participator.UserType = param.Participator.UserType |
@@ -19,9 +19,9 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD | @@ -19,9 +19,9 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD | ||
19 | if err := createDividendsOrderCommand.ValidateCommand(); err != nil { | 19 | if err := createDividendsOrderCommand.ValidateCommand(); err != nil { |
20 | return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | 20 | return nil, application.ThrowError(application.ARG_ERROR, err.Error()) |
21 | } | 21 | } |
22 | - orderGoods := []allied_creation_cooperation.DividendsOrderGoods{} | 22 | + orderGoods := []allied_creation_cooperation.DividendsOrderGoodAdd{} |
23 | for _, v := range createDividendsOrderCommand.OrderGoods { | 23 | for _, v := range createDividendsOrderCommand.OrderGoods { |
24 | - good := allied_creation_cooperation.DividendsOrderGoods{ | 24 | + good := allied_creation_cooperation.DividendsOrderGoodAdd{ |
25 | CooperationContractNumber: v.CooperationContractNumber, | 25 | CooperationContractNumber: v.CooperationContractNumber, |
26 | DividendsOrderNumber: v.DividendsOrderNumber, | 26 | DividendsOrderNumber: v.DividendsOrderNumber, |
27 | OrderGoodAmount: v.OrderGoodAmount, | 27 | OrderGoodAmount: v.OrderGoodAmount, |
@@ -12,7 +12,7 @@ type CooperationContract struct { | @@ -12,7 +12,7 @@ type CooperationContract struct { | ||
12 | CooperationContractName string `json:"cooperationContractName"` // 共创合约名称 | 12 | CooperationContractName string `json:"cooperationContractName"` // 共创合约名称 |
13 | CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 | 13 | CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 |
14 | CooperationProjectNumber string `json:"cooperationProjectNumber"` | 14 | CooperationProjectNumber string `json:"cooperationProjectNumber"` |
15 | - CooperationContractUndertakerTypes []int `json:"cooperationContractUndertakerType"` // 共创合约承接对象,1员工,2共创用户,3公开 | 15 | + CooperationContractUndertakerTypes []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开 |
16 | Department struct { | 16 | Department struct { |
17 | DepartmentId int `json:"departmentId,string"` | 17 | DepartmentId int `json:"departmentId,string"` |
18 | DepartmentName string `json:"departmentName"` | 18 | DepartmentName string `json:"departmentName"` |
@@ -76,8 +76,11 @@ type CooperationContract struct { | @@ -76,8 +76,11 @@ type CooperationContract struct { | ||
76 | UserName string `json:"userName"` | 76 | UserName string `json:"userName"` |
77 | UserPhone string `json:"userPhone"` | 77 | UserPhone string `json:"userPhone"` |
78 | Referrer struct { | 78 | Referrer struct { |
79 | - UserId int `json:"userId,string"` | ||
80 | - UserInfo struct { | 79 | + UserId int `json:"userId,string"` |
80 | + UserType int32 `json:"userType"` // 用户类型,1员工,2共创用户,3公开 | ||
81 | + UserName string `json:"userName"` // 用户姓名 | ||
82 | + UserPhone string `json:"userPhone"` // 用户手机号 | ||
83 | + UserInfo struct { | ||
81 | UserAvatar string `json:"userAvatar"` // 用户头像 | 84 | UserAvatar string `json:"userAvatar"` // 用户头像 |
82 | UserEmail string `json:"userEmail"` // 用户邮箱 | 85 | UserEmail string `json:"userEmail"` // 用户邮箱 |
83 | UserName string `json:"userName"` // 共创人员姓名 | 86 | UserName string `json:"userName"` // 共创人员姓名 |
@@ -86,8 +89,11 @@ type CooperationContract struct { | @@ -86,8 +89,11 @@ type CooperationContract struct { | ||
86 | } `json:"userInfo"` | 89 | } `json:"userInfo"` |
87 | } `json:"referrer"` | 90 | } `json:"referrer"` |
88 | Salesman struct { | 91 | Salesman struct { |
89 | - UserId int `json:"userId,string"` | ||
90 | - UserInfo struct { | 92 | + UserId int `json:"userId,string"` |
93 | + UserType int32 `json:"userType"` // 用户类型,1员工,2共创用户,3公开 | ||
94 | + UserName string `json:"userName"` // 用户姓名 | ||
95 | + UserPhone string `json:"userPhone"` // 用户手机号 | ||
96 | + UserInfo struct { | ||
91 | UserAvatar string `json:"userAvatar"` // 用户头像 | 97 | UserAvatar string `json:"userAvatar"` // 用户头像 |
92 | UserEmail string `json:"userEmail"` // 用户邮箱 | 98 | UserEmail string `json:"userEmail"` // 用户邮箱 |
93 | UserName string `json:"userName"` // 共创人员姓名 | 99 | UserName string `json:"userName"` // 共创人员姓名 |
@@ -235,6 +241,9 @@ type ( | @@ -235,6 +241,9 @@ type ( | ||
235 | SponsorName string `json:"sponsorName"` //项目发起人姓名 | 241 | SponsorName string `json:"sponsorName"` //项目发起人姓名 |
236 | PageNumber int `json:"pageNumber"` | 242 | PageNumber int `json:"pageNumber"` |
237 | PageIndex int `json:"pageIndex"` | 243 | PageIndex int `json:"pageIndex"` |
244 | + CompanyId int64 ` json:"companyId"` | ||
245 | + OrgId int64 ` json:"orgId"` | ||
246 | + UserBaseId int64 `json:"userBaseId"` | ||
238 | } | 247 | } |
239 | 248 | ||
240 | DataCooperationContractSearchByUndertaker struct { | 249 | DataCooperationContractSearchByUndertaker struct { |
@@ -40,8 +40,12 @@ type ( | @@ -40,8 +40,12 @@ type ( | ||
40 | //返回共创模式列表 | 40 | //返回共创模式列表 |
41 | type ( | 41 | type ( |
42 | ReqCooperationModeList struct { | 42 | ReqCooperationModeList struct { |
43 | - PageSize int `json:"pageSize"` | ||
44 | - PageNumber int `json:"pageNumber"` | 43 | + PageSize int `json:"pageSize"` |
44 | + PageNumber int `json:"pageNumber"` | ||
45 | + CompanyId int64 `json:"companyId"` | ||
46 | + OrgId int64 `json:"orgId"` | ||
47 | + UserId int64 `json:"userId"` | ||
48 | + UserBaseId int64 `json:"userBaseId"` | ||
45 | } | 49 | } |
46 | 50 | ||
47 | DataCooperationModeList struct { | 51 | DataCooperationModeList struct { |
@@ -155,6 +159,10 @@ type ( | @@ -155,6 +159,10 @@ type ( | ||
155 | CooperationModeName string `json:"cooperationModeName"` | 159 | CooperationModeName string `json:"cooperationModeName"` |
156 | //组织名称 | 160 | //组织名称 |
157 | OrganizationName string `json:"organizationName"` | 161 | OrganizationName string `json:"organizationName"` |
162 | + CompanyId int64 `json:"companyId"` | ||
163 | + OrgId int64 `json:"orgId"` | ||
164 | + UserId int64 `json:"userId"` | ||
165 | + UserBaseId int64 `json:"userBaseId"` | ||
158 | } | 166 | } |
159 | 167 | ||
160 | DataCooperationModesSearch struct { | 168 | DataCooperationModesSearch struct { |
@@ -32,13 +32,16 @@ type CreditAccount struct { | @@ -32,13 +32,16 @@ type CreditAccount struct { | ||
32 | UserPhone string `json:"userPhone"` // 用户手机号 | 32 | UserPhone string `json:"userPhone"` // 用户手机号 |
33 | UserInfo domain.UserInfo `json:"userInfo"` // | 33 | UserInfo domain.UserInfo `json:"userInfo"` // |
34 | } `json:"operator"` | 34 | } `json:"operator"` |
35 | - ParticipateType string `json:"participateType"` // 参与类型 | ||
36 | - PaymentDocumentAttachment domain.Attachment `json:"paymentDocumentAttachment"` // 支付凭证附件 | ||
37 | - Org domain.Org `json:"org"` // 数据所属组织机构 | ||
38 | - Company domain.CompanyData `json:"company"` // 公司 | ||
39 | - CreatedAt time.Time `json:"createdAt"` // 创建时间 | ||
40 | - UpdatedAt time.Time `json:"updatedAt"` // 更新时间 | ||
41 | - AccountDetail []struct { | 35 | + ParticipateType string `json:"participateType"` // 参与类型 |
36 | + PaymentDocumentAttachment domain.Attachment `json:"paymentDocumentAttachment"` // 支付凭证附件 | ||
37 | + Org struct { | ||
38 | + OrgID int `json:"orgId,string"` | ||
39 | + OrgName string `json:"orgName"` | ||
40 | + } `json:"org"` // 数据所属组织机构 | ||
41 | + Company domain.CompanyData `json:"company"` // 公司 | ||
42 | + CreatedAt time.Time `json:"createdAt"` // 创建时间 | ||
43 | + UpdatedAt time.Time `json:"updatedAt"` // 更新时间 | ||
44 | + AccountDetail []struct { | ||
42 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` | 45 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` |
43 | DividendsType int `json:"dividendsType"` | 46 | DividendsType int `json:"dividendsType"` |
44 | DividendsAmount float64 `json:"dividendsAmount"` | 47 | DividendsAmount float64 `json:"dividendsAmount"` |
@@ -53,9 +53,21 @@ type DividendsOrder struct { | @@ -53,9 +53,21 @@ type DividendsOrder struct { | ||
53 | Returned bool `json:"returned"` //是否有退货记录,true:有退货记录,false:无退货记录 | 53 | Returned bool `json:"returned"` //是否有退货记录,true:有退货记录,false:无退货记录 |
54 | } | 54 | } |
55 | 55 | ||
56 | +type DividendsOrderGoods struct { | ||
57 | + // 订单产品 | ||
58 | + OrderGoodId int64 `json:"orderGoodId,string"` | ||
59 | + CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 | ||
60 | + DividendsOrderNumber string `json:"dividendsOrderNumber"` //关联分红订单号 | ||
61 | + OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 | ||
62 | + OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 | ||
63 | + OrderGoodName string `json:"orderGoodName"` //订单产品名称 | ||
64 | + OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 | ||
65 | + OrderGoodQuantity int `json:"orderGoodQuantity,string"` //订单产品数量 | ||
66 | + OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态, 1待分红,2已分红 | ||
67 | +} | ||
68 | + | ||
56 | type ( | 69 | type ( |
57 | - //订单产品 | ||
58 | - DividendsOrderGoods struct { | 70 | + DividendsOrderGoodAdd struct { |
59 | // 订单产品 | 71 | // 订单产品 |
60 | OrderGoodId int64 `json:"orderGoodId,string"` | 72 | OrderGoodId int64 `json:"orderGoodId,string"` |
61 | CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 | 73 | CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 |
@@ -64,20 +76,21 @@ type ( | @@ -64,20 +76,21 @@ type ( | ||
64 | OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 | 76 | OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 |
65 | OrderGoodName string `json:"orderGoodName"` //订单产品名称 | 77 | OrderGoodName string `json:"orderGoodName"` //订单产品名称 |
66 | OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 | 78 | OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 |
67 | - OrderGoodQuantity int `json:"orderGoodQuantity,string"` //订单产品数量 | 79 | + OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 |
68 | OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态, 1待分红,2已分红 | 80 | OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态, 1待分红,2已分红 |
69 | } | 81 | } |
82 | + //订单产品 | ||
70 | ReqDividendsOrderAdd struct { | 83 | ReqDividendsOrderAdd struct { |
71 | - CompanyId int `json:"companyId,string"` | ||
72 | - CustomerName string `json:"customerName"` //客户名称 | ||
73 | - DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号 | ||
74 | - OperatorUid int `json:"operatorUid,string"` //订单操作人id | ||
75 | - OrderGoods []DividendsOrderGoods `json:"orderGoods"` //订单产品列表 | ||
76 | - OrderTime string `json:"orderTime"` //订单日期,13位长度字符串类型时间戳 | ||
77 | - Remarks string `json:"remarks"` //备注 | ||
78 | - UserId int `json:"userId,string"` // | ||
79 | - SalesmanUid string `json:"salesmanUid"` //订单业务员uid | ||
80 | - RegionName string `json:"regionName"` //区域名称 | 84 | + CompanyId int `json:"companyId,string"` |
85 | + CustomerName string `json:"customerName"` //客户名称 | ||
86 | + DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号 | ||
87 | + OperatorUid int `json:"operatorUid,string"` //订单操作人id | ||
88 | + OrderGoods []DividendsOrderGoodAdd `json:"orderGoods"` //订单产品列表 | ||
89 | + OrderTime string `json:"orderTime"` //订单日期,13位长度字符串类型时间戳 | ||
90 | + Remarks string `json:"remarks"` //备注 | ||
91 | + UserId int `json:"userId,string"` // | ||
92 | + SalesmanUid string `json:"salesmanUid"` //订单业务员uid | ||
93 | + RegionName string `json:"regionName"` //区域名称 | ||
81 | } | 94 | } |
82 | 95 | ||
83 | DataDividendsOrderAdd struct { | 96 | DataDividendsOrderAdd struct { |
-
请 注册 或 登录 后发表评论