合并分支 'feature_order_number' 到 'master'
订单号查询修改 查看合并请求 !6
正在显示
9 个修改的文件
包含
10 行增加
和
0 行删除
| @@ -12,6 +12,7 @@ type SearchDividendsEstimateQuery struct { | @@ -12,6 +12,7 @@ type SearchDividendsEstimateQuery struct { | ||
| 12 | Operator domain.Operator `json:"-"` | 12 | Operator domain.Operator `json:"-"` |
| 13 | // 承接人分红预算单号 | 13 | // 承接人分红预算单号 |
| 14 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` | 14 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` |
| 15 | + OrderOrReturnedOrderNum string `json:"orderOrReturnedOrderNum"` // 分红订单号或退货单号 | ||
| 15 | // 分红类型，1订单分红，2退货冲销，3金额激励 | 16 | // 分红类型，1订单分红，2退货冲销，3金额激励 |
| 16 | DividendsType int `json:"dividendsType"` | 17 | DividendsType int `json:"dividendsType"` |
| 17 | PageNumber int `json:"pageNumber"` | 18 | PageNumber int `json:"pageNumber"` |
| @@ -75,6 +75,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat | @@ -75,6 +75,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat | ||
| 75 | searchDividendsEstimateQuery.Operator) | 75 | searchDividendsEstimateQuery.Operator) |
| 76 | result, err := creationCooperationGateway.DividendsEstimatesSearch(allied_creation_cooperation.ReqDividendsEstimateSearch{ | 76 | result, err := creationCooperationGateway.DividendsEstimatesSearch(allied_creation_cooperation.ReqDividendsEstimateSearch{ |
| 77 | DividendsEstimateOrderNumber: searchDividendsEstimateQuery.DividendsEstimateOrderNumber, //承接人分红预算单号 | 77 | DividendsEstimateOrderNumber: searchDividendsEstimateQuery.DividendsEstimateOrderNumber, //承接人分红预算单号 |
| 78 | + OrderOrReturnedOrderNum: searchDividendsEstimateQuery.OrderOrReturnedOrderNum, | ||
| 78 | DividendsType: searchDividendsEstimateQuery.DividendsType, //分红类型，1订单分红，2退货冲销，3金额激励 | 79 | DividendsType: searchDividendsEstimateQuery.DividendsType, //分红类型，1订单分红，2退货冲销，3金额激励 |
| 79 | PageNumber: searchDividendsEstimateQuery.PageNumber, | 80 | PageNumber: searchDividendsEstimateQuery.PageNumber, |
| 80 | PageSize: searchDividendsEstimateQuery.PageSize, | 81 | PageSize: searchDividendsEstimateQuery.PageSize, |
| @@ -11,6 +11,8 @@ type SearchDividendsOrderQuery struct { | @@ -11,6 +11,8 @@ type SearchDividendsOrderQuery struct { | ||
| 11 | DividendsOrderNumber string `json:"dividendsOrderNumber,omitempty"` | 11 | DividendsOrderNumber string `json:"dividendsOrderNumber,omitempty"` |
| 12 | // 客户名称 | 12 | // 客户名称 |
| 13 | CustomerName string `json:"customerName,omitempty"` | 13 | CustomerName string `json:"customerName,omitempty"` |
| 14 | + // 来源单号 | ||
| 15 | + DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` | ||
| 14 | // 页码 | 16 | // 页码 |
| 15 | PageNumber int `json:"pageNumber"` | 17 | PageNumber int `json:"pageNumber"` |
| 16 | // 每页限制 | 18 | // 每页限制 |
| @@ -87,6 +87,7 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD | @@ -87,6 +87,7 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD | ||
| 87 | PageSize: searchDividendsOrderQuery.PageSize, | 87 | PageSize: searchDividendsOrderQuery.PageSize, |
| 88 | CustomerName: searchDividendsOrderQuery.CustomerName, | 88 | CustomerName: searchDividendsOrderQuery.CustomerName, |
| 89 | DividendsOrderNumber: searchDividendsOrderQuery.DividendsOrderNumber, | 89 | DividendsOrderNumber: searchDividendsOrderQuery.DividendsOrderNumber, |
| 90 | + DividendsOriginalOrderNum: searchDividendsOrderQuery.DividendsOriginalOrderNum, | ||
| 90 | OrgIds: searchDividendsOrderQuery.Operator.OrgIds, | 91 | OrgIds: searchDividendsOrderQuery.Operator.OrgIds, |
| 91 | CompanyId: int(searchDividendsOrderQuery.Operator.CompanyId), | 92 | CompanyId: int(searchDividendsOrderQuery.Operator.CompanyId), |
| 92 | }) | 93 | }) |
| @@ -11,6 +11,7 @@ type SearchDividendsReturnedOrderQuery struct { | @@ -11,6 +11,7 @@ type SearchDividendsReturnedOrderQuery struct { | ||
| 11 | DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName,omitempty"` | 11 | DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName,omitempty"` |
| 12 | // 分红退货单号 | 12 | // 分红退货单号 |
| 13 | DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber,omitempty"` | 13 | DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber,omitempty"` |
| 14 | + OriginalOrderNum string `json:"originalOrderNum"` //源单号（原始订单号） | ||
| 14 | // 查询偏离量 | 15 | // 查询偏离量 |
| 15 | PageNumber int `json:"pageNumber"` | 16 | PageNumber int `json:"pageNumber"` |
| 16 | // 每页 | 17 | // 每页 |
| @@ -80,6 +80,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide | @@ -80,6 +80,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide | ||
| 80 | PageSize: searchDividendsReturnedOrderQuery.PageSize, | 80 | PageSize: searchDividendsReturnedOrderQuery.PageSize, |
| 81 | DividendsReturnedOrderNumber: searchDividendsReturnedOrderQuery.DividendsReturnedOrderNumber, | 81 | DividendsReturnedOrderNumber: searchDividendsReturnedOrderQuery.DividendsReturnedOrderNumber, |
| 82 | DividendsReturnedCustomerName: searchDividendsReturnedOrderQuery.DividendsReturnedCustomerName, | 82 | DividendsReturnedCustomerName: searchDividendsReturnedOrderQuery.DividendsReturnedCustomerName, |
| 83 | + OriginalOrderNum: searchDividendsReturnedOrderQuery.OriginalOrderNum, | ||
| 83 | OrgIds: searchDividendsReturnedOrderQuery.Operator.OrgIds, | 84 | OrgIds: searchDividendsReturnedOrderQuery.Operator.OrgIds, |
| 84 | }) | 85 | }) |
| 85 | if err != nil { | 86 | if err != nil { |
| @@ -42,6 +42,7 @@ type ( | @@ -42,6 +42,7 @@ type ( | ||
| 42 | ReqDividendsEstimateSearch struct { | 42 | ReqDividendsEstimateSearch struct { |
| 43 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` //承接人分红预算单号 | 43 | DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` //承接人分红预算单号 |
| 44 | CooperationContractNumber string `json:"orderOrReturnedOrderNum"` //合约编号 | 44 | CooperationContractNumber string `json:"orderOrReturnedOrderNum"` //合约编号 |
| 45 | + OrderOrReturnedOrderNum string `json:"matchOrderOrReturnedOrderNum"` // 分红订单号或退货单号 | ||
| 45 | DividendsType int `json:"dividendsType"` //分红类型，1订单分红，2退货冲销，3金额激励 | 46 | DividendsType int `json:"dividendsType"` //分红类型，1订单分红，2退货冲销，3金额激励 |
| 46 | PageNumber int `json:"pageNumber"` | 47 | PageNumber int `json:"pageNumber"` |
| 47 | PageSize int `json:"pageSize"` | 48 | PageSize int `json:"pageSize"` |
| @@ -127,6 +127,7 @@ type ( | @@ -127,6 +127,7 @@ type ( | ||
| 127 | CompanyId int `json:"companyId"` | 127 | CompanyId int `json:"companyId"` |
| 128 | CustomerName string `json:"customerName"` | 128 | CustomerName string `json:"customerName"` |
| 129 | DividendsOrderNumber string `json:"dividendsOrderNumber"` | 129 | DividendsOrderNumber string `json:"dividendsOrderNumber"` |
| 130 | + DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` | ||
| 130 | OrgId int64 `json:"orgId"` | 131 | OrgId int64 `json:"orgId"` |
| 131 | OrgIds []int64 `json:"orgIds"` | 132 | OrgIds []int64 `json:"orgIds"` |
| 132 | PageNumber int `json:"pageNumber"` | 133 | PageNumber int `json:"pageNumber"` |
| @@ -101,6 +101,7 @@ type ( | @@ -101,6 +101,7 @@ type ( | ||
| 101 | OrgId int `json:"orgId"` | 101 | OrgId int `json:"orgId"` |
| 102 | PageNumber int `json:"pageNumber"` | 102 | PageNumber int `json:"pageNumber"` |
| 103 | PageSize int `json:"pageSize"` | 103 | PageSize int `json:"pageSize"` |
| 104 | + OriginalOrderNum string `json:"originalOrderNum"` //源单号（原始订单号） | ||
| 104 | DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber"` | 105 | DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber"` |
| 105 | DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"` | 106 | DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"` |
| 106 | UserId int `json:"userId"` | 107 | UserId int `json:"userId"` |
-
请 注册 或 登录 后发表评论