Merge branch 'master' of git.oa00.com:supply-chain/service

finance
杨赟 2 years ago
commit a836940f8e

@ -12,6 +12,7 @@ import (
const (
ReplyOrderFreightFeeErrCodeNone = 0 // 无错误
ReplyOrderFreightFeeErrCodeErr = 1 // 有错误
ReplyOrderFreightFeeErrCodeDone = 2 // 已下架
OrderStatusLock = 1 // 锁单待确认
OrderStatusLadingBill = 2 // 提单
@ -171,6 +172,7 @@ func (o *order) Split(ctx context.Context, channelId string, args ArgsOrderSplit
}
type OrderListsSearch struct {
SkuIds []uint // 商品Ids
SkuName string // 商品名称
Status []uint // 订单状态
CancelStatus uint // 订单取消状态
@ -203,6 +205,7 @@ type OrderItem struct {
CloseAt int64 `json:"closeAt"`
Skus []OrderSku `json:"skus"`
Packages []OrderPackage `json:"packages"`
StockOutAt int64 `json:"stockOutAt"`
}
type OrderSku struct {

@ -7,8 +7,9 @@ import (
type skuState uint
const (
SkuStateIn = 1 // 有货
SkuStateOut = 2 // 无货
SkuStateIn = 1 // 有货
SkuStateOut = 2 // 无货
SkuStateDone = 3 // 下架商品
)
type Sku interface {

@ -106,6 +106,7 @@ type ArgsRetailOrderLists struct {
type RetailOrderSearch struct {
OrderSubSn uint64 `label:"订单号"`
SourceSubSn uint64 `label:"供应商订单号"`
SupplierId uint `label:"供应商"`
CustomerId uint `label:"客户"`
WaybillCode string `label:"运单号"`

Loading…
Cancel
Save