allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 c8573d9b4305bf9b7d04554a7270c09449c67cd1 2 个父辈 db3c67ba 3a999607

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

内嵌 并排对比
正在显示 9 个修改的文件 包含 97 行增加 和 42 行删除
@@ -14,7 +14,7 @@ type DividendsOrder struct { @@ -14,7 +14,7 @@ type DividendsOrder struct {
14 DividendStatus int `json:"dividendStatus"` //分红订单分红状态，1待分红，2已分红，3部分分红 14 DividendStatus int `json:"dividendStatus"` //分红订单分红状态，1待分红，2已分红，3部分分红
15 DividendTime int64 `json:"dividendTime"` //分红订单分红时间 15 DividendTime int64 `json:"dividendTime"` //分红订单分红时间
16 DividendsOrderAmount float64 `json:"dividendsOrderAmount"` //分红订单金额 16 DividendsOrderAmount float64 `json:"dividendsOrderAmount"` //分红订单金额
17 - DividendsOrderID int `json:"dividendsOrderId"` //分红订单 17 + DividendsOrderID int `json:"dividendsOrderId,string"` //分红订单
18 DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红订单号 18 DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红订单号
19 DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号 19 DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号
20 OrderTime int64 `json:"orderTime"` 20 OrderTime int64 `json:"orderTime"`
@@ -47,14 +47,8 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD @@ -47,14 +47,8 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
47 if err != nil { 47 if err != nil {
48 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 48 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
49 } 49 }
50 - data := struct {  
51 - DividendsOrderId int  
52 - command.CreateDividendsOrderCommand  
53 - }{  
54 - DividendsOrderId: result.DividendsOrderID,  
55 - CreateDividendsOrderCommand: *createDividendsOrderCommand,  
56 - }  
57 - return data, nil 50 +
  51 + return dto.ToDividendsOrder(&result.DividendsOrder), nil
58 } 52 }
59 53
60 // 返回分红订单实体对象 54 // 返回分红订单实体对象
@@ -104,11 +98,11 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD @@ -104,11 +98,11 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD
104 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 98 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
105 } 99 }
106 var dataList []dto.DividendsOrder 100 var dataList []dto.DividendsOrder
107 - for i := range result.Gride.List {  
108 - item := dto.ToDividendsOrder(&result.Gride.List[i]) 101 + for i := range result.Grid.List {
  102 + item := dto.ToDividendsOrder(&result.Grid.List[i])
109 dataList = append(dataList, *item) 103 dataList = append(dataList, *item)
110 } 104 }
111 - return result.Gride.Total, dataList, nil 105 + return result.Grid.Total, dataList, nil
112 } 106 }
113 107
114 // 更新分红订单实体对象 108 // 更新分红订单实体对象
@@ -8,5 +8,14 @@ import ( @@ -8,5 +8,14 @@ import (
8 type CreateDividendsReturnedOrderCommand struct { 8 type CreateDividendsReturnedOrderCommand struct {
9 //操作人 9 //操作人
10 Operator domain.Operator `json:"-"` 10 Operator domain.Operator `json:"-"`
11 - allied_creation_cooperation.ReqDividendsReturnedOrderAdd 11 + DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"` //退货客户
  12 + DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号
  13 + OriginalOrderNum string `json:"originalOrderNum"` //源单号
  14 + //货品
  15 + OrderGoods []allied_creation_cooperation.DividendsReturnedOrderGoods `json:"orderGoods"`
  16 +
  17 + DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
  18 + OrderDate int64 `json:"orderDate"` //订单日期
  19 + Remarks string `json:"remarks"` //
  20 + RegionName string `json:"regionName"`
12 } 21 }
@@ -8,5 +8,16 @@ import ( @@ -8,5 +8,16 @@ import (
8 type UpdateDividendsReturnedOrderCommand struct { 8 type UpdateDividendsReturnedOrderCommand struct {
9 //操作人 9 //操作人
10 Operator domain.Operator `json:"-"` 10 Operator domain.Operator `json:"-"`
11 - allied_creation_cooperation.ReqDividendsReturnedOrderUpdate 11 + DividendsReturnedOrderID int `json:"dividendsReturnedOrderId,string"` //分红退货单记录id
  12 + DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"` //退货客户
  13 + DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号
  14 + OriginalOrderNum string `json:"originalOrderNum"` //源单号
  15 + //货品
  16 + OrderGoods []allied_creation_cooperation.DividendsReturnedOrderGoods `json:"orderGoods"`
  17 +
  18 + DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
  19 + OrderDate int64 `json:"orderDate"` //订单日期
  20 +
  21 + Remarks string `json:"remarks"` //
  22 + RegionName string `json:"regionName"`
12 } 23 }
@@ -2,6 +2,7 @@ package service @@ -2,6 +2,7 @@ package service
2 2
3 import ( 3 import (
4 "strconv" 4 "strconv"
  5 + "time"
5 6
6 "github.com/linmadan/egglib-go/core/application" 7 "github.com/linmadan/egglib-go/core/application"
7 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/dividendsReturnedOrder/command" 8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/dividendsReturnedOrder/command"
@@ -16,13 +17,24 @@ type DividendsReturnedOrderService struct { @@ -16,13 +17,24 @@ type DividendsReturnedOrderService struct {
16 17
17 // 创建分红退货单服务 18 // 创建分红退货单服务
18 func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) { 19 func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) {
19 -  
20 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator) 20 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator)
21 - _, err := creationCooperationGateway.DividendsReturnedOrderAdd(createDividendsReturnedOrderCommand.ReqDividendsReturnedOrderAdd) 21 + dividendsReturnedDate := time.Unix(createDividendsReturnedOrderCommand.DividendsReturnedDate, 0)
  22 + orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderDate, 0)
  23 + result, err := creationCooperationGateway.DividendsReturnedOrderAdd(allied_creation_cooperation.ReqDividendsReturnedOrderAdd{
  24 + DividendsReturnedCustomerName: createDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
  25 + DividendsOrderNumber: createDividendsReturnedOrderCommand.DividendsOrderNumber,
  26 + OriginalOrderNum: createDividendsReturnedOrderCommand.OriginalOrderNum,
  27 + OrderGoods: createDividendsReturnedOrderCommand.OrderGoods,
  28 + DividendsReturnedDate: dividendsReturnedDate,
  29 + OrderData: orderDate,
  30 + OrgId: int(createDividendsReturnedOrderCommand.Operator.OrgId),
  31 + Remarks: createDividendsReturnedOrderCommand.Remarks,
  32 + RegionName: createDividendsReturnedOrderCommand.RegionName,
  33 + })
22 if err != nil { 34 if err != nil {
23 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 35 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
24 } 36 }
25 - return createDividendsReturnedOrderCommand, nil 37 + return dto.ToDividendsReturnedOrderInfo(&result.DividendsReturnedOrder), nil
26 } 38 }
27 39
28 // 返回分红退货单服务 40 // 返回分红退货单服务
@@ -77,7 +89,20 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide @@ -77,7 +89,20 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
77 // 更新分红退货单服务 89 // 更新分红退货单服务
78 func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) { 90 func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) {
79 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator) 91 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator)
80 - _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(updateDividendsReturnedOrderCommand.ReqDividendsReturnedOrderUpdate) 92 + dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate, 0)
  93 + orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderDate, 0)
  94 + _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{
  95 + DividendsReturnedOrderID: updateDividendsReturnedOrderCommand.DividendsReturnedOrderID,
  96 + DividendsReturnedCustomerName: updateDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
  97 + DividendsOrderNumber: updateDividendsReturnedOrderCommand.DividendsOrderNumber,
  98 + OriginalOrderNum: updateDividendsReturnedOrderCommand.OriginalOrderNum,
  99 + OrderGoods: updateDividendsReturnedOrderCommand.OrderGoods,
  100 + DividendsReturnedDate: dividendsReturnedDate,
  101 + OrderData: orderDate,
  102 + OrgId: int(updateDividendsReturnedOrderCommand.Operator.OrgId),
  103 + Remarks: updateDividendsReturnedOrderCommand.Remarks,
  104 + RegionName: updateDividendsReturnedOrderCommand.RegionName,
  105 + })
81 if err != nil { 106 if err != nil {
82 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 107 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
83 } 108 }
@@ -97,7 +122,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SelectorDivi @@ -97,7 +122,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SelectorDivi
97 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 122 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
98 } 123 }
99 listData := []map[string]interface{}{} 124 listData := []map[string]interface{}{}
100 - for _, v := range result.Gride.List { 125 + for _, v := range result.Grid.List {
101 m := map[string]interface{}{ 126 m := map[string]interface{}{
102 "dividendsOrderNumber": v.DividendsOrderNumber, 127 "dividendsOrderNumber": v.DividendsOrderNumber,
103 "dividendsOriginalOrderNum": v.DividendsOriginalOrderNum, 128 "dividendsOriginalOrderNum": v.DividendsOriginalOrderNum,
@@ -106,7 +131,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SelectorDivi @@ -106,7 +131,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SelectorDivi
106 } 131 }
107 listData = append(listData, m) 132 listData = append(listData, m)
108 } 133 }
109 - return result.Gride.Total, listData, nil 134 + return result.Grid.Total, listData, nil
110 } 135 }
111 136
112 func NewDividendsReturnedOrderService(options map[string]interface{}) *DividendsReturnedOrderService { 137 func NewDividendsReturnedOrderService(options map[string]interface{}) *DividendsReturnedOrderService {
@@ -232,7 +232,7 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderGet(param ReqDivid @@ -232,7 +232,7 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderGet(param ReqDivid
232 // DividendsOrderBatchRemove 批量移除分红订单 232 // DividendsOrderBatchRemove 批量移除分红订单
233 func (gateway HttplibAlliedCreationCooperation) DividendsOrderBatchRemove(param ReqDividendsOrderBatchRemove) (*DataDividendsOrderBatchRemove, error) { 233 func (gateway HttplibAlliedCreationCooperation) DividendsOrderBatchRemove(param ReqDividendsOrderBatchRemove) (*DataDividendsOrderBatchRemove, error) {
234 url := gateway.baseUrL + "/dividends-orders/batch-remove" 234 url := gateway.baseUrL + "/dividends-orders/batch-remove"
235 - method := "DELETE" 235 + method := "POST"
236 req := gateway.CreateRequest(url, method) 236 req := gateway.CreateRequest(url, method)
237 log.Logger.Debug("向业务模块请求数据：移除分红订单。", map[string]interface{}{ 237 log.Logger.Debug("向业务模块请求数据：移除分红订单。", map[string]interface{}{
238 "api": method + ":" + url, 238 "api": method + ":" + url,
@@ -255,7 +255,7 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderBatchRemove(param @@ -255,7 +255,7 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderBatchRemove(param
255 if err != nil { 255 if err != nil {
256 return nil, fmt.Errorf("解析移除分红订单：%w", err) 256 return nil, fmt.Errorf("解析移除分红订单：%w", err)
257 } 257 }
258 - var data DataDividendsOrderBatchRemove  
259 - err = gateway.GetResponseData(result, &data)  
260 - return &data, err 258 + // var data []DataDividendsOrderBatchRemove
  259 + // err = gateway.GetResponseData(result, &data)
  260 + return nil, err
261 } 261 }
@@ -51,7 +51,18 @@ type ( @@ -51,7 +51,18 @@ type (
51 FeedbackContent string `json:"feedbackContent"` 51 FeedbackContent string `json:"feedbackContent"`
52 CooperationContractNumber string `json:"cooperationContractNumber"` 52 CooperationContractNumber string `json:"cooperationContractNumber"`
53 CooperationContractName string `json:"cooperationContractName"` 53 CooperationContractName string `json:"cooperationContractName"`
54 - ContractUndertaker interface{} `json:"contractUndertaker"` 54 + ContractUndertaker struct {
  55 + UserId int `json:"userId,string,"`
  56 + UserPhone string `json:"userPhone"`
  57 + UserName string `json:"userName"`
  58 + UserCode string `json:"userCode"`
  59 + UserInfo struct {
  60 + UserAccount string `json:"userAccount"`
  61 + UserName string `json:"userName"`
  62 + UserPhone string `json:"userPhone"`
  63 + UserCode string `json:"userCode"`
  64 + } `json:"userInfo"`
  65 + } `json:"contractUndertaker"`
55 Org interface{} `json:"org"` 66 Org interface{} `json:"org"`
56 Company interface{} `json:"company"` 67 Company interface{} `json:"company"`
57 //UpdatedAt time.Time `json:"updatedAt"` 68 //UpdatedAt time.Time `json:"updatedAt"`
@@ -59,7 +70,7 @@ type ( @@ -59,7 +70,7 @@ type (
59 CreatedAt jtime.TimeToUnixMsec `json:"createdAt"` 70 CreatedAt jtime.TimeToUnixMsec `json:"createdAt"`
60 CooperationMode struct { 71 CooperationMode struct {
61 // 共创模式ID 72 // 共创模式ID
62 - CooperationModeId int `json:"cooperationModeId,string"` 73 + CooperationModeId int `json:"cooperationModeId,string,"`
63 // 共创模式编码，唯一确定 74 // 共创模式编码，唯一确定
64 CooperationModeNumber string `json:"cooperationModeNumber"` 75 CooperationModeNumber string `json:"cooperationModeNumber"`
65 // 模式名称，唯一确定 76 // 模式名称，唯一确定
@@ -47,12 +47,14 @@ type DividendsOrder struct { @@ -47,12 +47,14 @@ type DividendsOrder struct {
47 Region struct { 47 Region struct {
48 RegionName string `json:"regionName"` 48 RegionName string `json:"regionName"`
49 RegionNumber string `json:"regionNumber"` 49 RegionNumber string `json:"regionNumber"`
50 - } 50 + } `json:"region"`
51 } 51 }
52 52
53 type ( 53 type (
54 //订单产品 54 //订单产品
55 DividendsOrderGoods struct { 55 DividendsOrderGoods struct {
  56 + // 订单产品
  57 + OrderGoodId int64 `json:"orderGoodId,string"`
56 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 58 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号
57 DividendsOrderNumber string `json:"dividendsOrderNumber"` //关联分红订单号 59 DividendsOrderNumber string `json:"dividendsOrderNumber"` //关联分红订单号
58 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 60 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
@@ -60,6 +62,7 @@ type ( @@ -60,6 +62,7 @@ type (
60 OrderGoodName string `json:"orderGoodName"` //订单产品名称 62 OrderGoodName string `json:"orderGoodName"` //订单产品名称
61 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 63 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
62 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 64 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量
  65 + OrderGoodDividendsStatus int32 `json:"OrderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红
63 } 66 }
64 ReqDividendsOrderAdd struct { 67 ReqDividendsOrderAdd struct {
65 CompanyId int `json:"companyId,string"` 68 CompanyId int `json:"companyId,string"`
@@ -115,10 +118,10 @@ type ( @@ -115,10 +118,10 @@ type (
115 } 118 }
116 119
117 DataDividendsOrderSearch struct { 120 DataDividendsOrderSearch struct {
118 - Gride struct { 121 + Grid struct {
119 Total int `json:"total"` 122 Total int `json:"total"`
120 List []DividendsOrder `json:"list"` 123 List []DividendsOrder `json:"list"`
121 - } `json:"gride"` 124 + } `json:"grid"`
122 } 125 }
123 ) 126 )
124 127
@@ -5,11 +5,13 @@ import "time" @@ -5,11 +5,13 @@ import "time"
5 //创建分红退货单 5 //创建分红退货单
6 type ( 6 type (
7 DividendsReturnedOrderGoods struct { 7 DividendsReturnedOrderGoods struct {
  8 + OrderGoodId int64 `json:"orderGoodId,string"` // 订单产品id
8 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 9 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号
9 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 10 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
10 OrderGoodName string `json:"orderGoodName"` //订单产品名称 11 OrderGoodName string `json:"orderGoodName"` //订单产品名称
11 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 12 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
12 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 13 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量
  14 +
13 } 15 }
14 16
15 DividendsReturnedOrder struct { 17 DividendsReturnedOrder struct {
@@ -46,39 +48,39 @@ type ( @@ -46,39 +48,39 @@ type (
46 } 48 }
47 49
48 ReqDividendsReturnedOrderAdd struct { 50 ReqDividendsReturnedOrderAdd struct {
49 - CustomerName string `json:"customerName"`  
50 - DividendsOrderAmount string `json:"dividendsOrderAmount"`  
51 - DividendsOrderNumber string `json:"dividendsOrderNumber"`  
52 - DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` 51 + DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`
  52 + DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号
  53 + OriginalOrderNum string `json:"originalOrderNum"`
53 OrderGoods []DividendsReturnedOrderGoods `json:"orderGoods"` 54 OrderGoods []DividendsReturnedOrderGoods `json:"orderGoods"`
54 - OrderTime time.Time `json:"orderTime"` 55 + DividendsReturnedDate time.Time `json:"dividendsReturnedDate"`
  56 + OrderData time.Time `json:"orderData"`
55 OrgId int `json:"orgId"` 57 OrgId int `json:"orgId"`
56 Remarks string `json:"remarks"` 58 Remarks string `json:"remarks"`
57 - SalesmanUid string `json:"salesmanUid"`  
58 RegionName string `json:"regionName"` 59 RegionName string `json:"regionName"`
59 } 60 }
60 61
61 DataDividendsReturnedOrderAdd struct { 62 DataDividendsReturnedOrderAdd struct {
  63 + DividendsReturnedOrder
62 } 64 }
63 ) 65 )
64 66
65 //更新分红退货单 67 //更新分红退货单
66 type ( 68 type (
67 ReqDividendsReturnedOrderUpdate struct { 69 ReqDividendsReturnedOrderUpdate struct {
68 - DividendsReturnedOrderID int `json:"dividendsReturnedOrderId"` //分红退货单记录id  
69 - CustomerName string `json:"customerName"`  
70 - DividendsOrderAmount string `json:"dividendsOrderAmount"`  
71 - DividendsOrderNumber string `json:"dividendsOrderNumber"`  
72 - DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` 70 + DividendsReturnedOrderID int `json:"dividendsReturnedOrderId,string"` //分红退货单记录id
  71 + DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`
  72 + DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号
  73 + OriginalOrderNum string `json:"originalOrderNum"`
73 OrderGoods []DividendsReturnedOrderGoods `json:"orderGoods"` 74 OrderGoods []DividendsReturnedOrderGoods `json:"orderGoods"`
74 - OrderTime time.Time `json:"orderTime"` 75 + DividendsReturnedDate time.Time `json:"orderTime"`
  76 + OrderData time.Time `json:"orderData"`
75 OrgId int `json:"orgId"` 77 OrgId int `json:"orgId"`
76 Remarks string `json:"remarks"` 78 Remarks string `json:"remarks"`
77 - SalesmanUid string `json:"salesmanUid"`  
78 RegionName string `json:"regionName"` 79 RegionName string `json:"regionName"`
79 } 80 }
80 81
81 DataDividendsReturnedOrderUpdate struct { 82 DataDividendsReturnedOrderUpdate struct {
  83 + DividendsReturnedOrder
82 } 84 }
83 ) 85 )
84 86