作者 Administrator

合并分支 'feature_order_number' 到 'master'

订单号查询修改



查看合并请求 !6
... ... @@ -12,6 +12,7 @@ type SearchDividendsEstimateQuery struct {
Operator domain.Operator `json:"-"`
// 承接人分红预算单号
DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"`
OrderOrReturnedOrderNum string `json:"orderOrReturnedOrderNum"` // 分红订单号或退货单号
// 分红类型,1订单分红,2退货冲销,3金额激励
DividendsType int `json:"dividendsType"`
PageNumber int `json:"pageNumber"`
... ...
... ... @@ -75,7 +75,8 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat
searchDividendsEstimateQuery.Operator)
result, err := creationCooperationGateway.DividendsEstimatesSearch(allied_creation_cooperation.ReqDividendsEstimateSearch{
DividendsEstimateOrderNumber: searchDividendsEstimateQuery.DividendsEstimateOrderNumber, //承接人分红预算单号
DividendsType: searchDividendsEstimateQuery.DividendsType, //分红类型,1订单分红,2退货冲销,3金额激励
OrderOrReturnedOrderNum: searchDividendsEstimateQuery.OrderOrReturnedOrderNum,
DividendsType: searchDividendsEstimateQuery.DividendsType, //分红类型,1订单分红,2退货冲销,3金额激励
PageNumber: searchDividendsEstimateQuery.PageNumber,
PageSize: searchDividendsEstimateQuery.PageSize,
CompanyId: searchDividendsEstimateQuery.Operator.CompanyId,
... ...
... ... @@ -11,6 +11,8 @@ type SearchDividendsOrderQuery struct {
DividendsOrderNumber string `json:"dividendsOrderNumber,omitempty"`
// 客户名称
CustomerName string `json:"customerName,omitempty"`
// 来源单号
DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"`
// 页码
PageNumber int `json:"pageNumber"`
// 每页限制
... ...
... ... @@ -83,12 +83,13 @@ func (dividendsOrderService *DividendsOrderService) RemoveDividendsOrder(removeD
func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchDividendsOrderQuery *query.SearchDividendsOrderQuery) (int, interface{}, error) {
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(searchDividendsOrderQuery.Operator)
result, err := creationCooperationGateway.DividendsOrderSearch(allied_creation_cooperation.ReqDividendsOrderSearch{
PageNumber: searchDividendsOrderQuery.PageNumber,
PageSize: searchDividendsOrderQuery.PageSize,
CustomerName: searchDividendsOrderQuery.CustomerName,
DividendsOrderNumber: searchDividendsOrderQuery.DividendsOrderNumber,
OrgIds: searchDividendsOrderQuery.Operator.OrgIds,
CompanyId: int(searchDividendsOrderQuery.Operator.CompanyId),
PageNumber: searchDividendsOrderQuery.PageNumber,
PageSize: searchDividendsOrderQuery.PageSize,
CustomerName: searchDividendsOrderQuery.CustomerName,
DividendsOrderNumber: searchDividendsOrderQuery.DividendsOrderNumber,
DividendsOriginalOrderNum: searchDividendsOrderQuery.DividendsOriginalOrderNum,
OrgIds: searchDividendsOrderQuery.Operator.OrgIds,
CompanyId: int(searchDividendsOrderQuery.Operator.CompanyId),
})
if err != nil {
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ...
... ... @@ -11,6 +11,7 @@ type SearchDividendsReturnedOrderQuery struct {
DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName,omitempty"`
// 分红退货单号
DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber,omitempty"`
OriginalOrderNum string `json:"originalOrderNum"` //源单号(原始订单号)
// 查询偏离量
PageNumber int `json:"pageNumber"`
// 每页
... ...
... ... @@ -80,6 +80,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
PageSize: searchDividendsReturnedOrderQuery.PageSize,
DividendsReturnedOrderNumber: searchDividendsReturnedOrderQuery.DividendsReturnedOrderNumber,
DividendsReturnedCustomerName: searchDividendsReturnedOrderQuery.DividendsReturnedCustomerName,
OriginalOrderNum: searchDividendsReturnedOrderQuery.OriginalOrderNum,
OrgIds: searchDividendsReturnedOrderQuery.Operator.OrgIds,
})
if err != nil {
... ...
... ... @@ -42,6 +42,7 @@ type (
ReqDividendsEstimateSearch struct {
DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` //承接人分红预算单号
CooperationContractNumber string `json:"orderOrReturnedOrderNum"` //合约编号
OrderOrReturnedOrderNum string `json:"matchOrderOrReturnedOrderNum"` // 分红订单号或退货单号
DividendsType int `json:"dividendsType"` //分红类型,1订单分红,2退货冲销,3金额激励
PageNumber int `json:"pageNumber"`
PageSize int `json:"pageSize"`
... ...
... ... @@ -124,14 +124,15 @@ type (
//查询分红订单
type (
ReqDividendsOrderSearch struct {
CompanyId int `json:"companyId"`
CustomerName string `json:"customerName"`
DividendsOrderNumber string `json:"dividendsOrderNumber"`
OrgId int64 `json:"orgId"`
OrgIds []int64 `json:"orgIds"`
PageNumber int `json:"pageNumber"`
PageSize int `json:"pageSize"`
UserId int `json:"userId"`
CompanyId int `json:"companyId"`
CustomerName string `json:"customerName"`
DividendsOrderNumber string `json:"dividendsOrderNumber"`
DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"`
OrgId int64 `json:"orgId"`
OrgIds []int64 `json:"orgIds"`
PageNumber int `json:"pageNumber"`
PageSize int `json:"pageSize"`
UserId int `json:"userId"`
}
DataDividendsOrderSearch struct {
... ...
... ... @@ -101,6 +101,7 @@ type (
OrgId int `json:"orgId"`
PageNumber int `json:"pageNumber"`
PageSize int `json:"pageSize"`
OriginalOrderNum string `json:"originalOrderNum"` //源单号(原始订单号)
DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber"`
DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`
UserId int `json:"userId"`
... ...