作者 tangxuhui

数据结构调整

@@ -23,6 +23,7 @@ type UpdateDividendsOrderCommand struct { @@ -23,6 +23,7 @@ type UpdateDividendsOrderCommand struct {
23 RegionName string `json:"regionName"` 23 RegionName string `json:"regionName"`
24 //订单产品列表 24 //订单产品列表
25 OrderGoods []struct { 25 OrderGoods []struct {
  26 + OrderGoodId int `json:"orderGoodId,string"`
26 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 27 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号
27 DividendsOrderNumber string `json:"dividendsOrderNumber"` //关联分红订单号 28 DividendsOrderNumber string `json:"dividendsOrderNumber"` //关联分红订单号
28 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 29 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
@@ -109,9 +109,10 @@ func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateD @@ -109,9 +109,10 @@ func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateD
109 // if err := updateDividendsOrderCommand.ValidateCommand(); err != nil { 109 // if err := updateDividendsOrderCommand.ValidateCommand(); err != nil {
110 // return nil, application.ThrowError(application.ARG_ERROR, err.Error()) 110 // return nil, application.ThrowError(application.ARG_ERROR, err.Error())
111 // } 111 // }
112 - orderGoods := []allied_creation_cooperation.DividendsOrderGoods{} 112 + orderGoods := []allied_creation_cooperation.DividendsOrderGoodAdd{}
113 for _, v := range updateDividendsOrderCommand.OrderGoods { 113 for _, v := range updateDividendsOrderCommand.OrderGoods {
114 - good := allied_creation_cooperation.DividendsOrderGoods{ 114 + good := allied_creation_cooperation.DividendsOrderGoodAdd{
  115 + OrderGoodId: int64(v.OrderGoodId),
115 CooperationContractNumber: v.CooperationContractNumber, 116 CooperationContractNumber: v.CooperationContractNumber,
116 DividendsOrderNumber: v.DividendsOrderNumber, 117 DividendsOrderNumber: v.DividendsOrderNumber,
117 OrderGoodExpense: v.OrderGoodExpense, 118 OrderGoodExpense: v.OrderGoodExpense,
@@ -101,19 +101,19 @@ type ( @@ -101,19 +101,19 @@ type (
101 //更新分红订单 101 //更新分红订单
102 type ( 102 type (
103 ReqDividendsOrderUpdate struct { 103 ReqDividendsOrderUpdate struct {
104 - DividendsOrderId int `json:"dividendsOrderId,string"`  
105 - CompanyId int `json:"companyId,string"`  
106 - CustomerName string `json:"customerName"` //客户名称  
107 - DividendsOrderAmount float64 `json:"dividendsOrderAmount"` //分红订单金额  
108 - DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红订单号  
109 - DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号  
110 - OperatorUid int `json:"operatorUid,string"` //订单操作人id  
111 - OrderGoods []DividendsOrderGoods `json:"orderGoods"` //订单产品列表  
112 - OrderTime string `json:"orderTime"` //订单日期,13位长度字符串类型时间戳  
113 - Remarks string `json:"remarks"` //备注  
114 - SalesmanUid string `json:"salesmanUid"` //订单业务员uid  
115 - UserId int `json:"userId,string"` //  
116 - RegionName string `json:"regionName"` //区域名称 104 + DividendsOrderId int `json:"dividendsOrderId,string"`
  105 + CompanyId int `json:"companyId,string"`
  106 + CustomerName string `json:"customerName"` //客户名称
  107 + DividendsOrderAmount float64 `json:"dividendsOrderAmount"` //分红订单金额
  108 + DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红订单号
  109 + DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号
  110 + OperatorUid int `json:"operatorUid,string"` //订单操作人id
  111 + OrderGoods []DividendsOrderGoodAdd `json:"orderGoods"` //订单产品列表
  112 + OrderTime string `json:"orderTime"` //订单日期,13位长度字符串类型时间戳
  113 + Remarks string `json:"remarks"` //备注
  114 + SalesmanUid string `json:"salesmanUid"` //订单业务员uid
  115 + UserId int `json:"userId,string"` //
  116 + RegionName string `json:"regionName"` //区域名称
117 } 117 }
118 118
119 DataDividendsOrderUpdate struct { 119 DataDividendsOrderUpdate struct {